1711 files changed, 0 insertions, 607692 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 00c805b196..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,25 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-install-sh
-intl
-libtool
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h
-stamp-h.in
-stamp.h
-xlibtool
-xltmain.sh
-evolution.spec
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 5156573f32..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,66 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@helixcode.com>
-	Chris Lahey <clahey@helixcode.com>
-	Chris Toshok <toshok@helixcode.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@helixcode.com>
-
-Calendar
-	Seth Alves <seth@helixcode.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@helixcode.com>
-	Federico Mena-Quintero <federico@helixcode.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <battery841@mypad.com>
-	Aaron Weber <aaron@helixcode.com>
-
-Mailer
-	Bertrand Guiheneuf <bertrand@helixcode.com>
-	Matt Loper <matt@helixcode.com>
-	Ettore Perazzoli <ettore@helixcode.com>
-	Jeff Stedfast <fejj@helixcode.com>
-	Peter Williams <peterw@helixcode.com>
-	Dan Winship <danw@helixcode.com>
-	Michael Zucchi <notzed@helixcode.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Shell
-	Miguel de Icaza <miguel@helixcode.com>
-	Ettore Perazzoli <ettore@helixcode.com>
-
-Translations
-	Akira TAGOH <tagoh@gnome.gr.jp>
-	Andraz Tori <andraz.tori1@guest.arnes.si>
-	Andreas Hyden <a.hyden@cyberpoint.se>
-	Arjan Scherpenisse <acscherp@wins.uva.nl>
-	Clara Tattoni <clara.tattoni@libero.it>
-	Fatih Demir <kabalak@gmx.net>
-	GNOME PL Team <gnomepl@pandora.info.bielsko.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	Héctor García Alvarez <hector@scouts-es.org>
-	Jesús Bravo Álvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	Matthias Warkus <mawa@iname.com>
-	Spiros Papadimitriou <spapadim+@cs.cmu.edu>
-	Sung-Hyun Nam <namsh@kldp.org>
-	Szabolcs BAN <shooby@gnome.hu>
-	Tiago Antão <tiagoantao@bigfoot.com>
-	Valek Filippov <frob@df.ru>
-	Vincent Renardias <vincent@redhat.com>
-	Yuri Syrota <rasta@renome.rovno.ua>
-
-Widgets
-	Damon Chaplin <damon@helixcode.com>
-	Miguel de Icaza <miguel@helixcode.com>
-	Chris Lahey <clahey@helixcode.com>
-	Federico Mena-Quintero <federico@helixcode.com>
-	Chris Toshok <toshok@helixcode.com>
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index bd44e8882b..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,5695 +0,0 @@
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  Héctor García Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/HACKING b/HACKING
deleted file mode 100644
index e69de29bb2..0000000000
--- a/HACKING
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17ac46..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 7a42d1eee8..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Email: miguel@kernel.org
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 4b475c8a61..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-changelogs =			\
-	ChangeLog
-
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-applicationdir = $(datadir)/gnome/apps/Applications
-application_DATA = evolution.desktop
-
-EXTRA_DIST =			\
-	AUTHORS			\
-	$(changelogs)		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	$(appicon_DATA)		\
-	$(application_DATA)
-
-
-SUBDIRS =			\
-        intl                    \
-        macros                  \
-        data                    \
-        e-util                  \
-        widgets                 \
-        shell                   \
-	executive-summary	\
-        libibex                 \
-        camel                   \
-        filter                  \
-        composer                \
-        mail                    \
-        libical                 \
-        libversit               \
-        addressbook             \
-        calendar                \
-        wombat                  \
-        art                     \
-	ui			\
-        default_user            \
-        tools                   \
-        po                      \
-        doc
-
-
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 373284bf36..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,614 +0,0 @@
-Version 0.6
------------
-
-General:
-
-  - Split out lots of functionality to gal.  Evolution now depends on
-    gal. (Chris Lahey, Gal Team)
-
-Shell:
-
-  - Added a cute splash screen.  (Ettore, TigerT)
-
-  - Improved the way `~/evolution' is initialized the first time.
-    (Iain)
-
-  - Fixed the problem with the folder bar disappearing too son when
-    clicking on the scrollbar.  (Ettore)
-
-  - Updated to use the new toolbar and UI merging code from Bonobo.
-    (Michael Meeks, Ettore)
-
-Mail:
-
-  - Numerous i18n encoding, decoding, and display fixes. Non-ASCII
-    text should be displayed correctly in most context in the mailer
-    now. The composer no longer sends undeclared 8bit data. (Jeff)
-
-  - The IMAP provider now caches summary info between sessions, so
-    startup should be much faster for large folders. (Dan)
-
-  - Subscribe/unsubscribe UI for newsgroups. (IMAP subscriptions will
-    be supported in a later release.) NNTP authentication support.
-    Various other NNTP fixes. (Chris Toshok)
-
-  - New "full search" button to do more complicated searches. (NotZed)
-
-  - Composer attachment bar improvements. You can now drag files to
-    the composer window to attach them to the message. (Iain)
-
-  - Message list state (columns selected, sorting, etc) is now saved
-    between sessions. (NotZed)
-
-  - "Get Mail" now works for IMAP. IMAP mail no longer arrives
-    asynchronously (although if you delete mail from another client,
-    it will be deleted asynchronously). (Dan)
-
-  - Image attachments now use thumbnail images rather than a generic
-    image icon. (Iain)
-
-  - Various IMAP provider bugs (Dan, Jeff)
-
-  - Filter code cleanup/improvements. (NotZed) Filtering can read and
-    write message scores. (Jeff) On-demand filters no longer expunge
-    the source folder, and don't filter deleted messages. (Jeff)
-    Filters now log their actions. (Jeff)
-
-  - Drafts, Outbox, and Sent folders now default to showing "To"
-    instead of "From" in the header list. Messages output to the Sent
-    folder are marked as "Seen". "Send later" on a reply will mark the
-    message as having been replied to. (Jeff)
-
-  - Message list "attachment" column is now functional. The
-    read/unread state of a fake thread header now matches the state of
-    the thread. (NotZed) Message list sorting is more clever (Jeff)
-
-  - The "Print" toolbar button now opens a Print dialog rather than a
-    Print Preview window. (Miguel)
-
-  - New "Select All" command. "Mark all messages as seen" became "Mark
-    (selected) messages seen". (Jeff)
-
-Calendar:
-
-  - Improved todo list and calendar view gui (Damon)
-
-  - Printing works again (Federico)
-
-  - Config dialog improvement and implementation (Damon)
-
-  - Todo and calendar conduits working, except for archiving (JP)
-
-Addressbook:
-
-  - Lots of internal refactoring of addressbook, including changes due
-    to gal. (Chris, Chris)
-
-  - Lots of bug fixes. (Chris, Chris, Matt Bissiri, Iain, Dan)
-
-  - Added a working field to save whether the contact wants
-    HTML. (Chris Lahey)
-
-  - Added "Stop" and "View All" toolbar buttons. (Chris Lahey)
-
-  - Lots of work on modifiable LDAP. (Chris Toshok)
-
-  - Recognizes a lot more Prefixes and Suffixes when parsing names. (Nat)
-
-  - The card view doesn't write out cards unless they've changed. (Chris Lahey)
-
-  - New layout of address editor dialog. (Anna, Chris Lahey)
-
-Version 0.5.1, "Salamended", 2000-09-15
----------------------------------------
-
-General:
-
-  - Fixed a font-handling problem that would cause Evolution to crash
-    at startup with certain Gtk themes. (Chris)
-
-  - Fixed some build problems. (Chris)
-
-  - We no longer ship an out-of-date Red Hat-only RPM spec file.
-
-Shell:
-
-  - The shell now installs the `Sent' folder at startup if it doesn't
-    exist yet.  (Ettore)
-
-  - If a component crashes unexpectedly, the shell displays a dialog
-    box informing the user of that.  (Ettore)
-
-  - Fixed a bug in the folder selector dialog that would result in
-    crashes while trying to move messages in the mailer. (Dan)
-
-Addressbook:
-
-  - Fixed a bug that would cause the addressbook to crash when
-    embedded in the composer. (Dan)
-
-Mail:
-
-  - Fixed a display problem caused by expunging an IMAP folder. (Dan)
-
-  - Fixed POP mail so that "keep on server" is obeyed correctly. (Dan,
-    Jeff)
-
-  - Fixed replies so that replying to a message twice doesn't turn off
-    the "replied" flag. (Dan)
-
-  - Fixed a bug that prevented "Send later" from working. (Dan)
-
-
-Version 0.5, "Salamander", 2000-09-13
--------------------------------------
-
-Shell:
-
-  - Switched to using ETree for the folder view.  (Chris Toshok,
-    Ettore)
-
-  - Added interfaces to change the string displayed in the tree view
-    as the name of the folder.  (Ettore)
-
-Calendar:
-
-  - Uses only the new iCalendar standard internally; this means future
-    interoperability with new calendaring programs.  (JP, Federico)
-
-  - New ultra-cool date range selector, aka little calendar.  (Damon)
-
-  - Plenty of internal refactoring.  (JP, Damon, Federico)
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)
-    <EXPERIMENTAL>
-
-Addressbook:
-
-  - New advanced search dialog.  (Michael Zucchi, Chris Lahey)
-
-  - Added parsing of addresses.  (Jesse Pavel)
-
-  - Converted most of addressbook to UTF8.  (Lauris)
-
-Mailer:
-
-  - Filters (but not vfolders) are now more powerful: they can check
-    any message header, and can do regexp searches on the headers and
-    body.  (Jeff)
-
-  - A first draft of an automated mailing list recognizer
-    has been added.  (It will need more/better rules.)  (Ettore)
-
-  - Attachments are handled differently now.  All attachments always
-    have an icon and a header, and you can right-click on the icon to
-    view/hide, save, or launch an external viewer.  (Dan)
-
-  - It is no longer necessary to quit and restart after adding a new
-    IMAP server.  (Peter)
-
-  - Lots of i18n/charset fixing.  (Lauris)
-
-  - Shiny new toolbar icons.  (Tuomas)
-
-  - Giant menu reorganization. Most message operations are now in the
-    "Message" menu, and folder operations in the "Folder" menu.
-    (Ettore, Dan, Peter)
-
-  - "Mark as seen" timeout is now configurable. Mail view remembers
-    the location of the message list/message display split.  (Richard
-    Hult)
-
-  - New filter category: "On-demand", for filters to be applied
-    at arbitrary times rather than during mail incorporation.  (Peter)
-
-  - POP/IMAP config pages allow you to specify a port... this may
-    go away in a later release when we support ssl/ssh tunneling
-    directly.  (Peter)
-
-  - Reply To All will now remove your own addresses from the recipient
-    lists.  (Jesse Pavel)
-
-  - Folders are synced when you switch to another folder now.  (Dan)
-
-  - An IMAP bug that caused all messages to be marked as read before
-    they were read has been fixed.  (Dan)
-
-  - The IMAP provider is now more robust about dealing with other
-    concurrent IMAP clients.  (Jeff)
-
-  - POP and IMAP are better about when they do and don't try to
-    reconnect.  This was part of Camel operation cancellation support,
-    which unfortunately didn't make it into 0.5.  (Peter)
-
-  - Sent and Outbox folders are now functional.  You now have 2
-    options when sending a message - "Send Now" which will send the
-    message imediately and "Send Later" which will queue the message in
-    Outbox for later sending.  When a message is successfully sent, it
-    is copied to the Sent folder for your records.  (Jeff)
-
-ETable:
-
-  - ETree fixes.  (Chris Toshok)
-
-  - Lots of small usability fixes.  (Chris Lahey)
-
-  - Lots of grouping bug fixes.  Specifically, fixed crashes when
-    grouping in trees and made ETable not go crazy when you change
-    data and the table is grouped.  (Chris Lahey)
-
-  - Improved table printing when grouped.  (Chris Lahey)
-
-  - Converted most of ETable to UTF8.  (Lauris)
-
-
-Version 0.4, "Alewife", 2000-08-14
-----------------------------------
-
-Shell:
-
-  - Added interfaces to display messages and a progress bar when the
-    component is busy.  (Ettore)
-
-  - Changed the shell BonoboUIHandler code to allow placing menu items
-    such as "Print" in the right places.  (Ettore)
-
-  - Added code to check if an existing `~/evolution' directory
-    actually has the content we expect and, if not, complain to the
-    user.  (Dan)
-
-  - Fixed some Bonobo-related refcounting problems.  (Michael Meeks)
-
-  - Removed the GConf dependency.  (JP)
-
-  - Improved the API for the folder selection dialog.  (Ettore)
-
-  - Memory leak fixes.  (Peter)
-
-Calendar:
-
-  The calendar is in the middle of major rewrite. Evolution 0.4
-  ships with essentially the same calendar component as 0.3 did.
-
-Addressbook:
-
-  - More work on the Palm Pilot conduits.  (Chris Toshok)
-
-  - Fixed some LDAP-related crashes.  (Chris Toshok)
-
-  - Added support for displaying embedded vCards through a Bonobo
-    component.  (Chris Lahey)
-
-  - Added support for generic fields.  (Chris Lahey)
-
-  - Fixed the navigation order for the Tab key in the contact editor
-    window.  (Chris Lahey)
-
-  - Fixed some Bonobo-related bugs and crashes.  (Chris Lahey, Michael
-    Meeks)
-
-  - Only display entries that have an email address in the address
-    selector dialog.  (Chris Lahey)
-
-  - Added an utility program to import vCards from Gnomecard.  (Chris
-    Lahey)
-
-Mailer:
-
- Generic
-
-  - Long mailer operations (such as fetching new mail) now run
-    asynchronously rather than blocking the UI. This involved
-    a major rewrite of much of the Camel and mailer code.  (Peter)
-
-  - GPG/PGP message decryption support (Nathan Thompson-Amato, Dan)
-
-  - Unfinished messages in the composer can be saved to the "Drafts"
-    folder and finished later.  (Jeff)
-
-  - Double-clicking on a message in the message view now opens it in a
-    separate window.  (Jeff)
-
-  - vCards attached to messages now bring up a minicard view with a
-    button to add the vCard to the addressbook (Chris Lahey, Dan)
-
-  - Inline uuencoded/binhexed "attachment" support (Dan)
-
-  - "Mark All Messages Seen" command.  (Cody Russell)
-
- Filters / VFolders
-
-  - Major filter/vfolder dialog rewrite (Michael Zucchi) VFolders can
-    now search any (searchable) folder, not just Inbox.
-
-  - Auto-filter/auto-vfolder code (right click on a message in the
-    list and pick one of the options at the bottom of the menu to
-    create a filter/vfolder rule for similar messages).  (Michael)
-
-  - You can now set the color of messages in the message list, based
-    on filter rules.  (Local stores can also now store arbitrary user
-    flags, although there is not yet UI code to set/view them.)
-    (Michael)
-
-  - Added "Save" button to the quicksearch bar to save a search as a
-    vfolder.  (Michael)
-
- Configuration
-
-  - Major mail config dialog rewrite (JP).
-
-  - The mailer now remembers your threaded/unthreaded message view
-    setting between sessions.  (Jeremy Wise).
-
-  - Support for multiple identities (JP, Jeff), sources (JP, Peter), and
-    IMAP servers (JP, Dan)
-
- Providers
-
-  - You can now leave POP mail on the server. (This will [currently]
-    only work right with POP servers that support the UIDL command.
-    On other servers, it will never download some messages unless you
-    never delete mail.)
-
-  - There is now an MH-like local store available, and code to convert
-    a folder from one type to the other.  (Michael)
-
-  - The mbox provider now writes out "From " lines that are more
-    compatible with other mailers (like Mutt) that are picky about
-    their exact format.  (Michael)
-
-  - The IMAP provider now supports searching (Jeff). Also various
-    other speed/efficiency/robustness improvements (Jeff), and support
-    for old IMAP4 servers as well as IMAP4rev1 (Jon K Hellan).
-
-
-Version 0.3, "Jellyfish", 2000-07-21
-------------------------------------
-
-Shell:
-
-  - Pop-up folder selection.  (Ettore)
-
-  - Added support for multiple views.  (Ettore)
-
-  - Added support for saving component-specific settings, and
-    some initial code to save the view's configuration.
-    (Ettore)
-
-  - Fixed the Bonobo menu code so that it works with all the
-    locales.  (Ettore)
-
-Mailer:
-
-   - Lots of IMAP fixes.  (Jeff) 
-
-   - You can use an external setuid/setgid movemail program
-    (although we don't ship our own yet). If you have one
-    installed with emacs, the configure script will find
-    that. Otherwise, you can specify --with-movemail=/path.
-    (Dan)
-
-  - You can toggle HTML/plain text for an individual message
-    in the composer now.  (Ettore)
-
-  - Bonobo embedding sort of works again, but there are
-    problems with size allocation somewhere. Attachments can now
-    also be handled by external applications.  (Dan)
-
-  - text/plain mail is now line-wrapped in the mail display,
-    to deal with people who don't put newlines in their mail.
-    (Dan)
-
-  - Allow user to specify IMAP namespace in the mail config
-    dialog.  (Dan, Jeff)
-
-  - Quoted-printable encoder fixes.  (Michael Zucchi)
-
-  - Various NNTP fixes, include a news pane in the config
-    dialog.  (Chris Toshok)
-
-  - Some memory corruption fixes.  (Peter Williams)
-
-  - Fix for message not being re-drawn as deleted.  (Peter
-    Williams, Jeff)
-
-  - Moving a message to another folder copies the flags now
-    (Jeff)
-
-  - Close signature in HTML mail with </PRE>, not <PRE>, and
-    default to ~/.signature.  (Michael Meeks)
-
-  - Fixed some confusing behavior in the message threading
-    algorithm.  (Dan)
-
-  - Improvements to the item selection code.  (Chris Lahey)
-
-Calendar:
-
-  - Added support for a bunch of previously unsupported iCalendar
-    properties.  (Federico)
-
-  - Conduit for synchronizing the calendar with gnome-pilot
-    (requires gnome-pilot from CVS).  (Seth)
-
-  - ETable-based to-do list view ("taskpad"), for your viewing
-    pleasure.
-
-Addressbook:
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Conduit for synchronizing the addressbook with gnome-pilot
-    (requires gnome-pilot from CVS).  (Chris Toshok)
-
-  - Fixed some random crashes.  (Chris Lahey)
-
-  - Implemented a vCard Bonobo control so that we can support
-    inline vCard viewing in the mailer.  (Chris Lahey)
-
-  - Quick search looks at both the name and the company name now.
-    (Chris Lahey)
-
-  - Added more functionality to the contact editor's toolbar.  (Chris
-    Lahey)
-
-  - Support for printing single cards.  (Chris Lahey)
-
-Version 0.2, "Saccharomyces", 2000-07-11
-----------------------------------------
-
-Shell:
-
-  * Folder selection dialog (Ettore).
-
-  * Folder creation dialog (Ettore).
-
-Addressbook:
-
-  * LDAP server configuration dialog (Chris Toshok).
-  
-  * Integration of LDAP servers in the shell's tree view (Chris Toshok).
-  
-  * ETable-based view (Chris Lahey).
-  
-  * Printing support for the ETable-based view (Chris Lahey).
-  
-  * Address selection dialog integrated with the message composer (Chris
-    Lahey).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-Calendar:
-
-  * Printing support (Michael, Federico).
-  
-  * Many, many behavior fixes and polishing to the day/week/month view
-    widgets (Damon).
-  
-  * New glade-based event editor.  This is unfinished but usable (Seth,
-    Federico).
-  
-  * Mouse wheel scrolling support (Anders).
-  
-  * We have an awesome new engine for computing recurring events
-    (Damon).  This will be plugged in to the new iCalendar code.
-  
-  * Internal and public API fixes (Federico, Seth).
-  
-  * Shell-related changes (Ettore).
-  
-  * Data model for ETable; this is not used yet (Federico).
-  
-  * New iCalendar support; this is not used yet (Federico).
-  
-  * Pilot syncing updates; this is not used yet (Seth).
-  
-  * Many miscellaneous bugs fixed (everyone).
-
-
-Mailer:
-
-  Major features:
-
-  * Basic IMAP support (Jeff)
-
-  * Threaded message view (Michael, Chris Toshok)
-
-  * Filters now work (original work by Michael, bugfixes by Dan)
-
-
-  Smaller features:
-
-  * Implemented moving messages between folders (Dan)
-
-  * Very basic printing support (Dan, but it was only like 5 lines
-    of code, because gnome-print kicks ass)
-
-  * "Delete", "Forward", and "Refile" operations now work on
-    multiple messages. (Chris Lahey, Peter Williams, Dan)
-
-  * Toggle read/unread flag when the user clicks on the envelope
-    icon (Chris Lahey, Dan).
-
-  * The "New folder" menu item now works (Ettore, Dan).
-
-  * The filter/vfolder druid now uses the new shell folder selection
-    UI (Michael)
-
-  * Added "Cc" to the set of filter/vfolderable headers and make the
-    filter/vfolder "messages to address" rule work with to or cc.
-    (Dan)
-
-  * New key bindings: "Delete" deletes the current message and jumps
-    to the next undeleted message. "N" and "P" go to next/previous
-    unread message. (Dan)
-
-  * Keep asking for POP/IMAP password until the user gets it correct
-    or hits Cancel, and remember the result until the user exits (or
-    chooses "Forget Passwords"). (Dan, Jeff)
-
-  * Kludge Camel to output ISO-8859-1 instead of UTF-8, since
-    neither GtkHTML nor ETable supports UTF-8 still. (Dan)
-
-  * Use the gnome-vfs "sniff buffer" interface to try to identify
-    the MIME type of attachments without useful type information
-    (Dan)
-
-  * Allow saving drafts in the composer (Ettore)
-
-  * Added "Received date" header to the set of possible message list
-    headers. (Dan)
-
-  * Partial gladification of the config dialog (JP Rosevear)
-
-
-  Bug fixes:
-
-  * Message read/unread/deleted flags should now be saved reliably
-    when you exit, and summary should not be rebuilt when a rebuild
-    isn't needed. Expunging should work reliably (Dan, Ettore,
-    Jeff).
-
-  * Fix disappearing toolbar bug (Dan).
-
-  * Fixed a bug that made downloading of very large messages over
-    POP incredibly slow, and various other smaller POP bugs. (Dan)
-
-  * Fixed bugs that made large attachments sometimes get dropped and
-    small ones sometimes get truncated. (Dan)
-
-  * Fixed filter/vfolder "messages to address" rule to correctly
-    match "to" rather than "from". (Michael)
-
-  * Fix some text/plain formatting bugs in the composer. (Dan,
-    Ettore)
-
-  * Turn off search mode when getting new mail (to avoid corrupting
-    the display). Make "get mail" always put unfiltered mail into
-    Inbox rather than the current folder. (Dan)
-
-  * Fixed a bug that caused "Re:" to be prepended even to subjects
-    that started with "Re:" when replying. Added a default subject
-    to forwarded messages. (Dan)
-
-  * Make the "Attach" dialog in the composer remember the last
-    directory it was in. (Dan)
-
-  * Code to parse invalid date formats since some mailers generate
-    them... (Jeff)
-
-  * Fixed various small SMTP bugs (Jeff, Chris Lahey)
-
-  * Fixed some memory leaks (Peter, Jeff)
-
-  * Make replies use the text/plain part of a multipart/alternative
-    if the user configured plain text rather than HTML mail sending.
-    (Dan)
-
-  * Various config dialog fixes (Jeff)
-
-  * Partial filter/vfolder GUI facelift (Jacob)
diff --git a/README b/README
deleted file mode 100644
index f0a7032d3b..0000000000
--- a/README
+++ /dev/null
@@ -1,184 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Helix Code, Inc.
-
-See http://www.helixcode.com/apps/evolution.php3 for more information.
-
-Note that Evolution is still beta. This means it may delete all of
-your mail if you give it the chance.
-
-If you are interested in hacking on Evolution, you should subscribe to
-the Evolution mailing list. Send mail to
-"evolution-request@helixcode.com" with the word "subscribe" in the
-body of the message. If you are planning to work on any part of
-Evolution, please send mail to the mailing list first, to avoid
-duplicated effort (and to make sure that you aren't basing your work
-on interfaces that are expected to change).
-
-There is a mailing list archive available at
-http://lists.helixcode.com/archives/public/evolution/
-
-There is also an #evolution IRC channel on irc.gnome.org.
-
-
-IF IT DOESN'T WORK
-------------------
-
-Did you read the "How to build" section below? :-)
-
-If you have built Evolution and it doesn't work, or you can't get it
-or one of its dependencies to compile, try running the
-"verify-evolution-install.sh" script in the tools/ subdirectory. It
-may be able to figure out what went wrong.
-
-
-HOW TO BUILD EVOLUTION
-----------------------
-
-	*** READ THIS BEFORE YOU START BUILDING ANYTHING! ***
-
-Evolution depends on a large number of unreleased and rapidly-changing
-libraries. Some of these libraries in turn depend on other unreleased
-and rapidly-changing libraries.
-
-Building Evolution is HARD, and it's going to stay hard until all of
-the libraries it depends on stabilize, and there's nothing we can do
-to make it any easier until then.
-
-
-General Principles
-------------------
-
-First you have to decide whether you want to install Evolution (and
-its dependencies) into the same prefix as the rest of your GNOME
-install, or into a new prefix. Installing everything into the same
-prefix as the rest of your GNOME install will make it much easier to
-build and run programs, but may make it harder to uninstall later.
-
-If you want to install into the same prefix as the rest of GNOME,
-type:
-
-	gnome-config --prefix
-	gnome-config --sysconfdir
-
-and remember the answers, and pass them to "configure" and "autogen"
-when building the other packages you need. Eg:
-
-	./configure --prefix=/usr --sysconfdir=/etc
-
-
-If you do not do this, you will need to set the GNOME_PATH environment
-variable (and ACLOCAL_FLAGS as well if building from CVS) to include
-the prefix you install into. Eg:
-
-        export GNOME_PATH=/usr/local
-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
-
-(Assuming your shell is bash, and you installed into /usr/local.) You
-need to set GNOME_PATH both during compiling AND when you run
-evolution. Remember also that if you're installing into an odd prefix
-such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH.
-
-If you install Evolution into a different prefix from OAF, you will
-also need to set OAF_INFO_PATH to include the directory where the
-oafinfo files are installed (${prefix}/share/oaf). (OAF will
-eventually obey the GNOME_PATH variable, but it does not do so
-currently.) Eg:
-
-	export OAF_INFO_PATH=/usr/local/share/oaf
-
-If you are already running an oafd, you will need to kill it after
-setting that variable so it gets restarted later with that in its
-environment.
-
-
-Dependencies
-------------
-
-All of these libraries are available in GNOME CVS, under the given
-names. Most (but not all) of them are also available as tarballs on
-ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
-(http://www.helixcode.com/desktop/)
-
- - gnome-xml - 1.8.7 or later in the 1.0 series, but not from the 2.0
-   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_X".)
-   (*)
-
- - gnome-print - 0.20 (*). The gnome-print CVS HEAD will NOT work, nor
-   will 0.21.
-
- - gdk-pixbuf - 0.7.0 or later (*)
-
- - ORBit - 0.5.3 or later (*)
-
- - oaf - 0.5 or later
-
-   *** If you are using oaf from CVS, you should use the flag
-   *** "--disable-more-warnings" when configure, or it may fail to
-   *** build.
-
- - gnome-vfs - 0.3 or later
-
-   *** If you are using gnome-vfs from CVS, you should use the flag
-   *** "--disable-more-warnings" when configuring, or it may fail to
-   *** build.
-
- - bonobo - 0.17 or later
-
-   *** Note that bonobo must be installed with the same --prefix as
-   *** either gnome-libs or evolution for the Makefiles to work
-   *** properly.
-
- - libunicode - 0.4 or later, available from
-   http://www.pango.org/download.shtml
-
- - gconf - 0.6 or later
-
- - gal (GNOME Application Library) - from CVS
-
- - gtkhtml - 0.5 or later
-
- - libglade (*)
-
-If you want support for PalmPilot syncing (currently only supported by
-the calendar and not yet very stable/functional), you will also need
-the following packages:
-
- - pilot-link (*)
-
- - gnome-pilot - from CVS, with --enable-oaf
-
-
-
-
-The layout of the source tree is:
-
-addressbook:	the Address Book UI
-art:		graphics used by evolution
-calendar:	the Calendar UI
-camel:		libcamel, a messaging library used by the mailer.
-		Camel is inspired by Sun's JavaMail
-		(http://java.sun.com/products/javamail/) and the
-		IMAPv4 spec (RFC 2060).
-composer:	the message composer UI
-data:		the .desktop file for Evolution
-default_user:	initial Evolution config files for new users
-devel-docs:	entirely inadequate documentation
-doc:		more adequate documentation
-e-util:		utility code used by various parts of Evolution
-filter:		libfilter, a mail filtering library
-libibex:	an indexing library used by the mailer
-libical:	a library for the iCalendar format (RFC 2445-2446)
-libversit:	a library for the vCard (RFC 2425-2426) and vCalendar
-		(http://www.imc.org/pdi/vcal-10.txt) formats
-mail:		the mail display UI
-shell:		the Evolution shell (the main program that launches
-		the other components)
-tests:		some test programs
-tools:		utilities, notably "killev", a script to kill of all
-		of the Evolution components
-widgets:	widgets used by Evolution, including the shortcut bar,
-		ETable, and EText
-wombat:		Has source code that will load in the addressbook
-		and calendar backend, and will form the server
-		process we'll be using
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index de3e404849..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE
-#undef VERSION
-#undef ENABLE_THREADS
-#undef SENDMAIL_PATH
-#undef SYSTEM_MAIL_DIR
-#undef HAVE_LDAP
-#undef HAVE_TIMEZONE
-#undef HAVE_TM_GMTOFF
-#undef USING_OAF
-#undef HAVE_KRB4
-#undef HAVE_KRB5
-#undef MOVEMAIL_PATH
-#undef PGP_PROGRAM
-#undef GPG_PATH
-#undef PGP5_PATH
-#undef PGP_PATH
-#undef USING_GNOME_PRINT_0_20
-#undef NEED_KRB_SENDAUTH_PROTO
-#undef HAVE_ISBLANK
-
-/* Define this if you want to build against the development gtk */
-#undef HAVE_DEVGTK
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_ARGS
diff --git a/addressbook/.cvsignore b/addressbook/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
deleted file mode 100644
index d18c824e5d..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,3005 +0,0 @@
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add
-	menus items to the envelope printing stuff.
-
-	* gui/component/addressbook.c: Hook up the search menu.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Add the search menu.
-
-	* printing/Makefile.am: Add e-contact-print-envelope.c and
-	e-contact-print-envelope.h.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Added envelope printing.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Clean the idl-generated
-	files properly.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
-	unnecessary .cvsignores.
-
-	* gui/component/addressbook.c: Switch to using EAddressbookSearch
-	instead of custom quick search widget.
-
-	* gui/component/select-names/e-select-names.c: Made this do a
-	slightly better job of rendering names.
-
-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
-	e-addressbook-search.h.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: New class that puts up an
-	entry and a combo box.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): 
-	(e_ldap_storage_add_server): Add "highlighted" flag to
-	evolution_storage_new_folder
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense
-	(compute_pid): remove
-	(local_record_from_ecard): Create local record from ecard - not finished
-	(local_record_from_uid): Obtain local_record from uid with the proper
-	e-book way
-	(set_status_cleared): Add empty callback
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): Add empty callback
-	(conduit_get_gpilot_conduit): Update signal connects
-
-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine
-	the type of change - not finished
-	(pas_backend_file_search_changes): Create a view and callback based on 
-	how the cards have changed
-	(pas_backend_file_process_get_changes): Implement the get changes operation
-	for files
-	(pas_backend_file_process_client_requests): Add GetChanges method for
-	processing
-
-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to
-	the list
-	(impl_Evolution_Book_get_changes): implement object method
-	(pas_book_get_epv): Add get changes to epv
-	(pas_book_respond_get_changes): Respond to the get changes operation
-
-	* backend/pas/pas-book.h: Add GetChanges PASOperation
-
-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes
-	methods
-
-	* backend/ebook/e-book.c (e_book_get_changes): Client function
-	to a view of the changed objects
-
-	* backend/ebook/e-book.h: New prototype
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/e-book/e-card.c: Fixed marking of strings
-	for translation. Use "_(" instead of "_ (".
-	* gui/component/addressbook-factory.c: Add missing
-	calls to bindtextdomain() and textdomain noticed by
-	Dan Winship.
-	* gui/component/addressbook.c: Marked string for translation.
-	
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/Makefile.am, gui/search/Makefile.am,
-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
-
-	* gui/component/select-names/e-select-names-manager.c: Turned off
-	newlines in header fields.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* printing/e-contact-print.c (e_contact_print_letter_tab),
-	(complete_sequence, e_contact_do_print_phone_list, lowify):
-	unsigned charness.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only
-	call the handler if the if we're connected, and if we fail to
-	connect finish the op and post a message.
-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.
-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY => LDAP_SUCCESS.
-	(modify_card_handler): only perform the ldap_modify_s if we have a
-	list of modifications.
-	(get_cursor_handler): use ldap_error_to_response here.
-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant
-	389.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): 
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* backend/pas/Makefile.am (INCLUDES): 
-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduit/address-conduit.c: ditto
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read
-	(post_sync): Use e_pilot_map_write
-
-	* conduit/Makefile.am: Link libeconduit and not libical
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
-
-	* gui/component/addressbook.c (toggle_view_as_cb): 
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: New structure of file - similar
-	to calendar/todo conduits
-
-	* conduit/address-conduit.c: ditto
-
-	* conduit/address-conduit-config.h: Config stuff for conduit
-
-	* conduit/.cvsignore: Update
-
-	* conduit/Makefile.am: Build fixes
-
-	* conduit/address-conduit-control-applet.desktop: Renamed
-	to e-address-conduit-control-applet.desktop
-
-	* conduit/address.conduit.in: Renamed to e-address.conduit.in
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name
-	column since it's a bit weird.  This also fixes the initial state
-	since all of the column choices were off by one.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* printing/Makefile.am (glade_DATA): Remove
-	`e-contact-print.glade.h'.
-	(EXTRA_DIST): Move here.
-
-	* gui/component/Makefile.am (glade_DATA): Remove
-	`ldap-server-dialog.glade.h'.
-	(EXTRA_DIST): Move here.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Change how the extension field acts when
-	converting delivery addresses to labels.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the
-	function e_card_delivery_address_to_label.
-
-	* contact-editor/e-contact-editor-address.c: Fixed a potential
-	crash.
-
-	* contact-editor/e-contact-editor.c: Made this save the changed
-	data to the string version of the address.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (change_view_type): update to new
-	UI handler.
-	(update_view_type): split from (change_view_type).
-	(control_activate): add an update_view_type.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the
-	email address if both name and organization are taken.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the spec
-	strings in this class.  Removed the "cursor_mode" argument to
-	ETable since it's part of the spec now.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Change the initial dialog 
-	visibility to FALSE
-	so the contact editor doesn't flash when it appears.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per manager.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
-	bit better.
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am:
-	* gui/component/Makefile.am: Remove CPPFLAGS since they just
-	duplicate flags that were already in INCLUDES.
-
-	* printing/Makefile.am (ecpsdir): 
-	* gui/widgets/Makefile.am:
-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
-	INCLUDES so they don't override any CPPFLAGS set at configure
-	time.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): if we are in
-	LDAP mode then merge in the extra few items, otherwise just merge
-	the standard thing; saves duplication.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per id.
-	(e_select_names_manager_destroy): Destroy the hashtable.
-	(e_select_names_manager_init): Init the hashtable.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged these fields a bit more.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Changed these for boolean
-	ascending attribute instead of int ascending attribute.  Fixed
-	e-select-names to not use a column past the end of its array.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged the address editor dialog.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed the column
-	elements, the no-headers attribute and added a cursor-mode=line
-	attribute.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Updated these to the new style
-	ETables.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed
-	ondemand callback nonsense from rule_context_load().
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-	(e_contact_editor_init): upd.
-
-	* gui/component/addressbook.c (control_activate_cb): upd.
-	(control_deactivate): kill.
-	(control_activate): upd.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-Fri Sep 29 07:33:54 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so
- 	that minicard doesn't write out changes to the backend unless
- 	something's actually changed.
-
-Tue Sep 26 16:28:47 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make sure that card->name and
- 	card->full_name are always valid.
-
-	* contact-editor/e-contact-editor.c: Removed some unused
- 	variables.
-
-2000-09-22  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* contact-editor/e-contact-editor-fullname.c (extract_info): If
-	(editor->name == NULL), store ptr to newly allocated ECardName in
- 	editor->name, not just in a stack variable.  This fixes a crash
- 	which happened when you click "New", then click "Full Name...",
- 	then enter name, then click "OK".
-
-	* backend/ebook/e-card.c (e_card_name_to_string): Add
- 	g_return_val_if_fail.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/widgets/Makefile.am:
-	* gui/component/Makefile.am:
-	* contact-editor/Makefile.am:
-	* printing/Makefile.am: Look for ename in /e-util/ename instead of
-	/addressbook/ename
-	
-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
-
-	* ename: Moved to /e-util so it could be shared
-
-	* Makefile.am (SUBDIRS): took out ename
-
-2000-09-25  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added a ton of new prefixes and
-	suffixes.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
- 	remove/modify/create functions.  add another flag for the property
- 	table, PROP_DN, which makes it easy for us to determine when we
- 	need to create a new DN for a record when we're modifying.  also
- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills
- 	in the list of bvalues that we send to the ldap server.  The
- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly
- 	complex (yay ldap).
-	(ldap_search_handler): act synchronous when ldap_search responds
- 	with -1.
-	(view_destroy): use pas_book_view_notify_status_message.
-	(ldap_op_process_current): same
-	(ldap_op_process): same
-	(poll_ldap): same
-	(ldap_search_handler): same
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-simple.h: add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.
-
-	* backend/ebook/e-card-simple.c (field_data): add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.
-	(e_card_simple_get): add getter for FAMILY_NAME.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Made addresses be quoted printable again
- 	so that they will encode properly if they have carriage returns in
- 	them.  This is possible now because of a fix in libversit.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a
- 	function to set the status message associated with a given view.
-  	This is not yet implemented in the gui.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c, backend/ebook/e-book.h,
-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,
-	backend/pas/pas-backend.h, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Added a function to query static
-	capabilities (capabilities that can be reported immediately) and
-	implemented them in the 2 servers.
-
-	* gui/component/addressbook.c: Added a View All button and a Stop
-	button.  Sorted out the new directory server stuff a bit.
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop
-	function.  Check for capabilities before deciding whether to load
-	all cards when initially viewed.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: Added stop and view all
-	functions.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added a stop function.  Check for capabilities before deciding
-	whether to load all cards when initially viewed.
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): remove _UIHandler
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Added a missing include
-	of ctype.h.
-
-	* backend/pas/pas-backend-file.c: Fixed a problem where using a
-	GList was causing us to not be reentrant.  We now use an EList
-	here and so now this is reentrant.  This should fix the "wombat
-	crashes every time you run evolution" bug.
-
-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Make this work when a
-	field is spread across multiple lines.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
-	wants_html field to cards.  Uses "x-mozilla-html".
-
-	* contact-editor/Makefile.am: Added definition of
-	EVOLUTION_DATADIR.
-
-	* contact-editor/contact-editor.glade: Make Wants HTML check
-	button visible.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Make Wants HTML check button
-	active.  Fix UI stuff to use XML.  Set parent window of
-	confirm_delete dialog.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
-	the parent window of the confirm_delete dialog.
-	
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards
-	when the addressbook was first loading.  (It was overwriting a
-	string with NULL during init.)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* gui/search/Makefile.am (ruledir): Use $(datadir), not
-	$(prefix)/share
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
-	ename/Makefile.am, gui/component/Makefile.am,
-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h,
-	contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
-	ename/test-ename-western-gtk.c,
-	gui/component/addressbook-factory.c, gui/component/addressbook.c,
-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
-	gui/component/select-names/e-select-names-bonobo.c,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
-	printing/e-contact-print.c: Fixed the #include lines to deal
-	properly with gal.
-	
-2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.h,
-	contact-editor/e-contact-save-as.h,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,
-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.
-
-	* gui/component/addressbook.c: Removed all of the code to actually
-	create and display the correct view of the addressbook and moved
-	it to the new class gui/widgets/e-addressbook-view.c.
-
-	* gui/widgets/Makefile.am: Added everything necessary for
-	e-addressbook-view.c and e-addressbook-view.h.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New class to deal with actual
-	display of addresses and switching between card view and table
-	view.
-
-	* gui/widgets/e-minicard-view-widget.c: Made this deal more
-	gracefully with having the book set to NULL.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: fix broken include.
-
-	* gui/component/Makefile.am (INCLUDES): define datadir.
-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
-
-	* gui/component/addressbook.c (control_activate): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/widgets/Makefile.am (gladedir): Define.
-	(glade_DATA): Install `alphabet.glade'.
-	(EXTRA_DIST): Define.
-
-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.
-	(EXTRA_DIST): Remove `alphabet.glade.h'.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add
-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this
-	is what Chris meant to do.
-
-	* gui/component/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/gui/widgets'.
-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'
-	and `e-addressbook-model.h'.
-
-	* gui/component/select-names/e-select-names.c: #include
-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of
-	"addressbook/gui/component", as it has been moved there.
-
-2000-09-15  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: split all the ldap operations
-	into 2 halves, a handler, and destructor, and create a structure
-	containing two function pointers and any data they need.  this
-	allows us queue up pending operations (since the LDAP*'s are no
-	longer view specific.  there's one per backend.)  also, add
-	support for restarting async operations if the SERVER DOWN error
-	isn't communicated until sometime after the handler is called (as
-	is the case with the async search stuff.)
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Call unicode_init
-	for e-font stuff.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added
-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.
-
-	* gui/component/addressbook.c: update include.
-
-	* gui/component/addressbook-factory.c: update include.
-
-	* gui/widgets/e-minicard-view.h: update include.
-
-	* gui/search/e-addressbook-search-dialog.c: update include path.
-
-2000-09-13  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.
-	(create_toolbar): ditto.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c: Radicaly update UI handler code.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to
-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,
-	and e-reflow-sorted.h.
-
-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and
-	libereflow.a to a bunch of LDADD lines.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libereflow.a here.
-
-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Add space after `-I'
-	when invoking `orbit-idl'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a crash error.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-11  Jesse Pavel <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: fixed certain address parsing
-	problems.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Made this a bit better balanced.
-
-	* gui/component/addressbook.c: Make the toolbar button for find do
-	the same thing that the menu item for search does.
-
-	* gui/search/e-addressbook-search-dialog.c: Made the top half of
-	this not expand.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Removed a bunch of redundant code.  Made it so that when you set
-	an address label, it sets the delivery address as well.  Added
-	functions to set and get the delivery address.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	convert and address label to a delivery address.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],
-	fulladdr.glade, fulladdr.glade.h.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Switched from a label
-	to a button to show the parsed address.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-address.h: New class to implement
-	the parsed address dialog.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h: Added const to the
-	_new function.
-
-	* contact-editor/e-contact-editor.c: Implemented clicking on the
-	address button.
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	New glade files for the parsed address dialog.
-
-	* contact-editor/fullname-strings.h, fullname.glade: Changed these
-	accellabels to labels.
-
-	* ename/Makefile.am: Added e-address-western.c.
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Added by Jesse.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):
-	Use canvas default font
-
-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto
-	(get_left_width): Ditto
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
-
-2000-09-02  Lauris kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers
-
-	* contact-editor/e-contact-editor.c: e_utf8 wrappers
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the
-	extra arg now needed by `evolution_storage_new_folder()'.
-	(e_ldap_storage_add_server): Likewise.
-
-2000-08-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and
-	`-I$(top_srcdir)'.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook
-	and load-pine-addressbook.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Add a name to the minicard
-	viewer.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* backend/ebook/e-book.c: 
-	* backend/ebook/test-client.c: 
-	* backend/ebook/test-client-list.c: 
-	* backend/ebook/load-gnomecard-addressbook.c: 
-	* backend/ebook/load-pine-addressbook.c: 
-	* backend/pas/pas-book-factory.c: 
-	* conduit/address-conduit.h: Remove USING_OAF checks
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Use the right argument name to turn
-	on grid lines.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Comment out minicard-view-test
-	since its gnorba dependent
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):
-	ditto
-
-	* gui/component/addressbook.c: ditto
-
-	* gui/component/addressbook-factory.c: ditto
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* demo/* Removed the demo directory since it's no longer used.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.gnorba: Kill
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook.gnorba: Kill
-
-	* gui/component/Makefile.am:  Remove gnorba stuff
-
-2000-08-25  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
-	-export-dynamic so libglade will be able to resolve custom widget
-	callbacks.
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase
-
-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper
-	(extract_field): Same
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash
-
-	* ename/Makefile.am: Link demo with libeutil.la
-
-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper
-
-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper
-	(search_entry_activated): Same
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the
-	arguments to rule_context_load.
-
-	* backend/ebook/e-card.c: Fix this to not mess up if the person
-	passes a VCard with a carriage return in the mailing address.
-
-2000-08-14  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/addresstypes.xml: Fixed fullname->full_name for
-	search field.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we
-	actually got any parts to build the dialogue with.
-
-2000-08-13  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Set the
-	global_shell_client nastyhack when we know it.
-	This is only required to link with the filter code ...
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libfilter.a to the link line.
-
-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name
-	from libaddressbooksearchdialog to libaddressbooksearch, as used
-	elsewhere.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget):
-	Implement.
-	(get_query): Likewise.
-	(e_addressbook_search_dialog_destroy): Unref filter stuff when
-	done.
-
-	* gui/component/addressbook.c (control_deactivate): Added chris's
-	patch to put the meny in
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/e-card.h: Started adding a time zone field to ECard.
-
-	* gui/component/e-addressbook-model.c: Added
-	e_table_model_pre_change where appropriate.
-
-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Linked in the search dialog again.
-	It looks like some changes in the shell made this not work.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed
-	this to use ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Fixed a memory leak.
-
-	* gui/component/addressbook.c: Added stuff to the right click
-	menu.  Activated the new search dialog that doesn't quite work
-	yet.
-
-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.
-
-2000-08-15  Larry Ewing  <lewing@helixcode.com>
-
-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors
-	for the selected state.  This doesn't properly redraw the minicard
-	when there is a style_change event, that is next.
-	(e_minicard_realize): use style colors.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h
-	as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
-	address-conduit.h
-
-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if
-	ENABLE_PILOT_CONDUITS is set.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (SUBDIRS): add conduit subdir.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
-	special oaf initialization hack so conduit can find wombat, and
-	accept all cookies so that we can actually talk to oaf.
-
-2000-08-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the
-	wrong field to be searched.
-
-	* gui/component/select-names/e-select-names.c: Made the select
-	names dialog only display entries with email addresses.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Fixed a typo in the name of
-	the first phone entry.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/Makefile.am,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: A few small interface
-	fixes.
-
-	* gui/component/Makefile.am: Link in the addressbook search
-	dialog.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added the search directory.
-
-	* backend/ebook/e-book.c: Fixed a potential crash.
-
-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
-
-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
-
-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Ettore fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk
-	object.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-view.c: Ref our book view listener.
-
-	* gui/component/addressbook.c: Updated to use new minicard view
-	widget.
-
-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and
-	e-minicard-view-widget.h.
-
-	* gui/minicard/e-minicard-view-widget.c,
-	gui/minicard/e-minicard-view-widget.h: New class that's just a
-	minicard view in an ECanvas.
-
-	* gui/search/e-addressbook-search-dialog.c: New file for
-	implementing a search dialog.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (transmit): implement code to encode
-	the first email address and send to the pilot.
-	(get_phone_label_by_flag): rename find_phone_label_for_flags to
-	this, and implement by calling get_phone_label_by_name.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): add code
-	for handling email addresses from pilot (which stores it as a
-	phone number entry.  go figure.)
-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).
-	(update_record): un #if 0 the code to handle the case where the
-	pilot info has changed for a local record.
-	(merge_ecard_with_remote_record): implement function, but for now
-	just return the existing (desktop) record - we still don't allow
-	merge from the pilot.
-
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/addresstypes.xml: Changed a couple of input field
-	names.
-
-2000-08-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove prototype for
-	`setup_ldap_storage()', which shouldn't be here anyway.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/, gui/search/addresstypes.xml: New search dialog for
-	addressbook.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Update for
-	changed prototype, pass evolution_homedir arg to
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes
-	an evolution_homedir arg, uses that to generate the path to the
-	ldapservers.xml file, and stores the result in a static variable.
-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that
-	static variable rather than hardcoding the path to the file.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on
-	missing phone numbers or email addresses.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added a button to save to
-	your addressbook.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/component/addressbook.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added some military prefixes.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Add the stock
-	print icon to the print item.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the print
-	item in the right placeholder so that it gets the right position
-	in the "File" menu.
-	(control_deactivate): Updated accordingly.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed
-	e_popup_menu_run call to match the new arguments.
-
-	* gui/component/addressbook.oafinfo: Fixed this file to work
-	properly.
-
-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID
-	here.  Also cleaned up the code a bit with the help of Michael
-	Meeks.
-
-2000-08-08  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):
-	use x-evolution-any-field.
-
-	* gui/component/addressbook.c (search_entry_activated): use
-	x-evolution-any-field.
-	(change_view_type): same.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query
-	to x-evolution-any-field.
-
-	* backend/pas/pas-backend-ldap.c (func_contains): support
-	x-evolution-any-field for matching any evolution supported field.
-
-	* backend/pas/pas-backend-file.c (compare_email): switch to using
-	ECardSimple calls.
-	(compare_phone): same.
-	(compare_address): same.
-	(entry_compare): switch to using ECardSimple calls, and support a
-	'x-evolution-any-field' wildcard field.
-	(vcard_matches_search): use an ECardSimple.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Removed the next and prev
-	toolbar buttons since they don't do anything.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c: Fixed the tab order to not
-	repeat the web page address field.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed the tab order for this
-	dialog.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed a warning.
-
-	* backend/ebook/e-card.c: Cast to (char *) in
-	e_card_load_cards_from_file since libversit isn't const correct.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): unref.
-
-	* demo/addressbook.c (control_activate): unref.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Emit "model_pre_change"
-	signal as appropriate.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Adapted this to supply the
-	new append_row API of ETableModel.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Changed the default set of columns.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook
-	compilation.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_load_cards_from_file helper function to load multiple cards
-	from a single file.
-
-	* backend/ebook/load-gnomecard-addressbook.c: New file to load
-	vcard files.  I think this is the format that gnomecard uses so if
-	you copy your gnomecard file to gnomecard.vcf and then run this
-	program in the same directory, it'll copy all your gnome contacts
-	into evolution.  It needs to be changed to take a filename as a
-	parameter.  Some fields (phone and address information, for
-	example) aren't displayed properly, but are saved.  This is new
-	code, so some other than phone and address may be lost.
-
-2000-07-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and
-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even
-	if the OpenLDAP support is not enabled.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load
-	to.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the
-	view until we've taken care of freeing its internals.  also, close
-	the ldap connection here.
-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,
-	since it's always called when we create a view.
-	(pas_backend_ldap_build_all_cards_list): open an ldap connection
-	in this function and close it at the end.
-	(poll_ldap): make sure to call ldap_unbind to close the view's
-	connection here.
-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -
-	ldap_unbind will either be called from poll_ldap or from
-	view_destroy.
-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an
-	LDAP*.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): same.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: lowercasify the
-	supported_mime_types
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.
-
-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.
-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.
-	(set_status): implement.
-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous
-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.
-	(local_record_from_ecard): get the current status from the ecard.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.
-	(parse_pilot_status): new function.
-	(e_card_class_init): add pilot status object arg.
-	(e_card_set_arg): add pilot status support.
-	(e_card_get_arg): same.
-	(e_card_init): initialize pilot_status to 0.
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c: add comment headers to signals that
-	didn't have any.
-	
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (start_address_server): use the user's
-	Contact db.  not toshok's.
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
-	opened ok.
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
-	version of the library for address conduit to use
-
-	* backend/ebook/Makefile.am: build a static version of the library
-	to link into the conduit
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Added a #define for
-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's
-	in properly from VCards.  Rearranged some field orders.  Added a
-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.
-
-2000-07-24  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card.h: add pilot_id.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add support for
-	X-EVOLUTION-PILOTD vcard field.
-	(e_card_class_init): add pilot_id arg.
-	(e_card_set_arg): handle pilot_id arg.
-
-2000-07-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c: Remove the idle handler
-	when we're destroyed.
-
-	* printing/e-contact-print.c: Fixed the spacing on the card
-	header.
-
-2000-07-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Fixed the oaf info.
-
-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,
-	gui/minicard/e-minicard-widget-test.c: Added a test for the
-	minicard widget.
-
-	* gui/minicard/e-minicard-control.c: Fixed the mime type.
-
-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent
-	isn't a minicard view.
-
-	* gui/minicard/e-minicard-control.oafinfo: Removed.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Update for
-	the new `evolution_shell_component_new()'.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduit/address-conduit-control-applet.desktop:
-		Added the Turkish desktop entry.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the
-	list of mime types we support.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/Makefile.am: Added
-	gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c, and
-	gui/minicard/e-minicard-widget.h.
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: Got these to compile.
-
-	* gui/minicard/e-minicard-control.gnorba,
-	gui/minicard/e-minicard-control.oafinfo: Copied directly from
-	bonobo-clock-control.  These aren't done yet.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: New files for using a minicard
-	as a widget or a bonobo control.
-
-2000-07-14  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.
-	don't save the port in the host slot either.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-confirm-delete.glade,
-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added
-	these.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the order of compilation of printing and
-	contact-editor.
-
-	* contact-editor/Makefile.am: Added printing libraries and a
-	confirm delete dialog glade file.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Enabled the delete and print
-	functions as well as providing a confirm delete dialog to the
-	outside world.
-
-	* gui/component/addressbook.c: Made the delete button on new cards
-	active.
-
-	* gui/minicard/Makefile.am: Added printing libraries to a number
-	of test programs.
-
-	* gui/minicard/e-minicard.c: Added print and delete to the right
-	click menu.  Made the delete button on the card editor active.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a
-	function to print a single card.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix
-	typo that was saving the port in the rootdn spot.
-	(save_ldap_data): make this a bit safer - writing to a new file
-	and renaming it.
-	(load_ldap_data): make this a bit smarter - if parsing the
-	ldapservers.xml file fails and there's a .new file there,
-	rename it.
-	
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Do case insensitive compares.
-
-	* addressbook/gui/component/addressbook.c: Make quick search
-	search both name and company name.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added installation of arrow.png.
-
-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed an unused function
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl
-	file to EXTRA_DIST
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Remove the
-	SelectNames test.
-
-2000-07-10  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)
-	Make multiple addresses be concatenated correctly.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Switched from ETable
-	to ETableScrolled.
-
-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or
-	"name or org" fields.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a field that gives the name if it exists and the company
-	name otherwise.
-
-	* gui/component/e-addressbook-model.c: Formatting changes.
-
-	* gui/component/select-names/e-select-names-table-model.c: Added
-	stripping of names and display of company name if name doesn't
-	exist.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the
-	display so that we display both name and email address.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: Fixed a small
-	off by one error that was causing an extra character to get
-	deleted sometimes.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(main): Put the contacts list in an EScrolledFrame instead of using a
-	separate GtkScrollbar.
-
-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and
-	don't allow drags on dividers that aren't visible.
-
-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of
-	using a separate GtkScrollbar.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed unused do_nothing_cb
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: Made the OK
-	and Cancel buttons in the ESelectNames dialog we create work
-	properly.
-	
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added
-	e_select_names_model_duplicate.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made the
-	text be set correctly if there's already data in the source when
-	the text model is created.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Removed handling of
-	the buttons (the user of this dialog will have to handle them.)
-	Added e_select_names_get_source.  Fixed some typos.
-
-2000-07-09  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook.c: Link the toolbar print button to
-	the print callback.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_clicked): Hitting OK or Cancel at least closes the
-	dialog now.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Set the returned entry to
-	use the ellipsis.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-factory.c: Include
-	e-select-names-factory.h.
-
-	* gui/component/select-names/e-select-names-model.c: Handle a NULL
-	iterator properly in the replace function.
-
-	* gui/component/select-names/e-select-names-table-model.c: Fill in
-	info properly in the value_at function.
-
-	* gui/component/select-names/e-select-names-text-model.c: Don't
-	strlen a NULL text object.
-
-	* gui/component/select-names/e-select-names.c: Close if the person
-	hits ok or cancel (doesn't yet actually undo changes if Cancel is
-	hit.)  Handle removing addresses when they're double clicked on.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Hid some unused
-	fields and changed the text at the top of the dialog.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/component/select-names/.cvsignore: Ignore dynamically 
-	created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): New function to set the properties.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Start up the factory
-	for `Evolution::Addressbook::SelectNames'.
-
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	New.
-
-	* gui/component/select-names/e-select-names-factory.c: New.
-	* gui/component/select-names/e-select-names-factory.h: New.
-
-	* gui/component/select-names/e-select-names-bonobo.c: New.
-	* gui/component/select-names/e-select-names-bonobo.h: New.
-
-	* gui/component/addressbook-factory.c (main): Call
-	`e_select_names_factory_init()'.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_add_section): Made const-aware.
-	(e_select_names_manager_create_entry): Made const-aware.
-	(e_select_names_manager_activate_dialog): Made const-aware.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	New.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added an "editable" argument.
-
-	* gui/component/select-names/e-select-names.c: Set our
-	EAddressModel to not be editable.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: Changed to line
-	mode.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c: Implemented the
-	get_cards function.
-
-	* gui/component/select-names/e-select-names.c: Implemented adding
-	cards through the interface.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c: Make the
-	entry widgets we create editable.
-
-	* gui/component/select-names/e-select-names-model.c: Use
-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.
-
-	* gui/component/select-names/e-select-names-table-model.c: When
-	the model changes, send a model changed signal.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made
-	changing this work correctly if it's empty.  Made change signals
-	propagate properly.  Is a bit better about freeing iterators when
-	done.
-
-	* gui/component/select-names/e-select-names.c: Made the finished
-	lists be in order instead of being sorted.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): Since
-	ELDAPServer->port is a char *, allocate a string with the number
-	389 contained.
-
-	* gui/component/addressbook.c: Make the select names test test the
-	new code instead of the old way of getting to an ESelectNames
-	dialog.
-
-	* gui/component/select-names/e-select-names-manager.c: Coded
-	storing the model for each section, creating an entry and
-	returning it, and for activating the dialog.  Wrote a bit of the
-	get_cards code, but not all of it.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Coded all of
-	the code needed to make ESelectNamesTextModel work (it doesn't
-	yet, but all the code should be there.)  Removed
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-text-model.c: Changed
-	these to compensate for removal of
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h: Fixed some
-	silly typos.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added a parameter to
-	add_section that lets you specify the source ESelectNamesModel.
-	
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and
-	make port a string.
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a
-	uri, load all the bits and pieces and build up the uri when
-	creating the folder, according to the openldap url format.
-	(ldap_server_foreach): store out each of the individual uri
-	pieces.
-	(e_ldap_storage_remove_server): free the new fields.
-	(get_string_value): if the text is empty, return the empty string
-	instead of NULL.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.
-	(fill_in_server_info): port is a string now.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and
-	Close" to "Save and Close".  Removed some toolbar items that will
-	never be used.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added functions
-	to allow you to modify the model (not implemented yet.)
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h: Finished
-	this.  Doesn't support changing the model at all.
-
-	* gui/component/select-names/e-select-names-text-model.c: Finished
-	this.  Changing the model by typing is done, but doesn't work
-	since none of the functions in the base model are implemented.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): call
-	e_ldap_storage_add_server call.
-
-	* gui/component/ldap-server-dialog.glade: add name row.
-
-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add
-	support for the name-entry.
-
-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.
-
-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add
-	prototypes for e_ldap_storage_add_server and
-	e_ldap_storage_remove_server.
-
-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new
-	function, add it to our hash table, add a shell folder, and save
-	out the metadata.
-	(ldap_server_foreach): add the ldap server info under a
-	"contactserver" node.
-	(setup_ldap_storage): create our hashtable.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): remove hack to read
-	"uri" file from local directory.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	e-ldap-storage.{c,h}
-
-	* gui/component/addressbook-component.c (owner_set_cb): call
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
-	the LDAP storage and load the .xml file.
-	(load_ldap_data): function to load our xml file.
-	(save_ldap_data): function to save our xml file.
-
-	* gui/component/e-ldap-storage.h: new file.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names.c: Fixed more compile
-	errors.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Fixed compile error.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
-	e-card-list.c, e-card-list.h.
-
-	* backend/ebook/e-card-iterator.c,
-	backend/ebook/e-card-iterator.h,
-	backend/ebook/e-card-list-iterator.c,
-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
-	backend/ebook/e-card-list.h: Removed in favor or versions without
-	the -card in the e-util directory since these classes are not
-	specific to cards at all.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card.c, backend/ebook/e-card.h,
-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
-	backend/pas/pas-backend-file.c: Changed the references to
-	e-card-list.c and friends to e-list.c and friends.
-
-	* contact-editor/e-contact-editor.c: Added #include
-	<e-contact-save-as.h> to fix a warning.
-
-	* gui/component/Makefile.am: Moved a number of classes associated
-	with the select-names object to the new select-names directory.
-
-	* gui/component/addressbook.c: Changed the reference to
-	e-select-names.h.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h,
-	gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Moved these files into
-	select-names/.
-
-	* gui/component/select-names/.cvsignore,
-	gui/component/select-names/Makefile.am,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/recipient.glade,
-	gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: New files for
-	select names dialog (e-select-names.c, e-select-names.h,
-	select-names.glade, select-names.glade.h and recipient.glade moved
-	from gui/component/.)
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: New select
-	names manager interface (Not complete.)
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	addressbook/gui/component/e-cardlist-model.c: Added
-	value_to_string handlers.
-
-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and
-	"y" arguments.
-
-	* addressbook/gui/component/addressbook.c: Activated Click To Add
-	and set the click to add message.
-
-	* addressbook/gui/component/e-addressbook-model.c: Added
-	value_to_string and append_row handlers.
-
-	* addressbook/gui/component/e-select-names.c: Added a column.
-
-2000-06-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.
-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer
-	we know to be NULL.
-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.
-	easier to type.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/test-minicard-label.c,
-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove
-	usage of "x" and "y" arguments.
-
-2000-06-18    <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
-	the default GNOME prefix.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c,
-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made
-	the left column of minicards not get any wider than the widest
-	possible name.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_addressbook_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Removed the
-	ETableModel thaw handler.
-	* gui/component/e-cardlist-model.c: Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-select-names.c: Fixed the widget reparenting.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added glade files.
-
-	* gui/component/addressbook.c: Added a test of the Select Names
-	functionality.
-
-	* gui/component/e-addressbook-model.c: Made this class_init
-	function a bit cleaner.
-
-	* gui/component/e-select-names.c: Tested this and fixed some
-	obvious errors.
-
-	* gui/component/select-names.glade: The main window shouldn't be
-	visible by default.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link
-	with libemiscwidgets.a.
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions
-	for better readability.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h:
-	This should be a working dialog now.
-
-	* gui/component/select-names.glade: Changed the name & creation
-	function of the ETable here.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Glade files for Select Names
-	dialog.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and
-	extract_info more often.
-
-	* gui/component/addressbook.c: Added table printing code.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL
-	for the new args @create_folder_fn and @remove_folder_fn.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (create_view): Updated for
-	the new `EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not
-	"contacts".
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Bind Save As to save the
-	current view of the contact as a vcard.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the
-	card simple and extract the card info.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.h (EContactEditor): Now this
-	derives from GtkObject.  It follows the same strategy as the
-	EventEditor in the calendar.
-	(EContactEditor): Added an is_new_card field so that we can know
-	whether to add() or commit() the card.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):
-	Derive from GtkObject.
-	(e_contact_editor_class_init): Likewise.
-	(e_contact_editor_class_init): Added an "is_new_card" argument.
-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.
-	(e_contact_editor_get_arg): Likewise.
-	(e_contact_editor_new): Take in an is_new_arg argument and set it
-	on the object.
-	(e_contact_editor_init): Load the app widget into the app field of
-	the EContactEditor structure.  Create its UIHandler as well.
-	(e_contact_editor_class_init): New "add_card", "commit_card", and
-	"editor_closed" signals.
-
-	* contact-editor/test-editor.c (main): Modified for the new API.
-	(editor_closed_cb): Tweaked for the new API.
-	Since this test program does not use Bonobo, it doesn't work,
-	though.
-
-	* gui/component/addressbook.c (new_contact_cb): Use the new
-	contact editor API.
-	(table_double_click): Ditto.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the
-	new contact editor API.
-
-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new
-	contact editor API.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove
-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of
-	course] the library is built in the build directory, not in the
-	source directory.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with
-	`libeminicard.a'.
-	(minicard_label_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Bind right click on the ETable to
-	"Save to VCard."
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made phone/email/address
-	labels change correctly again.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c: Made
-	evolution-addressbook shut down when the shell is done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made
-	double click only work on the first button.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: return TRUE if opening a contact
-	editor so that we don't get a "new dialog" contact editor.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Use the stock
-	cancel button for the dialog.
-	(table_double_click): Likewise.
-	(find_contact_cb): Likewise.
-
-2000-05-31  Miguel de Icaza  <miguel@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Added accelerators for
-	the remaining items.
-
-	Add spacing, beautify the dialogs.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/e-cardlist-model.h: New files for card list.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a memory leak.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Made the alphabet buttons not
-	focusable.
-
-	* gui/minicard/e-minicard-view.c: Made the "123" button work.
-
-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last
-	letter available work.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Added a bit of space around the
-	alphabet bar.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added alphabet.glade and
-	alphabet.glade.h.
-
-	* gui/component/addressbook.c, gui/component/alphabet.glade,
-	gui/component/alphabet.glade.h: Added an alphabet bar.
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,
-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:
-	Added the ability to just to a particular spot in the reflow.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c: Made double clicking create a
-	new card.  Set the empty message.
-
-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.
-
-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a
-	message for when the reflow is empty.
-
-	* printing/e-contact-print.c, printing/medbook.ecps: Made the
-	default printout be full page.  Made sorting case insensitive.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,
-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,
-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.
-
-	* printing/e-contact-print.c: Made printing wait for
-	"sequence_complete" signal and made it sort.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added double click to open
-	contact editor.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed some columns.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	New function.
-	(addressbook_factory): Use it.
-
-	* Makefile.am (evolution_addressbook_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* gui/component/addressbook-component.c: New.
-	* gui/component/addressbook-component.h: New.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched printing and gui.
-
-	* backend/ebook/e-book-view-listener.h,
-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
-	#defines to work elsewhere in evolution.
-
-	* gui/component/Makefile.am: Added linking to libecontactprint.
-
-	* gui/component/addressbook.c: Added a menu item to print the
-	current query.
-
-	* printing/Makefile.am: Add linking to libebook and requirements.
-	Add installation of ecps files.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
-	this to use real data from an EBook.
-
-	* printing/test-print.c: Made this pass NULL, NULL to
-	e_contact_print_dialog_new so that it will compile.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and
-	e-contact-editor-save-as.h.
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h: New files that display a save
-	as dialog and then save the given card to that file.
-
-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right
-	click menu.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Added initialize_value and
-	value_is_empty callbacks.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a bug that broke
-	address field support.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added support for arbitrary
-	fields in the contact editor.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed e_card_name_copy and
-	e_card_arbitrary_copy to deal correctly with a passed NULL.
-
-	* contact-editor/Makefile.am: Removed imagesdir stuff.
-
-	* contact-editor/arrow.png: Made this transparent.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Renamed some widgets
-	and added custom widgets for all of the images.
-
-	* contact-editor/e-contact-editor.c: Worked on making this work
-	decently well with messed up glade files.  Cleaned up a lot of code.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed the code to write out and read in
-	arbitrary fields.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
-	arbitrary field support.
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.
-	(poll_ldap): same.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-book.h: add typedefs for the can_write
-	functions, and add parameters to pas_book_new.
-
-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.
-	(pas_book_new): same.
-	(impl_Evolution_Book_can_write): new function.
-	(impl_Evolution_Book_can_write_card): same.
-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.
-	(pas_backend_ldap_can_write_card): same.
-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.
-	(pas_backend_file_can_write): same.
-	(can_write): return TRUE if we can write to the addressbook file.
-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/idl/addressbook.idl (Evolution): add can_write and
-	can_write_card permission requests.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor.c, ename/e-name-western.c,
-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed
-	some memory leaks.
-
-	* backend/ebook/e-card.c: Rearranged some code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a reference
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a compile
-	error.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Got rid of a
-	memory leak.  Rearranged a couple functions.
-	
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:
-	Added some code to stop watching the EBook when the canvas is
-	destroyed (apparently the canvas is destroyed before our widget is
-	destroyed.)
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Use the correct
-	policy for resize.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added libeutil for e-card's support
-	for categories.
-
-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added
-	a function to get the length.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories
-	support (accessible either as "categories" or "category_list".)
-
-	* contact-editor/Makefile.am: Added e-table and all of the
-	categories files.
-
-	* contact-editor/categories.glade,
-	contact-editor/categories-strings.h,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h:
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.
-
-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.
-	Added opening of categories dialog.
-
-	* gui/component/Makefile.am: Rearranged libraries so that
-	libetable would be available for the contact editor categories
-	dialog.
-
-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make
-	contact editor dialog resizable.
-
-	* gui/minicard/Makefile.am: Added libetable contact editor
-	categories dialog.
-
-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.
-
-2000-05-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* contact-editor/fulname.glade: Use accelerators here.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* gui/component/ldap-server-dialog.glade: save translatable strings
-	* gui/component/ldap-server-dialog.glade.h: file with strings
-	* printing/e-contact-print.glade: save translatable strings
-	* printing/e-contact-print.glade.h: file with strings
-		
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Now that we
-	depend on recent gnome-libs we can make the toolbar detachable
-	again.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the table view be sorted by
-	name initially.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Send a proper response when you
-	can't find the ldap URI.
-
-	* gui/component/addressbook.c: Cleaned up the open error dialog a
-	bit.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Added a dialog for when you can't
-	open an addressbook.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,
-	e-card-types.h.
-
-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.
-
-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.
-	Removed some old defines.
-
-	* ename/Makefile.am: Added e-name-western-tables.h.
-
-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added
-	a proper EXTRA_DIST section.
-
-	* gui/minicard/e-reflow.c: Added a missed cast.
-
-	* printing/Makefile.am: Added a proper EXTRA_DIST section.
-	
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Make sure that the canvas
-	doesn't intercept keyboard focus.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use new art.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Replaced the Address
-	button with a label and rearranged the address area a bit.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Reenable editting.
-
-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Destroy the view object when
-	leaving the minicard view.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call
-	reflow_request when sorting on an item changes.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Make File As change if name or
-	company are changed pretty much anywhere.
-
-	* gui/minicard/e-minicard.c: Turned off having minicard editing
-	effect anything since it's so crashy.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Added a default card to all new
-	file backends.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Rearranged order of things
-	getting destroyed.
-
-	* gui/minicard/e-minicard-view.c: Rearranged order of things
-	getting destroyed.  Don't set attributes of non-null or destroyed
-	items.  Destroy parent object when destroyed.  Maintain ref_count
-	of items in list.
-
-	* gui/minicard/e-minicard.c: Don't set attributes of non-null
-	items.
-
-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in
-	list.
-
-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.
-	Destroy parent object when destroyed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed some indentation.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Changed Email to
-	Primary Email.
-
-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate
-	if data exists in the pull down menus for the phone, address, and
-	email fields.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed the string duplication
-	problem.  Fixed the business/home address string mix up.
-
-	* gui/component/addressbook.c: Made the minicard view the default
-	view.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing
-	should work better now.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,
-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,
-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be
-	destroyed and recreated when updating a field.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* gui/minicard/e-minicard.c (remodel): make sure to free the
-	return value of e_card_simple_get.
-
-	* gui/component/addressbook.c (teardown_table_view): destroy the
-	ECardSimple here, plug memory leak.
-	(create_table_view): use view->simple so we can destroy the
-	ECardSimple later on.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): comment
-	function, and fix an ABR.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_cleanup_string): comment
-	function, and fix an ABR.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Added saving in minicard view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): don't create a new
-	ebook.  instead, unload the current uri (if there is one) and load
-	the new one.
-	(addressbook_factory): create the ebook once.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Replaced some model_changed
-	calls with row_inserted calls.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Removed some code that was notifying too many clients at the wrong
-	times.
-
-	* gui/component/addressbook.c: Set view->book.  Unreffed
-	view->book.  Unreffed the model instead of destroying it.  Removed
-	the /tmp/test.db stuff.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the addressbook create the
-	correct file uri.  Added a default query.  Initialize view->model
-	and view->view to NULL.
-
-	* gui/component/e-addressbook-model.c,
-	gui/minicard/e-minicard-view.c: Only call get_book_view if both
-	book and query and non-null.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	separator and toggle view items as well.
-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu
-	item.
-	(get_query): getter for the query string that takes into account
-	the two view types.
-	(set_query): setter for the query string that takes into account
-	the two view types.
-	(set_book): setter for the EBook type - not really a setter, since
-	the book is kept in the AddressbookView, but this method actually
-	sets the "book" property on the current view.
-	(find_contact_cb): make use of get/set_query
-	(search_entry_activated): make use of set_query.
-	(control_activate): add a menu separator and an item to toggle
-	between view types.
-	(book_open_cb): make use of set_book.
-	(ebook_create): no longer needs to return the EBook, since we set
-	the book field in our view.
-	(teardown_minicard_view): destructor function for the minicard
-	specific ui.
-	(create_minicard_view): constructor function for the minicard
-	specific ui.
-	(teardown_table_view): destructor function for the e-table
-	specific ui.
-	(create_table_view): constructor function for the e-table specific
-	ui.
-	(change_view_type): destroy the old and create the new view ui,
-	change the label of the Toggle View menu item, and reset the book
-	and query on the new view type.
-	(addressbook_factory): create an all-encompassing vbox that the
-	view uses to create the bonobo control, which contains 1 widget
-	per ui specific view (the e-table in the table case, and another
-	vbox in the minicard case.)  use change_view_type to create the
-	initial view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c: Made a NULL callback just mean to not
-	call back.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Reordered fields.  Added a get_const function to get a constant
-	string that persists until the simple is destroyed.
-
-	* gui/component/Makefile.am: Added e-addressbook-model.c and
-	e-addressbook-model.h and all of the libraries and includes that
-	they are dependent on.
-
-	* gui/component/addressbook-factory.c: Initialize e cursors.
-
-	* gui/component/addressbook.c: Added inactive code to display an
-	ETable view of the addressbook.
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: New files to implement an
-	ETable model with a EBook back end.
-	
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Mostly finished ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Changed this to match with
-	some of the changes to ECardSimple.
-
-	* gui/component/addressbook.c: Changed this to look for
-	"addressbook.db" in the given directory if it doesn't find the
-	file "uri".
-
-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
-	this to use ECardSimple.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* gui/component/.cvsignore: ignore evolution-addressbook.pure
-
-	* gui/component/Makefile.am: add support for generating 
-	evolution-addressbook.pure.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a
-	port isn't specified in the uri default to 389.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Made this take a uri through its
-	property bag.
-
-2000-05-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-card-simple.c and
-	e-card-simple.h.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	New card wrapper class to simplify things.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use
-	ECardSimple a bit.
-
-2000-05-03  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): #ifdef
-	HAVE_LDAP the ldap specific stuff.
-	(null_cb): same.
-	(control_activate): same.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/ename'.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* demo/Makefile.am: set G_LOG_DOMAIN.
-	* printing/Makefile.am: same.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Add back in the
-	CORBA_Object_release.
-
-	* backend/pas/pas-book.c: Properly duplicate and release the
-	listener passed to us.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Made uri slightly better managed.
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): Remove this
-	CORBA_Object_release that causes things not to work.  This is just
-	a temporary fix until we figure out what's actually wrong.
-
-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
-	
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the subdirs order since backend depends on
-	ename.
-
-2000-05-01  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):
-	fix a typo in the for loop.
-
-2000-05-01  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: include gtk.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* backend/ebook/e-book-types.h (EBookStatus): Added new status
-	values for the IDL stuff.
-
-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New
-	"last_book_gone" signal.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_launch_backend): Better error handling.
-	(pas_book_factory_process_queue): Let
-	pas_book_factory_process_request() free the request.
-	(pas_book_factory_process_request): Free the request here.
-	Perform better error handling.
-	(free_active_server_map_entry): Free an active server map entry;
-	free the URI key and unref the backend value.  This function was
-	renamed; the old one was trying to CORBA_Object_unref() a GTK+
-	object!
-	(remove_backends_entry): Free a backend table entry; free the URI
-	key.
-	(backend_last_client_gone_cb): Remove the backend from the active
-	server map and emit the "last_book_gone" signal if appropriate.
-	(pas_book_factory_get_n_backends): New function to query the
-	number of running backends in an addressbook factory.
-
-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a
-	ProtocolNotSupported code.  This is for when the addressbook
-	factory cannot find a provider for the requested URI.
-
-	* backend/pas/pas-backend.h (PASBackendClass): New
-	"last_client_gone" signal.
-	(PASBackendClass): New get_uri virtual method.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a
-	gboolean success code.
-	(pas_backend_add_client): Return a gboolean success code.
-	(pas_backend_last_client_gone): New function used by backend
-	implementations to notify upwards when the backend's last client
-	is destroyed.
-	(pas_backend_get_uri): New function to get the URI of a backend.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  We cannot call pas_book_get_backend() in the callback
-	since the book's private data has already been destroyed when the
-	callback is invoked.  Alternatively, we could move the private
-	data destruction step to the book's ::finalize() method.
-	(pas_backend_file_book_destroy_cb): Get the backend from the
-	callback's data, not from the book.
-	(pas_backend_file_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(PASBackendFilePrivate): Added an uri field.
-	(pas_backend_file_get_uri): Implement the get_uri method.
-	(pas_backend_file_load_uri): Return a gboolean success code.
-	Also, store the URI in the private structure.
-	(pas_backend_file_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(pas_backend_file_destroy): Free the bf->priv->uri.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  See above for rationale.
-	(pas_backend_ldap_book_destroy_cb): Get the backend from the
-	callback's data.
-	(pas_backend_ldap_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(pas_backend_ldap_load_uri): Return a gboolean success code.
-	(pas_backend_ldap_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(PASBackendLDAPPrivate): New uri field.
-	(pas_backend_ldap_get_uri): Implement the get_uri method.
-	(pas_backend_ldap_load_uri): Store the uri in the private
-	structure.
-	(pas_backend_ldap_destroy): Free the bl->priv->uri.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added
-	e-ldap-server-dialog.c
-	(glade_DATA): added ldap-server-dialog.glade
-
-	* gui/component/ldap-server-dialog.glade: new file.
-
-	* gui/component/e-ldap-server-dialog.h: new file.
-
-	* gui/component/e-ldap-server-dialog.c: new file, contains logic
-	associated with ldap server dialog.
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	directory server menu item.
-	(null_cb): do nothing callback for e_book_load_uri call.  should
-	change to (at the very least) pop up a dialog if there was an
-	error.
-	(new_server_cb): new function - really just switches to a
-	particular ldap server, since the information isn't saved
-	anywhere.
-	(control_activate): add directory server menu item.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): create the book
-	listener here, since it's destroyed in unload_uri.
-	(e_book_construct): remove the book listener construction here.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-pine-addressbook.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
-	some fields invisible that were visible before.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make file as not have the : after it if
-	it's empty.  If there's no name, or file_as, fill in these fields
-	with defaults based on full_name or name respectively.
-
-	* backend/ebook/load-pine-addressbook.c: New file to do import of
-	pine .addressbook files.
-
-	* backend/pas/pas-backend-file.c: Made empty fields act as the
-	empty string for searches.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the File As field update
-	properly as you edit the name and company fields.  Added the pull
-	down list of File As choices.  Made sure that all fields will
-	be set to NULL if they are deleted to the empty string.
-
-	* gui/minicard/e-minicard.c: Use the File As field instead of the
-	Full Name field for the header.  Make identical compares on the
-	File As field do a compare on the uid.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/fullname.glade: Fixed a string mismatch.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added ename includes and libs.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_name_from_string.  Added header for
-	e_card_delivery_address_from_string, even though it's not
-	implemented yet.
-
-	* contact-editor/Makefile.am: Removed the ename includes since we
-	no longer use ename directly here.
-
-	* contact-editor/e-contact-editor.c: Fixed this to properly save
-	the address labels displayed.  Updated this to use the function
-	e_card_name_from_string instead of doing it by hand.
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Deleted an unused field.  Changed
-	the set of prefixes and suffixes.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): add support for a rootdn in
-	the uri.
-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in
-	the call to ldap_search_s.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.
-
-2000-04-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_phone_new e_card_delivery_address_new,
-	e_card_delivery_address_to_string, e_card_name_copy,
-	e_card_name_new, e_card_name_to_string, and made e_card_name_free
-	public.  Removed some unused code.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]
-	and fullname.glade.  Added e-name libs and includes.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h,
-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:
-	New dialog for editing the fields of a name separately.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Create an
-	EContactEditorFullname when you click on the Full Name button.
-	Maintain a parsed name at all times.
-
-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added
-	e-name libs.
-
-2000-04-28  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-book-factory.c (register_factory): fix the
-	`USING_OAF' changes so that they work for when we are not using
-	oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ename/Makefile.am
-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.
-	(INCLUDES): Add `-I$(srcdir)/..'.
-
-	* backend/pas/pas-book-factory.c
-	(register_factory): New function to register the factory.
-	Implementation different according to `USING_OAF'.
-	(pas_book_factory_activate): Use `register_factory()'.
-
-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',
-	varying depending on whether we are `USING_OAF'.
-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* backend/ebook/test-client.c (init_corba): New function,
-	implemented differently according to the `USING_OAF' #define.
-
-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.
-	(e_book_construct): Work with OAF #if `USING_OAF'.
-
-	* backend/ebook/Makefile.am (gnome_libs): Removed.
-	(corbadir): Removed.
-	(ebook_libs): Removed.
-	(test_client_LDADD): Just add `libebook.la'.
-	(test_card_LDADD): Likewise.
-	(test_client_list_LDADD): Likewise.
-
-	* gui/component/addressbook-factory.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Call `init_corba()'.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,
-	office, manager, assistant, spouse, and anniversary fields.  These
-	all use "X-EVOLUTION-" fields in the VCards.
-
-	* backend/pas/pas-backend-file.c: Added all the new fields (except
-	anniversary) to the list of fields.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed
-	fields and fixed the placement of the comments field.
-
-	* contact-editor/e-contact-editor.c: Made the newly added fields
-	display properly.
-
-	* Makefile.am: Added ename.
-
-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,
-	ename/test-ename-western.c: Fixed up some #includes.
-
-	* ename/.cvsignore: Added .cvsignore.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Added an address label field.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Got rid of some unused
-	fields.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added the address label field.
-	Load only.  Editing these fields seems to mess things up.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Added proper handling of the
-	email field.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Edited the glade file.
-	Removed all the fields that we don't use.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the phone fields work
-	properly.  The address and email fields are temporarily turned off
-	until they can be made to work as the phone fields do.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
-	pick up IDL files in the installation prefix as well.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
-	to get the IDLs from the installation prefix as well.
-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of
-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,
-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.
-	(test_client_list_LDADD): Likewise.
-	(test_card_LDADD): Likewise.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
-	domain.
-
-	* gui/component/Makefile.am (INCLUDES): Use
-	"evolution-addressbook" as the log domain.
-
-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
-	Do not install any header files.
-	(INCLUDES): Remove spurious include paths.
-
-	* backend/pas/*.[ch]: Fix includes.
-
-	* backend/ebook/Makefile.am: Do not install the test programs.
-	Fixed some include weirdness.
-
-	* backend/ebook/*.[ch]: Fix includes.
-
-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
-	"contact-editor".
-	(INCLUDES): Fix.
-
-	* contact-editor/*.[ch]: Fix includes.
-
-	* gui/minicard/*.[ch]: Fix includes.
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index cc89ee5aeb..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	backend printing contact-editor gui $(CONDUIT_SUBDIR)
-
diff --git a/addressbook/backend/.cvsignore b/addressbook/backend/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/Makefile.am b/addressbook/backend/Makefile.am
deleted file mode 100644
index b2807b2480..0000000000
--- a/addressbook/backend/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = idl ebook pas
diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore
deleted file mode 100644
index 1abc66db18..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-test-card
-test-client
-test-client-list
-load-pine-addressbook
-load-gnomecard-addressbook
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
deleted file mode 100644
index 7fef103315..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS = load-pine-addressbook load-gnomecard-addressbook
-
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        \
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/ename		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/ename		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libebook.la
-
-libebook_la_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	e-book-listener.c				\
-	e-book-view-listener.c				\
-	e-book-view.c					\
-	e-book.c					\
-	e-card-cursor.c					\
-	e-card-simple.c					\
-	e-card.c
-
-libebookincludedir = $(includedir)/evolution/ebook
-
-libebookinclude_HEADERS =				\
-	e-book-listener.h				\
-	e-book-types.h					\
-	e-book-view-listener.h				\
-	e-book-view.h					\
-	e-book.h					\
-	e-card-cursor.h					\
-	e-card-pairs.h					\
-	e-card-simple.h					\
-	e-card-types.h					\
-	e-card.h
-
-
-#
-# make a static library for use by addressbook's conduit's shared library
-#
-noinst_LTLIBRARIES = libebook-static.la
-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
-libebook_static_la_LDFLAGS = --all-static
-
-
-test_client_SOURCES =					\
-	test-client.c
-
-test_client_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
-
-test_client_list_SOURCES =				\
-	test-client-list.c
-
-test_client_list_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/addressbook/backend/ebook/TODO b/addressbook/backend/ebook/TODO
deleted file mode 100644
index a69703cd92..0000000000
--- a/addressbook/backend/ebook/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Make sure open_book_progress does not use the EBook op queue; make
-  sure it works.
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
deleted file mode 100644
index 5efdaa37df..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,587 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-listener.h"
-
-static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_listener_parent_class;
-POA_Evolution_BookListener__vepv  e_book_listener_vepv;
-
-struct _EBookListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = op;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_response (EBookListener  *listener,
-				     EBookStatus     status,
-				     Evolution_Book  book)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = OpenBookResponse;
-	resp->status = status;
-	resp->book   = book;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_progress (EBookListener *listener,
-				     const char    *msg,
-				     short          percent)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op      = OpenProgressEvent;
-	resp->msg     = g_strdup (msg);
-	resp->percent = percent;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-
-static void
-e_book_listener_queue_create_card_response (EBookListener *listener,
-					    EBookStatus    status,
-					    const char    *id)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = CreateCardResponse;
-	resp->status = status;
-	resp->id     = g_strdup (id);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_cursor_response (EBookListener        *listener,
-					   EBookStatus           status,
-					   Evolution_CardCursor  cursor)
-{
-	EBookListenerResponse *resp;
-	
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetCursorResponse;
-	resp->status = status;
-	resp->cursor = cursor;
-	
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_view_response (EBookListener        *listener,
-					 EBookStatus           status,
-					 Evolution_BookView    book_view)
-{
-	EBookListenerResponse *resp;
-	
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetBookViewResponse;
-	resp->status    = status;
-	resp->book_view = book_view;
-	
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_link_status (EBookListener *listener,
-				   gboolean       connected)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = LinkStatusEvent;
-	resp->connected = connected;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const Evolution_BookListener_CallStatus  status,
-				       const Evolution_CardId                   id,
-				       CORBA_Environment                       *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_create_card_response (
-		listener,
-		e_book_listener_convert_status (status),
-		id);
-}
-
-static void
-impl_BookListener_respond_remove_card (PortableServer_Servant servant,
-				       const Evolution_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, RemoveCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_modify_card (PortableServer_Servant servant,
-				       const Evolution_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, ModifyCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const Evolution_BookListener_CallStatus status,
-				      const Evolution_CardCursor cursor,
-				      CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_CardCursor  cursor_copy;
-
-	cursor_copy = CORBA_Object_duplicate (cursor, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating CardCursor!\n");
-		return;
-	}
-
-	e_book_listener_queue_get_cursor_response (
-		listener,
-		e_book_listener_convert_status (status),
-		cursor_copy);
-}
-
-static void
-impl_BookListener_respond_get_view (PortableServer_Servant servant,
-				    const Evolution_BookListener_CallStatus status,
-				    const Evolution_BookView book_view,
-				    CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_BookView    book_view_copy;
-
-	book_view_copy = CORBA_Object_duplicate (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_view_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_open_book (PortableServer_Servant servant,
-				     const Evolution_BookListener_CallStatus status,
-				     const Evolution_Book book,
-				     CORBA_Environment *ev)
-{
-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_Book  book_copy;
-
-	book_copy = CORBA_Object_duplicate (book, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating Book!\n");
-		return;
-	}
-
-	e_book_listener_queue_open_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_copy);
-}
-
-static void
-impl_BookListener_report_open_book_progress (PortableServer_Servant servant,
-					     const CORBA_char *status_message,
-					     const CORBA_short percent,
-					     CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_open_progress (
-		listener, status_message, percent);
-}
-
-static void
-impl_BookListener_report_connection_status (PortableServer_Servant servant,
-					    const CORBA_boolean connected,
-					    CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_link_status (
-		listener, connected);
-}
-
-/**
- * e_book_listener_check_pending:
- * @listener: the #EBookListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookListener.
- */
-int
-e_book_listener_check_pending (EBookListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_listener_pop_response:
- * @listener: the #EBookListener for which a request is to be popped
- *
- * Returns: an #EBookListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookListener.
- */
-EBookListenerResponse *
-e_book_listener_pop_response (EBookListener *listener)
-{
-	EBookListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookStatus
-e_book_listener_convert_status (const Evolution_BookListener_CallStatus status)
-{
-	switch (status) {
-	case Evolution_BookListener_Success:
-		return E_BOOK_STATUS_SUCCESS;
-	case Evolution_BookListener_RepositoryOffline:
-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case Evolution_BookListener_PermissionDenied:
-		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case Evolution_BookListener_CardNotFound:
-		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case Evolution_BookListener_ProtocolNotSupported:
-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case Evolution_BookListener_OtherError:
-		return E_BOOK_STATUS_OTHER_ERROR;
-	default:
-		g_warning ("e_book_listener_convert_status: Unknown status "
-			   "from card server: %d\n", (int) status);
-		return E_BOOK_STATUS_UNKNOWN;
-
-	}
-}
-
-static EBookListener *
-e_book_listener_construct (EBookListener *listener)
-{
-	POA_Evolution_BookListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_LISTENER (listener));
-
-	servant = (POA_Evolution_BookListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_BookListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_listener_new:
- * @book: the #EBook for which the listener is to be bound
- *
- * Creates and returns a new #EBookListener for the book.
- *
- * Returns: a new #EBookListener
- */
-EBookListener *
-e_book_listener_new ()
-{
-	EBookListener *listener;
-	EBookListener *retval;
-
-	listener = gtk_type_new (E_BOOK_LISTENER_TYPE);
-
-	retval = e_book_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_listener_new: Error constructing "
-			   "EBookListener!\n");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_listener_init (EBookListener *listener)
-{
-	listener->priv = g_new0 (EBookListenerPrivate, 1);
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener     *listener = E_BOOK_LISTENER (object);
-	GList             *l;
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		g_free (resp->msg);
-		g_free (resp->id);
-
-		if (resp->book != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->book, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying book "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		if (resp->cursor != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->cursor, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying cursor "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		if (resp->book_view != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (resp->book_view, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying book_view "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
-}
-
-POA_Evolution_BookListener__epv *
-e_book_listener_get_epv (void)
-{
-	POA_Evolution_BookListener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookListener__epv, 1);
-
-	epv->report_open_book_progress = impl_BookListener_report_open_book_progress;
-	epv->respond_open_book         = impl_BookListener_respond_open_book;
-
-	epv->respond_create_card       = impl_BookListener_respond_create_card;
-	epv->respond_remove_card       = impl_BookListener_respond_remove_card;
-	epv->respond_modify_card       = impl_BookListener_respond_modify_card;
-
-	epv->respond_get_cursor        = impl_BookListener_respond_get_cursor;
-	epv->respond_get_view          = impl_BookListener_respond_get_view;
-
-	epv->report_connection_status  = impl_BookListener_report_connection_status;
-
-	return epv;
-}
-
-static void
-e_book_listener_corba_class_init (void)
-{
-	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_listener_vepv.Evolution_BookListener_epv = e_book_listener_get_epv ();
-}
-
-static void
-e_book_listener_class_init (EBookListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_listener_destroy;
-
-	e_book_listener_corba_class_init ();
-}
-
-/**
- * e_book_listener_get_type:
- */
-GtkType
-e_book_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookListener",
-			sizeof (EBookListener),
-			sizeof (EBookListenerClass),
-			(GtkClassInitFunc)  e_book_listener_class_init,
-			(GtkObjectInitFunc) e_book_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
deleted file mode 100644
index eb0432e360..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_LISTENER_H__
-#define __E_BOOK_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <ebook/addressbook.h>
-#include <ebook/e-book-types.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookListener EBookListener;
-typedef struct _EBookListenerClass EBookListenerClass;
-typedef struct _EBookListenerPrivate EBookListenerPrivate;
-
-struct _EBookListener {
-	BonoboObject           parent;
-	EBookListenerPrivate *priv;
-};
-
-struct _EBookListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async responses */
-	OpenBookResponse,
-	CreateCardResponse,
-	RemoveCardResponse,
-	ModifyCardResponse,
-	GetCursorResponse,
-	GetBookViewResponse,
-
-	/* Async events */
-	LinkStatusEvent,
-	OpenProgressEvent,
-} EBookListenerOperation;
-
-typedef struct {
-	EBookListenerOperation  op;
-
-	/* For most Response notifications */
-	EBookStatus             status;
-
-	/* For OpenBookResponse */
-	Evolution_Book          book;
-
-	/* For GetCursorResponse */
-	Evolution_CardCursor    cursor;
-
-	/* For GetBookViewReponse */
-	Evolution_BookView      book_view;
-
-	/* For OpenProgressEvent */
-	char                   *msg;
-	short                   percent;
-
-	/* For LinkStatusEvent */
-	gboolean                connected;
-
-	/* For Card[Added|Removed|Modified]Event */
-	char                   *id;
-} EBookListenerResponse;
-
-EBookListener         *e_book_listener_new            (void);
-int                    e_book_listener_check_pending  (EBookListener *listener);
-EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);
-GtkType                e_book_listener_get_type       (void);
-
-POA_Evolution_BookListener__epv *e_book_listener_get_epv (void);
-
-#define E_BOOK_LISTENER_TYPE        (e_book_listener_get_type ())
-#define E_BOOK_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))
-#define E_BOOK_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_LISTENER_TYPE, EBookListenerClass))
-#define E_IS_BOOK_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_LISTENER_TYPE))
-#define E_IS_BOOK_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h
deleted file mode 100644
index a3e8bbc032..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_TYPES_H__
-#define __E_BOOK_TYPES_H__
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	E_BOOK_STATUS_SUCCESS,
-	E_BOOK_STATUS_UNKNOWN,
-	E_BOOK_STATUS_REPOSITORY_OFFLINE,
-	E_BOOK_STATUS_PERMISSION_DENIED,
-	E_BOOK_STATUS_CARD_NOT_FOUND,
-	E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED,
-	E_BOOK_STATUS_OTHER_ERROR
-} EBookStatus;
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
deleted file mode 100644
index cd1bdc6000..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookViewListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-#include "e-card.h"
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_view_listener_parent_class;
-POA_Evolution_BookViewListener__vepv  e_book_view_listener_vepv;
-
-struct _EBookViewListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_view_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_id_event (EBookViewListener          *listener,
-				     EBookViewListenerOperation  op,
-				     const char             *id)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = g_strdup (id);
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,
-					   EBookViewListenerOperation  op,
-					   const Evolution_VCardList  *cards)
-{
-	EBookViewListenerResponse *resp;
-	int i;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-	
-	for ( i = 0; i < cards->_length; i++ ) {
-		resp->cards = g_list_append(resp->cards, e_card_new(cards->_buffer[i]));
-	}
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Status Message */
-static void
-e_book_view_listener_queue_message_event (EBookViewListener          *listener,
-					  EBookViewListenerOperation  op,
-					  const char                 *message)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = g_strdup(message);
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookViewListener_signal_card_added (PortableServer_Servant servant,
-					 const Evolution_VCardList *cards,
-					 CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardAddedEvent, cards);
-}
-
-static void
-impl_BookViewListener_signal_card_removed (PortableServer_Servant servant,
-					   const Evolution_CardId id,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_id_event (
-		listener, CardRemovedEvent, (const char *) id);
-}
-
-static void
-impl_BookViewListener_signal_card_changed (PortableServer_Servant servant,
-					   const Evolution_VCardList *cards,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardModifiedEvent, cards);
-}
-
-static void
-impl_BookViewListener_signal_sequence_complete (PortableServer_Servant servant,
-						CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_empty_event (listener, SequenceCompleteEvent);
-}
-
-static void
-impl_BookViewListener_signal_status_message (PortableServer_Servant  servant,
-					     const char             *message,
-					     CORBA_Environment      *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_message_event (listener, StatusMessageEvent, message);
-}
-
-/**
- * e_book_view_listener_check_pending:
- * @listener: the #EBookViewListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookViewListener.
- */
-int
-e_book_view_listener_check_pending (EBookViewListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_view_listener_pop_response:
- * @listener: the #EBookViewListener for which a request is to be popped
- *
- * Returns: an #EBookViewListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookViewListener.
- */
-EBookViewListenerResponse *
-e_book_view_listener_pop_response (EBookViewListener *listener)
-{
-	EBookViewListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookViewListener *
-e_book_view_listener_construct (EBookViewListener *listener)
-{
-	POA_Evolution_BookViewListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
-
-	servant = (POA_Evolution_BookViewListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_view_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_BookViewListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_view_listener_new:
- * @book: the #EBookView for which the listener is to be bound
- *
- * Creates and returns a new #EBookViewListener for the book.
- *
- * Returns: a new #EBookViewListener
- */
-EBookViewListener *
-e_book_view_listener_new ()
-{
-	EBookViewListener *listener;
-	EBookViewListener *retval;
-
-	listener = gtk_type_new (E_BOOK_VIEW_LISTENER_TYPE);
-
-	retval = e_book_view_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_view_listener_new: Error constructing "
-			   "EBookViewListener!\n");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_view_listener_init (EBookViewListener *listener)
-{
-	listener->priv                 = g_new0 (EBookViewListenerPrivate, 1);
-	listener->priv->response_queue = NULL;
-	listener->priv->idle_id        = 0;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
-	GList             *l;
-
-	if (listener->priv->idle_id)
-		g_source_remove(listener->priv->idle_id);
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookViewListenerResponse *resp = l->data;
-
-		g_free(resp->id);
-
-		g_list_foreach(resp->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free(resp->cards);
-
-		g_free (resp->message);
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
-}
-
-POA_Evolution_BookViewListener__epv *
-e_book_view_listener_get_epv (void)
-{
-	POA_Evolution_BookViewListener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookViewListener__epv, 1);
-
-	epv->signal_card_changed       = impl_BookViewListener_signal_card_changed;
-	epv->signal_card_removed       = impl_BookViewListener_signal_card_removed;
-	epv->signal_card_added         = impl_BookViewListener_signal_card_added;
-	epv->signal_sequence_complete  = impl_BookViewListener_signal_sequence_complete;
-	epv->signal_status_message     = impl_BookViewListener_signal_status_message;
-
-	return epv;
-}
-
-static void
-e_book_view_listener_corba_class_init (void)
-{
-	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_view_listener_vepv.Evolution_BookViewListener_epv = e_book_view_listener_get_epv ();
-}
-
-static void
-e_book_view_listener_class_init (EBookViewListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_view_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_view_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_view_listener_destroy;
-
-	e_book_view_listener_corba_class_init ();
-}
-
-/**
- * e_book_view_listener_get_type:
- */
-GtkType
-e_book_view_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookViewListener",
-			sizeof (EBookViewListener),
-			sizeof (EBookViewListenerClass),
-			(GtkClassInitFunc)  e_book_view_listener_class_init,
-			(GtkObjectInitFunc) e_book_view_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
deleted file mode 100644
index 5a535a209a..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookViewListener interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_LISTENER_H__
-#define __E_BOOK_VIEW_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <addressbook/backend/ebook/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookViewListener EBookViewListener;
-typedef struct _EBookViewListenerClass EBookViewListenerClass;
-typedef struct _EBookViewListenerPrivate EBookViewListenerPrivate;
-
-struct _EBookViewListener {
-	BonoboObject           parent;
-	EBookViewListenerPrivate *priv;
-};
-
-struct _EBookViewListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async events */
-	CardAddedEvent,
-	CardRemovedEvent,
-	CardModifiedEvent,
-	SequenceCompleteEvent,
-	StatusMessageEvent,
-} EBookViewListenerOperation;
-
-typedef struct {
-	EBookViewListenerOperation  op;
-
-	/* For CardRemovedEvent */
-	char                   *id;
-
-	/* For Card[Added|Modified]Event */
-	GList                  *cards; /* Of type ECard. */
-
-	/* For StatusMessageEvent */
-	char                   *message;
-	
-} EBookViewListenerResponse;
-
-EBookViewListener         *e_book_view_listener_new            (void);
-int                        e_book_view_listener_check_pending  (EBookViewListener *listener);
-EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);
-GtkType                    e_book_view_listener_get_type       (void);
-
-POA_Evolution_BookViewListener__epv *e_book_view_listener_get_epv (void);
-
-#define E_BOOK_VIEW_LISTENER_TYPE        (e_book_view_listener_get_type ())
-#define E_BOOK_VIEW_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))
-#define E_BOOK_VIEW_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListenerClass))
-#define E_IS_BOOK_VIEW_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_LISTENER_TYPE))
-#define E_IS_BOOK_VIEW_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
deleted file mode 100644
index 6e0379f2cc..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-
-GtkObjectClass *e_book_view_parent_class;
-
-struct _EBookViewPrivate {
-	Evolution_BookView     corba_book_view;
-	
-	EBookViewListener     *listener;
-
-	int                    responses_queued_id;
-};
-
-enum {
-	CARD_CHANGED,
-	CARD_REMOVED,
-	CARD_ADDED,
-	SEQUENCE_COMPLETE,
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_signals [LAST_SIGNAL];
-
-static void
-e_book_view_do_added_event (EBookView                 *book_view,
-			    EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_ADDED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_modified_event (EBookView                 *book_view,
-			       EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_CHANGED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_removed_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_REMOVED],
-			 resp->id);
-
-	g_free(resp->id);
-}
-
-static void
-e_book_view_do_complete_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [SEQUENCE_COMPLETE]);
-}
-
-static void
-e_book_view_do_status_message_event (EBookView                 *book_view,
-				     EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [STATUS_MESSAGE],
-			 resp->message);
-	g_free(resp->message);
-}
-
-
-/*
- * Reading notices out of the EBookViewListener's queue.
- */
-static void
-e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_view)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = e_book_view_listener_pop_response (listener);
-
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CardAddedEvent:
-		e_book_view_do_added_event (book_view, resp);
-		break;
-	case CardModifiedEvent:
-		e_book_view_do_modified_event (book_view, resp);
-		break;
-	case CardRemovedEvent:
-		e_book_view_do_removed_event (book_view, resp);
-		break;
-	case SequenceCompleteEvent:
-		e_book_view_do_complete_event (book_view, resp);
-		break;
-	case StatusMessageEvent:
-		e_book_view_do_status_message_event (book_view, resp);
-		break;
-	default:
-		g_error ("EBookView: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-static gboolean
-e_book_view_construct (EBookView *book_view, Evolution_BookView corba_book_view, EBookViewListener *listener)
-{
-	CORBA_Environment  ev;
-	g_return_val_if_fail (book_view != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK_VIEW (book_view), FALSE);
-
-	/*
-	 * Copy in the corba_book_view.
-	 */
-	CORBA_exception_init (&ev);
-
-	book_view->priv->corba_book_view = CORBA_Object_duplicate(corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception duplicating corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	Evolution_BookView_ref(book_view->priv->corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception reffing corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	        CORBA_Object_release (book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_view_construct: Exception releasing corba_book_view.\n");
-		}
-		CORBA_exception_free (&ev);
-		book_view->priv->corba_book_view = NULL;
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book_view->priv->listener = listener;
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-	book_view->priv->responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view->priv->listener), "responses_queued",
-								   e_book_view_check_listener_queue, book_view);
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (Evolution_BookView corba_book_view, EBookViewListener *listener)
-{
-	EBookView *book_view;
-
-	book_view = gtk_type_new (E_BOOK_VIEW_TYPE);
-
-	if (! e_book_view_construct (book_view, corba_book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-		return NULL;
-	}
-
-	return book_view;
-}
-
-static void
-e_book_view_init (EBookView *book_view)
-{
-	book_view->priv                      = g_new0 (EBookViewPrivate, 1);
-	book_view->priv->corba_book_view     = CORBA_OBJECT_NIL;
-	book_view->priv->listener            = NULL;
-	book_view->priv->responses_queued_id = 0;
-}
-
-static void
-e_book_view_destroy (GtkObject *object)
-{
-	EBookView             *book_view = E_BOOK_VIEW (object);
-	CORBA_Environment  ev;
-
-	if (book_view->priv->corba_book_view) {
-		CORBA_exception_init (&ev);
-
-		Evolution_BookView_unref(book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while unreffing BookView\n");
-			
-			CORBA_exception_free (&ev);
-			CORBA_exception_init (&ev);
-		}
-
-		CORBA_Object_release (book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while releasing BookView\n");
-		}
-
-		CORBA_exception_free (&ev);
-	}
-
-	if (book_view->priv->listener) {
-		if (book_view->priv->responses_queued_id)
-			gtk_signal_disconnect(GTK_OBJECT(book_view->priv->listener),
-					      book_view->priv->responses_queued_id);
-		bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
-	}
-
-	g_free (book_view->priv);
-
-	if (GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy)
-		GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy (object);
-}
-
-static void
-e_book_view_class_init (EBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_view_signals [CARD_CHANGED] =
-		gtk_signal_new ("card_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [CARD_ADDED] =
-		gtk_signal_new ("card_added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_added),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	e_book_view_signals [CARD_REMOVED] =
-		gtk_signal_new ("card_removed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_removed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [SEQUENCE_COMPLETE] =
-		gtk_signal_new ("sequence_complete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, sequence_complete),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_book_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, status_message),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, e_book_view_signals,
-				      LAST_SIGNAL);
-
-	klass->card_changed = NULL;
-	klass->card_added = NULL;
-	klass->card_removed = NULL;
-	klass->sequence_complete = NULL;
-	klass->status_message = NULL;
-
-	object_class->destroy = e_book_view_destroy;
-}
-
-/**
- * e_book_view_get_type:
- */
-GtkType
-e_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookView",
-			sizeof (EBookView),
-			sizeof (EBookViewClass),
-			(GtkClassInitFunc)  e_book_view_class_init,
-			(GtkObjectInitFunc) e_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
deleted file mode 100644
index bd64c9dbc7..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_H__
-#define __E_BOOK_VIEW_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book-view-listener.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookView        EBookView;
-typedef struct _EBookViewClass   EBookViewClass;
-typedef struct _EBookViewPrivate EBookViewPrivate;
-
-struct _EBookView {
-	GtkObject     parent;
-	EBookViewPrivate *priv;
-};
-
-struct _EBookViewClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* card_changed)      (EBookView *book_view, const GList *cards);
-	void (* card_removed)      (EBookView *book_view, const char *id);
-	void (* card_added)        (EBookView *book_view, const GList *cards);
-	void (* sequence_complete) (EBookView *book_view);
-	void (* status_message)    (EBookView *book_view, const char *message);
-};
-
-/* Creating a new addressbook. */
-EBookView         *e_book_view_new                    (Evolution_BookView corba_book_view, EBookViewListener *listener);
-
-GtkType            e_book_view_get_type               (void);
-void               e_book_view_get_book_view_listener (EBookView *book_view);
-
-#define E_BOOK_VIEW_TYPE        (e_book_view_get_type ())
-#define E_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_TYPE, EBookView))
-#define E_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_TYPE, EBookViewClass))
-#define E_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_TYPE))
-#define E_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
deleted file mode 100644
index 32103fc9df..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1066 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-listener.h"
-#include "e-book.h"
-
-GtkObjectClass *e_book_parent_class;
-
-#define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-
-typedef enum {
-	URINotLoaded,
-	URILoading,
-	URILoaded
-} EBookLoadState;
-
-struct _EBookPrivate {
-	Evolution_BookFactory  book_factory;
-	EBookListener	      *listener;
-
-	Evolution_Book         corba_book;
-
-	EBookLoadState         load_state;
-
-	/*
-	 * The operation queue.  New operations are appended to the
-	 * end of the queue.  When responses come back from the PAS,
-	 * the op structures are popped off the front of the queue.
-	 */
-	GList                 *pending_ops;
-};
-
-enum {
-	OPEN_PROGRESS,
-	LINK_STATUS,
-	LAST_SIGNAL
-};
-
-static guint e_book_signals [LAST_SIGNAL];
-
-typedef struct {
-	gpointer  cb;
-	gpointer  closure;
-	EBookViewListener *listener;
-} EBookOp;
-
-/*
- * Local response queue management.
- */
-static void
-e_book_queue_op (EBook    *book,
-		 gpointer  cb,
-		 gpointer  closure,
-		 EBookViewListener *listener)
-{
-	EBookOp *op;
-
-	op           = g_new0 (EBookOp, 1);
-	op->cb       = cb;
-	op->closure  = closure;
-	op->listener = listener;
-
-	book->priv->pending_ops =
-		g_list_append (book->priv->pending_ops, op);
-}
-
-static EBookOp *
-e_book_pop_op (EBook *book)
-{
-	GList   *popped;
-	EBookOp *op;
-
-	if (book->priv->pending_ops == NULL)
-		return NULL;
-
-	op = book->priv->pending_ops->data;
-
-	popped = book->priv->pending_ops;
-	book->priv->pending_ops =
-		g_list_remove_link (book->priv->pending_ops,
-				    book->priv->pending_ops);
-
-	g_list_free_1 (popped);
-
-	return op;
-}
-
-static void
-e_book_do_response_create_card (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_create_card: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookIdCallback) op->cb) (book, resp->status, resp->id, op->closure);
-	g_free (resp->id);
-	g_free (op);
-}
-
-static void
-e_book_do_response_generic (EBook                 *book,
-			    EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_generic: Cannot find operation "
-			   "in local op queue!\n");
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_cursor (EBook                 *book,
-			       EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	ECardCursor *cursor;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	cursor = e_card_cursor_new(resp->cursor);
-
-	if (op->cb)
-		((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
-
-	/*
-	 * Release the remote Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception unref'ing "
-			   "remote Evolution_CardCursor interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception releasing "
-			   "remote Evolution_CardCursor interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(cursor));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_view (EBook                 *book,
-			     EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_view: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new(resp->book_view, op->listener);
-	
-	if (op->cb)
-		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-
-	/*
-	 * Release the remote Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception unref'ing "
-			   "remote Evolution_BookView interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception releasing "
-			   "remote Evolution_BookView interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(book_view));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_open (EBook                 *book,
-			 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	if (resp->status == E_BOOK_STATUS_SUCCESS) {
-		book->priv->corba_book  = resp->book;
-		book->priv->load_state  = URILoaded;
-	}
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_open: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-	g_free (op);
-}
-
-static void
-e_book_do_progress_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],
-			 resp->msg, resp->percent);
-
-	g_free (resp->msg);
-}
-
-static void
-e_book_do_link_event (EBook                 *book,
-		      EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],
-			 resp->connected);
-}
-
-
-/*
- * Reading notices out of the EBookListener's queue.
- */
-static void
-e_book_check_listener_queue (EBookListener *listener, EBook *book)
-{
-	EBookListenerResponse *resp;
-
-	resp = e_book_listener_pop_response (listener);
-
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CreateCardResponse:
-		e_book_do_response_create_card (book, resp);
-		break;
-	case RemoveCardResponse:
-	case ModifyCardResponse:
-		e_book_do_response_generic (book, resp);
-		break;
-	case GetCursorResponse:
-		e_book_do_response_get_cursor (book, resp);
-		break;
-	case GetBookViewResponse:
-		e_book_do_response_get_view(book, resp);
-		break;
-	case OpenBookResponse:
-		e_book_do_response_open (book, resp);
-		break;
-
-	case OpenProgressEvent:
-		e_book_do_progress_event (book, resp);
-		break;
-	case LinkStatusEvent:
-		e_book_do_link_event (book, resp);
-		break;
-	default:
-		g_error ("EBook: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-/**
- * e_book_load_uri:
- */
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (uri != NULL,           FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	if (book->priv->load_state != URINotLoaded) {
-		g_warning ("e_book_load_uri: Attempted to load a URI "
-			   "on a book which already has a URI loaded!\n");
-		return FALSE;
-	}
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book->priv->listener = e_book_listener_new ();
-	if (book->priv->listener == NULL) {
-		g_warning ("e_book_load_uri: Could not create EBookListener!\n");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book->priv->listener), "responses_queued",
-			    e_book_check_listener_queue, book);
-
-	/*
-	 * Load the addressbook into the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Evolution_BookFactory_open_book (
-		book->priv->book_factory, uri,
-		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	book->priv->load_state = URILoading;
-
-	e_book_queue_op (book, open_response, closure, NULL);
-
-	/* Now we play the waiting game. */
-
-	return TRUE;
-}
-
-/**
- * e_book_unload_uri:
- */
-void
-e_book_unload_uri (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	/*
-	 * FIXME: Make sure this works if the URI is still being
-	 * loaded.
-	 */
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return;
-	}
-
-	/*
-	 * Release the remote Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception unref'ing "
-			   "remote Evolution_Book interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception releasing "
-			   "remote book interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (book->priv->listener));
-
-	book->priv->listener   = NULL;
-	book->priv->load_state = URINotLoaded;
-}
-
-char *
-e_book_get_static_capabilities (EBook *book)
-{
-	CORBA_Environment ev;
-	char *temp;
-	char *ret_val;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return g_strdup("");
-	}
-
-	temp = Evolution_Book_get_static_capabilities(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_static_capabilities: Exception "
-			   "during get_static_capabilities!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	ret_val = g_strdup(temp);
-	CORBA_free(temp);
-
-	CORBA_exception_free (&ev);
-
-	return ret_val;
-}
-
-static gboolean
-e_book_construct (EBook *book)
-{
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	/*
-	 * Connect to the Personal Addressbook Server.
-	 */
-
-	book->priv->book_factory = (Evolution_BookFactory)
-		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
-	if (book->priv->book_factory == CORBA_OBJECT_NIL) {
-		g_warning ("e_book_construct: Could not obtain a handle "
-			   "to the Personal Addressbook Server!\n");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * e_book_new:
- */
-EBook *
-e_book_new (void)
-{
-	EBook *book;
-
-	book = gtk_type_new (E_BOOK_TYPE);
-
-	if (! e_book_construct (book)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		return NULL;
-	}
-
-	return book;
-}
-
-/* Fetching cards */
-
-/**
- * e_book_get_card:
- */
-ECard *
-e_book_get_card (EBook       *book,
-		 const char  *id)
-{
-	char  *vcard;
-	ECard *card;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return NULL;
-	}
-
-	vcard = e_book_get_vcard (book, id);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_get_card: Got bogus VCard from PAS!\n");
-		return NULL;
-	}
-
-	card = e_card_new (vcard);
-	g_free(vcard);
-	
-	e_card_set_id(card, id);
-
-	return card;
-}
-
-/**
- * e_book_get_vcard:
- */
-char *
-e_book_get_vcard (EBook       *book,
-		  const char  *id)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *vcard;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_vcard: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	vcard = Evolution_Book_get_vcard (book->priv->corba_book,
-					  (Evolution_CardId) id,
-					  &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_vcard: Exception getting VCard from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (vcard == NULL || strlen (vcard) == 0) {
-		g_warning ("e_book_get_vcard: Got NULL VCard from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (vcard);
-	CORBA_free (vcard);
-
-	return retval;
-}
-
-/* Deleting cards. */
-
-/**
- * e_book_remove_card:
- */
-gboolean
-e_book_remove_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	const char *id;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	id = e_card_get_id (card);
-	g_assert (id != NULL);
-
-	return e_book_remove_card_by_id (book, id, cb, closure);
-}
-
-/**
- * e_book_remove_card_by_id:
- */
-gboolean
-e_book_remove_card_by_id (EBook         *book,
-			  const char    *id,
-			  EBookCallback  cb,
-			  gpointer       closure)
-
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (id != NULL,       FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Book_remove_card (
-		book->priv->corba_book, (const Evolution_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_remove_card_by_id: CORBA exception "
-			   "talking to PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Adding cards. */
-
-/**
- * e_book_add_card:
- */
-gboolean
-e_book_add_card (EBook           *book,
-		 ECard           *card,
-		 EBookIdCallback  cb,
-		 gpointer         closure)
-
-{
-	char     *vcard;
-	gboolean  retval;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_add_card: Cannot convert card to VCard string!\n");
-		return FALSE;
-	}
-
-	retval = e_book_add_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	return retval;
-}
-
-/**
- * e_book_add_vcard:
- */
-gboolean
-e_book_add_vcard (EBook           *book,
-		  const char      *vcard,
-		  EBookIdCallback  cb,
-		  gpointer         closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Book_create_card (
-		book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Modifying cards. */
-
-/**
- * e_book_commit_card:
- */
-gboolean
-e_book_commit_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	char     *vcard;
-	gboolean  retval;
-	
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_commit_card: Error "
-			   "getting VCard for card!\n");
-		return FALSE;
-	}
-
-	retval = e_book_commit_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	return retval;
-}
-
-/**
- * e_book_commit_vcard:
- */
-gboolean
-e_book_commit_vcard (EBook         *book,
-		     const char    *vcard,
-		     EBookCallback  cb,
-		     gpointer       closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Book_modify_card (
-		book->priv->corba_book, (const Evolution_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_commit_vcard: Exception "
-			   "modifying card in PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-/**
- * e_book_check_connection:
- */
-gboolean
-e_book_check_connection (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Book_check_connection (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_check_connection: Exception "
-			   "querying the PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-gboolean e_book_get_cursor       (EBook               *book,
-				  gchar               *query,
-				  EBookCursorCallback  cb,
-				  gpointer             closure)
-{
-	CORBA_Environment ev;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return FALSE;
-	}
-	
-	CORBA_exception_init (&ev);
-	
-	Evolution_Book_get_cursor (book->priv->corba_book, query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_all_cards: Exception "
-			   "querying list of cards!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-gboolean e_book_get_book_view       (EBook                 *book,
-				     gchar                 *query,
-				     EBookBookViewCallback  cb,
-				     gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_book_view: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-	
-	Evolution_Book_get_book_view (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_book_view: Exception "
-			   "getting book_view!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, listener);
-
-	return TRUE;
-}
-
-gboolean e_book_get_changes         (EBook                 *book,
-				     gchar                 *changeid,
-				     EBookBookViewCallback  cb,
-				     gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-  
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_changes: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-	
-	Evolution_Book_get_changes (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_changes: Exception "
-			   "getting changes!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, listener);
-
-	return TRUE;
-}
-
-/**
- * e_book_get_name:
- */
-char *
-e_book_get_name (EBook *book)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *name;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_name: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	name = Evolution_Book_get_name (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_name: Exception getting name from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (name == NULL) {
-		g_warning ("e_book_get_name: Got NULL name from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (name);
-	CORBA_free (name);
-
-	return retval;
-}
-
-static void
-e_book_init (EBook *book)
-{
-	book->priv             = g_new0 (EBookPrivate, 1);
-	book->priv->load_state = URINotLoaded;
-}
-
-static void
-e_book_destroy (GtkObject *object)
-{
-	EBook             *book = E_BOOK (object);
-	CORBA_Environment  ev;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	CORBA_Object_release (book->priv->book_factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBook: Exception while releasing BookFactory\n");
-
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (e_book_parent_class)->destroy (object);
-}
-
-static void
-e_book_class_init (EBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_signals [LINK_STATUS] =
-		gtk_signal_new ("link_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookClass, link_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, e_book_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = e_book_destroy;
-}
-
-/**
- * e_book_get_type:
- */
-GtkType
-e_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBook",
-			sizeof (EBook),
-			sizeof (EBookClass),
-			(GtkClassInitFunc)  e_book_class_init,
-			(GtkObjectInitFunc) e_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
deleted file mode 100644
index 3c3f2bc65b..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#ifndef __E_BOOK_H__
-#define __E_BOOK_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-cursor.h>
-#include <addressbook/backend/ebook/e-book-view.h>
-#include <addressbook/backend/ebook/e-book-types.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBook        EBook;
-typedef struct _EBookClass   EBookClass;
-typedef struct _EBookPrivate EBookPrivate;
-
-struct _EBook {
-	GtkObject     parent;
-	EBookPrivate *priv;
-};
-
-struct _EBookClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* open_progress) (EBook *book, const char *msg, short percent);
-	void (* link_status)   (EBook *book, gboolean connected);
-};
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);
-typedef void (*EBookOpenProgressCallback)     (EBook          *book,
-					       const char     *status_message,
-					       short           percent,
-					       gpointer        closure);
-typedef void (*EBookIdCallback) (EBook *book, EBookStatus status, const char *id, gpointer closure);
-typedef void (*EBookCursorCallback) (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure);
-typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
-
-
-/* Creating a new addressbook. */
-EBook    *e_book_new                      (void);
-gboolean  e_book_load_uri                 (EBook                 *book,
-					   const char            *uri,
-					   EBookCallback          open_response,
-					   gpointer               closure);
-void      e_book_unload_uri               (EBook                 *book);
-char     *e_book_get_static_capabilities  (EBook                 *book);
-
-/* Fetching cards. */
-ECard    *e_book_get_card                 (EBook                 *book,
-					   const char            *id);
-char     *e_book_get_vcard                (EBook                 *book,
-					   const char            *id);
-
-/* Deleting cards. */
-gboolean  e_book_remove_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_remove_card_by_id        (EBook                 *book,
-					   const char            *id,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Adding cards. */
-gboolean  e_book_add_card                 (EBook                 *book,
-					   ECard                 *card,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-gboolean  e_book_add_vcard                (EBook                 *book,
-					   const char            *vcard,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-
-/* Modifying cards. */
-gboolean  e_book_commit_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_commit_vcard             (EBook                 *book,
-					   const char            *vcard,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Checking to see if we're connected to the card repository. */
-gboolean  e_book_check_connection         (EBook                 *book);
-gboolean  e_book_get_cursor               (EBook                 *book,
-					   char                  *query,
-					   EBookCursorCallback    cb,
-					   gpointer               closure);
-
-gboolean  e_book_get_book_view            (EBook                 *book,
-					   char                  *query,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-gboolean  e_book_get_changes              (EBook                 *book,
-					   char                  *changeid,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-/* Getting the name of the repository. */
-char     *e_book_get_name                 (EBook                 *book);
-
-GtkType   e_book_get_type                 (void);
-
-#define E_BOOK_TYPE        (e_book_get_type ())
-#define E_BOOK(o)          (GTK_CHECK_CAST ((o), E_BOOK_TYPE, EBook))
-#define E_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_TYPE, EBookClass))
-#define E_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), E_BOOK_TYPE))
-#define E_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_H__ */
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
deleted file mode 100644
index 1618a6ddee..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include "addressbook.h"
-#include "e-card-cursor.h"
-
-struct _ECardCursorPrivate {
-	Evolution_CardCursor corba_cursor;
-};
-
-/*
- * A pointer to our parent object class
- */
-static GtkObjectClass *parent_class;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-e_card_cursor_destroy (GtkObject *object)
-{
-	ECardCursor *cursor = E_CARD_CURSOR (object);
-	CORBA_Environment      ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_CardCursor_unref( cursor->priv->corba_cursor, &ev );
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception unreffing "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	CORBA_Object_release (cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception releasing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/**
- * e_card_cursor_get_length:
- * @cursor: the #ECardCursor whose length is being queried
- *
- * Returns: the number of items the cursor references, or -1 there's
- * an error.
- */
-long
-e_card_cursor_get_length (ECardCursor *cursor)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      ev;
-		long ret_val;
-
-		CORBA_exception_init (&ev);
-
-		ret_val = Evolution_CardCursor_get_length(cursor->priv->corba_cursor, &ev);
-		
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_length: Exception during "
-				  "get_length corba call.\n");
-			ret_val = -1;
-		}
-
-		CORBA_exception_free (&ev);
-
-		return ret_val;
-	}
-	else
-		return -1;
-}
-
-/**
- * e_card_cursor_get_nth:
- * @cursor: an #ECardCursor object
- * @n: the index of the item requested
- *
- * Gets an #ECard based on an index.
- *
- * Returns: a new #ECard on success, or %NULL on failure.
- */
-ECard *
-e_card_cursor_get_nth (ECardCursor *cursor,
-		       const long   n)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      en;
-		CORBA_char *vcard;
-		ECard *card;
-
-		CORBA_exception_init (&en);
-
-		vcard = Evolution_CardCursor_get_nth(cursor->priv->corba_cursor, n, &en);
-		
-		if (en._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_nth: Exception during "
-				  "get_nth corba call.\n");
-		}
-		
-		CORBA_exception_free (&en);
-
-		card = e_card_new (vcard);
-
-		CORBA_free(vcard);
-
-		return card;
-	}
-	else
-		return e_card_new("");
-}
-
-static void
-e_card_cursor_class_init (ECardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = e_card_cursor_destroy;
-}
-
-static void
-e_card_cursor_init (ECardCursor *cursor)
-{
-	cursor->priv = g_new(ECardCursorPrivate, 1);
-	cursor->priv->corba_cursor = CORBA_OBJECT_NIL;
-}
-
-GtkType
-e_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardCursor",
-			sizeof (ECardCursor),
-			sizeof (ECardCursorClass),
-			(GtkClassInitFunc) e_card_cursor_class_init,
-			(GtkObjectInitFunc) e_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-/**
- * e_card_cursor_construct:
- * @cursor: an #ECardCursor object
- * @corba_cursor: an #Evolution_CardCursor
- *
- * Wraps an #Evolution_CardCursor object inside the #ECardCursor
- * @cursor object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_construct (ECardCursor          *cursor,
-			 Evolution_CardCursor  corba_cursor)
-{
-	CORBA_Environment      ev;
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (E_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	CORBA_exception_init (&ev);
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->corba_cursor = CORBA_Object_duplicate(corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception duplicating "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	Evolution_CardCursor_ref(cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception reffing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/**
- * e_card_cursor_new:
- * @cursor: the #Evolution_CardCursor to be wrapped
- *
- * Creates a new #ECardCursor, which wraps an #Evolution_CardCursor
- * object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_new (Evolution_CardCursor corba_cursor)
-{
-	ECardCursor *cursor;
-
-	cursor = gtk_type_new (e_card_cursor_get_type ());
-	
-	return e_card_cursor_construct (cursor,
-					corba_cursor);
-}
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
deleted file mode 100644
index b318e646c4..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtk.h>
-#include <addressbook/backend/ebook/addressbook.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _ECardCursor        ECardCursor;
-typedef struct _ECardCursorPrivate ECardCursorPrivate;
-typedef struct _ECardCursorClass   ECardCursorClass;
-
-struct _ECardCursor {
-	GtkObject           parent;
-	ECardCursorPrivate *priv;
-};
-
-struct _ECardCursorClass {
-	GtkObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new       (Evolution_CardCursor  corba_cursor);
-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      Evolution_CardCursor  corba_cursor);
-
-GtkType      e_card_cursor_get_type    (void);
-
-/* Fetching cards. */
-long         e_card_cursor_get_length  (ECardCursor          *cursor);
-ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,
-					const long            nth);
-#define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())
-#define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))
-#define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))
-#define E_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE))
-#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_CURSOR_H__ */
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
deleted file mode 100644
index 0f379d3477..0000000000
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GnomeCard - a graphical contact manager.
- *
- * pairs.h: This file is part of GnomeCard.
- * 
- * Copyright (C) 1999 The Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __E_CARD_PAIRS_H__
-#define __E_CARD_PAIRS_H__
-
-#include <libversit/vcc.h>
-#include <ebook/e-card.h>
-
-
-#if 0
-struct pair
-{
-	char *str;
-	ECardPropertyType i ;
-};
-
-struct pair prop_lookup[] = {
-		{        VCFullNameProp, PROP_FNAME },
-		{            VCNameProp, PROP_NAME },
-		{           VCPhotoProp, PROP_PHOTO },
-		{       VCBirthDateProp, PROP_BDAY },
-		{             VCAdrProp, PROP_DELADDR },
-		{   VCDeliveryLabelProp, PROP_DELLABEL },
-		{       VCTelephoneProp, PROP_PHONE },
-		{    VCEmailAddressProp, PROP_EMAIL },
-		{          VCMailerProp, PROP_MAILER },
-		{        VCTimeZoneProp, PROP_TIMEZN },
-		{             VCGeoProp, PROP_GEOPOS },
-		{           VCTitleProp, PROP_TITLE },
-		{    VCBusinessRoleProp, PROP_ROLE },
-		{            VCLogoProp, PROP_LOGO },
-		{           VCAgentProp, PROP_AGENT },
-		{             VCOrgProp, PROP_ORG },
-		{      VCCategoriesProp, PROP_CATEGORIES },
-		{         VCCommentProp, PROP_COMMENT },
-		{     VCLastRevisedProp, PROP_REV },
-		{   VCPronunciationProp, PROP_SOUND },
-		{             VCURLProp, PROP_URL },
-		{    VCUniqueStringProp, PROP_UID },
-		{         VCVersionProp, PROP_VERSION },
-		{       VCPublicKeyProp, PROP_KEY },
-		{           VCValueProp, PROP_VALUE },
-		{        VCEncodingProp, PROP_ENCODING },
-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },
-		{            VC8bitProp, PROP_8BIT },
-		{          VCBase64Prop, PROP_BASE64 },
-		{        VCLanguageProp, PROP_LANG },
-		{         VCCharSetProp, PROP_CHARSET },
-		{ NULL, PROP_NONE} };
-
-struct pair photo_pairs[] = {
-		{ VCGIFProp, PHOTO_GIF },
-		{ VCCGMProp, PHOTO_CGM },
-		{ VCWMFProp, PHOTO_WMF },
-		{ VCBMPProp, PHOTO_BMP },
-		{ VCMETProp, PHOTO_MET },
-		{ VCPMBProp, PHOTO_PMB },
-		{ VCDIBProp, PHOTO_DIB },
-		{ VCPICTProp, PHOTO_PICT },
-		{ VCTIFFProp, PHOTO_TIFF },
-		{ VCPDFProp, PHOTO_PDF },
-		{ VCPSProp, PHOTO_PS },
-		{ VCJPEGProp, PHOTO_JPEG },
-		{ VCMPEGProp, PHOTO_MPEG },
-		{ VCMPEG2Prop, PHOTO_MPEG2 },
-		{ VCAVIProp, PHOTO_AVI },
-		{ VCQuickTimeProp, PHOTO_QTIME },
-		{ NULL, 0 } };
-
-struct pair email_pairs[] = {
-		{ VCAOLProp, EMAIL_AOL },
-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
-		{ VCATTMailProp, EMAIL_ATT },
-		{ VCCISProp, EMAIL_CIS },
-		{ VCEWorldProp, EMAIL_EWORLD },
-		{ VCInternetProp, EMAIL_INET },
-		{ VCIBMMailProp, EMAIL_IBM },
-		{ VCMCIMailProp, EMAIL_MCI },
-		{ VCPowerShareProp, EMAIL_POWERSHARE },
-		{ VCProdigyProp, EMAIL_PRODIGY },
-		{ VCTLXProp, EMAIL_TLX },
-		{ VCX400Prop, EMAIL_X400 },
-		{ NULL, 0 } };
-
-struct pair sound_pairs[] = {
-		{ VCAIFFProp, SOUND_AIFF },
-		{ VCPCMProp, SOUND_PCM },
-		{ VCWAVEProp, SOUND_WAVE },
-		{ NULL, 0 } };
-
-struct pair key_pairs[] = {
-		{ VCX509Prop, KEY_X509 },
-		{ VCPGPProp, KEY_PGP },
-		{ NULL, 0 } };
-	  
-
-#endif
-#endif /* ! __E_CARD_PAIRS_H__ */
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
deleted file mode 100644
index ff65ff82b0..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-#if 0
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_ID
-#endif
-};
-
-
-typedef enum _ECardSimpleInternalType ECardSimpleInternalType;
-typedef struct _ECardSimpleFieldData ECardSimpleFieldData;
-
-enum _ECardSimpleInternalType {
-	E_CARD_SIMPLE_INTERNAL_TYPE_STRING,
-	E_CARD_SIMPLE_INTERNAL_TYPE_DATE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS,
-	E_CARD_SIMPLE_INTERNAL_TYPE_PHONE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL,
-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,
-};
-
-struct _ECardSimpleFieldData {
-	ECardSimpleField         field;
-	char                    *ecard_field;
-	char                    *name;
-	char                    *short_name;
-	int                      list_type_index;
-	ECardSimpleInternalType  type;
-};
-
-/* This order must match the order in the .h. */
-
-static ECardSimpleFieldData field_data[] =
-{
-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",     "File As",       "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",   "Name",          "Name",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name", "Family Name",   "Family Name",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "",            "Email",         "Email",    E_CARD_SIMPLE_EMAIL_ID_EMAIL,   	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "",            "Primary",       "Prim",     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "",            "Business",      "Bus",      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "",            "Home",          "Home",     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",         "Organization",  "Org",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "",            "Business",      "Bus",      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "",            "Home",          "Home",     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "",            "Mobile",        "Mobile",   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "",            "Car",           "Car",      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "",            "Business Fax",  "Bus Fax",  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "",            "Home Fax",      "Home Fax", E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "",            "Business 2",    "Bus 2",    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "",            "Home 2",        "Home 2",   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "",            "ISDN",          "ISDN",     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "",            "Other",         "Other",    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "",            "Pager",         "Pager",    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "",            "Other",         "Other",    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "",            "Email 2",       "Email 2",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "",            "Email 3",       "Email 3",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",         "Web Site",      "Url",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",    "Department",    "Dep",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",      "Office",        "Off",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",       "Title",         "Title",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",        "Profession",    "Prof",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",     "Manager",       "Man",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",   "Assistant",     "Ass",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",    "Nickname",      "Nick",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",      "Spouse",        "Spouse",   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",        "Note",          "Note",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",       "Free-busy URL", "FBUrl",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary", "Anniversary",   "Anniv",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",  "Birth Date",    "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",      "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",   "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-};
-
-static void e_card_simple_init (ECardSimple *simple);
-static void e_card_simple_class_init (ECardSimpleClass *klass);
-
-static void e_card_simple_destroy (GtkObject *object);
-static void e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void fill_in_info(ECardSimple *simple);
-
-ECardPhoneFlags phone_correspondences[] = {
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */
-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */
-	E_CARD_PHONE_CELL | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Business",
-	"Business 2",
-	"Business Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mobile",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pager",
-	"Primary",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_short_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Bus",
-	"Bus 2",
-	"Bus Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mob",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pag",
-	"Prim",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-ECardAddressFlags addr_correspondences[] = {
-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */
-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */
-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */
-};
-
-char *address_names[] = {
-	"Business",
-	"Home",
-	"Other",
-};
-
-/**
- * e_card_simple_get_type:
- * @void: 
- * 
- * Registers the &ECardSimple class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECardSimple class.
- **/
-GtkType
-e_card_simple_get_type (void)
-{
-	static GtkType simple_type = 0;
-
-	if (!simple_type) {
-		GtkTypeInfo simple_info = {
-			"ECardSimple",
-			sizeof (ECardSimple),
-			sizeof (ECardSimpleClass),
-			(GtkClassInitFunc) e_card_simple_class_init,
-			(GtkObjectInitFunc) e_card_simple_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		simple_type = gtk_type_unique (gtk_object_get_type (), &simple_info);
-	}
-
-	return simple_type;
-}
-
-/**
- * e_card_simple_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ECardSimple that wraps the @VCard.
- */
-ECardSimple *
-e_card_simple_new (ECard *card)
-{
-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));
-	gtk_object_set(GTK_OBJECT(simple),
-		       "card", card,
-		       NULL);
-	return simple;
-}
-
-ECardSimple *e_card_simple_duplicate(ECardSimple *simple)
-{
-	char *vcard = e_card_simple_get_vcard(simple);
-	ECard *card = e_card_new(vcard);
-	ECardSimple *new_simple = e_card_simple_new(card);
-	g_free (vcard);
-	return new_simple;
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- *
- * Returns: a string representing the id of the simple, which is unique
- * within its book.
- */
-char *
-e_card_simple_get_id (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_id(simple->card);
-	else
-		return "";
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- * @id: a id in string format
- *
- * Sets the identifier of a simple, which should be unique within its
- * book.
- */
-void
-e_card_simple_set_id (ECardSimple *simple, const char *id)
-{
-	if ( simple->card )
-		e_card_set_id(simple->card, id);
-}
-
-/**
- * e_card_simple_get_vcard:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char
-*e_card_simple_get_vcard (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard(simple->card);
-	else
-		return g_strdup("");
-}
-
-static void
-e_card_simple_class_init (ECardSimpleClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ECardSimple::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_card_simple_destroy;
-	object_class->get_arg = e_card_simple_get_arg;
-	object_class->set_arg = e_card_simple_set_arg;
-}
-
-/*
- * ECardSimple lifecycle management and vcard loading/saving.
- */
-
-static void
-e_card_simple_destroy (GtkObject *object)
-{
-	ECardSimple *simple;
-	int i;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	if (simple->card)
-		gtk_object_unref(GTK_OBJECT(simple->card));
-	g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-	g_list_free(simple->temp_fields);
-	simple->temp_fields = NULL;
-
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		g_free(simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		g_free(simple->address[i]);
-}
-
-
-/* Set_arg handler for the simple */
-static void
-e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (simple->card)
-			gtk_object_unref(GTK_OBJECT(simple->card));
-		g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-		g_list_free(simple->temp_fields);
-		simple->temp_fields = NULL;
-		if (GTK_VALUE_OBJECT(*arg))
-			simple->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-		else
-			simple->card = NULL;
-		if(simple->card)
-			gtk_object_ref(GTK_OBJECT(simple->card));
-		fill_in_info(simple);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the simple */
-static void
-e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(simple);
-		if (simple->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(simple->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_simple_init:
- */
-static void
-e_card_simple_init (ECardSimple *simple)
-{
-	int i;
-	simple->card = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		simple->phone[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		simple->email[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		simple->address[i] = NULL;
-	simple->temp_fields = NULL;
-}
-
-static void
-fill_in_info(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const char *email;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		int i;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-			e_card_phone_free(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_copy(phone);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-			g_free(simple->email[i]);
-			simple->email[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if ((simple->email[i] == NULL)) {
-					simple->email[i] = g_strdup(email);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_address_label_free(simple->address[i]);
-			simple->address[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((address->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->address[i] == NULL)) {
-					simple->address[i] = e_card_address_label_copy(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_free(simple->delivery[i]);
-			simple->delivery[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->delivery[i] == NULL)) {
-					simple->delivery[i] = e_card_delivery_address_copy(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-}
-
-void
-e_card_simple_sync_card(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		const char *email;
-		int i;
-		int iterator_next = 1;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			phone = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_phone_free(simple->phone[i]);
-						simple->phone[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-			if (simple->phone[i]) {
-				simple->phone[i]->flags = phone_correspondences[i];
-				e_list_append(phone_list, simple->phone[i]);
-				e_card_phone_free(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			email = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if (simple->email[i]) {
-					if (*simple->email[i]) {
-						e_iterator_set(iterator, simple->email[i]);
-					} else {
-						e_iterator_delete(iterator);
-						iterator_next = 0;
-					}
-					g_free(simple->email[i]);
-					simple->email[i] = NULL;
-					break;
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-			if (simple->email[i]) {
-				e_list_append(email_list, simple->email[i]);
-				g_free(simple->email[i]);
-				simple->email[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			address = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags = addr_correspondences[i];
-						if (simple->address[i]->data && *simple->address[i]->data) {
-							e_iterator_set(iterator, simple->address[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_address_label_free(simple->address[i]);
-						simple->address[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->address[i]) {
-				simple->address[i]->flags = addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_free(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			delivery = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags = addr_correspondences[i];
-						if (!e_card_delivery_address_is_empty(simple->delivery[i])) {
-							e_iterator_set(iterator, simple->delivery[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_delivery_address_free(simple->delivery[i]);
-						simple->delivery[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->delivery[i]) {
-				simple->delivery[i]->flags = addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_free(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-	}
-}
-
-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,
-						 ECardSimplePhoneId    id)
-{
-	return simple->phone[id];
-}
-
-const char           *e_card_simple_get_email   (ECardSimple          *simple,
-						 ECardSimpleEmailId    id)
-{
-	return simple->email[id];
-}
-
-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,
-						 ECardSimpleAddressId  id)
-{
-	return simple->address[id];
-}
-
-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,
-								ECardSimpleAddressId  id)
-{
-	return simple->delivery[id];
-}
-
-void            e_card_simple_set_phone   (ECardSimple          *simple,
-					   ECardSimplePhoneId    id,
-					   const ECardPhone           *phone)
-{
-	if (simple->phone[id])
-		e_card_phone_free(simple->phone[id]);
-	simple->phone[id] = e_card_phone_copy(phone);
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	if (simple->email[id])
-		g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-}
-
-void            e_card_simple_set_address (ECardSimple          *simple,
-					   ECardSimpleAddressId  id,
-					   const ECardAddrLabel       *address)
-{
-	if (simple->address[id])
-		e_card_address_label_free(simple->address[id]);
-	simple->address[id] = e_card_address_label_copy(address);
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_copy(delivery);
-}
-
-const char *e_card_simple_get_const    (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	char *ret_val = e_card_simple_get(simple, field);
-	if (ret_val)
-		simple->temp_fields = g_list_prepend(simple->temp_fields, ret_val);
-	return ret_val;
-}
-
-char     *e_card_simple_get            (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	const ECardAddrLabel *addr;
-	const ECardPhone *phone;
-	const char *string;
-	ECardDate *date;
-	ECardName *name;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &string,
-			       NULL);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &date,
-			       NULL);
-		return NULL; /* FIXME!!!! */
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		addr = e_card_simple_get_address(simple,
-						 field_data[field].list_type_index);
-		if (addr)
-			return g_strdup(addr->data);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-		phone = e_card_simple_get_phone(simple,
-						field_data[field].list_type_index);
-		if (phone)
-			return g_strdup(phone->number);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-		string = e_card_simple_get_email(simple,
-						 field_data[field].list_type_index);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       "full_name", &string,
-				       NULL);
-			if (string && *string)
-				return g_strdup(string);
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       "org", &string,
-				       NULL);
-			if (string && *string)
-				return g_strdup(string);
-			string = e_card_simple_get_email(simple,
-							 E_CARD_SIMPLE_EMAIL_ID_EMAIL); 
-			return g_strdup(string);
-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
-			gtk_object_get (GTK_OBJECT(simple->card),
-					"name", &name,
-					NULL);
-			return g_strdup (name->family);
-		default:
-			return NULL;
-		}
-	default:
-		return NULL;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (ECardSimple *simple)
-{
-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	char *trystring;
-	char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!full_name)
-		full_name = g_strdup("");
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-
-		name = e_card_name_from_string(full_name);
-		
-		if (!name) {
-			goto end;
-		}
-
-		style = -1;
-		
-		for (i = 0; i < 5; i++) {
-			trystring = name_to_style(name, company, i);
-			if (!strcmp(trystring, filestring)) {
-				g_free(trystring);
-				style = i;
-				goto end;
-			}
-			g_free(trystring);
-		}
-	}		
- end:
-		
-	g_free(filestring);
-	g_free(full_name);
-	g_free(company);
-	if (name)
-		e_card_name_free(name);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-		
-		if (!full_name)
-			full_name = g_strdup("");
-		if (!company)
-			company = g_strdup("");
-		name = e_card_name_from_string(full_name);
-		if (name) {
-			string = name_to_style(name, company, style);
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);
-			g_free(string);
-		}
-		g_free(full_name);
-		g_free(company);
-		e_card_name_free(name);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	switch (field) {
-	case E_CARD_SIMPLE_FIELD_FULL_NAME:
-	case E_CARD_SIMPLE_FIELD_ORG:
-		style = file_as_get_style(simple);
-		gtk_object_set(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, data,
-			       NULL);
-		file_as_set_style(simple, style);
-		break;
-	default:
-		switch(type) {
-		case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-			gtk_object_set(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, data,
-				       NULL);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-			break; /* FIXME!!!! */
-		case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-			address = e_card_address_label_new();
-			address->data = (char *) data;
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			address->data = NULL;
-			e_card_address_label_free(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = (char *) data;
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			phone->number = NULL;
-			e_card_phone_free(phone);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-			e_card_simple_set_email(simple,
-						field_data[field].list_type_index,
-						data);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-			break;
-		}
-		break;
-	}
-}
-					     
-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,
-					  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	default:
-		return E_CARD_SIMPLE_TYPE_STRING;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		return E_CARD_SIMPLE_TYPE_DATE;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		return E_CARD_SIMPLE_TYPE_STRING;
-	}
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].name;
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].short_name;
-}
-
-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
-						       ECardSimpleArbitraryCallback *callback,
-						       gpointer                      closure)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (callback)
-				(*callback) (arbitrary, closure);
-		}
-	}
-}
-
-const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,
-						       const char           *key)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key))
-				return arbitrary;
-		}
-	}
-	return NULL;
-}
-
-/* Any of these except key can be NULL */	      
-void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,
-						       const char           *key,
-						       const char           *type,
-						       const char           *value)
-{
-	if (simple->card) {
-	ECardArbitrary *new_arb;
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key)) {
-				new_arb = e_card_arbitrary_new();
-				new_arb->key = g_strdup(key);
-				new_arb->type = g_strdup(type);
-				new_arb->value = g_strdup(value);
-				e_iterator_set(iterator, new_arb);
-				e_card_arbitrary_free(new_arb);
-				return;
-			}
-		}
-		new_arb = e_card_arbitrary_new();
-		new_arb->key = g_strdup(key);
-		new_arb->type = g_strdup(type);
-		new_arb->value = g_strdup(value);
-		e_list_append(list, new_arb);
-		e_card_arbitrary_free(new_arb);
-	}
-}
-
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
deleted file mode 100644
index e23f5fe90c..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_SIMPLE_H__
-#define __E_CARD_SIMPLE_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())
-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))
-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))
-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))
-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))
-
-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;
-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;
-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;
-typedef enum _ECardSimpleType ECardSimpleType;
-typedef enum _ECardSimpleField ECardSimpleField;
-
-enum _ECardSimplePhoneId {
-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,
-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,
-	E_CARD_SIMPLE_PHONE_ID_CAR,
-	E_CARD_SIMPLE_PHONE_ID_COMPANY,
-	E_CARD_SIMPLE_PHONE_ID_HOME,
-	E_CARD_SIMPLE_PHONE_ID_HOME_2,
-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,
-	E_CARD_SIMPLE_PHONE_ID_ISDN,
-	E_CARD_SIMPLE_PHONE_ID_MOBILE,
-	E_CARD_SIMPLE_PHONE_ID_OTHER,
-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,
-	E_CARD_SIMPLE_PHONE_ID_PAGER,
-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,
-	E_CARD_SIMPLE_PHONE_ID_RADIO,
-	E_CARD_SIMPLE_PHONE_ID_TELEX,
-	E_CARD_SIMPLE_PHONE_ID_TTYTTD,
-	E_CARD_SIMPLE_PHONE_ID_LAST
-};
-
-/* We need HOME and WORK email addresses here. */
-enum _ECardSimpleEmailId {
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,
-	E_CARD_SIMPLE_EMAIL_ID_LAST
-};
-
-/* Should this include (BILLING/SHIPPING)? */
-enum _ECardSimpleAddressId {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	E_CARD_SIMPLE_ADDRESS_ID_LAST
-};
-
-enum _ECardSimpleType {
-	E_CARD_SIMPLE_TYPE_STRING,
-	E_CARD_SIMPLE_TYPE_DATE,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME,
-        E_CARD_SIMPLE_FIELD_ORG,
-        E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,
-        E_CARD_SIMPLE_FIELD_ADDRESS_HOME,
-        E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-        E_CARD_SIMPLE_FIELD_PHONE_CAR,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-        E_CARD_SIMPLE_FIELD_PHONE_ISDN,
-        E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-        E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-        E_CARD_SIMPLE_FIELD_EMAIL_2,
-        E_CARD_SIMPLE_FIELD_EMAIL_3,
-        E_CARD_SIMPLE_FIELD_URL,
-        E_CARD_SIMPLE_FIELD_ORG_UNIT,
-        E_CARD_SIMPLE_FIELD_OFFICE,
-        E_CARD_SIMPLE_FIELD_TITLE,
-        E_CARD_SIMPLE_FIELD_ROLE,
-        E_CARD_SIMPLE_FIELD_MANAGER,
-        E_CARD_SIMPLE_FIELD_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_NICKNAME,
-        E_CARD_SIMPLE_FIELD_SPOUSE,
-        E_CARD_SIMPLE_FIELD_NOTE,
-        E_CARD_SIMPLE_FIELD_FBURL,
-        E_CARD_SIMPLE_FIELD_ANNIVERSARY,
-        E_CARD_SIMPLE_FIELD_BIRTH_DATE,
-	E_CARD_SIMPLE_FIELD_MAILER,
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG,
-        E_CARD_SIMPLE_FIELD_LAST
-};
-
-typedef struct _ECardSimple ECardSimple;
-typedef struct _ECardSimpleClass ECardSimpleClass;
-
-struct _ECardSimple {
-	GtkObject object;
-	ECard *card;
-
-	GList *temp_fields;
-
-	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];
-	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];
-	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-	ECardDeliveryAddress *delivery[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-};
-
-struct _ECardSimpleClass {
-	GtkObjectClass parent_class;
-};
-
-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                   (ECard                        *card);
-char                       *e_card_simple_get_id                (ECardSimple                  *simple);
-void                        e_card_simple_set_id                (ECardSimple                  *simple,
-								 const gchar                  *character);
-char                       *e_card_simple_get_vcard             (ECardSimple                  *simple);
-ECardSimple                *e_card_simple_duplicate             (ECardSimple                  *simple);
-char                       *e_card_simple_get                   (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_const             (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-void                        e_card_simple_set                   (ECardSimple                  *simple,
-								 ECardSimpleField              field,
-								 const char                   *data);
-ECardSimpleType             e_card_simple_type                  (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_name              (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_short_name        (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-
-
-/* Use these only if building lists of specific types.  It should be
- * easier to use the above if you consider a phone field to be the
- * same as any other field.
- */
-const ECardPhone           *e_card_simple_get_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id,
-								 const ECardPhone             *phone);
-void                        e_card_simple_set_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id,
-								 const char                   *email);
-void                        e_card_simple_set_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,
-								 ECardSimpleArbitraryCallback *callback,
-								 gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key);
-/* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key,
-								 const char                   *type,
-								 const char                   *value);
-void                        e_card_simple_sync_card             (ECardSimple                  *simple);
-
-/* Standard Gtk function */			      
-GtkType                     e_card_simple_get_type              (void);
-
-#endif /* ! __E_CARD_SIMPLE_H__ */
-
-
diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h
deleted file mode 100644
index a2563d4bf6..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_TYPES_H__
-#define __E_CARD_TYPES_H__
-
-/* IDENTIFICATION PROPERTIES */
-
-typedef struct {
-	char            *prefix;        /* Mr. */
-	char            *given;         /* John */
-	char            *additional;    /* Quinlan */
-	char            *family;        /* Public */
-	char            *suffix;        /* Esq. */
-} ECardName;
-
-typedef struct {
-	int year;
-	int month;
-	int day;
-} ECardDate;
-
-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_PHONE_PREF  = 1 << 0,
-	E_CARD_PHONE_WORK  = 1 << 1,
-	E_CARD_PHONE_HOME  = 1 << 2,
-	E_CARD_PHONE_VOICE = 1 << 3,
-	E_CARD_PHONE_FAX   = 1 << 4,
-	E_CARD_PHONE_MSG   = 1 << 5,
-	E_CARD_PHONE_CELL  = 1 << 6,
-	E_CARD_PHONE_PAGER = 1 << 7,
-	E_CARD_PHONE_BBS   = 1 << 8,
-	E_CARD_PHONE_MODEM = 1 << 9,
-	E_CARD_PHONE_CAR   = 1 << 10,
-	E_CARD_PHONE_ISDN  = 1 << 11,
-	E_CARD_PHONE_VIDEO = 1 << 12 
-} ECardPhoneFlags;
-
-typedef struct {
-	ECardPhoneFlags  flags;
-	char            *number;
-} ECardPhone;
-
-/* DELIVERY ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_ADDR_HOME   = 1 << 0, 
-	E_CARD_ADDR_WORK   = 1 << 1,
-	E_CARD_ADDR_POSTAL = 1 << 2, 
-	E_CARD_ADDR_PARCEL = 1 << 3, 
-	E_CARD_ADDR_DOM    = 1 << 4,
-	E_CARD_ADDR_INTL   = 1 << 5 
-} ECardAddressFlags;
-
-typedef struct {
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-/* PILOT SYNC STATUS */
-
-enum {
-	E_CARD_PILOT_STATUS_NONE,
-	E_CARD_PILOT_STATUS_MOD,
-	E_CARD_PILOT_STATUS_DEL
-};
-
-#endif /* __E_CARD_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
deleted file mode 100644
index 37a35b05e2..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,3383 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card.h"
-#include "e-card-pairs.h"
-#include <e-util/ename/e-name-western.h>
-#include <e-util/ename/e-address-western.h>
-
-#include <gal/util/e-util.h>
-
-#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
-#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
-#define has(obj,prop) (vo = isAPropertyOf ((obj), (prop)))
-
-#define XEV_PILOT_ID "X-EVOLUTION-PILOTID"
-#define XEV_PILOT_STATUS "X-EVOLUTION-PILOTSTATUS"
-#define XEV_WANTS_HTML "X-MOZILLA-HTML"
-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_MAILER,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_CATEGORIES,
-	ARG_CATEGORY_LIST,
-	ARG_WANTS_HTML,
-	ARG_WANTS_HTML_SET,
-	ARG_PILOTID,
-	ARG_PILOTSTATUS,
-	ARG_ARBITRARY,
-	ARG_ID,
-};
-
-#if 0
-static VObject *card_convert_to_vobject (ECard *crd);
-#endif
-static void parse(ECard *card, VObject *vobj);
-static void e_card_init (ECard *card);
-static void e_card_class_init (ECardClass *klass);
-
-static void e_card_destroy (GtkObject *object);
-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void assign_string(VObject *vobj, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name);
-static ECardDate e_card_date_from_string (char *str);
-
-static void parse_bday(ECard *card, VObject *object);
-static void parse_full_name(ECard *card, VObject *object);
-static void parse_file_as(ECard *card, VObject *object);
-static void parse_name(ECard *card, VObject *object);
-static void parse_email(ECard *card, VObject *object);
-static void parse_phone(ECard *card, VObject *object);
-static void parse_address(ECard *card, VObject *object);
-static void parse_address_label(ECard *card, VObject *object);
-static void parse_url(ECard *card, VObject *object);
-static void parse_org(ECard *card, VObject *object);
-static void parse_office(ECard *card, VObject *object);
-static void parse_title(ECard *card, VObject *object);
-static void parse_role(ECard *card, VObject *object);
-static void parse_manager(ECard *card, VObject *object);
-static void parse_assistant(ECard *card, VObject *object);
-static void parse_nickname(ECard *card, VObject *object);
-static void parse_spouse(ECard *card, VObject *object);
-static void parse_anniversary(ECard *card, VObject *object);
-static void parse_mailer(ECard *card, VObject *object);
-static void parse_fburl(ECard *card, VObject *object);
-static void parse_note(ECard *card, VObject *object);
-static void parse_categories(ECard *card, VObject *object);
-static void parse_wants_html(ECard *card, VObject *object);
-static void parse_pilot_id(ECard *card, VObject *object);
-static void parse_pilot_status(ECard *card, VObject *object);
-static void parse_arbitrary(ECard *card, VObject *object);
-static void parse_id(ECard *card, VObject *object);
-
-static ECardPhoneFlags get_phone_flags (VObject *vobj);
-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);
-static ECardAddressFlags get_address_flags (VObject *vobj);
-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);
-
-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object);
-
-struct {
-	char *key;
-	ParsePropertyFunc function;
-} attribute_jump_array[] = 
-{
-	{ VCFullNameProp,            parse_full_name },
-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },
-	{ VCNameProp,                parse_name },
-	{ VCBirthDateProp,           parse_bday },
-	{ VCEmailAddressProp,        parse_email },
-	{ VCTelephoneProp,           parse_phone },
-	{ VCAdrProp,                 parse_address },
-	{ VCDeliveryLabelProp,       parse_address_label },
-	{ VCURLProp,                 parse_url },
-	{ VCOrgProp,                 parse_org },
-	{ "X-EVOLUTION-OFFICE",      parse_office },
-	{ VCTitleProp,               parse_title },
-	{ VCBusinessRoleProp,        parse_role },
-	{ "X-EVOLUTION-MANAGER",     parse_manager },
-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },
-	{ "NICKNAME",                parse_nickname },
-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },
-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   
-	{ VCMailerProp,              parse_mailer },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ "CATEGORIES",              parse_categories },
-	{ XEV_WANTS_HTML,            parse_wants_html },
-	{ XEV_PILOT_ID,              parse_pilot_id },
-	{ XEV_PILOT_STATUS,          parse_pilot_status },
-	{ XEV_ARBITRARY,             parse_arbitrary },
-	{ VCUniqueStringProp,        parse_id }
-};
-
-/**
- * e_card_get_type:
- * @void: 
- * 
- * Registers the &ECard class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECard class.
- **/
-GtkType
-e_card_get_type (void)
-{
-	static GtkType card_type = 0;
-
-	if (!card_type) {
-		GtkTypeInfo card_info = {
-			"ECard",
-			sizeof (ECard),
-			sizeof (ECardClass),
-			(GtkClassInitFunc) e_card_class_init,
-			(GtkObjectInitFunc) e_card_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		card_type = gtk_type_unique (gtk_object_get_type (), &card_info);
-	}
-
-	return card_type;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));
-	while(vobj) {
-		VObject *next;
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	return card;
-}
-
-ECard *e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard(card);
-	ECard *new_card = e_card_new(vcard);
-	g_free (vcard);
-	return new_card;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- *
- * Returns: a string representing the id of the card, which is unique
- * within its book.
- */
-char *
-e_card_get_id (ECard *card)
-{
-	return card->id;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- * @id: a id in string format
- *
- * Sets the identifier of a card, which should be unique within its
- * book.
- */
-void
-e_card_set_id (ECard *card, const char *id)
-{
-	if ( card->id )
-		g_free(card->id);
-	card->id = g_strdup(id);
-}
-
-/**
- * e_card_get_vcard:
- * @card: an #ECard
- *
- * Returns: a string in vCard format, which is wrapped by the @card.
- */
-char
-*e_card_get_vcard (ECard *card)
-{
-	VObject *vobj; /*, *vprop; */
-	char *temp, *ret_val;
-	
-	vobj = newVObject (VCCardProp);
-
-	if ( card->file_as && *card->file_as )
-		addPropValue(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if ( card->fname )
-		addPropValue(vobj, VCFullNameProp, card->fname);
-
-	if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) {
-		VObject *nameprop;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			addPropValue(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given )
-			addPropValue(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			addPropValue(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			addPropValue(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			addPropValue(nameprop, VCNameSuffixesProp, card->name->suffix);
-	}
-
-
-	if ( card->address ) {
-		EIterator *iterator = e_list_get_iterator(card->address);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *addressprop;
-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if ( address->po )
-				addPropValue(addressprop, VCPostalBoxProp, address->po);
-			if ( address->ext )
-				addPropValue(addressprop, VCExtAddressProp, address->ext);
-			if ( address->street )
-				addPropValue(addressprop, VCStreetAddressProp, address->street);
-			if ( address->city )
-				addPropValue(addressprop, VCCityProp, address->city);
-			if ( address->region )
-				addPropValue(addressprop, VCRegionProp, address->region);
-			if ( address->code )
-				addPropValue(addressprop, VCPostalCodeProp, address->code);
-			if ( address->country )
-				addPropValue(addressprop, VCCountryNameProp, address->country);
-			addProp(addressprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->address_label ) {
-		EIterator *iterator = e_list_get_iterator(card->address_label);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *labelprop;
-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);
-			if (address_label->data)
-				labelprop = addPropValue(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-			addProp(labelprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->phone ) { 
-		EIterator *iterator = e_list_get_iterator(card->phone);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *phoneprop;
-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);
-			phoneprop = addPropValue(vobj, VCTelephoneProp, phone->number);
-			
-			set_phone_flags (phoneprop, phone->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->email ) { 
-		EIterator *iterator = e_list_get_iterator(card->email);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *emailprop;
-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		ECardDate date;
-		char *value;
-		date = *card->bday;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		addPropValue(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			addPropValue(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			addPropValue(orgprop, VCOrgUnitProp, card->org_unit);
-	}
-	
-	if (card->office)
-		addPropValue(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		addPropValue(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		addPropValue(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		addPropValue(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		addPropValue(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		addPropValue(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		addPropValue(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		ECardDate date;
-		char *value;
-		date = *card->anniversary;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		addPropValue(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->fburl)
-		addPropValue(vobj, "FBURL", card->fburl);
-	
-	if (card->note)
-		addPropValue(vobj, VCNoteProp, card->note);
-
-	if (card->categories) {
-		EIterator *iterator;
-		int length = 0;
-		char *string;
-		char *stringptr;
-		for (iterator = e_list_get_iterator(card->categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			length += strlen(e_iterator_get(iterator)) + 1;
-		}
-		string = g_new(char, length + 1);
-		stringptr = string;
-		*stringptr = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			strcpy(stringptr, e_iterator_get(iterator));
-			stringptr += strlen(stringptr);
-			*stringptr = ',';
-			stringptr++;
-			*stringptr = 0;
-		}
-		if (stringptr > string) {
-			stringptr --;
-			*stringptr = 0;
-		}
-		addPropValue (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		addPropValue (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->pilot_id) {
-		gchar *pilotid_str;
-		pilotid_str = g_strdup_printf ("%d", card->pilot_id);
-		addPropValue (vobj, XEV_PILOT_ID, pilotid_str);
-		g_free (pilotid_str);
-	}
-
-	if (card->pilot_status) {
-		gchar *pilotstatus_str;
-		pilotstatus_str = g_strdup_printf ("%d", card->pilot_status);
-		addPropValue (vobj, XEV_PILOT_STATUS, pilotstatus_str);
-		g_free (pilotstatus_str);
-	}
-
-	if (card->arbitrary) {
-		EIterator *iterator;
-		for (iterator = e_list_get_iterator(card->arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			VObject *arb_object;
-			if (arbitrary->value) {
-				arb_object = addPropValue (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				addPropValue (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	if (card->id)
-		addPropValue (vobj, VCUniqueStringProp, card->id);
-#if 0
-	
-	
-	if (crd->photo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCPhotoProp, 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (vprop, crd->photo.type);
-		add_CardProperty (vprop, &crd->photo.prop);
-	}
-
-	if (crd->xtension.l) {
-		GList *node;
-		
-		for (node = crd->xtension.l; node; node = node->next) {
-			CardXProperty *xp = (CardXProperty *) node->data;
-			addPropValue (vobj, xp->name, xp->data);
-			add_CardProperty (vobj, &xp->prop);
-		}
-	}
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		vprop = addPropValue (vobj, VCTimeZoneProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->timezn.prop);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		vprop = addPropValue (vobj, VCGeoLocationProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->geopos.prop);
-	}
-	
-	if (crd->logo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCLogoProp, 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (vprop, crd->logo.type);
-		add_CardProperty (vprop, &crd->logo.prop);
-	}
-	
-	if (crd->agent)
-	  addVObjectProp (vobj, card_convert_to_vobject (crd->agent));
-	
-	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,
-					    crd->sound.data, crd->sound.size);
-		else
-		  vprop = addPropValue (vobj, VCPronunciationProp, 
-				       crd->sound.data);
-		
-		add_SoundType (vprop, crd->sound.type);
-		add_CardProperty (vprop, &crd->sound.prop);
-	}
-	
-	if (crd->key.prop.used) {
-		vprop = addPropValue (vobj, VCPublicKeyProp, crd->key.data);
-		add_KeyType (vprop, crd->key.type);
-		add_CardProperty (vprop, &crd->key.prop);
-	}
-#endif
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-static void
-parse_file_as(ECard *card, VObject *vobj)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj)
-{
-	if ( card->name ) {
-		e_card_name_free(card->name);
-	}
-	card->name = g_new(ECardName, 1);
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-static void
-parse_bday(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->bday )
-			g_free(card->bday);
-		card->bday = g_new(ECardDate, 1);
-		*(card->bday) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_phone(ECard *card, VObject *vobj)
-{
-	ECardPhone *next_phone = g_new(ECardPhone, 1);
-	EList *list;
-
-	assign_string(vobj, &(next_phone->number));
-	next_phone->flags = get_phone_flags(vobj);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "phone", &list,
-		       NULL);
-	e_list_append(list, next_phone);
-	e_card_phone_free (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj)
-{
-	ECardDeliveryAddress *next_addr = g_new(ECardDeliveryAddress, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_free (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj)
-{
-	ECardAddrLabel *next_addr = g_new(ECardAddrLabel, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_free (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp);
-	if (temp) {
-		if (card->org)
-			g_free(card->org);
-		card->org = temp;
-	}
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp);
-	if (temp) {
-		if (card->org_unit)
-			g_free(card->org_unit);
-		card->org_unit = temp;
-	}
-}
-
-static void
-parse_office(ECard *card, VObject *vobj)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, &(card->spouse));
-}
-
-static void
-parse_anniversary(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (card->anniversary)
-			g_free(card->anniversary);
-		card->anniversary = g_new(ECardDate, 1);
-		*(card->anniversary) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_mailer(ECard *card, VObject *vobj)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, &(card->mailer));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj)
-{
-	g_free(card->fburl);
-	assign_string(vobj, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj)
-{
-	g_free(card->note);
-	assign_string(vobj, &(card->note));
-}
-
-static void
-add_list_unique(ECard *card, EList *list, char *string)
-{
-	char *temp = e_strdup_strip(string);
-	EIterator *iterator;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		if (!strcmp(e_iterator_get(iterator), temp)) {
-			break;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		e_list_append(list, temp);
-	}
-	g_free(temp);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-do_parse_categories(ECard *card, char *str)
-{
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	EList *list;
-	gtk_object_get(GTK_OBJECT(card),
-		       "category_list", &list,
-		       NULL);
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(card, list, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(card, list, copy);
-	g_free(copy);
-}
-
-static void
-parse_categories(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-static void
-parse_wants_html(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->wants_html = TRUE;
-			card->wants_html_set = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->wants_html = FALSE;
-			card->wants_html_set = TRUE;
-		}
-		free(str);
-	}
-}
-
-static void
-parse_pilot_id(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_id = atoi(str);
-		free(str);
-	}
-}
-
-static void
-parse_pilot_status(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_status = atoi(str);
-		free(str);
-	}
-}
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-} ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-};
-
-static void
-parse_arbitrary(ECard *card, VObject *vobj)
-{
-	ECardArbitrary *arbitrary = e_card_arbitrary_new();
-	VObjectIterator iterator;
-	EList *list;
-	for ( initPropIterator (&iterator, vobj); moreIteration(&iterator); ) {
-		VObject *temp = nextVObject(&iterator);
-		const char *name = vObjectName(temp);
-		if (name && !strcmp(name, "TYPE")) {
-			g_free(arbitrary->type);
-			assign_string(temp, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_free(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj)
-{
-	if ( card->id )
-		g_free(card->id);
-	assign_string(vobj, &(card->id));
-}
-
-static void
-parse_attribute(ECard *card, VObject *vobj)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj);
-}
-
-static void
-parse(ECard *card, VObject *vobj)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator));
-	}
-	if (!card->fname) {
-		card->fname = g_strdup("");
-	}
-	if (!card->name) {
-		card->name = e_card_name_from_string(card->fname);
-	}
-	if (!card->file_as) {
-		ECardName *name = card->name;
-		char *strings[3], **stringptr;
-		char *string;
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		card->file_as = string;
-	}
-}
-
-static void
-e_card_class_init (ECardClass *klass)
-{
-	int i;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	klass->attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for ( i = 0; i < sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {
-		g_hash_table_insert(klass->attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);
-	}
-
-	gtk_object_add_arg_type ("ECard::file_as",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);
-	gtk_object_add_arg_type ("ECard::full_name",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  
-	gtk_object_add_arg_type ("ECard::name",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("ECard::address",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("ECard::address_label",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);
-	gtk_object_add_arg_type ("ECard::phone",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);
-	gtk_object_add_arg_type ("ECard::email",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);
-	gtk_object_add_arg_type ("ECard::birth_date",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);
-	gtk_object_add_arg_type ("ECard::url",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  
-	gtk_object_add_arg_type ("ECard::org",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);
-	gtk_object_add_arg_type ("ECard::org_unit",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);
-	gtk_object_add_arg_type ("ECard::office",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);
-	gtk_object_add_arg_type ("ECard::title",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  
-	gtk_object_add_arg_type ("ECard::role",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);
-	gtk_object_add_arg_type ("ECard::manager",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);
-	gtk_object_add_arg_type ("ECard::assistant",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);
-	gtk_object_add_arg_type ("ECard::nickname",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);
-	gtk_object_add_arg_type ("ECard::spouse",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);
-	gtk_object_add_arg_type ("ECard::anniversary",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);
-	gtk_object_add_arg_type ("ECard::mailer",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);
-	gtk_object_add_arg_type ("ECard::fburl",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
-	gtk_object_add_arg_type ("ECard::note",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
-	gtk_object_add_arg_type ("ECard::categories",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CATEGORIES);
-	gtk_object_add_arg_type ("ECard::category_list",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CATEGORY_LIST);
-	gtk_object_add_arg_type ("ECard::wants_html",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::wants_html_set",
-				 GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::pilot_id",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTID);
-	gtk_object_add_arg_type ("ECard::pilot_status",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTSTATUS);
-	gtk_object_add_arg_type ("ECard::arbitrary",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_ARBITRARY);
-	gtk_object_add_arg_type ("ECard::id",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ID);
-
-
-	object_class->destroy = e_card_destroy;
-	object_class->get_arg = e_card_get_arg;
-	object_class->set_arg = e_card_set_arg;
-}
-
-ECardPhone *
-e_card_phone_new (void)
-{
-	ECardPhone *newphone = g_new(ECardPhone, 1);
-
-	newphone->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_free (ECardPhone *phone)
-{
-	if ( phone ) {
-		g_free(phone->number);
-
-		g_free(phone);
-	}
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = g_new(ECardPhone, 1);
-		phone_copy->number = g_strdup(phone->number);
-		phone_copy->flags  = phone->flags;
-		return phone_copy;
-	} else
-		return NULL;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_new (void)
-{
-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);
-
-	newaddr->po      = NULL;
-	newaddr->ext     = NULL;
-	newaddr->street  = NULL;
-	newaddr->city    = NULL;
-	newaddr->region  = NULL;
-	newaddr->code    = NULL;
-	newaddr->country = NULL;
-	newaddr->flags   = 0;
-
-	return newaddr;
-}
-
-void
-e_card_delivery_address_free (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		g_free(addr->po);
-		g_free(addr->ext);
-		g_free(addr->street);
-		g_free(addr->city);
-		g_free(addr->region);
-		g_free(addr->code);
-		g_free(addr->country);
-
-		g_free(addr);
-	}
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = g_new(ECardDeliveryAddress, 1);
-		addr_copy->po      = g_strdup(addr->po     );
-		addr_copy->ext     = g_strdup(addr->ext    );
-		addr_copy->street  = g_strdup(addr->street );
-		addr_copy->city    = g_strdup(addr->city   );
-		addr_copy->region  = g_strdup(addr->region );
-		addr_copy->code    = g_strdup(addr->code   );
-		addr_copy->country = g_strdup(addr->country);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-gboolean
-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)
-{
-	return (((addr->po      == NULL) || (*addr->po      == 0)) &&
-		((addr->ext     == NULL) || (*addr->ext     == 0)) &&
-		((addr->street  == NULL) || (*addr->street  == 0)) &&
-		((addr->city    == NULL) || (*addr->city    == 0)) &&
-		((addr->region  == NULL) || (*addr->region  == 0)) &&
-		((addr->code    == NULL) || (*addr->code    == 0)) &&
-		((addr->country == NULL) || (*addr->country == 0)));
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_from_label(const ECardAddrLabel *label)
-{
-	ECardDeliveryAddress *addr = g_new(ECardDeliveryAddress, 1);
-	EAddressWestern *western = e_address_western_parse (label->data);
-	
-	addr->po      = g_strdup (western->po_box     );
-	addr->ext     = g_strdup (western->extended   );
-	addr->street  = g_strdup (western->street     );
-	addr->city    = g_strdup (western->locality   );
-	addr->region  = g_strdup (western->region     );
-	addr->code    = g_strdup (western->postal_code);
-	addr->country = g_strdup (western->country    );
-	addr->flags   = label->flags;
-	
-	e_address_western_free(western);
-	
-	return addr;
-}
-
-char *
-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)
-{
-	char *strings[5], **stringptr = strings;
-	char *line1, *line22, *line2;
-	char *final;
-	if (addr->po && *addr->po)
-		*(stringptr++) = addr->po;
-	if (addr->street && *addr->street)
-		*(stringptr++) = addr->street;
-	*stringptr = NULL;
-	line1 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->region && *addr->region)
-		*(stringptr++) = addr->region;
-	if (addr->code && *addr->code)
-		*(stringptr++) = addr->code;
-	*stringptr = NULL;
-	line22 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->city && *addr->city)
-		*(stringptr++) = addr->city;
-	if (line22 && *line22)
-		*(stringptr++) = line22;
-	*stringptr = NULL;
-	line2 = g_strjoinv(", ", strings);
-	stringptr = strings;
-	if (line1 && *line1)
-		*(stringptr++) = line1;
-	if (addr->ext && *addr->ext)
-		*(stringptr++) = addr->ext;
-	if (line2 && *line2)
-		*(stringptr++) = line2;
-	if (addr->country && *addr->country)
-		*(stringptr++) = addr->country;
-	*stringptr = NULL;
-	final = g_strjoinv("\n", strings);
-	g_free(line1);
-	g_free(line22);
-	g_free(line2);
-	return final;
-}
-
-ECardAddrLabel *
-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)
-{
-	ECardAddrLabel *label;
-	label = e_card_address_label_new();
-	label->flags = addr->flags;
-	label->data = e_card_delivery_address_to_string(addr);
-
-	return label;
-}
-
-ECardAddrLabel *
-e_card_address_label_new (void)
-{
-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);
-
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_free (ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		g_free(addr->data);
-
-		g_free(addr);
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = g_new(ECardAddrLabel, 1);
-		addr_copy->data    = g_strdup(addr->data);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-ECardName *e_card_name_new(void)
-{
-	ECardName *newname = g_new(ECardName, 1);
-
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_free(ECardName *name)
-{
-	if (name) {
-		if ( name->prefix )
-			g_free(name->prefix);
-		if ( name->given )
-			g_free(name->given);
-		if ( name->additional )
-			g_free(name->additional);
-		if ( name->family )
-			g_free(name->family);
-		if ( name->suffix )
-			g_free(name->suffix);
-		g_free ( name );
-	}
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = g_new(ECardName, 1);
-		
-		newname->prefix = g_strdup(name->prefix);
-		newname->given = g_strdup(name->given);
-		newname->additional = g_strdup(name->additional);
-		newname->family = g_strdup(name->family);
-		newname->suffix = g_strdup(name->suffix);
-
-		return newname;
-	} else
-		return NULL;
-}
-
-char *
-e_card_name_to_string(const ECardName *name)
-{
-	char *strings[6], **stringptr = strings;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (name->prefix && *name->prefix)
-		*(stringptr++) = name->prefix;
-	if (name->given && *name->given)
-		*(stringptr++) = name->given;
-	if (name->additional && *name->additional)
-		*(stringptr++) = name->additional;
-	if (name->family && *name->family)
-		*(stringptr++) = name->family;
-	if (name->suffix && *name->suffix)
-		*(stringptr++) = name->suffix;
-	*stringptr = NULL;
-	return g_strjoinv(" ", strings);
-}
-
-ECardName *
-e_card_name_from_string(const char *full_name)
-{
-	ECardName *name = g_new(ECardName, 1);
-	ENameWestern *western = e_name_western_parse (full_name);
-	
-	name->prefix     = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
-	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffix     = g_strdup (western->suffix);
-	
-	e_name_western_free(western);
-	
-	return name;
-}
-
-ECardArbitrary *
-e_card_arbitrary_new(void)
-{
-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = g_new(ECardArbitrary, 1);
-		arb_copy->key = g_strdup(arbitrary->key);
-		arb_copy->type = g_strdup(arbitrary->type);
-		arb_copy->value = g_strdup(arbitrary->value);
-		return arb_copy;
-	} else
-		return NULL;
-}
-
-void
-e_card_arbitrary_free(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		g_free(arbitrary->key);
-		g_free(arbitrary->type);
-		g_free(arbitrary->value);
-	}
-	g_free(arbitrary);
-}
-
-/*
- * ECard lifecycle management and vCard loading/saving.
- */
-
-static void
-e_card_destroy (GtkObject *object)
-{
-	ECard *card = E_CARD(object);
-	g_free(card->id);
-	g_free(card->file_as);
-	g_free(card->fname);
-	if ( card->name )
-		e_card_name_free(card->name);
-	g_free(card->bday);
-
-	g_free(card->url);
-	g_free(card->org);
-	g_free(card->org_unit);
-	g_free(card->office);
-	g_free(card->title);
-	g_free(card->role);
-	g_free(card->manager);
-	g_free(card->assistant);
-	g_free(card->nickname);
-	g_free(card->spouse);
-	g_free(card->anniversary);
-	g_free(card->fburl);
-	g_free(card->note);
-		
-	if (card->categories)
-		gtk_object_unref(GTK_OBJECT(card->categories));
-	if (card->email)
-		gtk_object_unref(GTK_OBJECT(card->email));
-	if (card->phone)
-		gtk_object_unref(GTK_OBJECT(card->phone));
-	if (card->address)
-		gtk_object_unref(GTK_OBJECT(card->address));
-	if (card->address_label)
-		gtk_object_unref(GTK_OBJECT(card->address_label));
-}
-
-
-/* Set_arg handler for the card */
-static void
-e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-	
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		g_free(card->file_as);
-		card->file_as = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FULL_NAME:
-		g_free(card->fname);
-		card->fname = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NAME:
-		if ( card->name )
-			e_card_name_free(card->name);
-		card->name = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_CATEGORIES:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = NULL;
-		if (GTK_VALUE_STRING(*arg))
-			do_parse_categories(card, GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_CATEGORY_LIST:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->categories)
-			gtk_object_ref(GTK_OBJECT(card->categories));
-		break;
-	case ARG_BIRTH_DATE:
-		g_free(card->bday);
-		card->bday = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_URL:
-		g_free(card->url);
-		card->url = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG:
-		g_free(card->org);
-		card->org = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG_UNIT:
-		g_free(card->org_unit);
-		card->org_unit = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_OFFICE:
-		g_free(card->office);
-		card->office = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_TITLE:
-		g_free(card->title);
-		card->title = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ROLE:
-		g_free(card->role);
-		card->role = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_MANAGER:
-		g_free(card->manager);
-		card->manager = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ASSISTANT:
-		g_free(card->assistant);
-		card->assistant = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NICKNAME:
-		g_free(card->nickname);
-		card->nickname = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_SPOUSE:
-		g_free(card->spouse);
-		card->spouse = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ANNIVERSARY:
-		g_free(card->anniversary);
-		card->anniversary = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_MAILER:
-		g_free(card->mailer);
-		card->mailer = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FBURL:
-		g_free(card->fburl);
-		card->fburl = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NOTE:
-		g_free (card->note);
-		card->note = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_WANTS_HTML:
-		card->wants_html = GTK_VALUE_BOOL(*arg);
-		card->wants_html_set = TRUE;
-		break;
-	case ARG_PILOTID:
-		card->pilot_id = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_PILOTSTATUS:
-		card->pilot_status = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_ARBITRARY:
-		if (card->arbitrary)
-			gtk_object_unref(GTK_OBJECT(card->arbitrary));
-		card->arbitrary = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->arbitrary)
-			gtk_object_ref(GTK_OBJECT(card->arbitrary));
-		break;
-	case ARG_ID:
-		g_free(card->id);
-		card->id = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the card */
-static void
-e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		GTK_VALUE_STRING (*arg) = card->file_as;
-		break;
-	case ARG_FULL_NAME:
-		GTK_VALUE_STRING (*arg) = card->fname;
-		break;
-	case ARG_NAME:
-		GTK_VALUE_POINTER(*arg) = card->name;
-		break;
-	case ARG_ADDRESS:
-		if (!card->address)
-			card->address = e_list_new((EListCopyFunc) e_card_delivery_address_copy, 
-							(EListFreeFunc) e_card_delivery_address_free,
-							NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address);
-		break;
-	case ARG_ADDRESS_LABEL:
-		if (!card->address_label)
-			card->address_label = e_list_new((EListCopyFunc) e_card_address_label_copy, 
-							      (EListFreeFunc) e_card_address_label_free,
-							      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address_label);
-		break;
-	case ARG_PHONE:
-		if (!card->phone)
-			card->phone = e_list_new((EListCopyFunc) e_card_phone_copy, 
-						      (EListFreeFunc) e_card_phone_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone);
-		break;
-	case ARG_EMAIL:
-		if (!card->email)
-			card->email = e_list_new((EListCopyFunc) g_strdup, 
-						      (EListFreeFunc) g_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email);
-		break;
-	case ARG_CATEGORIES:
-		{
-			int i;
-			char ** strs;
-			int length;
-			EIterator *iterator;
-			if (!card->categories)
-				card->categories = e_list_new((EListCopyFunc) g_strdup, 
-								   (EListFreeFunc) g_free,
-								   NULL);
-			length = e_list_length(card->categories);
-			strs = g_new(char *, length + 1);
-			for (iterator = e_list_get_iterator(card->categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {
-				strs[i] = (char *)e_iterator_get(iterator);
-			}
-			strs[i] = 0;
-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);
-			g_free(strs);
-		}
-		break;
-	case ARG_CATEGORY_LIST:
-		if (!card->categories)
-			card->categories = e_list_new((EListCopyFunc) g_strdup, 
-							   (EListFreeFunc) g_free,
-							   NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->categories);
-		break;
-	case ARG_BIRTH_DATE:
-		GTK_VALUE_POINTER(*arg) = card->bday;
-		break;
-	case ARG_URL:
-		GTK_VALUE_STRING(*arg) = card->url;
-		break;
-	case ARG_ORG:
-		GTK_VALUE_STRING(*arg) = card->org;
-		break;
-	case ARG_ORG_UNIT:
-		GTK_VALUE_STRING(*arg) = card->org_unit;
-		break;
-	case ARG_OFFICE:
-		GTK_VALUE_STRING(*arg) = card->office;
-		break;
-	case ARG_TITLE:
-		GTK_VALUE_STRING(*arg) = card->title;
-		break;
-	case ARG_ROLE:
-		GTK_VALUE_STRING(*arg) = card->role;
-		break;
-	case ARG_MANAGER:
-		GTK_VALUE_STRING(*arg) = card->manager;
-		break;
-	case ARG_ASSISTANT:
-		GTK_VALUE_STRING(*arg) = card->assistant;
-		break;
-	case ARG_NICKNAME:
-		GTK_VALUE_STRING(*arg) = card->nickname;
-		break;
-	case ARG_SPOUSE:
-		GTK_VALUE_STRING(*arg) = card->spouse;
-		break;
-	case ARG_ANNIVERSARY:
-		GTK_VALUE_POINTER(*arg) = card->anniversary;
-		break;
-	case ARG_MAILER:
-		GTK_VALUE_STRING(*arg) = card->mailer;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_WANTS_HTML:
-		GTK_VALUE_BOOL(*arg) = card->wants_html;
-		break;
-	case ARG_WANTS_HTML_SET:
-		GTK_VALUE_BOOL(*arg) = card->wants_html_set;
-		break;
-	case ARG_PILOTID:
-		GTK_VALUE_INT(*arg) = card->pilot_id;
-		break;
-	case ARG_PILOTSTATUS:
-		GTK_VALUE_INT(*arg) = card->pilot_status;
-		break;
-	case ARG_ARBITRARY:
-		if (!card->arbitrary)
-			card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_copy,
-							  (EListFreeFunc) e_card_arbitrary_free,
-							  NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_init:
- */
-static void
-e_card_init (ECard *card)
-{
-	card->id = g_strdup("");
-	
-	card->file_as = NULL;
-	card->fname = NULL;
-	card->name = NULL;
-	card->bday = NULL;
-	card->email = NULL;
-	card->phone = NULL;
-	card->address = NULL;
-	card->address_label = NULL;
-	card->url = NULL;
-	card->org = NULL;
-	card->org_unit = NULL;
-	card->office = NULL;
-	card->title = NULL;
-	card->role = NULL;
-	card->manager = NULL;
-	card->assistant = NULL;
-	card->nickname = NULL;
-	card->spouse = NULL;
-	card->anniversary = NULL;
-	card->mailer = NULL;
-	card->fburl = NULL;
-	card->note = NULL;
-	card->categories = NULL;
-	card->wants_html = FALSE;
-	card->wants_html_set = FALSE;
-	card->pilot_id = 0;
-	card->pilot_status = 0;
-	card->arbitrary = NULL;
-#if 0
-
-	c = g_new0 (ECard, 1);
-	
-	c->fname      = 
-	c->mailer     = 
-	c->role       = 
-	c->comment    = 
-	c->categories = 
-	c->uid        = e_card_prop_str_empty ();
-	
-	c->photo.type = PHOTO_JPEG;
-	c->logo.type  = PHOTO_JPEG;
-	c->rev.utc    = -1;
-	c->sound.type = SOUND_PHONETIC;
-	c->key.type   = KEY_PGP;
-
-	c->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-	c->comment.prop.encod    = ENC_QUOTED_PRINTABLE;
-	
-	c->name.prop   = c->photo.prop = c->bday.prop     = c->timezn.prop   = 
-	c->geopos.prop = c->logo.prop  = c->org.prop      = c->rev.prop      =
-	c->sound.prop  = c->key.prop   = c->deladdr.prop  = c->dellabel.prop =
-	c->phone.prop  = c->email.prop = c->xtension.prop = c->prop = e_card_prop_empty ();
-	
-	c->prop.type            = PROP_CARD;
-	c->fname.prop.type      = PROP_FNAME;
-	c->name.prop.type       = PROP_NAME;
-	c->photo.prop.type      = PROP_PHOTO;
-	c->bday.prop.type       = PROP_BDAY;
-	
-	c->deladdr.prop.type    = PROP_DELADDR_LIST;
-	c->dellabel.prop.type   = PROP_DELLABEL_LIST;
-	c->phone.prop.type      = PROP_PHONE_LIST;
-	c->email.prop.type      = PROP_EMAIL_LIST;
-	c->xtension.prop.type   = PROP_XTENSION_LIST;
-	c->mailer.prop.type     = PROP_MAILER;
-	c->timezn.prop.type     = PROP_TIMEZN;
-	c->geopos.prop.type     = PROP_GEOPOS;
-	c->role.prop.type       = PROP_ROLE;
-	c->logo.prop.type       = PROP_LOGO;
-	c->org.prop.type        = PROP_ORG;
-	c->categories.prop.type = PROP_CATEGORIES;
-	c->comment.prop.type    = PROP_COMMENT;
-	c->rev.prop.type        = PROP_REV;
-	c->sound.prop.type      = PROP_SOUND;
-	c->uid.prop.type 	= PROP_UID;
-	c->key.prop.type 	= PROP_KEY;
-	
-	return c;
-#endif
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-static void
-assign_string(VObject *vobj, char **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		*string = g_strdup (vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = (vObjectValueType (vobj) ? fakeCString (vObjectUStringZValue (vobj)) : calloc(1, 1));
-		*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-}
-
-#if 0
-static void
-e_card_str_free (CardStrProperty *sp)
-{
-	g_free (sp->str);
-
-	e_card_prop_free (sp->prop);
-}
-
-static void
-e_card_photo_free (CardPhoto *photo)
-{
-	g_free (photo->data);
-
-	e_card_prop_free (photo->prop);
-}
-
-/**
- * e_card_free:
- */
-void
-e_card_free (ECard *card)
-{
-	GList *l;
-
-	g_return_if_fail (card != NULL);
-
-	e_card_name_free (& card->name);
-	e_card_str_free  (& card->fname);
-
-	e_card_photo_free (card->photo);
-
-	e_card_logo_free (card->logo);
-	e_card_org_free (card->org);
-	e_card_key_free (card->key);
-	e_card_sound_free (card->sound);
-
-	e_card_prop_str_free (& card->mailer);
-	e_card_prop_str_free (& card->role);
-	e_card_prop_str_free (& card->categories);
-	e_card_prop_str_free (& card->comment);
-	e_card_prop_str_free (& card->uid);
-
-	/* address is a little more complicated */
-	card_prop_free (card->deladdr.prop);
-	while ((l = card->deladdr.l)) {
-
-		e_card_deladdr_free ((CardDelAddr *) l->data);
-
-		card->deladdr.l = g_list_remove_link (card->deladdr.l, l);
-		g_list_free (l);
-	}
-	
-	g_free (card);
-}
-
-typedef struct
-{
-	char c;
-	int id;
-	
-	GList *sons;
-} tree;
-
-extern CardProperty 
-e_card_prop_empty (void)
-{
-	CardProperty prop;
-	
-	prop.used = FALSE;
-	
-	prop.type = PROP_NONE;
-	prop.encod = ENC_7BIT;
-	prop.value = VAL_INLINE;
-	prop.charset = NULL;
-	prop.lang = NULL;
-	prop.grp = NULL;
-	prop.xtension = NULL;
-	
-	prop.user_data = NULL;
-	
-	return prop;
-}
-
-static CardStrProperty 
-e_card_prop_str_empty (void)
-{
-	CardStrProperty strprop;
-	
-	strprop.prop = card_prop_empty ();
-	strprop.str = NULL;
-	
-	return strprop;
-}
-
-/* Intended to check asserts. */
-extern int card_check_prop (ECardProperty prop)
-{
-	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
-	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
-	    ((prop.encod >= ENC_NONE) && (prop.encod <= ENC_LAST)) &&
-	    ((prop.value >= VAL_NONE) && (prop.value <= VAL_LAST)))
-	  return TRUE;
-	    
-	return FALSE;
-}
-
-extern void
-card_prop_free (CardProperty prop)
-{
-	GList *l;
-	
-	g_free (prop.charset);
-	g_free (prop.lang);
-	
-	for (l = prop.xtension; l; l = l->next) {
-		CardXAttribute *xa = (CardXAttribute *) l->data;
-		g_free (xa->name);
-		g_free (xa->data);
-	}
-	
-	g_list_free (l);
-	
-	prop.used = FALSE;
-}
-	
-e_card_deladdr_free (ECardDelAddr *c)
-{
-	card_prop_free (c->prop);
-
-	g_free (p->pobox);
-	g_free (p->ext);
-	g_free (p->street);
-	g_free (p->city);
-	g_free (p->region);
-	g_free (p->code);
-	g_free (p->country);
-}
-
-void 
-card_free (Card *crd)
-{
-}
-
-static tree *
-new_tree (char c, int id)
-{
-	tree *t;
-	
-	t = malloc (sizeof (tree));
-	t->c = c;
-	t->id = id;
-	t->sons = NULL;
-	
-	return t;
-}
-
-static void 
-add_branch (tree *t, char *str, int id)
-{
-	tree *tmp;
-	char *end;
-	
-	end = str + strlen (str) + 1;
-
-	while (str != end) {
-		tmp = new_tree (*str, id);
-		t->sons = g_list_append (t->sons, (gpointer) tmp);
-		t = tmp;
-		
-		str ++;
-	}
-}
-
-static tree *
-add_to_tree (tree *t, struct pair p)
-{
-	GList *node;
-	char *c, *end;
-	tree *tmp;
-	
-	  c = p.str;
-	end = c + strlen (c) + 1;
-	tmp = t;
-	
-	while (c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-		
-		if (node) {
-			tmp = (tree *) node->data;
-			tmp->id = 0;
-			c++;
-		}
-		else {
-			add_branch (tmp, c, p.id);
-			break;
-		}
-	}
-	
-	return t;
-}
-		
-static tree *
-create_search_tree (void)
-{
-	tree *t;
-	int i;
-
-	t = new_tree (0, 0);
-	for (i = 0; prop_lookup[i].str; i++)
-	  t = add_to_tree (t, prop_lookup[i]);
-	
-	return t;
-}
-		
-static int 
-card_lookup_name (const char *c)
-{
-	static tree *search_tree = NULL;
-	GList *node;
-	tree *tmp;
-	const char *end;
-	
-	if (!search_tree)
-	  search_tree = create_search_tree ();
-	
-	tmp = search_tree;
-	end = c + strlen (c) + 1;
-	
-	while (tmp->id == 0 && c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-	
-		if (node) {
-			tmp = (tree *) node->data;
-			c++;
-		}
-		else
-		  return 0;
-	}
-	
-	return tmp->id;
-}
-
-static enum PhotoType 
-get_photo_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (has (o, photo_pairs[i].str))
-	    return photo_pairs[i].id;
-
-	g_warning ("? < No PhotoType for Photo property. Falling back to JPEG.");
-	return PHOTO_JPEG;
-}
-
-static CardProperty 
-get_CardProperty (VObject *o)
-{
-	VObjectIterator i;
-	CardProperty prop;
-
-	prop = card_prop_empty ();
-	prop.used = TRUE;
-	
-	initPropIterator (&i, o);
-	while (moreIteration (&i)) {
-		VObject *vo = nextVObject (&i);
-		const char *n = vObjectName (vo);
-		int propid;
-	
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-			
-		 case PROP_VALUE:
-		
-			if (has (vo, VCContentIDProp))
-			  prop.value = VAL_CID;
-			break;
-			
-		 case PROP_ENCODING:
-			if (has (vo, VCQuotedPrintableProp))
-			  prop.encod = ENC_QUOTED_PRINTABLE;
-			else if (has (vo, VC8bitProp))
-			  prop.encod = ENC_8BIT;
-			else if (has (vo, VCBase64Prop))
-			  prop.encod = ENC_BASE64;
-			break;
-			
-		 case PROP_QUOTED_PRINTABLE:
-			prop.encod = ENC_QUOTED_PRINTABLE;
-			break;
-			
-		 case PROP_8BIT:
-			prop.encod = ENC_8BIT;
-			break;
-			
-		 case PROP_BASE64:
-			prop.encod = ENC_BASE64;
-			break;
-	
-		 case PROP_LANG:
-			if (vObjectValueType (vo)) {
-				prop.lang = 
-				  g_strdup (vObjectStringZValue (vo));
-			} else
-			  g_warning ("? < No value for LANG attribute.");
-			break;
-			
-		 case PROP_CHARSET:
-			if (vObjectValueType (vo)) {
-				prop.charset = 
-				  g_strdup (vObjectStringZValue (vo));
-				g_warning (prop.charset); 
-			} else
-			  g_warning ("? < No value for CHARSET attribute.");
-			break;
-		 default:
-				{
-					CardXAttribute *c;
-
-					c = malloc (sizeof (CardXAttribute));
-					c->name = g_strdup (n);
-					
-					if (vObjectValueType (vo))
-					  c->data = 
-					  g_strdup (vObjectStringZValue (vo));
-					else
-					  c->data = NULL;
-					
-					prop.xtension = 
-					  g_list_append (prop.xtension, c);
-				}
-		}
-	}
-
-	return prop;
-}
-
-static gboolean
-e_card_prop_has (VObject    *o,
-		 const char *id)
-{
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	if (isAPropertyOf (o, id) == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-static const char *
-e_card_prop_get_str (VObject    *o,
-		     const char *id)
-{
-	VObject *strobj;
-
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	strobj = isAPropertyOf (o, id);
-
-	if (strobj == NULL)
-		return g_strdup ("");
-
-	if (vObjectValueType (strobj) != NULL) {
-		char *str;
-		char *g_str;
-
-		str = fakeCString (vObjectStringZValue (strobj));
-		g_str = g_strdup (str);
-		free (str);
-
-		return g_str;
-	}
-
-	return g_strdup ("");
-}
-
-static ECardName *
-e_card_get_name (VObject *o)
-{
-	CardName *name;
-	VObject *vo;
-	char *the_str;
-
-	name = g_new0 (ECardName, 1);
-
-	name->family     = e_card_prop_get_substr (o, VCFamilyNameProp);
-	name->given      = e_card_prop_get_substr (o, VCGivenNameProp);
-	name->additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);
-	name->prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);
-	name->suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);
-
-	return name;
-}
-
-static CardDelLabel *
-get_CardDelLabel (VObject *o)
-{
-	CardDelLabel *dellabel;
-	char *the_str;
-	
-	dellabel = malloc (sizeof (CardDelLabel));
-	
-	dellabel->type = get_addr_type (o);
-	dellabel->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	return dellabel;
-}
-
-static CardPhone *
-get_CardPhone (VObject *o)
-{
-	CardPhone *ret;
-	char *the_str;
-	
-	ret = malloc (sizeof (CardPhone));
-	ret->type = get_phone_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-
-	return ret;
-}
-
-static CardEMail *
-get_CardEMail (VObject *o)
-{
-	CardEMail *ret;
-	char *the_str; 
-	
-	ret = malloc (sizeof (CardEMail)); 
-	ret->type = get_email_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	
-	return ret;
-}
-	
-static CardTimeZone 
-strtoCardTimeZone (char *str)
-{
-	char s[3];
-	CardTimeZone tz;
-	
-	if (*str == '-') {
-		tz.sign = -1;
-		str++;
-	} else
-	  tz.sign = 1;
-	
-	tz.hours = 0;
-	tz.mins = 0;
-	
-	s[2] = 0;
-	if (strlen (str) > 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.hours = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	str += 2;
-	if (*str == ':')
-	  str++;
-	
-	if (strlen (str) >= 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.mins = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	if (strlen (str) > 3)
-		g_warning ("? < TimeZone value is too long.");
-
-	return tz;
-}
-
-static CardGeoPos 
-strtoCardGeoPos (char *str)
-{
-	CardGeoPos gp;
-	char *s;
-	
-	gp.lon = 0;
-	gp.lat = 0;
-	  
-	s = strchr (str, ',');
-	
-	if (! s) {
-		g_warning ("? < Bad format for GeoPos property.");
-		return gp;
-	}
-	
-	*s = 0;
-	s++;
-	
-	gp.lon = atof (str);
-	gp.lat = atof (s);
-	
-	return gp;
-}
-	
-static CardOrg *
-e_card_vobject_to_org (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardOrg *org;
-
-	org = g_new0 (CardOrg, 1);
-
-	if (has (o, VCOrgNameProp)) {
-		org.name = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnitProp)) {
-		org.unit1 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit2Prop)) {
-		org.unit2 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit3Prop)) {
-		org.unit3 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit4Prop)) {
-		org.unit4 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	
-	return org;
-}
-
-static CardXProperty *
-get_XProp (VObject *o)
-{
-	char *the_str;
-	CardXProperty *ret;
-	
-	ret = malloc (sizeof (CardXProperty)); 
-	ret->name = g_strdup (vObjectName (o));
-	ret->data = g_strdup (str_val (o));
-	free (the_str);
-	
-	return ret;
-}
-
-static CardRev 
-strtoCardRev (char *str)
-{
-	char s[3], *t, *ss;
-	int len, i;
-	CardRev rev;
-	
-	rev.utc = 0;
-	len = strlen (str);
-	
-	if (str[len] == 'Z') {              /* Is it UTC? */
-		rev.utc = 1;
-		str[len] = 0;
-	}
-	  
-	s[2] = 0;
-	t = strchr (str, 'T');
-	if (t) {                            /* Take the Time */
-		*t = 0;
-		t++;
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_hour = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')             /* Ignore ':' separator */
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_min = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_sec = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-
-		if (strlen (str) > 3)
-		  g_warning ("? < Rev value is too long.");
-		
-	} else {
-		g_warning ("? < No time value for Rev property.");
-	}
-
-	/* Now the date (the part before the T) */
-	
-	if (strchr (str, '-')) {                        /* extended iso 8601 */
-		for (ss = strtok (str, "-"), i = 0; ss;
-		     ss = strtok (NULL, "-"), i++)
-		  switch (i) {
-		   case 0:
-			  rev.tm.tm_year = atoi (ss);
-			  break;
-		   case 1:
-			  rev.tm.tm_mon = atoi (ss);
-			  break;
-		   case 2:
-			  rev.tm.tm_mday = atoi (ss);
-			  break;
-		   default:
-			  g_warning ("? < Too many values for Rev property.");
-		  }
-		
-		if (i < 2)
-		  g_warning ("? < Too few values for Rev property.");
-	} else {
-		if (strlen (str) >= 8) {             /* short representation */
-			rev.tm.tm_mday = atoi (str + 6);
-			str[6] = 0;
-			rev.tm.tm_mon = atoi (str + 4);
-			str[4] = 0;
-			rev.tm.tm_year = atoi (str);
-		} else
-		  g_warning ("? < Bad format for Rev property.");
-	}
-	
-	return rev;
-}
-		
-static enum KeyType 
-get_key_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (has (o, key_pairs[i].str))
-	    return key_pairs[i].id;
-
-	g_warning ("? < No KeyType for Key property. Falling back to PGP.");
-	return KEY_PGP;
-}
-
-static CardPhoto 
-get_CardPhoto (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardPhoto photo;
-
-	photo.type = get_photo_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		photo.size = vObjectIntegerValue (vo);
-		photo.data = malloc (photo.size);
-		memcpy (photo.data, vObjectAnyValue (o), photo.size);
-	} else {
-		photo.size = strlen (str_val (o)) + 1;
-		photo.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return photo;
-}
-
-static enum SoundType 
-get_sound_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (has (o, sound_pairs[i].str))
-	    return sound_pairs[i].id;
-
-	return SOUND_PHONETIC;
-}
-	
-static CardSound 
-get_CardSound (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardSound sound;
-
-	sound.type = get_sound_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		sound.size = vObjectIntegerValue (vo);
-		sound.data = malloc (sound.size);
-		memcpy (sound.data, vObjectAnyValue (o), sound.size);
-	} else {
-		sound.size = strlen (str_val (o));
-		sound.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return sound;
-}
-
-/* Loads our card contents from a VObject */
-static ECard *
-e_card_construct_from_vobject (ECard   *card,
-			       VObject *vcrd)
-{
-	VObjectIterator i;
-	Card *crd;
-	char *the_str;
-
-	initPropIterator (&i, vcrd);
-	crd = card_new ();
-
-	while (moreIteration (&i)) {
-		VObject *o = nextVObject (&i);
-		const char *n = vObjectName (o);
-		int propid;
-		CardProperty *prop = NULL;
-
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-		case PROP_FNAME:
-			prop = &crd->fname.prop;
-			crd->fname.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_NAME:
-			prop = &crd->name.prop;
-			crd->name = e_card_get_name (o);
-			break;
-		 case PROP_PHOTO:
-			prop = &crd->photo.prop;
-			crd->photo = get_CardPhoto (o);
-			break;
-		 case PROP_BDAY:
-			prop = &crd->bday.prop;
-			crd->bday = strtoCardBDay (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_DELADDR:
-				{
-					CardDelAddr *c;
-					c = get_CardDelAddr (o);
-					prop = &c->prop;
-					crd->deladdr.l = g_list_append (crd->deladdr.l, c);
-				}
-			break;
-		 case PROP_DELLABEL:
-				{
-					CardDelLabel *c;
-					c = get_CardDelLabel (o);
-					prop = &c->prop;
-					crd->dellabel.l = g_list_append (crd->dellabel.l, c);
-				}
-			break;
-		 case PROP_PHONE:
-				{
-					CardPhone *c;
-					
-					c = get_CardPhone (o);
-					prop = &c->prop;
-					crd->phone.l = g_list_append (crd->phone.l, c);
-				}
-			break;
-		 case PROP_EMAIL:
-				{
-					CardEMail *c;
-					
-					c = get_CardEMail (o);
-					prop = &c->prop;
-					crd->email.l = g_list_append (crd->email.l, c);
-				}
-			break;
-		 case PROP_MAILER:
-			prop = &crd->mailer.prop;
-			crd->mailer.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_TIMEZN:
-			prop = &crd->timezn.prop;
-			crd->timezn = strtoCardTimeZone (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_GEOPOS:
-			prop = &crd->geopos.prop;
-			crd->geopos = strtoCardGeoPos (str_val (o));
-			break;
-		 case PROP_ROLE:
-			prop = &crd->role.prop;
-			crd->role.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_LOGO:
-			prop = &crd->logo.prop;
-			crd->logo = get_CardPhoto (o);
-			break;
-		 case PROP_AGENT:
-			crd->agent = card_create_from_vobject (o);
-			break;
-		 case PROP_ORG:
-			prop = &crd->org.prop;
-			crd->org = get_CardOrg (o);
-			break;
-		 case PROP_CATEGORIES:
-			prop = &crd->categories.prop;
-			crd->categories.str = g_strdup (str_val (o));
-			crd->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_COMMENT:
-			prop = &crd->comment.prop;
-			crd->comment.str = g_strdup (str_val (o));
-			crd->comment.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_REV:
-			prop = &crd->rev.prop;
-			crd->rev = strtoCardRev (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_SOUND:
-			prop = &crd->sound.prop;
-			crd->sound = get_CardSound (o);
-			break;
-		 case PROP_VERSION:
-				{
-					char *str;
-					str = str_val (o);
-					if (strcmp (str, "2.1"))
-					  g_warning ("? < Version doesn't match.");
-					free (the_str);
-				}
-			break;
-		 case PROP_KEY:
-			prop = &crd->key.prop;
-			crd->key.type = get_key_type (o);
-			crd->key.data = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 default:
-				{
-					CardXProperty *c;
-				
-					c = get_XProp (o);
-					prop = &c->prop;
-					crd->xtension.l = g_list_append (crd->xtension.l, c);
-				}
-			break;
-		}
-		
-		if (prop) {
-			*prop = get_CardProperty (o);
-			prop->type = propid;
-		}
-	}
-	
-	return crd;
-}
-		
-/* Loads a card from a file */
-GList *
-card_load (GList *crdlist, char *fname)
-{
-	VObject *vobj, *tmp;
-	
-	vobj = Parse_MIME_FromFileName (fname);
-	if (!vobj) {
-		g_warning ("Could not load the cardfile");
-		return NULL;
-	}
-
-	while (vobj) {
-		const char *n = vObjectName (vobj);
-		
-		if (strcmp (n, VCCardProp) == 0) {
-			crdlist = g_list_append (crdlist, (gpointer)
-					    card_create_from_vobject (vobj));
-		}
-		tmp = vobj;
-		vobj = nextVObjectInList (vobj);
-		cleanVObject (tmp);
-	}
-
-	cleanVObject (vobj);
-	cleanStrTbl ();
-	return crdlist;
-}
-
-static VObject *
-add_strProp (VObject *o, const char *id, char *val)
-{
-	VObject *vo = NULL;
-	
-	if (val)
-	  vo = addPropValue (o, id, val);
-
-	return vo;
-}
-
-static VObject *
-add_CardProperty (VObject *o, CardProperty *prop)
-{
-	GList *node;
-	
-	switch (prop->encod) {
-	 case ENC_BASE64:
-		addProp (o, VCBase64Prop);
-		break;
-	 case ENC_QUOTED_PRINTABLE:
-		addProp (o, VCQuotedPrintableProp);
-		break;
-	 case ENC_8BIT:
-		addProp (o, VC8bitProp);
-		break;
-	 case ENC_7BIT:
-		/* Do nothing: 7BIT is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid encoding type.");
-	}
-	
-	switch (prop->value) {
-	 case VAL_CID:
-		addProp (o, VCContentIDProp);
-		break;
-	 case VAL_INLINE:
-		/* Do nothing: INLINE is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid value type.");
-	}
-	
-	for (node = prop->xtension; node; node = node->next) {
-		CardXAttribute *xa = (CardXAttribute *) node->data;
-		if (xa->data)
-		  addPropValue (o, xa->name, xa->data);
-		else
-		  addProp (o, xa->name);
-	}
-
-	add_strProp (o, VCCharSetProp, prop->charset);
-	add_strProp (o, VCLanguageProp, prop->lang);
-	
-	return o;
-}
-
-static VObject *
-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)
-{
-	VObject *vprop;
-	
-	if (strprop->prop.used) {
-		vprop = add_strProp (vobj, id, strprop->str);
-		add_CardProperty (vprop, &strprop->prop);
-	}
-	
-	return vobj;
-}
-
-static VObject *
-add_PhotoType (VObject *o, enum PhotoType photo_type)
-{
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (photo_type == photo_pairs[i].id) {
-		  addProp (o, photo_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No PhotoType for Photo property. Falling back to JPEG.");
-	addProp (o, VCJPEGProp);
-	
-	return o;
-}
-
-static VObject *
-add_AddrType (VObject *o, int addr_type)
-{
-	int i;
-	
-	for (i = 0; addr_pairs[i].str; i++)
-	  if (addr_type & addr_pairs[i].id)
-	    addProp (o, addr_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strAddrType (GString *string, int addr_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (addr_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; addr_pairs[i].str; i++)
-		  if (addr_type & addr_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (addr_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_PhoneType (VObject *o, int phone_type)
-{
-	int i;
-	
-	for (i = 0; phone_pairs[i].str; i++)
-	  if (phone_type & phone_pairs[i].id)
-	    addProp (o, phone_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strPhoneType (GString *string, int phone_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (phone_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; phone_pairs[i].str; i++)
-		  if (phone_type & phone_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (phone_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_EMailType (VObject *o, enum EMailType email_type)
-{
-	int i;
-	
-	for (i = 0; email_pairs[i].str; i++)
-	  if (email_type == email_pairs[i].id) {
-		  addProp (o, email_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No EMailType for EMail property. Falling back to INET.");
-	addProp (o, VCInternetProp);
-	
-	return o;
-}
-
-static void
-add_strEMailType (GString *string, int email_type)
-{
-	int i;
-	char *str;
-	
-	if (email_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; email_pairs[i].str; i++)
-		  if (email_type == email_pairs[i].id) {
-			  str = my_cap (email_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_KeyType (VObject *o, enum KeyType key_type)
-{
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (key_type == key_pairs[i].id) {
-		  addProp (o, key_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No KeyType for Key property. Falling back to PGP.");
-	addProp (o, VCPGPProp);
-	
-	return o;
-}
-
-static void
-add_strKeyType (GString *string, int key_type)
-{
-	int i;
-	char *str;
-	
-	if (key_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; key_pairs[i].str; i++)
-		  if (key_type == key_pairs[i].id) {
-			  str = my_cap (key_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_SoundType (VObject *o, enum SoundType sound_type)
-{
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (sound_type == sound_pairs[i].id) {
-		  addProp (o, sound_pairs[i].str);
-		  return o;
-	  }
-
-	return o;
-}
-
-char *card_timezn_str (CardTimeZone timezn)
-{
-	char *str;
-	
-	str = malloc (7);
-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",
-		 timezn.hours, timezn.mins);
-	return str;
-}
-
-char *card_geopos_str (CardGeoPos geopos)
-{
-	char *str;
-	
-	str = malloc (15);
-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);
-	return str;
-}
-
-static void add_CardStrProperty_to_string (GString *string, char *prop_name,
-					   CardStrProperty *strprop)
-{
-	if (strprop->prop.used) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, strprop->str);
-	}
-}
-
-static void add_strProp_to_string (GString *string, char *prop_name, char *val)
-{
-	if (val) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, val);
-	}
-}
-
-static void addProp_to_string (GString *string, char *prop_name)
-{
-	if (prop_name)
-	  g_string_append (string, prop_name);
-}
-
-char *
-card_to_string (Card *crd)
-{
-	GString *string;
-	char *ret;
-	
-	string = g_string_new ("");
-	
-	add_CardStrProperty_to_string (string, _("Card: "), &crd->fname);
-	if (crd->name.prop.used) {
-		addProp_to_string (string, _("\nName: "));
-		add_strProp_to_string (string, _("\n  Prefix:     "), crd->name.prefix);
-		add_strProp_to_string (string, _("\n  Given:      "), crd->name.given);
-		add_strProp_to_string (string, _("\n  Additional: "), crd->name.additional);
-		add_strProp_to_string (string, _("\n  Family:     "), crd->name.family);
-		add_strProp_to_string (string, _("\n  Suffix:     "), crd->name.suffix);
-		g_string_append_c (string, '\n');
-	}
-	
-/*	if (crd->photo.prop.used) {
-		addPropSizedValue (string, _ ("\nPhoto: "), 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (string, crd->photo.type);
-	}*/
-	
-	if (crd->bday.prop.used) {
-		char *date_str;
-		
-		date_str = card_bday_str (crd->bday);
-		add_strProp_to_string (string, _("\nBirth Date: "), date_str);
-		free (date_str);
-	}
-	
-	if (crd->deladdr.l) {
-		GList *node;
-		
-		for (node = crd->deladdr.l; node; node = node->next) {
-			CardDelAddr *deladdr = (CardDelAddr *) node->data;
-			
-			if (deladdr->prop.used) {
-				addProp_to_string (string, _("\nAddress:"));
-				add_strAddrType (string, deladdr->type);
-				add_strProp_to_string (string, _("\n  Postal Box:  "), deladdr->po);
-				add_strProp_to_string (string, _("\n  Ext:         "),deladdr->ext);
-				add_strProp_to_string (string, _("\n  Street:      "),deladdr->street);
-				add_strProp_to_string (string, _("\n  City:        "), deladdr->city);
-				add_strProp_to_string (string, _("\n  Region:      "), deladdr->region);
-				add_strProp_to_string (string, _("\n  Postal Code: "), deladdr->code);
-				add_strProp_to_string (string, _("\n  Country:     "), deladdr->country);
-			}
-		}
-		
-		g_string_append_c (string, '\n');
-	}
-	
-	if (crd->dellabel.l) {
-		GList *node;
-		
-		for (node = crd->dellabel.l; node; node = node->next) {
-			CardDelLabel *dellabel = (CardDelLabel *) node->data;
-			
-			add_strProp_to_string (string, _("\nDelivery Label: "),
-					    dellabel->data);
-			add_strAddrType (string, dellabel->type);
-		}
-	}
-	
-	if (crd->phone.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->phone.l->next) {
-			sep = "  ";
-			g_string_append (string, _("\nTelephones:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, _("\nTelephone:"));
-		}
-		
-		for (node = crd->phone.l; node; node = node->next) {
-			CardPhone *phone = (CardPhone *) node->data;
-
-			if (phone->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, phone->data);
-				add_strPhoneType (string, phone->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->phone.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	if (crd->email.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->email.l->next) {
-			sep = "  ";
-			g_string_append (string, _("\nE-mail:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, _("\nE-mail:"));
-		}
-		
-		
-		for (node = crd->email.l; node; node = node->next) {
-			CardEMail *email = (CardEMail *) node->data;
-			
-			if (email->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, email->data);
-				add_strEMailType (string, email->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->email.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	add_CardStrProperty_to_string (string, _("\nMailer: "), &crd->mailer);
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		add_strProp_to_string (string, _("\nTime Zone: "), str);
-		free (str);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		add_strProp_to_string (string, _("\nGeo Location: "), str);
-		free (str);
-	}
-	
-        add_CardStrProperty_to_string (string, _("\nBusiness Role: "), &crd->role);
-	
-/*	if (crd->logo.prop.used) {
-		addPropSizedValue (string, _ ("\nLogo: "), 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (string, crd->logo.type);
-	}*/
-	
-/*	if (crd->agent)
-	  addstringectProp (string, card_convert_to_stringect (crd->agent));*/
-	
-	if (crd->org.prop.used) {
-		addProp_to_string (string, _("\nOrg: "));
-		add_strProp_to_string (string, _("\n  Name:  "), crd->org.name);
-		add_strProp_to_string (string, _("\n  Unit:  "), crd->org.unit1);
-		add_strProp_to_string (string, _("\n  Unit2: "), crd->org.unit2);
-		add_strProp_to_string (string, _("\n  Unit3: "), crd->org.unit3);
-		add_strProp_to_string (string, _("\n  Unit4: "), crd->org.unit4);
-		g_string_append_c (string, '\n');
-	}
-	
-        add_CardStrProperty_to_string (string, _("\nCategories: "), &crd->categories);
-        add_CardStrProperty_to_string (string, _("\nComment: "), &crd->comment);
-	
-/*	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  addPropSizedValue (string, _ ("\nPronunciation: "),
-					    crd->sound.data, crd->sound.size);
-		else
-		  add_strProp_to_string (string, _ ("\nPronunciation: "), 
-				       crd->sound.data);
-		
-		add_SoundType (string, crd->sound.type);
-	}*/
-	
-        add_CardStrProperty_to_string (string, _("\nUnique String: "), &crd->uid);
-	
-	if (crd->key.prop.used) {
-		add_strProp_to_string (string, _("\nPublic Key: "), crd->key.data);
-		add_strKeyType (string, crd->key.type);
-	}
-	
-	ret = g_strdup (string->str);
-	g_string_free (string, TRUE);
-	
-	return ret;
-}
-#endif
-
-static ECardDate
-e_card_date_from_string (char *str)
-{
-	ECardDate date;
-	int length;
-
-	date.year = 0;
-	date.month = 0;
-	date.day = 0;
-
-	length = strlen(str);
-	
-	if (length == 10 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[5] * 10 + str[6] - '0' * 11;
-		date.day = str[8] * 10 + str[9] - '0' * 11;
-	} else if ( length == 8 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[4] * 10 + str[5] - '0' * 11;
-		date.day = str[6] * 10 + str[7] - '0' * 11;
-	}
-	
-	return date;
-}
-
-char *
-e_v_object_get_child_value(VObject *vobj, char *name)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, &ret_val);
-			return ret_val;
-		}
-	}
-	ret_val = g_new(char, 1);
-	*ret_val = 0;
-	return ret_val;
-}
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {
-			ret |= phone_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (flags & phone_pairs[i].flag) {
-				addProp (vobj, phone_pairs[i].id);
-		}
-	}
-}
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {
-			ret |= addr_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_address_flags (VObject *vobj, ECardAddressFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index bad7b3068b..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_H__
-#define __E_CARD_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD            (e_card_get_type ())
-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))
-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
-
-typedef struct _ECard ECard;
-typedef struct _ECardClass ECardClass;
-
-struct _ECard {
-	GtkObject object;
-	char *id;
-
-	char            *file_as;       /* The File As field.               */
-	char            *fname;         /* The full name.                   */
-	ECardName       *name;          /* The structured name.             */
-	EList       *address;  	/* Delivery addresses (ECardDeliveryAddress *) */
-	EList       *address_label; /* Delivery address labels
-					 * (ECardAddrLabel *)               */
-
-	EList       *phone;         /* Phone numbers (ECardPhone *)     */
-	EList       *email;         /* Email addresses (char *)         */
-	char            *url;	        /* The person's web page.           */
-
-	ECardDate       *bday;	        /* The person's birthday.           */
-
-	char            *note;
-
-
-	char            *org;           /* The person's organization.       */
-	char            *org_unit;      /* The person's organization unit.  */
-	char            *office;        /* The person's office.             */
-	char            *role;          /* The person's role w/in his org   */
-	char            *title;	        /* The person's title w/in his org  */
-
-	char            *manager;
-	char            *assistant;
-
-	char            *nickname;      /* The person's nickname            */
-	
-	char            *spouse;        /* The person's spouse.             */
-	ECardDate       *anniversary;   /* The person's anniversary.        */
-
-	char            *mailer;        /* Mailer                           */
-
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	EList       *categories;    /* Categories.                      */
-
-	EList       *arbitrary;     /* Arbitrary fields.                */
-
-	guint32         wants_html : 1; /* Wants html mail. */
-	guint32         wants_html_set : 1; /* Wants html mail. */
-
-	guint32         pilot_id;       /* id of the corresponding pilot */
-	guint32         pilot_status;   /* status information */
-#if 0
-	ECardPhoto      *logo;          /* This person's org's logo.        */
-
-	ECardPhoto      *photo;    	/* A photo of the person.           */
-	
-	ECard           *agent;         /* A person who sereves as this
-					   guy's agent/secretary/etc.       */
-	
-
-	char            *categories;    /* A list of the categories to which
-					   this card belongs.               */
-	
-	ECardSound      *sound;
-	
-	ECardKey        *key;	        /* The person's public key.         */
-	ECardTimeZone   *timezn;        /* The person's time zone.          */
-	ECardGeoPos     *geopos;        /* The person's long/lat.           */
-
-	ECardRev        *rev;	        /* The time this card was last
-					   modified.                        */
-
-	EList        xtension;
-#endif
-};
-
-struct _ECardClass {
-	GtkObjectClass parent_class;
-	GHashTable    *attribute_jump_table;
-};
-
-
-ECard         *e_card_new       (      char  *vcard);
-char          *e_card_get_id    (      ECard *card);
-void           e_card_set_id    (      ECard *card,
-				 const char  *character);
-char          *e_card_get_vcard (      ECard *card);
-ECard         *e_card_duplicate (      ECard *card);
-
-ECardPhone *e_card_phone_new  (void);
-ECardPhone *e_card_phone_copy (const ECardPhone *phone);
-void        e_card_phone_free (      ECardPhone *phone);
-
-ECardDeliveryAddress *e_card_delivery_address_new         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy        (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_free        (      ECardDeliveryAddress *addr);
-gboolean              e_card_delivery_address_is_empty    (const ECardDeliveryAddress *addr);
-char                 *e_card_delivery_address_to_string   (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_from_label  (const ECardAddrLabel *label);
-ECardAddrLabel       *e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr);
-
-ECardAddrLabel *e_card_address_label_new  (void);
-ECardAddrLabel *e_card_address_label_copy (const ECardAddrLabel *addr);
-void            e_card_address_label_free (      ECardAddrLabel *addr);
-
-ECardName *e_card_name_new         (void);
-ECardName *e_card_name_copy        (const ECardName *name);
-void       e_card_name_free        (      ECardName *name);
-char      *e_card_name_to_string   (const ECardName *name);
-ECardName *e_card_name_from_string (const char      *full_name);
-
-ECardArbitrary *e_card_arbitrary_new  (void);
-ECardArbitrary *e_card_arbitrary_copy (const ECardArbitrary *arbitrary);
-void            e_card_arbitrary_free (      ECardArbitrary *arbitrary);
-
-GList *e_card_load_cards_from_file(const char *filename);
-
-/* Standard Gtk function */
-GtkType        e_card_get_type (void);
-
-#endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
deleted file mode 100644
index 3295854b0a..0000000000
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = e_card_load_cards_from_file("gnomecard.vcf");
-	GList *iterator;
-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {
-		ECard *card = iterator->data;
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_list_free(list);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
deleted file mode 100644
index 30fda41be4..0000000000
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-#include <ctype.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-parse_line (EBook *book, char *line)
-{
-	char **strings;
-	ECardName *name;
-	ECard *card;
-	EList *list;
-
-	card = e_card_new("");
-	strings = g_strsplit(line, "\t", 3);
-	if (strings[0] && strings[1] && strings[2]) {
-		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
-		e_list_append(list, strings[2]);
-		g_strfreev(strings);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	FILE *fp = fopen (".addressbook", "r");
-	char line[2 * 1024];
-	int which = 0;
-	char *lastline = NULL;
-
-	if (!fp) {
-		g_warning ("Can't find .addressbook");
-		return;
-	}
-
-	while(fgets(line + which * 1024, 1024, fp)) {
-		int length;
-		char *thisline = line + which * 1024;
-		length = strlen(thisline);
-		if (thisline[length - 1] == '\n')
-			line[--length] = 0;
-		if (lastline && *thisline && isspace(*thisline)) {
-			char *temp;
-			while(*thisline && isspace(*thisline))
-				thisline ++;
-			temp = lastline;
-			lastline = g_strdup_printf("%s%s", lastline, thisline);
-			g_free(temp);
-			continue;
-		}
-		if (lastline) {
-			parse_line (book, lastline);
-			g_free(lastline);
-		}
-		lastline = g_strdup(thisline);
-	}
-
-	if (lastline) {
-		parse_line (book, lastline);
-		g_free(lastline);
-	}
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-#if 0
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
deleted file mode 100644
index a727dae7a3..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,194 +0,0 @@
-#include <gnome.h>
-#include "e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-
-int
-main (int argc, char **argv)
-{
-	char  *cardstr;
-	ECard *card;
-
-	/* Fields */
-	char *fname;
-	char *org;
-	char *org_unit;
-        char *title;
-	char *role;
-	char *nickname;
-	char *fburl;
-	ECardName *name;
-	EList *address;
-	EList *phone;
-	EList *email;
-	EIterator *iterator;
-	ECardDate *bday;
-
-	gnome_init ("TestCard", "0.0", argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-#if 0
-	{
-	  int i;
-	  for ( i = 0; i < 100000; i++ ) {
-	    card = e_card_new (cardstr);
-	  
-	    gtk_object_unref (GTK_OBJECT (card));
-	  }
-	}
-#endif
-	card = e_card_new (cardstr);
-	gtk_object_get(GTK_OBJECT(card),
-		       "full_name",  &fname,
-		       "name",       &name,
-		       "address",    &address,
-		       "phone",      &phone,
-		       "email",      &email,
-		       "org",        &org,
-		       "org_unit",   &org_unit,
-		       "title",      &title,
-		       "role",       &role,
-		       "nickname",   &nickname,
-		       "fburl",      &fburl,
-		       "birth_date", &bday,
-		       NULL);
-	if ( fname ) {
-	  printf("Name : %s\n", fname);
-	  g_free(fname);
-	}
-	if ( name ) {
-	  printf("Full Name:\n");
-	  if ( name->prefix )
-	    printf("  prefix     : %s\n", name->prefix);
-	  if ( name->given )
-	    printf("  given      : %s\n", name->given);
-	  if ( name->additional )
-	    printf("  additional : %s\n", name->additional);
-	  if ( name->family )
-	    printf("  family     : %s\n", name->family);
-	  if ( name->suffix )
-	    printf("  suffix     : %s\n", name->suffix);
-	}
-	if ( org ) {
-	  printf("Company : %s\n", org);
-        }
-	if ( org_unit ) {
-	  printf("Department : %s\n", org_unit);
-        }
-	if ( title ) {
-	  printf("Title : %s\n", title);
-        }
-	if ( role ) {
-	  printf("Profession : %s\n", role);
-        }
-	if ( nickname ) {
-	  printf("Nickname : %s\n", nickname);
-        }
-	if ( fburl ) {
-	  printf("Free Busy URL : %s\n", fburl);
-        }
-	if ( bday ) {
-	  printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
-	}
-	if ( email ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( phone ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);
-	    printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( address ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-	    printf("Address ; %d:\n", del_address->flags);
-	    if ( del_address->po )
-	      printf("  Po      : %s\n", del_address->po);
-	    if ( del_address->ext )
-	      printf("  Ext     : %s\n", del_address->ext);
-	    if ( del_address->street )
-	      printf("  Street  : %s\n", del_address->street);
-	    if ( del_address->city )
-	      printf("  City    : %s\n", del_address->city);
-	    if ( del_address->region )
-	      printf("  Region  : %s\n", del_address->region);
-	    if ( del_address->code )
-	      printf("  Code    : %s\n", del_address->code);
-	    if ( del_address->country )
-	      printf("  Country : %s\n", del_address->country);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	printf("%s", e_card_get_vcard(card));
-	gtk_object_unref (GTK_OBJECT (card));
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
deleted file mode 100644
index 69422ba20e..0000000000
--- a/addressbook/backend/ebook/test-client-list.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	gnome_init ("blah", "0.0", argc, argv);
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-	
-	printf ("Length: %d\n", (int) length);
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("[%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("Book opened.\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
deleted file mode 100644
index acbeedac41..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-
-#include <e-book.h>
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static CORBA_Environment ev;
-static char *cardstr;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-
-	/* we just added a card, so the length should be >1 */
-	printf ("\n%s: %s(): Number of cards is %ld\n",
-		__FILE__, __FUNCTION__, length);
-	if (length < 1)
-		printf ("*** Why isn't this above zero?? ***\n\n");
-	
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	char *vcard;
-	ECard *card;
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	card = e_book_get_card (book, id);
-	g_timer_stop (timer);
-
-	vcard = e_card_get_vcard(card);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-	printf ("Card added: [%s]\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	printf ("Getting cards..\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-	printf ("Done getting all cards.\n");	
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	e_book_add_vcard(book, cardstr, add_card_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/idl/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/idl/Makefile.am b/addressbook/backend/idl/Makefile.am
deleted file mode 100644
index db61d2c30c..0000000000
--- a/addressbook/backend/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA =			\
-	addressbook.idl
-
-EXTRA_DIST = $(idl_DATA)
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
deleted file mode 100644
index 2c5a54487e..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-
-	typedef string CardId;
-	typedef string VCard;
-	typedef sequence<VCard> VCardList;
-
-	interface CardCursor : Bonobo::Unknown {
-		long   get_length ();
-		string get_nth    (in long n);
-	};
-
-	/* 
-	 * A book view is a live view of a book.  It's either a view
-	 * of all the cards in the book or a view of a query.  When
-	 * created, it will get a series of signal_card_added calls
-	 * for all objects in the initial set.  After that, it will
-	 * get added, removed, or changed signals whenever the book
-	 * changes (if it affects the set of viewed cards.)
-	 */
-	interface BookViewListener : Bonobo::Unknown {
-		void signal_card_added (in VCardList cards);
-		void signal_card_removed (in CardId id);
-		void signal_card_changed (in VCardList cards);
-		void signal_sequence_complete ();
-		void signal_status_message (in string message);
-	};
-	
-	interface BookView : Bonobo::Unknown {
-	};
-
-	interface Book : Bonobo::Unknown {
-		/*
-		 * Fetching cards in the addresbook.
-		 */
-		VCard get_vcard (in CardId id);
-
-		/*
-		 * Permissions.  the first form is general write
-		 * permission (whether or not the user can add or
-		 * remove or modify any entry in the addressbook.)
-		 *
-		 * if can_write returns TRUE, can_write_card can still
-		 * return FALSE if the user doesn't have permission to
-		 * modify/remove that specific card.
-		 */
-		boolean can_write ();
-		boolean can_write_card (in CardId Id);
-
-		/*
-		 * Adding and deleting cards in the book.
-		 */
-		void create_card (in VCard vcard);
-		void remove_card (in CardId Id);
-	        
-		/*
-		 * Modifying cards in the addressbook.
-		 */
-		void modify_card (in VCard vcard);
-		
-		/*
-		 * These two functions return a cursor to the book
-		 * listener.  This is for people who want a snapshot
-		 * of the addressbook.  The syntax for the query
-		 * string is not yet defined.
-		 */
-		void get_cursor (in string query);
-		
-		/*
-		 * These two functions return a book view to the book
-		 * listener.  This is for people who want a live view
-		 * of the addressbook.
-		 */
-		void get_book_view(in BookViewListener listener, in string query);
-
-		void get_changes(in BookViewListener listener, in string changeid);
-
-		void check_connection ();
-
-		string get_static_capabilities ();
-
-		string get_name ();
-	};
-
-	interface BookListener : Bonobo::Unknown {
-
-		enum CallStatus {
-			Success,
-			RepositoryOffline,
-			PermissionDenied,
-			CardNotFound,
-			ProtocolNotSupported,
-			OtherError
-		};
-
-		void respond_create_card (in CallStatus status, in CardId Id);
-
-		void respond_remove_card (in CallStatus status);
-
-		void respond_modify_card (in CallStatus status);
-		
-		void report_open_book_progress (in string status_message, in short percent);
-
-		void respond_open_book (in CallStatus status, in Book book);
-
-		void respond_get_cursor (in CallStatus status, in CardCursor cursor);
-
-		void respond_get_view (in CallStatus status, in BookView view);
-
-		void respond_get_changes (in CallStatus status, in BookView view);
-
-		/**
-		 * report_connection_status:
-		 *
-		 * Used to report changes in the connection to the
-		 * contact repository.  This is often a response to a
-		 * call to check_connection() on the Book, but wombat
-		 * is free to report the connection status without
-		 * being asked.
-		 */
-		void report_connection_status (in boolean connected);
-	};
-
-	interface BookFactory : Bonobo::Unknown {
-		exception ProtocolNotSupported {};
-
-		void open_book (in string uri, in BookListener listener)
-			raises (ProtocolNotSupported);
-	};
-};
diff --git a/addressbook/backend/pas/.cvsignore b/addressbook/backend/pas/.cvsignore
deleted file mode 100644
index 071cef99ae..0000000000
--- a/addressbook/backend/pas/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-*.lo
-*.la
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
deleted file mode 100644
index 819f99e57d..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"wombat-pas\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)
-else
-LDAP_BACKEND = 
-endif
-
-noinst_LIBRARIES = libpas.a
-
-libpas_a_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	pas-book-factory.c				\
-	pas-book-factory.h				\
-	pas-book-view.c					\
-	pas-book-view.h					\
-	pas-book.c					\
-	pas-book.h					\
-	pas-backend-file.c				\
-	pas-backend-file.h				\
-	$(LDAP_BACKEND)					\
-	pas-backend.c					\
-	pas-backend.h					\
-	pas-card-cursor.c				\
-	pas-card-cursor.h
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
diff --git a/addressbook/backend/pas/TODO b/addressbook/backend/pas/TODO
deleted file mode 100644
index 0c77c1b200..0000000000
--- a/addressbook/backend/pas/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Implement pas_book_factory_activate
-* Authentication
\ No newline at end of file
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index 84a21d4c6f..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1443 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#ifdef HAVE_DB_185_H
-#include <db_185.h>
-#else
-#ifdef HAVE_DB1_DB_H
-#include <db1/db.h>
-#else
-#include <db.h>
-#endif
-#endif
-
-#include "pas-backend-file.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-#include <ebook/e-card-simple.h>
-#include <e-util/e-sexp.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.1"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	DB       *file_db;
-	EList    *book_views;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	ESExp                       *search_sexp;
-	PASBackendFileSearchContext *search_context;
-};
-
-struct _PASBackendFileSearchContext {
-	ECardSimple *card;
-};
-
-static PASBackendFileBookView *
-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)
-{
-	PASBackendFileBookView *new_book_view;
-	new_book_view = g_new(PASBackendFileBookView, 1);
-	new_book_view->book_view = book_view->book_view;
-	new_book_view->search = g_strdup(book_view->search);
-	new_book_view->search_sexp = book_view->search_sexp;
-	if (new_book_view->search_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->search_sexp));
-	new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
-	new_book_view->search_context->card = book_view->search_context->card;
-	return new_book_view;
-}
-
-static void
-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)
-{
-	g_free(book_view->search);
-	if (book_view->search_sexp)
-		gtk_object_unref(GTK_OBJECT(book_view->search_sexp));
-	g_free(book_view->search_context);
-	g_free(book_view);
-}
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-	GList *nth_item = g_list_nth(cursor_data->elements, n);
-
-	return g_strdup((char*)nth_item->data);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book corba_book;
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	g_list_foreach(cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendFile    *bf;
-	EIterator         *iterator;
-
-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));
-	for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			e_iterator_delete(iterator);
-			break;
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("view_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-string_to_dbt(const char *str, DBT *dbt)
-{
-	dbt->data = (void*)str;
-	dbt->size = strlen (str) + 1;
-}
-
-static char *
-pas_backend_file_create_unique_id (char *vcard)
-{
-	/* use a 32 counter and the 32 bit timestamp to make an id.
-	   it's doubtful 2^32 id's will be created in a second, so we
-	   should be okay. */
-	static guint c = 0;
-	return g_strdup_printf ("pas-id-%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-compare_email (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-		const char *email = e_card_simple_get_email (card, i);
-
-		if (email && compare(email, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_phone (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-		const ECardPhone *phone = e_card_simple_get_phone (card, i);
-
-		if (phone && compare(phone->number, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_address (ECardSimple *card, const char *str,
-		 char *(*compare)(const char*, const char*))
-{
-	g_warning("address searching not implemented\n");
-	return FALSE;
-}
-
-static struct prop_info {
-	ECardSimpleField field_id;
-	const char *query_prop;
-	const char *ecard_prop;
-#define PROP_TYPE_NORMAL   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_TYPE_LISTITEM 0x03
-	int prop_type;
-	gboolean (*list_compare)(ECardSimple *ecard, const char *str,
-				 char *(*compare)(const char*, const char*));
-
-} prop_info_table[] = {
-#define NORMAL_PROP(f,q,e) {f, q, e, PROP_TYPE_NORMAL, NULL}
-#define LIST_PROP(q,e,c) {0, q, e, PROP_TYPE_LIST, c}
-
-	/* query prop,  ecard prop,   type,              list compare function */
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "file_as" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "full_name" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),
-	LIST_PROP ( "email", "email", compare_email ),
-	LIST_PROP ( "phone", "phone", compare_phone ),
-	LIST_PROP ( "address", "address", compare_address ),
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(PASBackendFileSearchContext *ctx, struct _ESExp *f,
-	      int argc, struct _ESExpResult **argv,
-	      char *(*compare)(const char*, const char*))
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname;
-		struct prop_info *info = NULL;
-		int i;
-		gboolean any_field;
-
-		propname = argv[0]->value.string;
-
-		any_field = !strcmp(propname, "x-evolution-any-field");
-		for (i = 0; i < num_prop_infos; i ++) {
-			if (any_field
-			    || !strcmp (prop_info_table[i].query_prop, propname)) {
-				info = &prop_info_table[i];
-				
-				if (info->prop_type == PROP_TYPE_NORMAL) {
-					char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_simple_get (ctx->card, info->field_id);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-				}
-				else if (info->prop_type == PROP_TYPE_LIST) {
-				/* the special searches that match any of the list elements */
-					truth = info->list_compare (ctx->card, argv[1]->value.string, compare);
-				}
-
-				/* if we're looking at all fields and find a match,
-				   or if we're just looking at this one field,
-				   break. */
-				if ((any_field && truth)
-				    || !any_field)
-					break;
-			}
-		}
-		
-	}
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);
-}
-
-static char *
-is_helper (const char *s1, const char *s2)
-{
-	if (!strcmp(s1, s2))
-		return (char*)s1;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, is_helper);
-}
-
-static char *
-endswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (strlen(p) == strlen(s2)))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, endswith_helper);
-}
-
-static char *
-beginswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, beginswith_helper);
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	ESExpResult *r;
-	gboolean retval;
-	ECard *card;
-
-	card = e_card_new (vcard_string);
-	view->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!view->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(view->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-
-	gtk_object_unref(GTK_OBJECT(view->search_context->card));
-
-	e_sexp_result_free(r);
-
-	return retval;
-}
-
-static void
-pas_backend_file_search (PASBackendFile  	      *bf,
-			 PASBook         	      *book,
-			 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *cards = NULL;
-	DB      *db = bf->priv->file_db;
-	DBT     id_dbt, vcard_dbt;
-	int i;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-
-	if (!bf->priv->loaded)
-		return;
-
-	if (view->search_sexp)
-		gtk_object_unref(GTK_OBJECT(view->search_sexp));
-	view->search_sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(view->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, view->search_context);
-		} else {
-			e_sexp_add_function(view->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, view->search_context);
-		}
-	}
-
-	e_sexp_input_text(view->search_sexp, view->search, strlen(view->search));
-	e_sexp_parse(view->search_sexp);
-
-	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-			char *vcard_string = vcard_dbt.data;
-
-			/* check if the vcard matches the search sexp */
-			if (vcard_matches_search (view, vcard_string)) {
-				cards = g_list_append (cards, strdup(vcard_string));
-			}
-		}
-		
-		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-	}
-
-	if (db_error == -1) {
-		g_warning ("pas_backend_file_search: error building list\n");
-	}
-	else {
-		pas_book_view_notify_add (view->book_view, cards);
-		pas_book_view_notify_complete (view->book_view);
-	}
-
-	/*
-	** It's fine to do this now since the data has been handed off.
-	*/
-	g_list_foreach (cards, (GFunc)g_free, NULL);
-	g_list_free (cards);
-}
-
-typedef enum {
-	VCardChangeNone,
-	VCardChangeAdded,
-	VCardChangeModified,
-	VCardChangeDeleted
-} VCardChangeType;
-
-static VCardChangeType
-vcard_change_type (const PASBackendFileBookView *view, char *vcard_string)
-{
-	ECard *card;
-
-	card = e_card_new (vcard_string);
-	view->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!view->search_context->card)
-		return VCardChangeNone;
-
-	/* FIX ME, actually need to implement this */
-
-	gtk_object_unref(GTK_OBJECT(view->search_context->card));
-
-	return VCardChangeNone;
-}
-
-static void
-pas_backend_file_search_changes (PASBackendFile  	      *bf,
-				 PASBook         	      *book,
-				 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *add_cards = NULL;
-	GList   *mod_cards = NULL;
-	GList   *del_cards = NULL;
-	DB      *db = bf->priv->file_db;
-	DBT     id_dbt, vcard_dbt;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-
-	if (!bf->priv->loaded)
-		return;
-
-	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-			char *vcard_string = vcard_dbt.data;
-
-			/* check what type of change has occurred, if any */
-			switch (vcard_change_type (view, vcard_string)) {
-			case VCardChangeNone:
-				break;
-			case VCardChangeAdded:
-				add_cards = g_list_append (add_cards, strdup(vcard_string));
-				break;
-			case VCardChangeModified:
-				mod_cards = g_list_append (mod_cards, strdup(vcard_string));
-				break;
-			case VCardChangeDeleted:
-				del_cards = g_list_append (del_cards, strdup(vcard_string));
-				break;
-			}
-		}
-		
-		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-	}
-
-	if (db_error == -1) {
-		g_warning ("pas_backend_file_search_changes: error building list\n");
-	} else {
-		GList *l;
-		
-		pas_book_view_notify_add (view->book_view, add_cards);
-		pas_book_view_notify_change (view->book_view, mod_cards);
-
-		for (l = del_cards; l != NULL; l = l->next){
-			char *card = l->data;
-			pas_book_view_notify_remove (view->book_view, card);
-		}
-		
-		pas_book_view_notify_complete (view->book_view);
-	}
-
-	/*
-	** It's fine to do this now since the data has been handed off.
-	*/
-	g_list_foreach (add_cards, (GFunc)g_free, NULL);
-	g_list_foreach (mod_cards, (GFunc)g_free, NULL);
-	g_list_foreach (del_cards, (GFunc)g_free, NULL);
-	g_list_free (add_cards);
-	g_list_free (mod_cards);
-	g_list_free (del_cards);
-}
-
-static char *
-do_create(PASBackend *backend,
-	  char       *vcard_req,
-	  char      **vcard_ptr)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	char           *id;
-	ECard          *card;
-	char           *vcard;
-	char           *ret_val;
-
-	id = pas_backend_file_create_unique_id (vcard_req);
-
-	string_to_dbt (id, &id_dbt);
-	
-	card = e_card_new(vcard_req);
-	e_card_set_id(card, id);
-	vcard = e_card_get_vcard(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-		ret_val = id;
-
-	}
-	else {
-		ret_val = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	card = NULL;
-
-	if (vcard_ptr && ret_val)
-		*vcard_ptr = vcard;
-	else
-		g_free (vcard);
-
-	return ret_val;
-}
-
-static void
-pas_backend_file_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	char *id;
-	char *vcard;
-	EIterator *iterator;
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	id = do_create(backend, req->vcard, &vcard);
-	if (id) {
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			if (vcard_matches_search (view, vcard)) {
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			Evolution_BookListener_Success,
-			id);
-		g_free(vcard);
-		g_free(id);
-	}
-	else {
-		/* XXX need a different call status for this case, i
-                   think */
-		pas_book_respond_create (
-				 book,
-				 Evolution_BookListener_CardNotFound,
-				 "");
-	}
-
-	g_free(req->vcard);
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	char          *vcard_string;
-
-	string_to_dbt (req->id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	
-	db_error = db->del (db, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
-
-
-	vcard_string = vcard_dbt.data;
-	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 Evolution_BookListener_Success);
-	
-	g_free (req->id);
-}
-
-static void
-pas_backend_file_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	ECard         *card;
-	char          *id;
-	char          *old_vcard_string;
-
-	/* create a new ecard from the request data */
-	card = e_card_new(req->vcard);
-	id = e_card_get_id(card);
-
-	string_to_dbt (id, &id_dbt);	
-
-	/* get the old ecard - the one that's presently in the db */
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_modify (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	old_vcard_string = g_strdup(vcard_dbt.data);
-
-	string_to_dbt (req->vcard, &vcard_dbt);	
-
-	db_error = db->put (db, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			CORBA_Environment ev;
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			gboolean old_match, new_match;
-
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			old_match = vcard_matches_search (view, old_vcard_string);
-			new_match = vcard_matches_search (view, req->vcard);
-			if (old_match && new_match)
-				pas_book_view_notify_change_1 (view->book_view, req->vcard);
-			else if (new_match)
-				pas_book_view_notify_add_1 (view->book_view, req->vcard);
-			else /* if (old_match) */
-				pas_book_view_notify_remove (view->book_view, id);
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		pas_book_respond_modify (
-				 book,
-				 Evolution_BookListener_Success);
-	}
-	else {
-		pas_book_respond_modify (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-	}
-
-	g_free(old_vcard_string);
-
-	gtk_object_unref(GTK_OBJECT(card));
-	g_free (req->vcard);
-}
-
-static void
-pas_backend_file_build_all_cards_list(PASBackend *backend,
-				      PASBackendFileCursorPrivate *cursor_data)
-{
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  int            db_error;
-	  DBT  id_dbt, vcard_dbt;
-  
-	  cursor_data->elements = NULL;
-	  
-	  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	  while (db_error == 0) {
-
-		  /* don't include the version in the list of cards */
-		  if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		      || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-
-			  cursor_data->elements = g_list_append(cursor_data->elements,
-								g_strdup(vcard_dbt.data));
-
-		  }
-
-		  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-
-	  }
-
-	  if (db_error == -1) {
-		  g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	  }
-	  else {
-		  cursor_data->num_elements = g_list_length (cursor_data->elements);
-	  }
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	/*
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBT            id_dbt, vcard_dbt;
-	*/
-	CORBA_Environment ev;
-	int            db_error = 0;
-	PASBackendFileCursorPrivate *cursor_data;
-	PASCardCursor *cursor;
-	Evolution_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (
-		book,
-		(db_error == 0 
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound),
-		cursor);
-}
-
-static void
-pas_backend_file_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	Evolution_Book    corba_book;
-	PASBackendFileBookView view;
-	PASBackendFileSearchContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_book_view (book,
-		   (book_view != NULL
-		    ? Evolution_BookListener_Success 
-		    : Evolution_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.search_sexp = NULL;
-	view.search_context = &ctx;
-	ctx.card = NULL;
-
-	e_list_append(bf->priv->book_views, &view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_search (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-}
-
-static void
-pas_backend_file_process_get_changes (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	Evolution_Book    corba_book;
-	PASBackendFileBookView view;
-	PASBackendFileSearchContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_changes (book,
-		   (book_view != NULL
-		    ? Evolution_BookListener_Success 
-		    : Evolution_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.search_sexp = NULL;
-	view.search_context = &ctx;
-	ctx.card = NULL;
-
-	e_list_append(bf->priv->book_views, &view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_search_changes (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-}
-
-static void
-pas_backend_file_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	pas_book_report_connection (book, bf->priv->file_db != NULL);
-}
-
-static char *
-pas_backend_file_extract_path_from_uri (const char *uri)
-{
-	g_assert (strncasecmp (uri, "file:", 5) == 0);
-
-	return g_strdup (uri + 5);
-}
-
-static gboolean
-can_write (PASBackend *backend)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char *path = pas_backend_file_extract_path_from_uri (bf->priv->uri);
-	gboolean retval;
-
-	retval = (access (path, W_OK) != -1);
-
-	g_free (path);
-
-	return retval;
-}
-
-static gboolean
-pas_backend_file_can_write (PASBook *book)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static gboolean
-pas_backend_file_can_write_card (PASBook *book,
-				 const char *id)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static void
-pas_backend_file_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_file_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		pas_backend_file_process_get_changes (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendFile *backend;
-
-	backend = PAS_BACKEND_FILE (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_file_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendFile *bf;
-	DBT            id_dbt, vcard_dbt;
-	DB             *db;
-	int            db_error;
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		return g_strdup (vcard_dbt.data);
-	}
-	else if (db_error == 1) {
-		/* key was not in file */
-		return g_strdup (""); /* XXX */
-	}
-	else /* if (db_error < 0)*/ {
-		/* error */
-		return g_strdup (""); /* XXX */
-	}
-}
-
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	if (!strcmp (old_version, "0.0")) {
-		/* 0.0 is the same as 0.1, we just need to add the version */
-		DB  *db = bf->priv->file_db;
-		DBT version_name_dbt, version_dbt;
-		int db_error;
-
-		string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-		string_to_dbt (PAS_BACKEND_FILE_VERSION, &version_dbt);
-
-		db_error = db->put (db, &version_name_dbt, &version_dbt, 0);
-		if (db_error == 0)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	else {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-}
-
-static gboolean
-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
-{
-	DB   *db = bf->priv->file_db;
-	DBT  version_name_dbt, version_dbt;
-	int  db_error;
-	char *version;
-	gboolean ret_val = TRUE;
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-
-	db_error = db->get (db, &version_name_dbt, &version_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		version = g_strdup (version_dbt.data);
-	}
-	else {
-		/* key was not in file */
-		version = g_strdup ("0.0");
-	}
-
-	if (strcmp (version, PAS_BACKEND_FILE_VERSION))
-		ret_val = pas_backend_file_upgrade_db (bf, version);
-
-	g_free (version);
-
-	return ret_val;
-}
-
-#define INITIAL_VCARD "BEGIN:VCARD\n\
-X-EVOLUTION-FILE-AS:Helix Code, Inc.\n\
-LABEL;WORK;QUOTED-PRINTABLE:101 Rogers St. Ste. 214=0ACambridge, MA 02142=0AUSA\n\
-TEL;WORK;VOICE:(617) 679-1984\n\
-TEL;WORK;FAX:(617) 679-1949\n\
-EMAIL;INTERNET:hello@helixcode.com\n\
-URL:http://www.helixcode.com/\n\
-ORG:Helix Code, Inc.;\n\
-NOTE:Welcome to the Helix Code Addressbook.\n\
-END:VCARD"
-
-static gboolean
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-
-	g_assert (bf->priv->loaded == FALSE);
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	bf->priv->file_db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);
-	if (bf->priv->file_db == NULL) {
-		bf->priv->file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
-
-		if (bf->priv->file_db) {
-			char *id;
-			id = do_create(backend, INITIAL_VCARD, NULL);
-			g_free (id);
-		}
-	}
-
-	g_free (filename);
-
-	if (bf->priv->file_db != NULL) {
-		if (pas_backend_file_maybe_upgrade_db (bf))
-			bf->priv->loaded = TRUE;
-		/* XXX what if we fail to upgrade it? */
-		
-		g_free(bf->priv->uri);
-		bf->priv->uri = g_strdup (uri);
-	} else
-		return FALSE;
-
-	return TRUE;
-}
-
-/* Get_uri handler for the addressbook file backend */
-static const char *
-pas_backend_file_get_uri (PASBackend *backend)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	g_return_val_if_fail (bf->priv->loaded, NULL);
-	g_assert (bf->priv->uri != NULL);
-
-	return bf->priv->uri;
-}
-
-static gboolean
-pas_backend_file_add_client (PASBackend             *backend,
-			     Evolution_BookListener  listener)
-{
-	PASBackendFile *bf;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_file_get_vcard,
-		pas_backend_file_can_write,
-		pas_backend_file_can_write_card);
-
-	if (!book) {
-		if (!bf->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-			    pas_backend_file_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_file_process_client_requests, NULL);
-
-	bf->priv->clients = g_list_prepend (
-		bf->priv->clients, book);
-
-	if (bf->priv->loaded) {
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	}
-
-	return TRUE;
-}
-
-static void
-pas_backend_file_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendFile *bf;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_FILE (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bf->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bf->priv->clients = g_list_remove_link (bf->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bf->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_file_get_static_capabilities (PASBackend             *backend)
-{
-	return g_strdup("local");
-}
-
-static gboolean
-pas_backend_file_construct (PASBackendFile *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_file_new:
- */
-PASBackend *
-pas_backend_file_new (void)
-{
-	PASBackendFile *backend;
-
-	backend = gtk_type_new (pas_backend_file_get_type ());
-
-	if (! pas_backend_file_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-pas_backend_file_destroy (GtkObject *object)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (object);
-
-	gtk_object_unref(GTK_OBJECT(bf->priv->book_views));
-	g_free (bf->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_file_class_init (PASBackendFileClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_file_load_uri;
-	parent_class->get_uri                 = pas_backend_file_get_uri;
-	parent_class->add_client              = pas_backend_file_add_client;
-	parent_class->remove_client           = pas_backend_file_remove_client;
-	parent_class->get_static_capabilities = pas_backend_file_get_static_capabilities;
-
-	object_class->destroy = pas_backend_file_destroy;
-}
-
-static void
-pas_backend_file_init (PASBackendFile *backend)
-{
-	PASBackendFilePrivate *priv;
-
-	priv             = g_new0 (PASBackendFilePrivate, 1);
-	priv->loaded     = FALSE;
-	priv->clients    = NULL;
-	priv->book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL);
-	priv->uri        = NULL;
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_file_get_type:
- */
-GtkType
-pas_backend_file_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendFile",
-			sizeof (PASBackendFile),
-			sizeof (PASBackendFileClass),
-			(GtkClassInitFunc)  pas_backend_file_class_init,
-			(GtkObjectInitFunc) pas_backend_file_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h
deleted file mode 100644
index 4da9a29cc5..0000000000
--- a/addressbook/backend/pas/pas-backend-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_FILE_H__
-#define __PAS_BACKEND_FILE_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendFilePrivate PASBackendFilePrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendFilePrivate *priv;
-} PASBackendFile;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendFileClass;
-
-PASBackend *pas_backend_file_new      (void);
-GtkType     pas_backend_file_get_type (void);
-
-#define PAS_BACKEND_FILE_TYPE        (pas_backend_file_get_type ())
-#define PAS_BACKEND_FILE(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_FILE_TYPE, PASBackendFile))
-#define PAS_BACKEND_FILE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendFileClass))
-#define PAS_IS_BACKEND_FILE(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_FILE_TYPE))
-#define PAS_IS_BACKEND_FILE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_FILE_TYPE))
-
-#endif /* ! __PAS_BACKEND_FILE_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
deleted file mode 100644
index f9842d2406..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,1846 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Chris Toshok (toshok@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-/*#define DEBUG*/
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <fcntl.h>
-#include <time.h>
-#include <lber.h>
-
-#ifdef DEBUG
-#define LDAP_DEBUG
-#endif
-#include <ldap.h>
-#ifdef DEBUG
-#undef LDAP_DEBUG
-#endif
-
-#include "pas-backend-ldap.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#define LDAP_MAX_SEARCH_RESPONSES 100
-
-/* this really needs addressing */
-#define OBJECT_CLASS "person"
-
-
-static gchar *query_prop_to_ldap(gchar *query_prop);
-
-static PASBackendClass *pas_backend_ldap_parent_class;
-typedef struct _PASBackendLDAPCursorPrivate PASBackendLDAPCursorPrivate;
-typedef struct _PASBackendLDAPBookView PASBackendLDAPBookView;
-typedef struct LDAPOp LDAPOp;
-
-struct _PASBackendLDAPPrivate {
-	char     *uri;
-	gboolean connected;
-	GList    *clients;
-	gchar    *ldap_host;
-	gchar    *ldap_rootdn;
-	int      ldap_port;
-	int      ldap_scope;
-	GList    *book_views;
-
-	LDAP     *ldap;
-
-	/* whether or not there's a request in process on our LDAP* */
-	LDAPOp *current_op;
-	GList *pending_ops;
-	int op_idle;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	int                   search_idle;
-	int                   search_msgid;
-	LDAPOp                *search_op;
-};
-
-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);
-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-};
-
-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_process_current (PASBackend *backend);
-static void     ldap_op_process (LDAPOp *op);
-static void     ldap_op_restart (LDAPOp *op);
-static gboolean ldap_op_process_on_idle (PASBackend *backend);
-static void     ldap_op_finished (LDAPOp *op);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e);
-
-static void email_populate_func(ECardSimple *card, char **values);
-struct berval** email_ber_func(ECardSimple *card);
-gboolean email_compare_func (ECardSimple *ecard1, ECardSimple *ecard2);
-
-struct prop_info {
-	ECardSimpleField field_id;
-	char *query_prop;
-	char *ldap_attr;
-#define PROP_TYPE_NORMAL   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_DN            0x04
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_LIST props */
-
-	/* used when reading from the ldap server populates ECard with the values in **values. */
-	void (*populate_ecard_func)(ECardSimple *card, char **values);
-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */
-	struct berval** (*ber_func)(ECardSimple *card);
-	/* used to compare list attributes */
-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);
-
-} prop_info[] = {
-
-#define DN_NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL | PROP_DN, NULL}
-#define DN_LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST | PROP_DN, ctor, ber, cmp}
-#define NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL, NULL}
-
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name", "cn" ),
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),
-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_TITLE,     "title", "title"),
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_ORG,       "org", "o"),
-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "phone", "telephonenumber"),
-	DN_LIST_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate_func, email_ber_func, email_compare_func)
-
-#undef DN_NORMAL_PROP
-#undef DN_LIST_PROP
-#undef NORMAL_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendLDAP    *bl;
-	GList             *list;
-
-	bl = PAS_BACKEND_LDAP(pas_book_get_backend(book));
-	for (list = bl->priv->book_views; list; list = g_list_next(list)) {
-		PASBackendLDAPBookView *view = list->data;
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			if (view->search_idle != 0) {
-				/* we have a search running on the
-				   ldap connection.  remove the idle
-				   handler and anbandon the msg id */
-				g_source_remove(view->search_idle);
-				pas_book_view_notify_status_message (view->book_view, "Abandoning pending search");
-				if (view->search_msgid != -1)
-					ldap_abandon (bl->priv->ldap, view->search_msgid);
-
-				/* if the search op is the current op,
-				   finish it. else, remove it from the
-				   list and nuke it ourselves. */
-				if (view->search_op == bl->priv->current_op)
-					ldap_op_finished (view->search_op);
-				else {
-					bl->priv->pending_ops = g_list_remove (bl->priv->pending_ops,
-									       view->search_op);
-					view->search_op->dtor (view->search_op->backend,
-							       view->search_op);
-				}
-			}
-			g_free (view->search);
-			g_free (view);
-			bl->priv->book_views = g_list_remove_link(bl->priv->book_views, list);
-			g_list_free_1(list);
-			break;
-		}
-	}
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("view_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-pas_backend_ldap_connect (PASBackendLDAP *bl)
-{
-	PASBackendLDAPPrivate *blpriv = bl->priv;
-
-#ifdef DEBUG
-	{
-		extern int ldap_debug;
-		ldap_debug = LDAP_DEBUG_ANY;
-	}
-#endif
-
-	/* close connection first if it's open first */
-	if (blpriv->ldap)
-		ldap_unbind (blpriv->ldap);
-
-	blpriv->ldap = ldap_open (blpriv->ldap_host, blpriv->ldap_port);
-	if (NULL != blpriv->ldap) {
-		ldap_simple_bind_s(blpriv->ldap,
-				   NULL /*binddn*/, NULL /*passwd*/);
-		blpriv->connected = TRUE;
-	}
-	else {
-		g_warning ("pas_backend_ldap_connect failed for "
-			   "'ldap://%s:%d/%s'\n",
-			   blpriv->ldap_host,
-			   blpriv->ldap_port,
-			   blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
-		blpriv->connected = FALSE;
-	}
-}
-
-static void
-ldap_op_init (LDAPOp *op, PASBackend *backend,
-	      PASBook *book, PASBookView *view,
-	      LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->handler = handler;
-	op->dtor = dtor;
-}
-
-static void
-ldap_op_process_current (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPOp *op = bl->priv->current_op;
-
-	if (!bl->priv->connected) {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Connecting to LDAP server");
-		pas_backend_ldap_connect(bl);
-	}
-
-	if (bl->priv->connected) {
-		if (op->handler (backend, op))
-			ldap_op_finished (op);
-	}
-	else {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Unable to connect to LDAP server");
-
-		ldap_op_finished (op);
-	}
-}
-
-static void
-ldap_op_process (LDAPOp *op)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-
-	if (bl->priv->current_op) {
-		/* operation in progress.  queue this op for later and return. */
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Waiting for connection to ldap server...");
-		bl->priv->pending_ops = g_list_append (bl->priv->pending_ops, op);
-	}
-	else {
-		/* nothing going on, do this op now */
-		bl->priv->current_op = op;
-		ldap_op_process_current (op->backend);
-	}
-}
-
-static gboolean
-ldap_op_process_on_idle (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	bl->priv->op_idle = 0;
-
-	ldap_op_process_current (backend);
-
-	return FALSE;
-}
-
-static void
-ldap_op_restart (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-}
-
-static void
-ldap_op_finished (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	op->dtor (backend, op);
-
-	if (bl->priv->pending_ops) {
-		bl->priv->current_op = bl->priv->pending_ops->data;
-		bl->priv->pending_ops = g_list_remove_link (bl->priv->pending_ops, bl->priv->pending_ops);
-
-		bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-	}
-	else {
-		bl->priv->current_op = NULL;
-	}
-}
-
-static int
-ldap_error_to_response (int ldap_error)
-{
-	if (ldap_error == LDAP_SUCCESS)
-		return Evolution_BookListener_Success;
-	else if (NAME_ERROR (ldap_error))
-		return Evolution_BookListener_CardNotFound;
-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return Evolution_BookListener_PermissionDenied;
-	else if (ldap_error == LDAP_SERVER_DOWN)
-		return Evolution_BookListener_RepositoryOffline;
-	else
-		return Evolution_BookListener_OtherError;
-}
-
-
-static char *
-create_dn_from_ecard (ECardSimple *card)
-{
-	char *o, *o_part = NULL;
-	const char *mail;
-	char *mail_part = NULL;
-	char *cn, *cn_part = NULL;
-	char *dn;
-	gboolean need_comma = FALSE;
-
-	o = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_ORG);
-	if (o) {
-		o_part = g_strdup_printf ("o=%s", o);
-		need_comma = TRUE;
-	}
-	else {
-		o_part = g_strdup ("");
-		need_comma = FALSE;
-	}
-
-	mail = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL);
-	if (mail) {
-		mail_part = g_strdup_printf ("mail=%s%s", mail, need_comma ? "," : "");
-		need_comma = TRUE;
-	}
-	else {
-		mail_part = g_strdup ("");
-	}
-
-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (cn) {
-		cn_part = g_strdup_printf ("cn=\"%s\"%s", cn, need_comma ? "," : "");
-	}
-	else {
-		cn_part = g_strdup ("");
-	}
-
-	dn = g_strdup_printf ("%s%s%s", cn_part, mail_part, o_part);
-
-	g_free (cn_part);
-	g_free (mail_part);
-	g_free (o_part);
-
-	g_print ("generated dn: %s\n", dn);
-
-	return dn;
-}
-
-static GPtrArray*
-build_mods_from_ecards (ECardSimple *current, ECardSimple *new, gboolean *new_dn_needed)
-{
-	gboolean adding = (current == NULL);
-	GPtrArray *result = g_ptr_array_new();
-	int i;
-
-	if (new_dn_needed)
-		*new_dn_needed = FALSE;
-
-	/* we walk down the list of properties we can deal with (that
-	 big table at the top of the file) */
-
-	for (i = 0; i < num_prop_infos; i ++) {
-		char *new_prop = NULL;
-		char *current_prop = NULL;
-		gboolean include;
-
-		/* get the value for the new card, and compare it to
-                   the value in the current card to see if we should
-                   update it -- if adding is TRUE, short circuit the
-                   check. */
-		new_prop = e_card_simple_get (new, prop_info[i].field_id);
-
-		/* need to set INCLUDE to true if the field needs to
-                   show up in the ldap modify request */
-		if (adding) {
-			/* if we're creating a new card, include it if the
-                           field is there at all */
-			include = (new_prop != NULL);
-		}
-		else {
-			/* if we're modifying an existing card,
-                           include it if the current field value is
-                           different than the new one, if it didn't
-                           exist previously, or if it's been
-                           removed. */
-			current_prop = e_card_simple_get (current, prop_info[i].field_id);
-
-			if (new_prop && current_prop)
-				include = strcmp (new_prop, current_prop);
-			else
-				include = (!!new_prop != !!current_prop);
-		}
-
-		if (include) {
-			LDAPMod *mod = g_new (LDAPMod, 1);
-
-			/* the included attribute has changed - we
-                           need to update the dn if it's one of the
-                           attributes we compute the dn from. */
-			if (new_dn_needed)
-				*new_dn_needed |= prop_info[i].prop_type & PROP_DN;
-
-			if (adding) {
-				mod->mod_op = LDAP_MOD_ADD;
-			}
-			else {
-				if (!new_prop)
-					mod->mod_op = LDAP_MOD_DELETE;
-				else if (!current_prop)
-					mod->mod_op = LDAP_MOD_ADD;
-				else
-					mod->mod_op = LDAP_MOD_REPLACE;
-			}
-			
-			mod->mod_type = g_strdup (prop_info[i].ldap_attr);
-
-			if (prop_info[i].prop_type & PROP_TYPE_NORMAL) {
-				mod->mod_values = g_new (char*, 2);
-				mod->mod_values[0] = e_card_simple_get (new, prop_info[i].field_id);
-				mod->mod_values[1] = NULL;
-			}
-			else {
-				mod->mod_bvalues = prop_info[i].ber_func (new);
-			}
-
-			g_ptr_array_add (result, mod);
-		}
-	}
-
-	/* NULL terminate the list of modifications */
-	g_ptr_array_add (result, NULL);
-
-	return result;
-}
-
-static void
-free_mods (GPtrArray *mods)
-{
-	int i = 0;
-	LDAPMod *mod;
-
-	while ((mod = g_ptr_array_index (mods, i++))) {
-		g_free (mod->mod_type);
-
-		/* XXX we leak the values */
-		g_free (mod);
-	}
-
-	g_ptr_array_free (mods, TRUE /* XXX ? */);
-}
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPCreateOp;
-
-static gboolean
-create_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	ECardSimple *new_card;
-	char *dn;
-	int response;
-	int            ldap_error;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAPMod *objectclass_mod;
-	LDAP *ldap;
-
-	new_ecard = e_card_new (create_op->vcard);
-	new_card = e_card_simple_new (new_ecard);
-
-	dn = create_dn_from_ecard (new_card);
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (NULL, new_card, NULL);
-	objectclass_mod = g_new (LDAPMod, 1);
-
-	objectclass_mod->mod_op = LDAP_MOD_ADD;
-	objectclass_mod->mod_type = g_strdup ("objectclass");
-	objectclass_mod->mod_values = g_new (char*, 1);
-	objectclass_mod->mod_values[0] = g_strdup (OBJECT_CLASS);
-	objectclass_mod->mod_values[1] = NULL;
-
-	g_ptr_array_add (mod_array, objectclass_mod);
-
-	ldap_mods = (LDAPMod**)mod_array->pdata;
-
-	/* actually perform the ldap add */
-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);
-
-	g_print ("ldap_add_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));
-
-	/* and clean up */
-	free_mods (mod_array);
-	g_free (dn);
-
-	gtk_object_unref (GTK_OBJECT(new_card));
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (create_op->op.book,
-				 response,
-				 dn);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-create_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	g_free (create_op->vcard);
-	g_free (create_op);
-}
-
-static void
-pas_backend_ldap_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);
-
-	ldap_op_init ((LDAPOp*)create_op, backend, book, NULL, create_card_handler, create_card_dtor);
-
-	create_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)create_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static gboolean
-remove_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int response;
-	int ldap_error;
-
-	ldap_error = ldap_delete_s (bl->priv->ldap, remove_op->id);
-
-	response = ldap_error_to_response (ldap_error);
-
-	pas_book_respond_remove (remove_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-remove_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-
-	g_free (remove_op->id);
-	g_free (remove_op);
-}
-
-static void
-pas_backend_ldap_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);
-
-	ldap_op_init ((LDAPOp*)remove_op, backend, book, NULL, remove_card_handler, remove_card_dtor);
-
-	remove_op->id = req->id;
-
-	ldap_op_process ((LDAPOp*)remove_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPModifyOp;
-
-static gboolean
-modify_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	char *id;
-	int response;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-	char *query;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	new_ecard = e_card_new (modify_op->vcard);
-	id = e_card_get_id(new_ecard);
-
-	ldap = bl->priv->ldap;
-
-	/* we don't get sent the original vcard along with the new one
-           in this call, so we have to query the ldap server for the
-           original record so we can compute our delta. */
-	query = g_strdup_printf ("(dn=%s)", id);
-	ldap_error = ldap_search_s (ldap,
-				    bl->priv->ldap_rootdn,
-				    bl->priv->ldap_scope,
-				    query, NULL, 0, &res);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* get the single card from the list (we're guaranteed
-                   either 1 or 0 since we looked up by dn, which is
-                   unique) */
-		e = ldap_first_entry (ldap, res);
-		if (e)	{
-			ECardSimple *new_card = e_card_simple_new (new_ecard);
-			ECardSimple *current_card = build_card_from_entry (ldap, e);
-			gboolean need_new_dn;
-
-			/* build our mods */
-			mod_array = build_mods_from_ecards (current_card, new_card, &need_new_dn);
-			if (mod_array->len > 0) {
-				ldap_mods = (LDAPMod**)mod_array->pdata;
-
-				/* actually perform the ldap modify */
-				ldap_error = ldap_modify_s (ldap, id, ldap_mods);
-				g_print ("ldap_modify_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));
-			}
-			else {
-				g_print ("modify list empty.  on modification sent\n");
-			}
-
-			/* and clean up */
-			free_mods (mod_array);
-			gtk_object_unref (GTK_OBJECT(new_card));
-			gtk_object_unref (GTK_OBJECT(current_card));
-		}
-		else {
-			g_print ("didn't find original card\n");
-		}
-
-		ldap_msgfree(res);
-	}
-	else {
-		g_print ("ldap_search_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));
-	}
-
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_modify (modify_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-modify_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	g_free (modify_op->vcard);
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);
-
-	ldap_op_init ((LDAPOp*)modify_op, backend, book, NULL, modify_card_handler, modify_card_dtor);
-
-	modify_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)modify_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBook *book;
-} LDAPGetCursorOp;
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	g_return_val_if_fail (n < cursor_data->num_elements, NULL);
-
-	return (char*)g_list_nth (cursor_data->elements, n);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	/* free the ldap specific cursor information */
-	g_list_foreach (cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-pas_backend_ldap_build_all_cards_list(PASBackend *backend,
-				      PASBackendLDAPCursorPrivate *cursor_data)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-
-	if ((ldap_error = ldap_search_s (ldap,
-					 bl->priv->ldap_rootdn,
-					 bl->priv->ldap_scope,
-					 "(objectclass=*)",
-					 NULL, 0, &res)) == -1) {
-		g_warning ("ldap error '%s' in "
-			   "pas_backend_ldap_build_all_cards_list\n",
-			   ldap_err2string(ldap_error));
-	}
-
-	cursor_data->elements = NULL;
-
-	cursor_data->num_elements = ldap_count_entries (ldap, res);
-
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-
-		/* for now just make a list of the dn's */
-#if 0
-		for ( a = ldap_first_attribute( ldap, e, &ber ); a != NULL;
-		      a = ldap_next_attribute( ldap, e, ber ) ) {
-		}
-#else
-		cursor_data->elements = g_list_prepend(cursor_data->elements,
-						       g_strdup(ldap_get_dn(ldap, e)));
-#endif
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	ldap_msgfree(res);
-}
-
-
-static gboolean
-get_cursor_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	CORBA_Environment ev;
-	int            ldap_error = 0;
-	PASCardCursor *cursor;
-	Evolution_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data;
-	PASBook *book = cursor_op->book;
-
-	cursor_data = g_new(PASBackendLDAPCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_ldap_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (book,
-				     ldap_error_to_response (ldap_error),
-				     cursor);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-get_cursor_dtor (PASBackend *backend, LDAPOp *op)
-{
-	g_free (op);
-}
-
-static void
-pas_backend_ldap_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	LDAPGetCursorOp *op = g_new (LDAPGetCursorOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, backend, book, NULL, get_cursor_handler, get_cursor_dtor);
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-email_populate_func(ECardSimple *card, char **values)
-{
-	int i;
-
-	for (i = 0; values[i] && i < 3; i ++) {
-		e_card_simple_set_email (card, i, values[i]);
-	}
-}
-
-struct berval**
-email_ber_func(ECardSimple *card)
-{
-	struct berval** result;
-	const char *emails[3];
-	int i, j, num;
-
-	num = 0;
-	for (i = 0; i < 3; i ++) {
-		emails[i] = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		if (emails[i])
-			num++;
-	}
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 3; i ++) {
-		if (emails[i])
-			result[j++]->bv_val = g_strdup (emails[i]);
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-gboolean
-email_compare_func (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	const char *email1, *email2;
-	int i;
-
-	for (i = 0; i < 3; i ++) {
-		gboolean equal;
-		email1 = e_card_simple_get_email (ecard1, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		email2 = e_card_simple_get_email (ecard2, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-
-		if (email1 && email2)
-			equal = !strcmp (email1, email2);
-		else
-			equal = (!!email1 == !!email2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return FALSE;;
-}
-
-static ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		(*list)->data = g_strdup_printf("(!%s)", term);
-		g_free (term);
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (!strcmp (propname, "x-evolution-any-field")) {
-			int i;
-			int query_length;
-			char *big_query;
-			char *header, *footer;
-			char *match_str;
-
-			header = g_malloc0((num_prop_infos - 1) * 2 + 1);
-			footer = g_malloc0(num_prop_infos + 1);
-			for (i = 0; i < num_prop_infos - 1; i ++) {
-				strcat (header, "(|");
-				strcat (footer, ")");
-			}
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = strlen (header);
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, header);
-			for (i = 0; i < num_prop_infos; i ++) {
-				strcat (big_query, "(");
-				strcat (big_query, prop_info[i].ldap_attr);
-				strcat (big_query, match_str);
-			}
-			strcat (big_query, footer);
-
-			*list = g_list_prepend(*list, big_query);
-
-			g_free (match_str);
-			g_free (header);
-			g_free (footer);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				*list = g_list_prepend(*list,
-						       g_strdup_printf("(%s=*%s%s)",
-								       ldap_attr,
-								       str,
-								       one_star ? "" : "*"));
-		}
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s)",
-							       ldap_attr, str));
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s*)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=*%s)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and", func_and, 0 },
-	{ "or", func_or, 0 },
-	{ "not", func_not, 0 },
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gchar *
-pas_backend_ldap_build_query (gchar *query)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-
-	sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function(sexp, 0, symbols[i].name,
-					    symbols[i].func, &list);
-		}
-	}
-
-	e_sexp_input_text(sexp, query, strlen(query));
-	e_sexp_parse(sexp);
-
-	r = e_sexp_eval(sexp);
-
-	gtk_object_unref(GTK_OBJECT(sexp));
-	e_sexp_result_free(r);
-
-	if (list->next) {
-		g_warning ("conversion to ldap query string failed");
-		retval = NULL;
-		g_list_foreach (list, (GFunc)g_free, NULL);
-	}
-	else {
-		retval = list->data;
-	}
-
-	g_list_free (list);
-	return retval;
-}
-
-static gchar *
-query_prop_to_ldap(gchar *query_prop)
-{
-	int i;
-
-	for (i = 0; i < num_prop_infos; i ++)
-		if (!strcmp (query_prop, prop_info[i].query_prop))
-			return prop_info[i].ldap_attr;
-
-	return NULL;
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *ldap_query;
-	PASBackendLDAP *bl;
-	PASBackendLDAPBookView *view;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn = ldap_get_dn(ldap, e);
-	char *attr;
-	BerElement *ber = NULL;
-
-	g_print ("build_card_from_entry, dn = %s\n", dn);
-	e_card_simple_set_id (card, dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-
-		for (i = 0; i < num_prop_infos; i ++)
-			if (!strcmp (attr, prop_info[i].ldap_attr))
-				info = &prop_info[i];
-
-		if (info) {
-			char **values;
-			values = ldap_get_values (ldap, e, attr);
-
-			if (info->prop_type & PROP_TYPE_NORMAL) {
-				/* if it's a normal property just set the string */
-				e_card_simple_set (card, info->field_id, values[0]);
-
-			}
-			else if (info->prop_type & PROP_TYPE_LIST) {
-				/* if it's a list call the ecard-populate function,
-				   which calls gtk_object_set to set the property */
-				info->populate_ecard_func(card,
-							  values);
-			}
-
-			ldap_value_free (values);
-		}
-	}
-
-	/* if ldap->ld_errno == LDAP_DECODING_ERROR there was an
-	   error decoding an attribute, and we shouldn't free ber,
-	   since the ldap library already did it. */
-	if (ldap->ld_errno != LDAP_DECODING_ERROR && ber)
-		ber_free (ber, 0);
-
-	e_card_simple_sync_card (card);
-
-	return card;
-}
-
-static gboolean
-poll_ldap (LDAPSearchOp *op)
-{
-	PASBackendLDAPBookView *view = op->view;
-	PASBackendLDAP *bl = op->bl;
-	LDAP           *ldap = bl->priv->ldap;
-	int            rc;
-	LDAPMessage    *res, *e;
-	GList   *cards = NULL;
-	static int received = 0;
-
-	pas_book_view_notify_status_message (view->book_view, "Polling for LDAP search result");
-
-	rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
-	
-	if (rc == -1 && received == 0) {
-		pas_book_view_notify_status_message (view->book_view, "Restarting search");
-		/* connection went down and we never got any. */
-		bl->priv->connected = FALSE;
-
-		/* this will reopen the connection */
-		ldap_op_restart ((LDAPOp*)op);
-		return FALSE;
-	}
-
-	if (rc != LDAP_RES_SEARCH_ENTRY) {
-		view->search_idle = 0;
-		pas_book_view_notify_complete (view->book_view);
-		ldap_op_finished ((LDAPOp*)op);
-		received = 0;
-		pas_book_view_notify_status_message (view->book_view, "Search complete");
-		return FALSE;
-	}
-
-	received = 1;
-		
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-		ECardSimple *card = build_card_from_entry (ldap, e);
-
-		cards = g_list_append (cards, e_card_simple_get_vcard (card));
-
-		gtk_object_unref (GTK_OBJECT(card));
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	if (cards) {
-		pas_book_view_notify_add (view->book_view, cards);
-			
-		g_list_foreach (cards, (GFunc)g_free, NULL);
-		g_list_free (cards);
-		cards = NULL;
-	}
-
-	ldap_msgfree(res);
-
-	return TRUE;
-}
-
-static gboolean
-ldap_search_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "Searching...");
-
-	/* it might not be NULL if we've been restarted */
-	if (search_op->ldap_query == NULL)
-		search_op->ldap_query = pas_backend_ldap_build_query(search_op->view->search);
-
-	if (search_op->ldap_query != NULL) {
-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-		PASBackendLDAPBookView *view = search_op->view;
-		LDAP *ldap = bl->priv->ldap;
-
-		ldap->ld_sizelimit = LDAP_MAX_SEARCH_RESPONSES;
-		ldap->ld_deref = LDAP_DEREF_ALWAYS;
-
-		if ((view->search_msgid = ldap_search (ldap,
-						       bl->priv->ldap_rootdn,
-						       bl->priv->ldap_scope,
-						       search_op->ldap_query,
-						       NULL, 0)) == -1) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap->ld_errno));
-			return TRUE; /* act synchronous in this case */
-		}
-		else {
-			view->search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);
-		}
-
-		/* we're async */
-		return FALSE;
-	}
-	else {
-		/* error doing the conversion to an ldap query, let's
-                   end this now by acting like we're synchronous. */
-		g_warning ("LDAP problem converting search query %s\n", search_op->view->search);
-		return TRUE;
-	}
-}
-
-static void
-ldap_search_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	g_free (search_op->ldap_query);
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view, ldap_search_handler, ldap_search_dtor);
-
-	op->ldap_query = NULL;
-	op->view = view;
-	op->bl = bl;
-
-	/* keep track of the search op so we can delete it from the
-           list if the view is destroyed */
-	view->search_op = (LDAPOp*)op;
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_book_view (book,
-		(book_view != NULL
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound /* XXX */),
-		book_view);
-
-	view = g_new0(PASBackendLDAPBookView, 1);
-	view->book_view = book_view;
-	view->search = g_strdup(req->search);
-	view->blpriv = bl->priv;
-
-	bl->priv->book_views = g_list_prepend(bl->priv->book_views, view);
-
-	pas_backend_ldap_search (bl, book, view);
-
-}
-
-static void
-pas_backend_ldap_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_report_connection (book, bl->priv->connected);
-}
-
-static gboolean
-pas_backend_ldap_can_write (PASBook *book)
-{
-	return TRUE; /* XXX */
-}
-
-static gboolean
-pas_backend_ldap_can_write_card (PASBook *book,
-				 const char *id)
-{
-	return TRUE; /* XXX */
-}
-
-static void
-pas_backend_ldap_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_ldap_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_ldap_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_ldap_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_ldap_process_check_connection (backend, book, req);
-		break;
-
-	case GetCursor:
-		pas_backend_ldap_process_get_cursor (backend, book, req);
-		break;
-
-	case GetBookView:
-		pas_backend_ldap_process_get_book_view (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendLDAP *backend;
-
-	backend = PAS_BACKEND_LDAP (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_ldap_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendLDAP *bl;
-	int            ldap_error = LDAP_SUCCESS; /* XXX */
-
-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));
-
-	/* XXX use ldap_search */
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* success */
-		return g_strdup ("");
-	}
-	else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-
-	g_assert (bl->priv->connected == FALSE);
-
-	ldap_error = ldap_url_parse ((char*)uri, &lud);
-	if (ldap_error == LDAP_SUCCESS) {
-		g_free(bl->priv->uri);
-		bl->priv->uri = g_strdup (uri);
-		bl->priv->ldap_host = g_strdup(lud->lud_host);
-		bl->priv->ldap_port = lud->lud_port;
-		/* if a port wasn't specified, default to LDAP_PORT */
-		if (bl->priv->ldap_port == 0)
-			bl->priv->ldap_port = LDAP_PORT;
-		bl->priv->ldap_rootdn = g_strdup(lud->lud_dn);
-		bl->priv->ldap_scope = lud->lud_scope;
-
-		ldap_free_urldesc(lud);
-
-		pas_backend_ldap_connect (bl);
-		if (bl->priv->ldap == NULL)
-			return FALSE;
-		else
-			return TRUE;
-	} else
-		return FALSE;
-}
-
-/* Get_uri handler for the addressbook LDAP backend */
-static const char *
-pas_backend_ldap_get_uri (PASBackend *backend)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (backend);
-	return bl->priv->uri;
-}
-
-static gboolean
-pas_backend_ldap_add_client (PASBackend             *backend,
-			     Evolution_BookListener  listener)
-{
-	PASBackendLDAP *bl;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_ldap_get_vcard,
-		pas_backend_ldap_can_write,
-		pas_backend_ldap_can_write_card);
-
-	if (!book) {
-		if (!bl->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
-
-	bl->priv->clients = g_list_prepend (
-		bl->priv->clients, book);
-
-	if (bl->priv->connected) {
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	}
-
-	return TRUE;
-}
-
-static void
-pas_backend_ldap_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendLDAP *bl;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_LDAP (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bl->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bl->priv->clients = g_list_remove_link (bl->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bl->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_ldap_get_static_capabilites (PASBackend *backend)
-{
-	return g_strdup("net");
-}
-
-static gboolean
-pas_backend_ldap_construct (PASBackendLDAP *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_ldap_new:
- */
-PASBackend *
-pas_backend_ldap_new (void)
-{
-	PASBackendLDAP *backend;
-
-	backend = gtk_type_new (pas_backend_ldap_get_type ());
-
-	if (! pas_backend_ldap_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-call_dtor (LDAPOp *op, gpointer data)
-{
-	op->dtor (op->backend, op);
-}
-
-static void
-pas_backend_ldap_destroy (GtkObject *object)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (object);
-
-	g_list_foreach (bl->priv->pending_ops, (GFunc)call_dtor, NULL);
-	g_list_free (bl->priv->pending_ops);
-
-	g_free (bl->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_ldap_load_uri;
-	parent_class->get_uri                 = pas_backend_ldap_get_uri;
-	parent_class->add_client              = pas_backend_ldap_add_client;
-	parent_class->remove_client           = pas_backend_ldap_remove_client;
-	parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilites;
-
-	object_class->destroy = pas_backend_ldap_destroy;
-}
-
-static void
-pas_backend_ldap_init (PASBackendLDAP *backend)
-{
-	PASBackendLDAPPrivate *priv;
-
-	priv            = g_new0 (PASBackendLDAPPrivate, 1);
-	priv->connected = FALSE;
-	priv->clients   = NULL;
-	priv->uri       = NULL;
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_ldap_get_type:
- */
-GtkType
-pas_backend_ldap_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendLDAP",
-			sizeof (PASBackendLDAP),
-			sizeof (PASBackendLDAPClass),
-			(GtkClassInitFunc)  pas_backend_ldap_class_init,
-			(GtkObjectInitFunc) pas_backend_ldap_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h
deleted file mode 100644
index a59cdf3857..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_LDAP_H__
-#define __PAS_BACKEND_LDAP_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendLDAPPrivate *priv;
-} PASBackendLDAP;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendLDAPClass;
-
-PASBackend *pas_backend_ldap_new      (void);
-GtkType     pas_backend_ldap_get_type (void);
-
-#define PAS_BACKEND_LDAP_TYPE        (pas_backend_ldap_get_type ())
-#define PAS_BACKEND_LDAP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_LDAP_TYPE, PASBackendLDAP))
-#define PAS_BACKEND_LDAP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendLDAPClass))
-#define PAS_IS_BACKEND_LDAP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_LDAP_TYPE))
-#define PAS_IS_BACKEND_LDAP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_LDAP_TYPE))
-
-#endif /* ! __PAS_BACKEND_LDAP_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
deleted file mode 100644
index 1568918560..0000000000
--- a/addressbook/backend/pas/pas-backend.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "pas-backend.h"
-
-#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)->klass)
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static guint pas_backend_signals[LAST_SIGNAL];
-
-
-gboolean
-pas_backend_construct (PASBackend *backend)
-{
-	return TRUE;
-}
-
-gboolean
-pas_backend_load_uri (PASBackend             *backend,
-		      const char             *uri)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uri != NULL, FALSE);
-
-	g_assert (CLASS (backend)->load_uri != NULL);
-
-	return (* CLASS (backend)->load_uri) (backend, uri);
-}
-
-/**
- * pas_backend_get_uri:
- * @backend: An addressbook backend.
- * 
- * Queries the URI that an addressbook backend is serving.
- * 
- * Return value: URI for the backend.
- **/
-const char *
-pas_backend_get_uri (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * pas_backend_add_client:
- * @backend: An addressbook backend.
- * @listener: Listener for notification to the client.
- *
- * Adds a client to an addressbook backend.
- *
- * Return value: TRUE on success, FALSE on failure to add the client.
- */
-gboolean
-pas_backend_add_client (PASBackend             *backend,
-			Evolution_BookListener  listener)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (listener != CORBA_OBJECT_NIL, FALSE);
-
-	g_assert (CLASS (backend)->add_client != NULL);
-
-	return CLASS (backend)->add_client (backend, listener);
-}
-
-void
-pas_backend_remove_client (PASBackend *backend,
-			   PASBook    *book)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-	g_return_if_fail (book    != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-	
-	g_assert (CLASS (backend)->remove_client != NULL);
-
-	CLASS (backend)->remove_client (backend, book);
-}
-
-char *
-pas_backend_get_static_capabilities (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-	
-	g_assert (CLASS (backend)->get_static_capabilities != NULL);
-
-	return CLASS (backend)->get_static_capabilities (backend);
-}
-
-/**
- * pas_backend_last_client_gone:
- * @backend: An addressbook backend.
- * 
- * Emits the "last_client_gone" signal for the specified backend.  Should
- * only be called from backend implementations if the backend really does
- * not have any more clients.
- **/
-void
-pas_backend_last_client_gone (PASBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), pas_backend_signals[LAST_CLIENT_GONE]);	
-}
-
-static void
-pas_backend_init (PASBackend *backend)
-{
-}
-
-static void
-pas_backend_class_init (PASBackendClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	pas_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_backend_signals, LAST_SIGNAL);
-
-	klass->add_client = NULL;
-	klass->remove_client = NULL;
-	klass->get_static_capabilities = NULL;
-}
-
-/**
- * pas_backend_get_type:
- */
-GtkType
-pas_backend_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackend",
-			sizeof (PASBackend),
-			sizeof (PASBackendClass),
-			(GtkClassInitFunc)  pas_backend_class_init,
-			(GtkObjectInitFunc) pas_backend_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
deleted file mode 100644
index 4045074284..0000000000
--- a/addressbook/backend/pas/pas-backend.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * An abstract class which defines the API to a given backend.
- * There will be one PASBackend object for every URI which is loaded.
- *
- * Two people will call into the PASBackend API:
- *
- * 1. The PASBookFactory, when it has been asked to load a book.
- *    It will create a new PASBackend if one is not already running
- *    for the requested URI.  It will call pas_backend_add_client to
- *    add a new client to an existing PASBackend server.
- *
- * 2. A PASBook, when a client has requested an operation on the
- *    Evolution_Book interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BACKEND_H__
-#define __PAS_BACKEND_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBackend        PASBackend;
-typedef struct _PASBackendPrivate PASBackendPrivate;
-
-#include <pas/pas-book.h>
-
-struct _PASBackend {
-	GtkObject parent_object;
-	PASBackendPrivate *priv;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Virtual methods */
-	gboolean (*load_uri) (PASBackend *backend, const char *uri);
-	const char *(* get_uri) (PASBackend *backend);
-	gboolean (*add_client) (PASBackend *backend, Evolution_BookListener listener);
-	void (*remove_client) (PASBackend *backend, PASBook *book);
-        char *(*get_static_capabilities) (PASBackend *backend);
-
-	/* Notification signals */
-	void (* last_client_gone) (PASBackend *backend);
-} PASBackendClass;
-
-typedef PASBackend * (*PASBackendFactoryFn) (void);
-
-gboolean    pas_backend_construct                (PASBackend             *backend);
-gboolean    pas_backend_load_uri                 (PASBackend             *backend,
-						  const char             *uri);
-const char *pas_backend_get_uri                  (PASBackend             *backend);
-
-gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  Evolution_BookListener  listener);
-void        pas_backend_remove_client            (PASBackend             *backend,
-						  PASBook                *book);
-char       *pas_backend_get_static_capabilities  (PASBackend             *backend);
-
-void        pas_backend_last_client_gone         (PASBackend             *backend);
-
-GtkType     pas_backend_get_type                 (void);
-
-#define PAS_BACKEND_TYPE        (pas_backend_get_type ())
-#define PAS_BACKEND(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_TYPE, PASBackend))
-#define PAS_BACKEND_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendClass))
-#define PAS_IS_BACKEND(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_TYPE))
-#define PAS_IS_BACKEND_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_TYPE))
-
-#endif /* ! __PAS_BACKEND_H__ */
-
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
deleted file mode 100644
index 02dedbabe5..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "pas-book-factory.h"
-
-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-
-static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_Evolution_BookFactory__vepv   pas_book_factory_vepv;
-
-typedef struct {
-	char                              *uri;
-	Evolution_BookListener             listener;
-} PASBookFactoryQueuedRequest;
-
-struct _PASBookFactoryPrivate {
-	gint        idle_id;
-	GHashTable *backends;
-	GHashTable *active_server_map;
-	GList      *queued_requests;
-};
-
-/* Signal IDs */
-enum {
-	LAST_BOOK_GONE,
-	LAST_SIGNAL
-};
-
-static guint factory_signals[LAST_SIGNAL];
-
-static char *
-pas_book_factory_canonicalize_uri (const char *uri)
-{
-	/* FIXME: What do I do here? */
-
-	return g_strdup (uri);
-}
-
-static char *
-pas_book_factory_extract_proto_from_uri (const char *uri)
-{
-	char *proto;
-	char *p;
-
-	p = strchr (uri, ':');
-
-	if (p == NULL)
-		return NULL;
-
-	proto = g_malloc0 (p - uri + 1);
-
-	strncpy (proto, uri, p - uri);
-
-	return proto;
-}
-
-/**
- * pas_book_factory_register_backend:
- * @factory:
- * @proto:
- * @backend:
- */
-void
-pas_book_factory_register_backend (PASBookFactory      *factory,
-				   const char          *proto,
-				   PASBackendFactoryFn  backend)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-	g_return_if_fail (proto != NULL);
-	g_return_if_fail (backend != NULL);
-
-	if (g_hash_table_lookup (factory->priv->backends, proto) != NULL) {
-		g_warning ("pas_book_factory_register_backend: "
-			   "Proto \"%s\" already registered!\n", proto);
-	}
-
-	g_hash_table_insert (factory->priv->backends,
-			     g_strdup (proto), backend);
-}
-
-/**
- * pas_book_factory_get_n_backends:
- * @factory: An addressbook factory.
- * 
- * Queries the number of running addressbook backends in an addressbook factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-pas_book_factory_get_n_backends (PASBookFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), -1);
-
-	return g_hash_table_size (factory->priv->active_server_map);
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (PASBackend *backend, gpointer data)
-{
-	PASBookFactory *factory;
-	const char *uri;
-	gpointer orig_key;
-	gboolean result;
-	char *orig_uri;
-
-	factory = PAS_BOOK_FACTORY (data);
-
-	/* Remove the backend from the active server map */
-
-	uri = pas_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (factory->priv->active_server_map, uri,
-					       &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (factory->priv->active_server_map, orig_uri);
-	g_free (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (factory->priv->active_server_map) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), factory_signals[LAST_BOOK_GONE]);
-}
-
-static PASBackendFactoryFn
-pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
-					 const char     *uri)
-{
-	PASBackendFactoryFn  backend_fn;
-	char                *proto;
-	char                *canonical_uri;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-	g_assert (uri != NULL);
-
-	canonical_uri = pas_book_factory_canonicalize_uri (uri);
-	if (canonical_uri == NULL)
-		return NULL;
-
-	proto = pas_book_factory_extract_proto_from_uri (canonical_uri);
-	if (proto == NULL) {
-		g_free (canonical_uri);
-		return NULL;
-	}
-
-	backend_fn = g_hash_table_lookup (factory->priv->backends, proto);
-
-	g_free (proto); 
-	g_free (canonical_uri);
-
-	return backend_fn;
-}
-
-static PASBackend *
-pas_book_factory_launch_backend (PASBookFactory              *factory,
-				 Evolution_BookListener       listener,
-				 const char                  *uri)
-{
-	PASBackendFactoryFn  backend_factory;
-	PASBackend          *backend;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (
-		factory, uri);
-
-	if (!backend_factory) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = (* backend_factory) ();
-	if (!backend) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_BookListener_OtherError,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	g_hash_table_insert (factory->priv->active_server_map,
-			     g_strdup (uri),
-			     backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    backend_last_client_gone_cb,
-			    factory);
-
-	return backend;
-}
-
-static void
-pas_book_factory_process_request (PASBookFactory              *factory,
-				  PASBookFactoryQueuedRequest *request)
-{
-	PASBackend *backend;
-	char *uri;
-	Evolution_BookListener listener;
-	CORBA_Environment ev;
-
-	uri = request->uri;
-	listener = request->listener;
-	g_free (request);
-
-	/* Look up the backend and create one if needed */
-
-	backend = g_hash_table_lookup (factory->priv->active_server_map, uri);
-
-	if (!backend) {
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		if (!pas_backend_add_client (backend, listener))
-			goto out;
-
-		pas_backend_load_uri (backend, uri);
-
-		goto out;
-	}
-
-	pas_backend_add_client (backend, listener);
-
- out:
-	g_free (uri);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_factory_process_request(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_factory_process_queue (PASBookFactory *factory)
-{
-	/* Process pending Book-creation requests. */
-	if (factory->priv->queued_requests != NULL) {
-		PASBookFactoryQueuedRequest  *request;
-		GList *l;
-
-		l = factory->priv->queued_requests;
-		request = l->data;
-
-		pas_book_factory_process_request (factory, request);
-
-		factory->priv->queued_requests = g_list_remove_link (
-			factory->priv->queued_requests, l);
-		g_list_free_1 (l);
-	}
-
-	if (factory->priv->queued_requests == NULL) {
-
-		factory->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_factory_queue_request (PASBookFactory               *factory,
-				const char                   *uri,
-				const Evolution_BookListener  listener)
-{
-	PASBookFactoryQueuedRequest *request;
-	Evolution_BookListener       listener_copy;
-	CORBA_Environment            ev;
-
-	CORBA_exception_init (&ev);
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("PASBookFactory: Could not duplicate BookListener!\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	request           = g_new0 (PASBookFactoryQueuedRequest, 1);
-	request->listener = listener_copy;
-	request->uri      = g_strdup (uri);
-
-	factory->priv->queued_requests =
-		g_list_prepend (factory->priv->queued_requests, request);
-
-	if (! factory->priv->idle_id) {
-		factory->priv->idle_id =
-			g_idle_add ((GSourceFunc) pas_book_factory_process_queue, factory);
-	}
-}
-
-
-static void
-impl_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
-				      const CORBA_char             *uri,
-				      const Evolution_BookListener  listener,
-				      CORBA_Environment            *ev)
-{
-	PASBookFactory      *factory =
-		PAS_BOOK_FACTORY (bonobo_object_from_servant (servant));
-	PASBackendFactoryFn  backend_factory;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
-
-	if (backend_factory == NULL) {
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			ev);
-
-		return;
-	}
-
-	pas_book_factory_queue_request (factory, uri, listener);
-}
-
-static gboolean
-pas_book_factory_construct (PASBookFactory *factory)
-{
-	POA_Evolution_BookFactory  *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-
-	servant = (POA_Evolution_BookFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_factory_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_BookFactory__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (factory), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), obj);
-
-	return TRUE;
-}
-
-/**
- * pas_book_factory_new:
- */
-PASBookFactory *
-pas_book_factory_new (void)
-{
-	PASBookFactory *factory;
-
-	factory = gtk_type_new (pas_book_factory_get_type ());
-
-	if (! pas_book_factory_construct (factory)) {
-		g_warning ("pas_book_factory_new: Could not construct PASBookFactory!\n");
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		return NULL;
-	}
-
-	return factory;
-}
-
-static gboolean
-register_factory (CORBA_Object obj)
-{
-	OAF_RegistrationResult result;
-
-	puts ("about to register addressbook");
-
-	result = oaf_active_server_register (PAS_BOOK_FACTORY_OAF_ID, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		return FALSE;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		return FALSE;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		return FALSE;
-	}
-}
-
-/**
- * pas_book_factory_activate:
- */
-void
-pas_book_factory_activate (PASBookFactory *factory)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-
-	register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (factory)));
-}
-
-static void
-pas_book_factory_init (PASBookFactory *factory)
-{
-	factory->priv = g_new0 (PASBookFactoryPrivate, 1);
-
-	factory->priv->active_server_map = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->backends          = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->queued_requests   = NULL;
-}
-
-static void
-free_active_server_map_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	PASBackend *backend;
-
-	uri = key;
-	g_free (uri);
-
-	backend = PAS_BACKEND (value);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-static void
-remove_backends_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-
-	uri = key;
-	g_free (uri);
-}
-
-static void
-pas_book_factory_destroy (GtkObject *object)
-{
-	PASBookFactory *factory = PAS_BOOK_FACTORY (object);
-	GList          *l;
-
-	for (l = factory->priv->queued_requests; l != NULL; l = l->next) {
-		PASBookFactoryQueuedRequest *request = l->data;
-		CORBA_Environment ev;
-
-		g_free (request->uri);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (request->listener, &ev);
-		CORBA_exception_free (&ev);
-
-		g_free (request);
-	}
-	g_list_free (factory->priv->queued_requests);
-	factory->priv->queued_requests = NULL;
-
-	g_hash_table_foreach (factory->priv->active_server_map,
-			      free_active_server_map_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->active_server_map);
-	factory->priv->active_server_map = NULL;
-
-	g_hash_table_foreach (factory->priv->backends,
-			      remove_backends_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->backends);
-	factory->priv->backends = NULL;
-	
-	g_free (factory->priv);
-
-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
-}
-
-static POA_Evolution_BookFactory__epv *
-pas_book_factory_get_epv (void)
-{
-	POA_Evolution_BookFactory__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookFactory__epv, 1);
-
-	epv->open_book = impl_Evolution_BookFactory_open_book;
-
-	return epv;
-	
-}
-
-static void
-pas_book_factory_corba_class_init (void)
-{
-	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();
-	pas_book_factory_vepv.Evolution_BookFactory_epv = pas_book_factory_get_epv ();
-}
-
-static void
-pas_book_factory_class_init (PASBookFactoryClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_factory_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	factory_signals[LAST_BOOK_GONE] =
-		gtk_signal_new ("last_book_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookFactoryClass, last_book_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_factory_destroy;
-
-	pas_book_factory_corba_class_init ();
-}
-
-/**
- * pas_book_factory_get_type:
- */
-GtkType
-pas_book_factory_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookFactory",
-			sizeof (PASBookFactory),
-			sizeof (PASBookFactoryClass),
-			(GtkClassInitFunc)  pas_book_factory_class_init,
-			(GtkObjectInitFunc) pas_book_factory_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
deleted file mode 100644
index 7e4690adf1..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-
-#include <pas/pas-backend.h>
-
-#ifndef __PAS_BOOK_FACTORY_H__
-#define __PAS_BOOK_FACTORY_H__
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;
-
-typedef struct {
-	BonoboObject            parent_object;
-	PASBookFactoryPrivate *priv;
-} PASBookFactory;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* last_book_gone) (PASBookFactory *factory);
-} PASBookFactoryClass;
-
-PASBookFactory *pas_book_factory_new              (void);
-
-void            pas_book_factory_register_backend (PASBookFactory               *factory,
-						   const char                   *proto,
-						   PASBackendFactoryFn           backend_factory);
-
-int             pas_book_factory_get_n_backends   (PASBookFactory               *factory);
-
-void            pas_book_factory_activate         (PASBookFactory               *factory);
-
-GtkType         pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_BOOK_FACTORY_H__ */
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
deleted file mode 100644
index 94babf6280..0000000000
--- a/addressbook/backend/pas/pas-book-view.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book-view.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include "pas-book-view.h"
-
-static BonoboObjectClass *pas_book_view_parent_class;
-POA_Evolution_BookView__vepv pas_book_view_vepv;
-
-struct _PASBookViewPrivate {
-	Evolution_BookViewListener  listener;
-};
-
-/**
- * pas_book_view_notify_change:
- */
-void
-pas_book_view_notify_change (PASBookView                *book_view,
-			     const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_Evolution_VCard card_sequence;
-
-	length = g_list_length((GList *) cards);
-
-	card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_signal_card_changed (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_change: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_change_1 (PASBookView *book_view,
-			       const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_change(book_view, list);
-	g_list_free(list);
-}
-
-/**
- * pas_book_view_notify_remove:
- */
-void
-pas_book_view_notify_remove (PASBookView                *book_view,
-			     const char                 *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_signal_card_removed (
-		book_view->priv->listener, (Evolution_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_view_notify_add:
- */
-void
-pas_book_view_notify_add (PASBookView                *book_view,
-			  const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_Evolution_VCard card_sequence;
-
-	length = g_list_length((GList *)cards);
-
-	card_sequence._buffer = CORBA_sequence_Evolution_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_signal_card_added (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_add: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_add_1 (PASBookView *book_view,
-			    const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_add(book_view, list);
-	g_list_free(list);
-}
-
-void
-pas_book_view_notify_complete (PASBookView *book_view)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_signal_sequence_complete (
-		book_view->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_view_notify_status_message (PASBookView *book_view,
-				     const char  *message)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_signal_status_message (
-		book_view->priv->listener, message, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_view_construct (PASBookView                *book_view,
-			 Evolution_BookViewListener  listener)
-{
-	POA_Evolution_BookView *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book_view      != NULL);
-	g_assert (PAS_IS_BOOK_VIEW (book_view));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_BookView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_view_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_BookView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	Evolution_BookViewListener_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to ref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book_view), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book_view), obj);
-
-	book_view->priv->listener  = listener;
-
-	return TRUE;
-}
-
-/**
- * pas_book_view_new:
- */
-PASBookView *
-pas_book_view_new (Evolution_BookViewListener  listener)
-{
-	PASBookView *book_view;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-
-	book_view = gtk_type_new (pas_book_view_get_type ());
-
-	if (! pas_book_view_construct (book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-
-		return NULL;
-	}
-
-	return book_view;
-}
-
-static void
-pas_book_view_destroy (GtkObject *object)
-{
-	PASBookView *book_view = PAS_BOOK_VIEW (object);
-	CORBA_Environment   ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookViewListener_unref (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to unref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
-	CORBA_Object_release (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to release listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (book_view->priv);
-
-	GTK_OBJECT_CLASS (pas_book_view_parent_class)->destroy (object);	
-}
-
-static POA_Evolution_BookView__epv *
-pas_book_view_get_epv (void)
-{
-	POA_Evolution_BookView__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookView__epv, 1);
-
-	return epv;
-	
-}
-
-static void
-pas_book_view_corba_class_init (void)
-{
-	pas_book_view_vepv.Bonobo_Unknown_epv     = bonobo_object_get_epv ();
-	pas_book_view_vepv.Evolution_BookView_epv = pas_book_view_get_epv ();
-}
-
-static void
-pas_book_view_class_init (PASBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_view_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_book_view_destroy;
-
-	pas_book_view_corba_class_init ();
-}
-
-static void
-pas_book_view_init (PASBookView *book_view)
-{
-	book_view->priv           = g_new0 (PASBookViewPrivate, 1);
-	book_view->priv->listener = CORBA_OBJECT_NIL;
-}
-
-/**
- * pas_book_view_get_type:
- */
-GtkType
-pas_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookView",
-			sizeof (PASBookView),
-			sizeof (PASBookViewClass),
-			(GtkClassInitFunc)  pas_book_view_class_init,
-			(GtkObjectInitFunc) pas_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
deleted file mode 100644
index df6aed5bbb..0000000000
--- a/addressbook/backend/pas/pas-book-view.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the Evolution_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BOOK_VIEW_H__
-#define __PAS_BOOK_VIEW_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBookView        PASBookView;
-typedef struct _PASBookViewClass   PASBookViewClass;
-typedef struct _PASBookViewPrivate PASBookViewPrivate;
-
-struct _PASBookView {
-	BonoboObject     parent_object;
-	PASBookViewPrivate *priv;
-};
-
-struct _PASBookViewClass {
-	BonoboObjectClass parent_class;
-};
-PASBookView *pas_book_view_new                    (Evolution_BookViewListener  listener);
-
-void         pas_book_view_notify_change          (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_change_1        (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_remove          (PASBookView                *book_view,
-						   const char                 *id);
-void         pas_book_view_notify_add             (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_add_1           (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_complete        (PASBookView                *book_view);
-void         pas_book_view_notify_status_message  (PASBookView                *book_view,
-						   const char                 *message);
-
-GtkType      pas_book_view_get_type               (void);
-
-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())
-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))
-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))
-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))
-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))
-
-#endif /* ! __PAS_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
deleted file mode 100644
index 6a8c17a584..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,754 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "pas-book.h"
-
-static BonoboObjectClass *pas_book_parent_class;
-POA_Evolution_Book__vepv pas_book_vepv;
-
-enum {
-	REQUESTS_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint pas_book_signals [LAST_SIGNAL];
-
-struct _PASBookPrivate {
-	PASBackend             *backend;
-	Evolution_BookListener  listener;
-	PASBookGetVCardFn       get_vcard;
-	PASBookCanWriteFn       can_write;
-	PASBookCanWriteCardFn   can_write_card;
-
-	GList                  *request_queue;
-	gint                    idle_id;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->request_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (book),
-				 pas_book_signals [REQUESTS_QUEUED]);
-	}
-
-	if (book->priv->request_queue == NULL) {
-		book->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_queue_request (PASBook *book, PASRequest *req)
-{
-	book->priv->request_queue =
-		g_list_append (book->priv->request_queue, req);
-
-	if (book->priv->idle_id == 0) {
-		book->priv->idle_id = g_idle_add ((GSourceFunc) pas_book_check_queue, book);
-	}
-}
-
-static void
-pas_book_queue_create_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CreateCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_remove_card (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = RemoveCard;
-	req->id = g_strdup (id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_modify_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = ModifyCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_cursor (PASBook *book, const char *search)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = GetCursor;
-	req->search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_book_view (PASBook *book, const Evolution_BookViewListener listener, const char *search)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetBookView;
-	req->search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = CORBA_Object_duplicate(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_book_view: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_changes (PASBook *book, const Evolution_BookViewListener listener, const char *search)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetChanges;
-	req->search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = CORBA_Object_duplicate(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_changes: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_check_connection (PASBook *book)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CheckConnection;
-
-	pas_book_queue_request (book, req);
-}
-
-static CORBA_char *
-impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
-			       const Evolution_CardId id,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char       *vcard;
-	CORBA_char *retval;
-
-	vcard = (book->priv->get_vcard) (book, (const char *) id);
-	retval = CORBA_string_dup (vcard);
-	g_free (vcard);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_Evolution_Book_can_write (PortableServer_Servant servant,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write) (book);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
-				    const Evolution_CardId id,
-				    CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write_card) (book, (const char *) id);
-
-	return retval;
-}
-
-static void
-impl_Evolution_Book_create_card (PortableServer_Servant servant,
-				 const Evolution_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_create_card (book, (const char *) vcard);
-}
-
-static void
-impl_Evolution_Book_remove_card (PortableServer_Servant servant,
-				 const Evolution_CardId id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_remove_card (book, (const char *) id);
-}
-
-static void
-impl_Evolution_Book_modify_card (PortableServer_Servant servant,
-				 const Evolution_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_modify_card (book, (const char *) vcard);
-}
-
-static void
-impl_Evolution_Book_get_cursor (PortableServer_Servant servant,
-				const CORBA_char *search,
-				CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_cursor (book, search);
-}
-
-static void
-impl_Evolution_Book_get_book_view (PortableServer_Servant servant,
-				   const Evolution_BookViewListener listener,
-				   const CORBA_char *search,
-				   CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_book_view (book, listener, search);
-}
-
-static void
-impl_Evolution_Book_get_changes (PortableServer_Servant servant,
-				 const Evolution_BookViewListener listener,
-				 const CORBA_char *search,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_changes (book, listener, search);
-}
-
-static void
-impl_Evolution_Book_check_connection (PortableServer_Servant servant,
-				      CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_check_connection (book);
-}
-
-static char *
-impl_Evolution_Book_get_static_capabilities (PortableServer_Servant servant,
-					     CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char *temp;
-	char *ret_val;
-
-	temp = pas_backend_get_static_capabilities (book->priv->backend);
-	ret_val = CORBA_string_dup(temp);
-	g_free(temp);
-	return ret_val;
-}
-
-/**
- * pas_book_get_backend:
- */
-PASBackend *
-pas_book_get_backend (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	return book->priv->backend;
-}
-
-/**
- * pas_book_get_listener:
- */
-Evolution_BookListener
-pas_book_get_listener (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       CORBA_OBJECT_NIL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), CORBA_OBJECT_NIL);
-
-	return book->priv->listener;
-}
-
-/**
- * pas_book_check_pending
- */
-gint
-pas_book_check_pending (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       -1);
-	g_return_val_if_fail (PAS_IS_BOOK (book), -1);
-
-	return g_list_length (book->priv->request_queue);
-}
-
-/**
- * pas_book_pop_request:
- */
-PASRequest *
-pas_book_pop_request (PASBook *book)
-{
-	GList      *popped;
-	PASRequest *req;
-
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	if (book->priv->request_queue == NULL)
-		return NULL;
-
-	req = book->priv->request_queue->data;
-
-	popped = book->priv->request_queue;
-	book->priv->request_queue =
-		g_list_remove_link (book->priv->request_queue, popped);
-
-	g_list_free_1 (popped);
-
-	return req;
-}
-
-/**
- * pas_book_respond_open:
- */
-void
-pas_book_respond_open (PASBook                           *book,
-		       Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (status == Evolution_BookListener_Success) {
-		Evolution_BookListener_respond_open_book (
-			book->priv->listener, status,
-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
-			&ev);
-	} else {
-		Evolution_BookListener_respond_open_book (
-			book->priv->listener, status,
-			CORBA_OBJECT_NIL, &ev);
-	}
-	
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_open: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_create:
- */
-void
-pas_book_respond_create (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status,
-			 const char                        *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_create_card (
-		book->priv->listener, status, (char *)id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_create: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_remove:
- */
-void
-pas_book_respond_remove (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_remove_card (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_remove: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_modify:
- */
-void
-pas_book_respond_modify (PASBook                           *book,
-			 Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_modify_card (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_modify: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_cursor:
- */
-void
-pas_book_respond_get_cursor (PASBook                           *book,
-			     Evolution_BookListener_CallStatus  status,
-			     PASCardCursor                     *cursor)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
-
-	Evolution_BookListener_respond_get_cursor (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_cursor: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_book_view:
- */
-void
-pas_book_respond_get_book_view (PASBook                           *book,
-				Evolution_BookListener_CallStatus  status,
-				PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	Evolution_BookListener_respond_get_view (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_book_view: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_changes:
- */
-void
-pas_book_respond_get_changes (PASBook                           *book,
-			      Evolution_BookListener_CallStatus  status,
-			      PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	Evolution_BookListener_respond_get_changes (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_changes: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_report_connection:
- */
-void
-pas_book_report_connection (PASBook  *book,
-			    gboolean  connected)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_report_connection_status (
-		book->priv->listener, (CORBA_boolean) connected, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_report_connection: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_construct (PASBook                *book,
-		    PASBackend             *backend,
-		    Evolution_BookListener  listener,
-		    PASBookGetVCardFn       get_vcard,
-		    PASBookCanWriteFn       can_write,
-		    PASBookCanWriteCardFn   can_write_card)
-{
-	POA_Evolution_Book *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book      != NULL);
-	g_assert (PAS_IS_BOOK (book));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-	g_assert (get_vcard != NULL);
-	g_assert (can_write != NULL);
-	g_assert (can_write_card != NULL);
-
-	servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_Book__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book), obj);
-
-	CORBA_exception_init (&ev);
-	book->priv->listener = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not duplicate the listener");
-
-	CORBA_exception_free (&ev);
-
-	book->priv->listener  = listener;
-	book->priv->get_vcard = get_vcard;
-	book->priv->can_write = can_write;
-	book->priv->can_write_card = can_write_card;
-	book->priv->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      Evolution_BookListener  listener,
-	      PASBookGetVCardFn       get_vcard,
-	      PASBookCanWriteFn       can_write,
-	      PASBookCanWriteCardFn   can_write_card)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (get_vcard != NULL,             NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener,
-				  get_vcard, can_write, can_write_card)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-static void
-pas_book_destroy (GtkObject *object)
-{
-	PASBook *book = PAS_BOOK (object);
-	GList   *l;
-	CORBA_Environment ev;
-
-	for (l = book->priv->request_queue; l != NULL; l = l->next) {
-		PASRequest *req = l->data;
-
-		g_free (req->id);
-		g_free (req->vcard);
-		g_free (req);
-	}
-	g_list_free (book->priv->request_queue);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (book->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_Evolution_Book__epv *
-pas_book_get_epv (void)
-{
-	POA_Evolution_Book__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Book__epv, 1);
-
-	epv->get_vcard               = impl_Evolution_Book_get_vcard;
-	epv->can_write               = impl_Evolution_Book_can_write;
-	epv->can_write_card          = impl_Evolution_Book_can_write_card;
-	epv->create_card             = impl_Evolution_Book_create_card;
-	epv->remove_card             = impl_Evolution_Book_remove_card;
-	epv->modify_card             = impl_Evolution_Book_modify_card;
-	epv->check_connection        = impl_Evolution_Book_check_connection;
-	epv->get_static_capabilities = impl_Evolution_Book_get_static_capabilities;
-	epv->get_cursor              = impl_Evolution_Book_get_cursor;
-	epv->get_book_view           = impl_Evolution_Book_get_book_view;
-	epv->get_changes             = impl_Evolution_Book_get_changes;
-
-	return epv;
-	
-}
-
-static void
-pas_book_corba_class_init (void)
-{
-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.Evolution_Book_epv = pas_book_get_epv ();
-}
-
-static void
-pas_book_class_init (PASBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	pas_book_signals [REQUESTS_QUEUED] =
-		gtk_signal_new ("requests_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookClass, requests_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_book_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_destroy;
-
-	pas_book_corba_class_init ();
-}
-
-static void
-pas_book_init (PASBook *book)
-{
-	book->priv                = g_new0 (PASBookPrivate, 1);
-	book->priv->idle_id       = 0;
-	book->priv->request_queue = NULL;
-}
-
-/**
- * pas_book_get_type:
- */
-GtkType
-pas_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBook",
-			sizeof (PASBook),
-			sizeof (PASBookClass),
-			(GtkClassInitFunc)  pas_book_class_init,
-			(GtkObjectInitFunc) pas_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
deleted file mode 100644
index ab59d7bb3e..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the Evolution_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_BOOK_H__
-#define __PAS_BOOK_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-#include <pas/pas-book-view.h>
-
-typedef struct _PASBook        PASBook;
-typedef struct _PASBookPrivate PASBookPrivate;
-
-#include <pas/pas-backend.h>
-#include <pas/pas-card-cursor.h>
-
-typedef enum {
-	CreateCard,
-	RemoveCard,
-	ModifyCard,
-	GetCursor,
-	GetBookView,
-	GetChanges,
-	CheckConnection
-} PASOperation;
-
-typedef struct {
-	PASOperation               op;
-	char                      *id;
-	char                      *vcard;
-	char                      *search;
-	Evolution_BookViewListener listener;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef char *   (*PASBookGetVCardFn)     (PASBook *book, const char *id);
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 Evolution_BookListener             listener,
-							 PASBookGetVCardFn                  get_vcard,
-							 PASBookCanWriteFn                  can_write,
-							 PASBookCanWriteCardFn              can_write_card);
-PASBackend             *pas_book_get_backend            (PASBook                           *book);
-Evolution_BookListener  pas_book_get_listener           (PASBook                           *book);
-int                     pas_book_check_pending          (PASBook                           *book);
-PASRequest             *pas_book_pop_request            (PASBook                           *book);
-void                    pas_book_respond_open           (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_create         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 const char                        *id);
-void                    pas_book_respond_remove         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_modify         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 PASCardCursor                     *cursor);
-void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_respond_get_changes    (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_report_connection      (PASBook                           *book,
-							 gboolean                           connected);
-
-gboolean                pas_book_can_write              (PASBook                           *book);
-gboolean                pas_book_can_write_card         (PASBook                           *book,
-							 const char                        *id);
-GtkType                 pas_book_get_type               (void);
-
-#define PAS_BOOK_TYPE        (pas_book_get_type ())
-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))
-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))
-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))
-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))
-
-#endif /* ! __PAS_BOOK_H__ */
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
deleted file mode 100644
index c2bbe1c9b0..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "addressbook.h"
-#include "pas-card-cursor.h"
-
-struct _PASCardCursorPrivate {
-	long     (*get_length) (PASCardCursor *cursor, gpointer data);
-	char *   (*get_nth)    (PASCardCursor *cursor, long n, gpointer data);
-	gpointer   data;
-};
-
-/*
- * A pointer to our parent object class
- */
-static BonoboObjectClass *parent_class;
-
-/*
- * The VEPV for the CardCursor object
- */
-static POA_Evolution_CardCursor__vepv cursor_vepv;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-pas_card_cursor_destroy (GtkObject *object)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (object);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static CORBA_long
-impl_pas_card_cursor_get_length (PortableServer_Servant  servant,
-			       CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_length )
-		return cursor->priv->get_length( cursor, cursor->priv->data );
-	else
-		return 0;
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static char *
-impl_pas_card_cursor_get_nth (PortableServer_Servant  servant,
-			    const CORBA_long        n,
-			    CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_nth ) {
-		char *vcard = cursor->priv->get_nth( cursor, n, cursor->priv->data );
-		char *retval = CORBA_string_dup (vcard);
-		g_free (vcard);
-		return retval;
-	} else
-		return CORBA_string_dup ("");
-}
-
-/*
- * If you want users to derive classes from your implementation
- * you need to support this method.
- */
-POA_Evolution_CardCursor__epv *
-pas_card_cursor_get_epv (void)
-{
-	POA_Evolution_CardCursor__epv *epv;
-
-	epv = g_new0 (POA_Evolution_CardCursor__epv, 1);
-
-	/*
-	 * This is the method invoked by CORBA
-	 */
-	epv->get_length = impl_pas_card_cursor_get_length;
-	epv->get_nth    = impl_pas_card_cursor_get_nth;
-
-	return epv;
-}
-
-static void
-init_pas_card_cursor_corba_class (void)
-{
-	cursor_vepv.Bonobo_Unknown_epv       = bonobo_object_get_epv ();
-	cursor_vepv.Evolution_CardCursor_epv = pas_card_cursor_get_epv ();
-}
-
-static void
-pas_card_cursor_class_init (PASCardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_card_cursor_destroy;
-
-	init_pas_card_cursor_corba_class ();
-}
-
-static void
-pas_card_cursor_init (PASCardCursor *cursor)
-{
-	cursor->priv = g_new(PASCardCursorPrivate, 1);
-	cursor->priv->get_length = NULL;
-	cursor->priv->get_nth = NULL;
-	cursor->priv->data = NULL;
-}
-
-GtkType
-pas_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"PASCardCursor",
-			sizeof (PASCardCursor),
-			sizeof (PASCardCursorClass),
-			(GtkClassInitFunc) pas_card_cursor_class_init,
-			(GtkObjectInitFunc) pas_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-PASCardCursor *
-pas_card_cursor_construct (PASCardCursor           *cursor,
-			   Evolution_CardCursor     corba_cursor,
-			   PASCardCursorLengthFunc  get_length,
-			   PASCardCursorNthFunc     get_nth,
-			   gpointer data)
-{
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	/*
-	 * Call parent constructor
-	 */
-	if (!bonobo_object_construct (BONOBO_OBJECT (cursor), (CORBA_Object) corba_cursor))
-		return NULL;
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->get_length = get_length;
-	cursor->priv->get_nth = get_nth;
-	cursor->priv->data = data;
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/*
- * This routine creates the ORBit CORBA server and initializes the
- * CORBA side of things
- */
-static Evolution_CardCursor
-create_cursor (BonoboObject *cursor)
-{
-	POA_Evolution_CardCursor *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_CardCursor *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cursor_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_CardCursor__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Activates the CORBA object.
-	 */
-	return (Evolution_CardCursor) bonobo_object_activate_servant (cursor, servant);
-}
-
-PASCardCursor *
-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
-		     PASCardCursorNthFunc     get_nth,
-		     gpointer data)
-{
-	PASCardCursor *cursor;
-	Evolution_CardCursor corba_cursor;
-
-	cursor = gtk_type_new (pas_card_cursor_get_type ());
-	corba_cursor = create_cursor (BONOBO_OBJECT (cursor));
-
-	if (corba_cursor == CORBA_OBJECT_NIL){
-		gtk_object_unref (GTK_OBJECT (cursor));
-		return NULL;
-	}
-	
-	return pas_card_cursor_construct (cursor,
-					  corba_cursor,
-					  get_length,
-					  get_nth,
-					  data);
-}
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
deleted file mode 100644
index 300e3e3ce1..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __PAS_CARD_CURSOR_H__
-#define __PAS_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <pas/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASCardCursor        PASCardCursor;
-typedef struct _PASCardCursorPrivate PASCardCursorPrivate;
-typedef struct _PASCardCursorClass   PASCardCursorClass;
-
-typedef long (*PASCardCursorLengthFunc) (PASCardCursor *cursor, gpointer data);
-typedef char * (*PASCardCursorNthFunc) (PASCardCursor *cursor, long n, gpointer data);
-
-struct _PASCardCursor {
-	BonoboObject     parent;
-	PASCardCursorPrivate *priv;
-};
-
-struct _PASCardCursorClass {
-	BonoboObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,
-				          PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,
-					  Evolution_CardCursor     corba_cursor,
-					  PASCardCursorLengthFunc  get_length,
-					  PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-
-GtkType        pas_card_cursor_get_type  (void);
-POA_Evolution_CardCursor__epv *
-               pas_card_cursor_get_epv   (void);
-
-/* Fetching cards. */
-#define PAS_CARD_CURSOR_TYPE        (pas_card_cursor_get_type ())
-#define PAS_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), PAS_CARD_CURSOR_TYPE, PASCardCursor))
-#define PAS_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_CARD_CURSOR_TYPE, PASCardCursorClass))
-#define PAS_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), PAS_CARD_CURSOR_TYPE))
-#define PAS_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_CARD_CURSOR_H__ */
diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore
deleted file mode 100644
index 67db02346b..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libeaddress_conduit.la
-e-address-conduit-control-applet
-e-address.conduit
\ No newline at end of file
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index 368a50e477..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
-	$(GNOME_PILOT_CFLAGS)
-
-# Address Capplet
-bin_PROGRAMS = e-address-conduit-control-applet
-
-e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c
-
-e_address_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-                $(INTLLIBS)
-
-
-# Address Conduit
-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c \
-	address-conduit.h \
-	address-conduit-config.h
-
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/libeutil-static.la			\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-address.conduit: e-address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
-	&& mv e-address.conduit.tmp e-address.conduit
-
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-address-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-address.conduit
-
-EXTRA_DIST = \
-	e-address.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
-
-
-
-
-
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
deleted file mode 100644
index 1afa8cef4b..0000000000
--- a/addressbook/conduit/address-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_CONFIG_H__
-#define __ADDR_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-struct _EAddrConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef ADDR_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EAddrConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef ADDR_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef ADDR_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef ADDR_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __ADDR_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/addressbook/conduit/address-conduit-control-applet.c b/addressbook/conduit/address-conduit-control-applet.c
deleted file mode 100644
index 3cbdbf8976..0000000000
--- a/addressbook/conduit/address-conduit-control-applet.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook -  Address Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_SAVE 1
-#define ADDR_CONFIG_DUPE 1
-#define ADDR_CONFIG_DESTROY 1
-#include <address-conduit-config.h>
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_SAVE
-#undef ADDR_CONFIG_DUPE
-#undef ADDR_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-EAddrConduitCfg *origState = NULL;
-EAddrConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, EAddrConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, EAddrConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, EAddrConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, EAddrConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	addrconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, EAddrConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution Addressbook Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution addressbook conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, EAddrConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution Address conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	addrconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = addrconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	addrconduit_destroy_configuration (&origState);
-	addrconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 048422cb7b..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Address Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <pi-version.h>
-#include <ebook/e-book.h>
-#include <ebook/e-card-cursor.h>
-#include <ebook/e-card.h>
-#include <ebook/e-card-simple.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_DESTROY 1
-#include <address-conduit-config.h>
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_DESTROY
-
-#include <address-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.0"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "eaddrconduit"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-typedef struct {
-	EBookStatus status;
-	char *id;
-} add_card_cons;
-
-/* debug spew DELETE ME */
-static char *
-print_local (EAddrLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-/*  	if (local->addr && local->addr->description) { */
-/*  		sprintf (buff, "[%d %ld %d %d '%s' '%s']", */
-/*  			 local->todo->indefinite, */
-/*  			 mktime (& local->todo->due), */
-/*  			 local->todo->priority, */
-/*  			 local->todo->complete, */
-/*  			 local->todo->description, */
-/*  			 local->todo->note); */
-/*  		return buff; */
-/*  	} */
-
-	return "";
-}
-
-
-/* debug spew DELETE ME */
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Address addr;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&addr, 0, sizeof (struct Address));
-	unpack_Address (&addr, remote->record, remote->length);
-
-	sprintf (buff, "Hi");
-/*  	sprintf (buff, "[%d %ld %d %d '%s' '%s']", */
-/*  		 todo.indefinite, */
-/*  		 mktime (& todo.due), */
-/*  		 todo.priority, */
-/*  		 todo.complete, */
-/*  		 todo.description, */
-/*  		 todo.note); */
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_addr_context_new (EAddrConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (EAddrConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	addrconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_addr_context_destroy (EAddrConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->cfg != NULL)
-		addrconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Addressbok Server routines */
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	add_card_cons *cons = (add_card_cons*)closure;
-
-	cons->status = status;
-	cons->id = g_strdup (id);
-
-	gtk_main_quit();
-}
-
-static void
-status_cb (EBook *ebook, EBookStatus status, gpointer closure)
-{
-	(*(EBookStatus*)closure) = status;
-	gtk_main_quit();
-}
-
-static void
-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		long length;
-		int i;
-
-		ctxt->address_load_success = TRUE;
-
-		length = e_card_cursor_get_length (cursor);
-		ctxt->cards = NULL;
-		for (i = 0; i < length; i ++)
-			ctxt->cards = g_list_append (ctxt->cards, e_card_cursor_get_nth (cursor, i));
-
-		gtk_main_quit(); /* end the sub event loop */
-	}
-	else {
-		WARN (_("Cursor could not be loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);
-	} else {
-		WARN (_("EBook not loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static int
-start_addressbook_server (EAddrConduitContext *ctxt)
-{
-	gchar *uri, *path;
-
-	g_return_val_if_fail(ctxt!=NULL,-2);
-
-	ctxt->ebook = e_book_new ();
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	e_book_load_uri (ctxt->ebook, uri, book_open_cb, ctxt);
-
-	/* run a sub event loop to turn ebook's async loading into a
-           synchronous call */
-	gtk_main ();
-
-	g_free (uri);
-
-	if (ctxt->address_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EAddrConduitContext *ctxt) 
-{
-	char *filename = NULL;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-	local->local.attr = GnomePilotRecordNothing;
-}
-
-static GnomePilotRecord *
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord *p = NULL;
-	
-	g_return_val_if_fail (local != NULL, NULL);
-	g_assert (local->addr != NULL );
-	
-	LOG ("local_record_to_remote_record\n");
-
-	p = g_new0 (GnomePilotRecord, 1);
-
-	p->ID = local->local.ID;
-	p->category = 0;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p->record = g_new0 (char,0xffff);
-	p->length = pack_Address (local->addr, p->record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)
-{
-	ECardSimple *simple;
-	const ECardDeliveryAddress *delivery;
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (ecard != NULL);
-
-	local->ecard = ecard;
-	simple = e_card_simple_new (ecard);
-	
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, ecard->id);
-
-	compute_status (ctxt, local, ecard->id);
-
-	local->addr = g_new0 (struct Address, 1);
-
-	local->addr->entry[entryFirstname] = strdup (ecard->name->given);
-	local->addr->entry[entryLastname] = strdup (ecard->name->family);
-	local->addr->entry[entryCompany] = strdup (ecard->org);
-	local->addr->entry[entryTitle] = strdup (ecard->title);
-
-	delivery = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);
-	local->addr->entry[entryAddress] = strdup (delivery->street);
-	local->addr->entry[entryCity] = strdup (delivery->city);
-	local->addr->entry[entryState] = strdup (delivery->region);
-	local->addr->entry[entryZip] = strdup (delivery->code);
-	local->addr->entry[entryCountry] = strdup (delivery->country);
-
-	/* FIX ME Phone numbers */
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	ECard *ecard;
-
-	g_assert(local!=NULL);
-
-	ecard = e_book_get_card (ctxt->ebook, uid);
-
-	if (ecard != NULL) {
-		local_record_from_ecard (local, ecard, ctxt);
-	} else {
-		ecard = e_card_new (NULL);
-		local_record_from_ecard (local, ecard, ctxt);
-	}
-}
-
-static ECard *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 ECard *in_card)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	int i;
-	char *string;
-	char *stringparts[4];
-	char *commaparts[3];
-	char *spaceparts[3];
-	char *commastring, *spacestring;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	if (in_card == NULL) {
-		ecard = e_card_new("");
-	} else {
-		ecard = e_card_duplicate (in_card);
-	}
-	simple = e_card_simple_new (ecard);
-
-#define get(pilotprop) \
-        (address.entry [(pilotprop)])
-#define check(pilotprop) \
-        (address.entry [(pilotprop)] && *address.entry [(pilotprop)])
-
-	i = 0;
-	if (check(entryFirstname))
-		stringparts[i++] = get(entryFirstname);
-	if (check(entryLastname))
-		stringparts[i++] = get(entryLastname);
-	stringparts[i] = NULL;
-	string = g_strjoinv(" ", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FULL_NAME, string);
-	g_free(string);
-
-	i = 0;
-	if (check (entryAddress))
-		spaceparts[i++] = get (entryAddress);
-	if (check (entryZip))
-		spaceparts[i++] = get (entryZip);
-	spaceparts[i] = 0;
-	spacestring = g_strjoinv(" ", spaceparts);
-
-	i = 0;
-	if (check (entryCity))
-		commaparts[i++] = get (entryCity);
-	if (spacestring && *spacestring)
-		commaparts[i++] = spacestring;
-	commaparts[i] = 0;
-	commastring = g_strjoinv(", ", commaparts);
-
-	i = 0;
-	if (check (entryAddress))
-		stringparts[i++] = get (entryAddress);
-	if (commastring && *commastring)
-		stringparts[i++] = commastring;
-	if (check (entryCountry))
-		stringparts[i++] = get (entryCountry);
-	stringparts[i] = NULL;
-	string = g_strjoinv("\n", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ADDRESS_HOME, string);
-
-	g_free(spacestring);
-	g_free(commastring);
-	g_free(string);
-
-	if (check (entryTitle))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, get (entryTitle));
-
-	if (check (entryCompany))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, get (entryCompany));
-
-	for (i = entryPhone1; i <= entryPhone5; i ++) {
-		if (address.entry [i] && *(address.entry [i])) {
-			char *phonelabel = ctxt->ai.phoneLabels[address.phoneLabel[i - entryPhone1]];
-			if (!strcmp (phonelabel, "E-mail"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_EMAIL, address.entry[i]);
-			else if (!strcmp (phonelabel, "Home"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_HOME, address.entry[i]);
-			else if (!strcmp (phonelabel, "Work"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, address.entry[i]);
-			else if (!strcmp (phonelabel, "Fax"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, address.entry[i]);
-			else if (!strcmp (phonelabel, "Other"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER, address.entry[i]);
-			else if (!strcmp (phonelabel, "Main"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, address.entry[i]);
-			else if (!strcmp (phonelabel, "Pager"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, address.entry[i]);
-			else if (!strcmp (phonelabel, "Mobile"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, address.entry[i]);
-		}
-	}
-#undef get
-#undef set
-
-	free_Address(&address);
-
-	gtk_object_unref(GTK_OBJECT(simple));
-
-	return ecard;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	int count, map_count;
-
-  	count = g_list_length (ctxt->cards);
-	count = 0;
-
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-  	/* If there are no objects or objects but no log */
-	if ((count == 0) || (count > 0 && map_count == 0)) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-/*    	GList *l; */
-	int len;
-	unsigned char *buf;
-	char *filename;
-/*  	gint num_records; */
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION);
-	g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->ebook = NULL;
-	
-	if (start_addressbook_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Set the count information */
-/*  	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); */
-/*  	num_records = g_hash_table_size (ctxt->added); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, num_records); */
-/*  	num_records = g_hash_table_size (ctxt->modified); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, num_records); */
-/*  	num_records = g_hash_table_size (ctxt->deleted); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, num_records); */
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-  	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	gchar *filename;
-	
-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	e_pilot_map_insert (ctxt->map, ID, local->ecard->id, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	LOG ("set_status_cleared: clearing status\n");
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EAddrLocalRecord **local,
-	  EAddrConduitContext *ctxt)
-{
-  	static GList *cards, *iterator;
-  	static int count;
-
-  	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		cards = ctxt->cards;
-		count = 0;
-		
-		if (cards != NULL) {
-			LOG ("iterating over %d records", g_list_length (cards));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-/*  			local_record_from_uid (*local, uids->data, ctxt) */;
-
-			iterator = cards;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-  			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EAddrLocalRecord **local,
-		   EAddrConduitContext *ctxt)
-{
-/*  	static GList *changes, *iterator; */
-/*  	static int count; */
-
-/*  	g_return_val_if_fail (local != NULL, 0); */
-
-/*  	if (*local == NULL) { */
-/*  		LOG ("beginning for_each_modified: beginning\n"); */
-		
-/*  		changes = ctxt->changed; */
-		
-/*  		count = 0; */
-		
-/*  		if (changes != NULL) { */
-/*  			CalObjChange *coc = changes->data; */
-			
-/*  			LOG ("iterating over %d records", g_list_length (changes)); */
-			 
-/*  			*local = g_new0 (EAddrLocalRecord, 1); */
-/*  			local_record_from_uid (*local, coc->uid, ctxt); */
-
-/*  			iterator = changes; */
-/*  		} else { */
-/*  			LOG ("no events"); */
-/*  			(*local) = NULL; */
-/*  			return 0; */
-/*  		} */
-/*  	} else { */
-/*  		count++; */
-/*  		if (g_list_next (iterator)) { */
-/*  			CalObjChange *coc; */
-
-/*  			iterator = g_list_next (iterator); */
-/*  			coc = iterator->data; */
-
-/*  			*local = g_new0 (EAddrLocalRecord, 1); */
-/*  			local_record_from_uid (*local, coc->uid, ctxt); */
-/*  		} else { */
-/*  			LOG ("for_each_modified ending"); */
-
-    			/* Tell the pilot the iteration is over */
-/*  			(*local) = NULL; */
-
-/*  			return 0; */
-/*  		} */
-/*  	} */
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord *local_pilot = NULL;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-/*  	local_pilot = local_record_to_pilot_record (local, ctxt); */
-	if (!local_pilot) 
-		return -1;
-
-	if (remote->length != local_pilot->length
-	    || memcmp (local_pilot->record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	g_free (local_pilot);
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	ECard *ecard;
-	add_card_cons cons;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	ecard = ecard_from_remote_record (ctxt, remote, NULL);
-
-	/* add the ecard to the server */
-	e_book_add_card (ctxt->ebook, ecard, add_card_cb, &cons);
-
-	gtk_main(); /* enter sub mainloop */
-	
-	if (cons.status != E_BOOK_STATUS_SUCCESS) {
-		WARN ("add_record: failed to add card to ebook\n");
-		return -1;
-	}
-
-	ctxt->cards = g_list_append (ctxt->cards,
-				     e_book_get_card (ctxt->ebook, cons.id));
-	g_free (cons.id);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, ecard->id, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	ECard *new_ecard;
-	EBookStatus commit_status;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_ecard = ecard_from_remote_record (ctxt, remote, local->ecard);
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	local->ecard = new_ecard;
-
-	e_book_commit_card (ctxt->ebook, local->ecard, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS)
-		WARN ("replace_record: failed to update card in ebook\n");
-
-	gtk_object_unref (GTK_OBJECT (new_ecard));
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-/*  	const char *uid; */
-
-/*  	g_return_val_if_fail (local != NULL, -1); */
-/*  	g_assert (local->comp != NULL); */
-
-/*  	cal_component_get_uid (local->comp, &uid); */
-
-/*  	LOG ("delete_record: deleting %s\n", uid); */
-
-/*  	cal_client_remove_object (ctxt->client, uid); */
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		gboolean archive,
-		EAddrConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("archive_record: %s\n", archive ? "yes" : "no");
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-/*  	char *uid; */
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-/*  	*local = NULL; */
-/*  	uid = g_hash_table_lookup (ctxt->map->pid_map, &remote->ID); */
-	
-/*  	if (!uid) */
-/*  		return 0; */
-
-/*  	LOG ("  matched\n"); */
-	
-/*  	*local = g_new0 (EAddrLocalRecord, 1); */
-/*  	local_record_from_uid (*local, uid, ctxt); */
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-/*  	gtk_object_unref (GTK_OBJECT (local->comp)); */
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord **remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-/*  	*remote = local_record_to_pilot_record (local, ctxt); */
-
-/*  	if (!*remote) */
-/*  		return -1; */
-	
-	return 0;
-}
-
-static gint
-free_prepare (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      GnomePilotRecord **remote,
-	      EAddrConduitContext *ctxt)
-{
-	LOG ("free_prepare: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	g_free (*remote);
-	*remote = NULL;
-
-        return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG ("in address's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_addr_conduit");
-
-	e_addr_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
deleted file mode 100644
index 141ec1b53c..0000000000
--- a/addressbook/conduit/address-conduit.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_H__
-#define __ADDR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-address.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	ECard *ecard;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EAddrConduitContext EAddrConduitContext;
-struct _EAddrConduitContext {
-	EAddrConduitCfg *cfg;
-
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	EPilotMap *map;
-};
-
-#endif __ADDR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop b/addressbook/conduit/e-address-conduit-control-applet.desktop
deleted file mode 100644
index 25b4c591f6..0000000000
--- a/addressbook/conduit/e-address-conduit-control-applet.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Evolution Address conduit 
-Name[da]=Udstående
-Name[es]=Enlace del libro de direcciones de Evolution
-Name[fr]=Conduit Adresses
-Name[no]=Oppgaver
-Name[sv]=Adresser
-Name[tr]=Adres parçasý
-Comment=Configure the address conduit
-Comment[da]=Konfigurér Udstående
-Comment[es]=Configura el enlace del libro de direcciones
-Comment[fr]=Configuration du conduit Adresses
-Comment[no]=Konfigurér oppgavelisten
-Comment[sv]=Konfigurera adresskanalen
-Comment[tr]=Adres parçasýnýn ayarlarý
-Exec=e-address-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index 1aa78a180e..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
-<name value="EAddress"/>
-<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/contact-editor/.cvsignore b/addressbook/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
deleted file mode 100644
index 1016d38301..0000000000
--- a/addressbook/contact-editor/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-categories.c		\
-	e-contact-editor-categories.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-save-as.c			\
-	e-contact-save-as.h
-
-noinst_PROGRAMS =		\
-	contact-editor-test
-
-contact_editor_test_SOURCES = 	\
-	test-editor.c
-
-contact_editor_test_LDADD =					\
-	libecontacteditor.a					\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(GNOMEGNORBA_LIBS)					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-	$(top_builddir)/e-util/libeutil.la			\
-	$(GNOME_PRINT_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	categories.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)			\
-	e-contact-editor-strings.h	\
-	fulladdr.glade.h		\
-	fullname-strings.h		\
-	categories-strings.h		\
-	e-contact-editor-confirm-delete.glade.h
diff --git a/addressbook/contact-editor/arrow.png b/addressbook/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/contact-editor/briefcase.png b/addressbook/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/contact-editor/categories-strings.h b/addressbook/contact-editor/categories-strings.h
deleted file mode 100644
index 813018a00e..0000000000
--- a/addressbook/contact-editor/categories-strings.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("categories");
-gchar *s = N_("Item(s) belong to these categories:");
-gchar *s = N_("Available Categories:");
diff --git a/addressbook/contact-editor/categories.glade b/addressbook/contact-editor/categories.glade
deleted file mode 100644
index bf78008940..0000000000
--- a/addressbook/contact-editor/categories.glade
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>categories-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Item(s) belong to these categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Available Categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
deleted file mode 100644
index 5d49fd06ff..0000000000
--- a/addressbook/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2455 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Contact-editor</name>
-  <program_name>contact-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>2</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button31</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Phone Types</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <label>New phone type</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment9</name>
-	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>Contact Editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-general</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>14</rows>
-	<columns>8</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>text-address</name>
-	  <width>1</width>
-	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <has_default>True</has_default>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <value_in_list>False</value_in_list>
-	  <ok_if_empty>True</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></items>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>True</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Home</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone2</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Business _Fax</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone3</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Mobile</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone4</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Primary Email</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-email1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0</xalign>
-	  <yalign>0</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Job title:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-jobtitle</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>cellphone.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>envelope.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>house.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-company</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Office:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-office</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Nickname:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-nickname</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Manager's Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-manager</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 7df9cb8cb4..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-GtkType
-e_contact_editor_address_get_type (void)
-{
-	static GtkType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type)
-		{
-			static const GtkTypeInfo contact_editor_address_info =
-			{
-				"EContactEditorAddress",
-				sizeof (EContactEditorAddress),
-				sizeof (EContactEditorAddressClass),
-				(GtkClassInitFunc) e_contact_editor_address_class_init,
-				(GtkObjectInitFunc) e_contact_editor_address_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info);
-		}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_ADDRESS);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable) {
-		e_utf8_gtk_editable_set_text(editable, string);
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (address) {
-		fill_in_field(editor, "entry-street" , address->street );
-		fill_in_field(editor, "entry-po"     , address->po     );
-		fill_in_field(editor, "entry-ext"    , address->ext    );
-		fill_in_field(editor, "entry-city"   , address->city   );
-		fill_in_field(editor, "entry-region" , address->region );
-		fill_in_field(editor, "entry-code"   , address->code   );
-		fill_in_field(editor, "entry-country", address->country);
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (!address) {
-		address = e_card_delivery_address_new();
-		editor->address = address;
-	}
-	address->street  = extract_field(editor, "entry-street" );
-	address->po      = extract_field(editor, "entry-po"     );
-	address->ext     = extract_field(editor, "entry-ext"    );
-	address->city    = extract_field(editor, "entry-city"   );
-	address->region  = extract_field(editor, "entry-region" );
-	address->code    = extract_field(editor, "entry-code"   );
-	address->country = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/contact-editor/e-contact-editor-address.h b/addressbook/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index a74e1bd967..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
-GtkType    e_contact_editor_address_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c
deleted file mode 100644
index 045f128b48..0000000000
--- a/addressbook/contact-editor/e-contact-editor-categories.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-categories.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <e-contact-editor-categories.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_destroy         (GtkObject *object);
-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);
-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);
-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);
-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);
-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);
-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);
-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);
-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);
-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);
-static char * e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CATEGORIES
-};
-
-GtkType
-e_contact_editor_categories_get_type (void)
-{
-	static GtkType contact_editor_categories_type = 0;
-
-	if (!contact_editor_categories_type)
-		{
-			static const GtkTypeInfo contact_editor_categories_info =
-			{
-				"EContactEditorCategories",
-				sizeof (EContactEditorCategories),
-				sizeof (EContactEditorCategoriesClass),
-				(GtkClassInitFunc) e_contact_editor_categories_class_init,
-				(GtkObjectInitFunc) e_contact_editor_categories_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_categories_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_categories_info);
-		}
-
-	return contact_editor_categories_type;
-}
-
-static void
-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorCategories::categories", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_CATEGORIES);
- 
-	object_class->set_arg = e_contact_editor_categories_set_arg;
-	object_class->get_arg = e_contact_editor_categories_get_arg;
-	object_class->destroy = e_contact_editor_categories_destroy;
-}
-
-gchar *builtin_categories[] = {
-	"Business",
-	"Competition",
-	"Favorites",
-	"Gifts",
-	"Goals/Objectives",
-	"Holiday",
-	"Holiday Cards",
-	"Hot Contacts",
-	"Ideas",
-	"International",
-	"Key Customer",
-	"Miscellaneous",
-	"Personal",
-	"Phone Calls",
-	"Status",
-	"Strategies",
-	"Suppliers",
-	"Time & Expenses",
-	"VIP",
-	"Waiting",
-};
-
-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))
-
-static void
-add_list_unique(EContactEditorCategories *categories, char *string)
-{
-	int k;
-	char *temp = e_strdup_strip(string);
-	char **list = categories->category_list;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for (k = 0; k < categories->list_length; k++) {
-		if (!strcmp(list[k], temp)) {
-			categories->selected_list[k] = TRUE;
-			break;
-		}
-	}
-	if (k == categories->list_length) {
-		categories->selected_list[categories->list_length] = TRUE;
-		list[categories->list_length++] = temp;
-	} else {
-		g_free(temp);
-	}
-}
-
-static void
-do_parse_categories(EContactEditorCategories *categories)
-{
-	char *str = categories->categories;
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	char **list;
-	int count = 1;
-
-	e_table_model_pre_change(categories->model);
-
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-
-	for (i = 0; str[i]; i++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (!str[i])
-				i--;
-			break;
-		case ',':
-			count ++;
-			break;
-		}
-	}
-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);
-	categories->category_list = list;
-
-	categories->selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);
-
-	for (count = 0; count < BUILTIN_CATEGORY_COUNT; count++) {
-		list[count] = g_strdup(builtin_categories[count]);
-		categories->selected_list[count] = 0;
-	}
-
-	categories->list_length = count;
-
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(categories, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(categories, copy);
-	g_free(copy);
-	e_table_model_changed(categories->model);
-}
-
-static void
-e_contact_editor_categories_entry_change (GtkWidget *entry, 
-					  EContactEditorCategories *categories)
-{
-	g_free(categories->categories);
-	categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	do_parse_categories(categories);
-}
-
-#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
-  <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
-  <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-        <ETableState> \
-		<column source=\"0\"/>						\
-		<column source=\"1\"/>						\
-        	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>	\
-        </ETableState> \
-</ETableSpecification>"
-
-static void
-e_contact_editor_categories_init (EContactEditorCategories *categories)
-{
-	GladeXML *gui;
-	GtkWidget *table;
-	GtkWidget *e_table;
-
-	categories->list_length = 0;
-	categories->category_list = NULL;
-	categories->selected_list = NULL;
-	categories->categories = NULL;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);
-	categories->gui = gui;
-
-	table = glade_xml_get_widget(gui, "table-categories");
-	gtk_widget_ref(table);
-	gtk_container_remove(GTK_CONTAINER(table->parent), table);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)->vbox), table, TRUE, TRUE, 0);
-	gtk_widget_unref(table);
-
-	categories->entry = glade_xml_get_widget(gui, "entry-categories");
-	
-	gtk_signal_connect(GTK_OBJECT(categories->entry), "changed",
-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);
-
-	categories->model = e_table_simple_new(e_contact_editor_categories_col_count, 
-					       e_contact_editor_categories_row_count,
-					       e_contact_editor_categories_value_at,
-					       e_contact_editor_categories_set_value_at,
-					       e_contact_editor_categories_is_cell_editable,
-					       e_contact_editor_categories_duplicate_value,
-					       e_contact_editor_categories_free_value,
-					       e_contact_editor_categories_initialize_value,
-					       e_contact_editor_categories_value_is_empty,
-					       e_contact_editor_categories_value_to_string,
-					       categories);
-
-	e_table = e_table_scrolled_new (categories->model, NULL, INITIAL_SPEC, NULL);
-
-	gtk_object_sink(GTK_OBJECT(categories->model));
-	
-	gtk_widget_show(e_table);
-
-	gtk_table_attach_defaults(GTK_TABLE(table),
-				  e_table, 
-				  0, 1,
-				  3, 4);
-}
-
-void
-e_contact_editor_categories_destroy (GtkObject *object)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);
-	int i;
-
-	if (categories->gui)
-		gtk_object_unref(GTK_OBJECT(categories->gui));
-
-	g_free(categories->categories);
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-}
-
-GtkWidget*
-e_contact_editor_categories_new (char *categories)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"categories", categories,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);
-	
-	switch (arg_id){
-	case ARG_CATEGORIES:
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg));
-		break;
-	}
-}
-
-static void
-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);
-
-	switch (arg_id) {
-	case ARG_CATEGORIES:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories->categories);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_contact_editor_categories_row_count (ETableModel *etc, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	return categories->list_length;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if (col == 0)
-		return (void *) categories->selected_list[row];
-	else
-		return categories->category_list[row];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if ( col == 0 ) {
-		char **strs;
-		int i, j;
-		char *string;
-		categories->selected_list[row] = (gboolean) val;
-		strs = g_new(char *, categories->list_length + 1);
-		for (i = 0, j = 0; i < categories->list_length; i++) {
-			if (categories->selected_list[i])
-				strs[j++] = categories->category_list[i];
-		}
-		strs[j] = 0;
-		string = g_strjoinv(", ", strs);
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string);
-		g_free(string);
-		g_free(strs);
-	}
-	if ( col == 1 )
-		return;
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)
-{
-	return col == 0;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return (void *)value;
-	else
-		return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)
-{
-	if (col == 0)
-		return;
-	else
-		g_free(value);
-}
-
-static void *
-e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup("");
-}
-
-static gboolean
-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h
deleted file mode 100644
index 3edff76b4b..0000000000
--- a/addressbook/contact-editor/e-contact-editor-categories.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-categories.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_CATEGORIES_H__
-#define __E_CONTACT_EDITOR_CATEGORIES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorCategories - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())
-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))
-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))
-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-
-
-typedef struct _EContactEditorCategories       EContactEditorCategories;
-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;
-
-struct _EContactEditorCategories
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	char *categories;
-	GtkWidget *entry;
-	ETableModel *model;
-
-	int list_length;
-	char **category_list;
-	gboolean *selected_list;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorCategoriesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_categories_new(char *categories);
-GtkType    e_contact_editor_categories_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_CATEGORIES_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index 7f52321021..0000000000
--- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-contact-editor-confirm-delete</name>
-  <program_name>e-contact-editor-confirm-delete</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeMessageBox</class>
-  <name>confirm-dialog</name>
-  <message_box_type>GNOME_MESSAGE_BOX_QUESTION</message_box_type>
-  <message>Are you sure you want
-to delete this contact?</message>
-  <title>Delete Contact?</title>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
deleted file mode 100644
index 7168db0a5c..0000000000
--- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Are you sure you want\n"
-              "to delete this contact?");
-gchar *s = N_("Delete Contact?");
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 05e8d45702..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-GtkType
-e_contact_editor_fullname_get_type (void)
-{
-	static GtkType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type)
-		{
-			static const GtkTypeInfo contact_editor_fullname_info =
-			{
-				"EContactEditorFullname",
-				sizeof (EContactEditorFullname),
-				sizeof (EContactEditorFullnameClass),
-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,
-				(GtkObjectInitFunc) e_contact_editor_fullname_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_fullname_info);
-		}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_NAME);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			e_utf8_gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefix);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffix);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (!name) {
-		name = e_card_name_new();
-		editor->name = name;
-	}
-
-	name->prefix     = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffix     = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index bde6733976..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardName *name;
-	GladeXML *gui;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);
-GtkType    e_contact_editor_fullname_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h
deleted file mode 100644
index bb9c0b5b30..0000000000
--- a/addressbook/contact-editor/e-contact-editor-strings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Add");
-gchar *s = N_("_Delete");
-gchar *s = N_("Phone Types");
-gchar *s = N_("New phone type");
-gchar *s = N_("Add");
-gchar *s = N_("New phone type");
-gchar *s = N_("Contact Editor");
-gchar *s = N_("_Full Name...");
-gchar *s = N_("File As:");
-gchar *s = N_("Web page address:");
-gchar *s = N_("Wants to receive _HTML mail");
-gchar *s = N_("_Business");
-gchar *s = N_("_Home");
-gchar *s = N_("Business _Fax");
-gchar *s = N_("_Mobile");
-gchar *s = N_("Primary Email");
-gchar *s = N_("B_usiness");
-gchar *s = N_("_This is the mailing address");
-gchar *s = N_("C_ontacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("_Job title:");
-gchar *s = N_("_Company:");
-gchar *s = N_("_Address...");
-gchar *s = N_("General");
-gchar *s = N_("_Department:");
-gchar *s = N_("_Office:");
-gchar *s = N_("_Profession:");
-gchar *s = N_("_Nickname:");
-gchar *s = N_("_Spouse:");
-gchar *s = N_("_Birthday:");
-gchar *s = N_("_Assistant's name:");
-gchar *s = N_("_Manager's Name:");
-gchar *s = N_("Anni_versary:");
-gchar *s = N_("No_tes:");
-gchar *s = N_("Details");
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
deleted file mode 100644
index c4e8ed8640..0000000000
--- a/addressbook/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1748 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <e-contact-editor-categories.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *card);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_destroy (GtkObject *object);
-
-#if 0
-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);
-#endif
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_fields(EContactEditor *editor);
-static void set_address_field(EContactEditor *editor, int result);
-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-GtkType
-e_contact_editor_get_type (void)
-{
-  static GtkType contact_editor_type = 0;
-
-  if (!contact_editor_type)
-    {
-      static const GtkTypeInfo contact_editor_info =
-      {
-        "EContactEditor",
-        sizeof (EContactEditor),
-        sizeof (EContactEditorClass),
-        (GtkClassInitFunc) e_contact_editor_class_init,
-        (GtkObjectInitFunc) e_contact_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_editor_info);
-    }
-
-  return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_editor_set_arg;
-  object_class->get_arg = e_contact_editor_get_arg;
-  object_class->destroy = e_contact_editor_destroy;
-}
-
-static void
-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	GtkWidget *pixmap;
-	gchar *image_temp;
-	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
-		gtk_container_add(GTK_CONTAINER(button),
-				  pixmap);
-		g_free(image_temp);
-		gtk_widget_show(pixmap);
-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
-	}
-}
-
-static void
-_replace_buttons(EContactEditor *editor)
-{
-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);
-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	gtk_object_get(GTK_OBJECT(widget),
-		       "active", &wants_html,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(editor->card),
-		       "wants_html", wants_html,
-		       NULL);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	string = e_utf8_gtk_entry_get_text(entry);
-
-	e_card_simple_set_email(editor->simple, editor->email_choice, string);
-
-	g_free (string);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const ECardName *name, char *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name) {
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (EContactEditor *editor)
-{
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	char *filestring;
-	char *trystring;
-	ECardName *name = editor->name;
-	int i;
-	int style;
-
-	filestring = e_utf8_gtk_entry_get_text(file_as);
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style(name, editor->company, i);
-		if (!strcmp(trystring, filestring)) {
-			g_free(trystring);
-			g_free(filestring);
-			return i;
-		}
-		g_free(trystring);
-	}
-	g_free (filestring);
-	return -1;
-}
-
-static void
-file_as_set_style(EContactEditor *editor, int style)
-{
-	char *string;
-	int i;
-	GList *strings = NULL;
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	GtkWidget *widget;
-		
-
-	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
-		strings = g_list_append(strings, string);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense(editor->name, editor->company, i)) {
-			char *u;
-			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO(widget)) {
-		GtkCombo *combo = GTK_COMBO(widget);
-		gtk_combo_set_popdown_strings(combo, strings);
-		g_list_foreach(strings, (GFunc) g_free, NULL);
-		g_list_free(strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkWidget *file_as;
-	int style = 0;
-	char *string;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	GtkWidget *file_as;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   phone_entry_changed, editor);
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-	widget = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   email_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   address_text_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   name_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   company_entry_changed, editor);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
-			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "address", &new_address,
-			       NULL);
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	else if (editor->card)
-		gtk_object_get(GTK_OBJECT(editor->card),
-			       "categories", &categories,
-			       NULL);
-	dialog = GNOME_DIALOG(e_contact_editor_categories_new(categories));
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-	if (result == 0) {
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "categories", &categories,
-			       NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			gtk_object_set(GTK_OBJECT(editor->card),
-				       "categories", categories,
-				       NULL);
-		g_free(categories);
-	}
-	gtk_object_destroy(GTK_OBJECT(dialog));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-gboolean
-e_contact_editor_confirm_delete(GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GladeXML *gui;
-	int result;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);
-
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));
-
-	gnome_dialog_set_parent(dialog, parent);
-	
-	result = gnome_dialog_run_and_close(dialog);
-
-	gtk_object_unref(GTK_OBJECT(gui));
-
-	return !result;
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (ce->simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 ce->card);
-		
-		file_close_cb(widget, data);
-	}
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor->app),
-				  (GtkCallback) add_field_callback,
-				  e_contact_editor);
-
-	_replace_buttons(e_contact_editor);
-	set_entry_changed_signals(e_contact_editor);
-
-	wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail");
-	if (wants_html && GTK_IS_TOGGLE_BUTTON(wants_html))
-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",
-				   wants_html_changed, e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_name_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_addr_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   categories_clicked, e_contact_editor);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (e_contact_editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (e_contact_editor->app);
-		e_contact_editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->email_list) {
-		g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->email_list);
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-	}
-	if (e_contact_editor->email_popup) {
-		gtk_widget_unref(e_contact_editor->email_popup);
-	}
-	
-	if (e_contact_editor->phone_list) {
-		g_list_foreach(e_contact_editor->phone_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->phone_list);
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-	}
-	if (e_contact_editor->phone_popup) {
-		gtk_widget_unref(e_contact_editor->phone_popup);
-	}
-	
-	if (e_contact_editor->address_list) {
-		g_list_foreach(e_contact_editor->address_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->address_list);
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-	}
-	if (e_contact_editor->address_popup) {
-		gtk_widget_unref(e_contact_editor->address_popup);
-	}
-	
-	if (e_contact_editor->simple)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->simple));
-
-	if (e_contact_editor->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	return ce;
-}
-
-static void
-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		gtk_object_set(GTK_OBJECT(editor->simple),
-			       "card", editor->card,
-			       NULL);
-		fill_in_info(editor);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(e_contact_editor->simple);
-		extract_info(e_contact_editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->card);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->is_new_card ? TRUE : FALSE;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.width;
-	*y += button->allocation.height;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &request);
-
-	mh = request.height;
-	mw = request.width;
-
-	*x -= mw;
-	if (*x < 0)
-		*x = 0;
-	
-	if (*y < 0)
-		*y = 0;
-	
-	if ((*x + mw) > gdk_screen_width ())
-		*x = gdk_screen_width () - mw;
-	
-	if ((*y + mh) > gdk_screen_height ())
-		*y = gdk_screen_height () - mh;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)
-{
-	gint menu_item;
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);
-	if ( menu_item != -1 ) {
-#if 0
-		if (menu_item == g_list_length (*list)) {
-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);
-		} else {
-#endif
-			GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-			if (label_widget && GTK_IS_LABEL(label_widget)) {
-				gtk_object_set(GTK_OBJECT(label_widget),
-					       "label", g_list_nth_data(*list, menu_item),
-					       NULL);
-			}
-#if 0
-		}
-#endif
-	}
-	return menu_item;
-}
-
-static void
-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)
-{
-	GnomeUIInfo *info;
-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };
-	GnomeUIInfo end = GNOMEUIINFO_END;
-	int length;
-	int i;
-
-	info = *infop;
-
-	if ( info )
-		g_free(info);
-	length = g_list_length( list );
-	info = g_new(GnomeUIInfo, length + 2);
-	for (i = 0; i < length; i++) {
-		info[i] = singleton;
-		info[i].label = _(list->data);
-		list = list->next;
-	}
-	info[i] = end;
-
-	*infop = info;
-}
-
-#if 0
-static void
-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
-{
-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
-					       "e_contact_editor_label");
-
-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
-						      "e_contact_editor_dialog_entry");
-	
-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_list");
-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_info");
-	switch (button) {
-	case 0:
-		if (label && GTK_IS_LABEL(label)) {
-			gtk_object_set(GTK_OBJECT(label),
-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),
-				       NULL);
-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));
-			g_free(*info);
-			*info = NULL;
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static GtkWidget *
-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)
-{
-	GtkWidget *dialog_entry = gtk_entry_new();
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, entry_id);
-	GtkWidget *label = glade_xml_get_widget(editor->gui, label_id);
-	
-	GtkWidget *dialog = gnome_dialog_new(title,
-					     NULL);
-	
-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox),
-			  gtk_widget_new (gtk_frame_get_type(),
-					  "border_width", 4,
-					  "label", title,
-					  "child", gtk_widget_new(gtk_alignment_get_type(),
-								  "child", dialog_entry,
-								  "xalign", .5,
-								  "yalign", .5,
-								  "xscale", 1.0,
-								  "yscale", 1.0,
-								  "border_width", 9,
-								  NULL),
-					  NULL));
-
-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),
-					       "Add",
-					       GNOME_STOCK_PIXMAP_ADD);
-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);
-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
-	
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   _dialog_clicked, editor);
-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",
-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));
-	
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_entry", entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_label", label);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_dialog_entry", dialog_entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_list", list);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_info", info);
-
-	gtk_widget_show_all(dialog);
-	return dialog;
-}
-#endif
-
-static void
-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int which;
-	int i;
-	gchar *label;
-	gchar *entry;
-	int result;
-	if ( widget == glade_xml_get_widget(editor->gui, "button-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone4") ) {
-		which = 4;
-	} else
-		return;
-	
-	label = g_strdup_printf("label-phone%d", which);
-	entry = g_strdup_printf("entry-phone%d", which);
-
-	if (editor->phone_list == NULL) {
-		static char *info[] = {
-			N_("Assistant"),
-			N_("Business"),
-			N_("Business 2"),
-			N_("Business Fax"),
-			N_("Callback"),
-			N_("Car"),
-			N_("Company"),
-			N_("Home"),
-			N_("Home 2"),
-			N_("Home Fax"),
-			N_("ISDN"),
-			N_("Mobile"),
-			N_("Other"),
-			N_("Other Fax"),
-			N_("Pager"),
-			N_("Primary"),
-			N_("Radio"),
-			N_("Telex"),
-			N_("TTY/TDD")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			gtk_widget_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-		const ECardPhone *phone = e_card_simple_get_phone(editor->simple, i);
-		gboolean checked;
-		checked = phone && phone->number && *phone->number;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
-	
-	if (result != -1) {
-		editor->phone_choice[which - 1] = result;
-		set_fields(editor);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->email_list == NULL) {
-		static char *info[] = {
-			N_("Primary Email"),
-			N_("Email 2"),
-			N_("Email 3")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->email_list = g_list_append(editor->email_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			gtk_widget_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-		const char *string = e_card_simple_get_email(editor->simple, i);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
-	
-	if (result != -1) {
-		editor->email_choice = result;
-		set_fields(editor);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->address_list == NULL) {
-		static char *info[] = {
-			N_("Business"),
-			N_("Home"),
-			N_("Other")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->address_list = g_list_append(editor->address_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->address_info == NULL) {
-		e_contact_editor_build_ui_info(editor->address_list, &editor->address_info);
-
-		if ( editor->address_popup )
-			gtk_widget_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-		gboolean checked;
-		checked = address && address->data && *address->data;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		ECardName *name;
-		const ECardDate *anniversary;
-		const ECardDate *bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-		gboolean wants_html, wants_html_set;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as",       &file_as,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       key, string,
-				       NULL);
-		else
-			gtk_object_set(GTK_OBJECT(card),
-				       key, NULL,
-				       NULL);
-
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_single_field(EContactEditor *editor, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	ECardSimple *simple = editor->simple;
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    string);
-		else
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    NULL);
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				gtk_object_set(GTK_OBJECT(card),
-					       "file_as", string,
-					       NULL);
-
-			if (string) g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			extract_single_field(editor, list->data);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
deleted file mode 100644
index fae6939595..0000000000
--- a/addressbook/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-	GnomeUIInfo *email_info;
-	GnomeUIInfo *phone_info;
-	GnomeUIInfo *address_info;
-	GtkWidget *email_popup;
-	GtkWidget *phone_popup;
-	GtkWidget *address_popup;
-	GList *email_list;
-	GList *phone_list;
-	GList *address_list;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-
-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);
-GtkType    e_contact_editor_get_type (void);
-
-
-gboolean e_contact_editor_confirm_delete(GtkWindow *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 7209c5e8f8..0000000000
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(card);
-	
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
diff --git a/addressbook/contact-editor/e-contact-save-as.h b/addressbook/contact-editor/e-contact-save-as.h
deleted file mode 100644
index d1c84dc596..0000000000
--- a/addressbook/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-save-as.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void
-e_contact_save_as(gchar *title, ECard *card);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/email.png b/addressbook/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade
deleted file mode 100644
index e46064bb92..0000000000
--- a/addressbook/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fulladdr</name>
-  <program_name>fulladdr</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h
deleted file mode 100644
index 7db13fcf4d..0000000000
--- a/addressbook/contact-editor/fulladdr.glade.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Address");
-gchar *s = N_("_Address:");
-gchar *s = N_("_City:");
-gchar *s = N_("_PO Box:");
-gchar *s = N_("Address _2:");
-gchar *s = N_("_State/Province:");
-gchar *s = N_("USA");
-gchar *s = N_("Canada");
-gchar *s = N_("Finland");
-gchar *s = N_("_ZIP Code:");
-gchar *s = N_("Countr_y:");
diff --git a/addressbook/contact-editor/fullname-strings.h b/addressbook/contact-editor/fullname-strings.h
deleted file mode 100644
index 4d4303270a..0000000000
--- a/addressbook/contact-editor/fullname-strings.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Full Name");
-gchar *s = N_("\n"
-              "Mr.\n"
-              "Mrs.\n"
-              "Dr.\n"
-              "");
-gchar *s = N_("\n"
-              "Sr.\n"
-              "Jr.\n"
-              "I\n"
-              "II\n"
-              "III\n"
-              "Esq.\n"
-              "");
-gchar *s = N_("_First:");
-gchar *s = N_("_Title:");
-gchar *s = N_("_Middle:");
-gchar *s = N_("_Last:");
-gchar *s = N_("_Suffix:");
diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade
deleted file mode 100644
index f2dfa23834..0000000000
--- a/addressbook/contact-editor/fullname.glade
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fullname</name>
-  <program_name>fullname</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fullname-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkfullname</name>
-  <visible>False</visible>
-  <title>Check Full Name</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkfullname</name>
-      <border_width>8</border_width>
-      <rows>5</rows>
-      <columns>3</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>21</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-title</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Mr.
-Mrs.
-Dr.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-title</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-suffix</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Sr.
-Jr.
-I
-II
-III
-Esq.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-suffix</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-first</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-middle</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-last</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_First:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-first</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>_Title:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-title</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>_Middle:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-middle</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_Last:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-last</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_Suffix:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-suffix</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/head.png b/addressbook/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netfreebusy.png b/addressbook/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netmeeting.png b/addressbook/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/contact-editor/phone.png b/addressbook/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/contact-editor/snailmail.png b/addressbook/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	gtk_object_unref (GTK_OBJECT (ce));
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/contact-editor/web.png b/addressbook/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/contact-editor/web.png
+++ /dev/null
diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
deleted file mode 100644
index cd8fe38705..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index a8ecb5d170..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
deleted file mode 100644
index a41848b25b..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
deleted file mode 100644
index a41848b25b..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index ca8e333739..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-factory.c		\
-	addressbook.c			\
-	addressbook.h			\
-	e-cardlist-model.c		\
-	e-cardlist-model.h		\
-	e-ldap-server-dialog.c          \
-	e-ldap-server-dialog.h		\
-	e-ldap-storage.c		\
-	e-ldap-storage.h
-
-evolution_addressbook_LDADD =						\
-	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.a				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-
-oafdir = $(datadir)/oaf
-oaf_DATA = addressbook.oafinfo
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = ldap-server-dialog.glade
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	ldap-server-dialog.glade.h
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-addressbook.pure
-
-evolution-addressbook.pure: evolution-addressbook
-	@rm -f evolution-addressbook.pure
-	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
-
-endif
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
deleted file mode 100644
index 5b52b8337b..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include "addressbook-component.h"
-#include "addressbook.h"
-#include "e-ldap-storage.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-
-/* Nasty hack for filters to be able to find folders */
-/* Not even used with addressbook??? */
-EvolutionShellClient *global_shell_client;
-
-static BonoboGenericFactory *factory = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "contacts") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static int owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	owner_count ++;
-
-	if (global_shell_client == NULL)
-		global_shell_client = shell_client;
-	
-	setup_ldap_storage (shell_component, evolution_homedir);
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-addressbook_component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("Cannot initialize the Evolution addressbook factory.");
-}
-
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index ec37da694a..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H
-#define _ADDRESSBOOK_COMPONENT_H
-
-void  addressbook_component_factory_init  (void);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H */
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index 623e0385de..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Helix Code, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <unicode.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/widgets/e-minicard-control.h"
-#include "select-names/e-select-names-factory.h"
-
-
-static void
-init_corba (int *argc, char **argv)
-{
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    *argc, argv, oaf_popt_options, 0, NULL);
-
-	oaf_init (*argc, argv);
-}
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	#ifdef ENABLE_NLS
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-	#endif
-	
-	init_corba (&argc, argv);
-
-	
-	init_bonobo (argc, argv);
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_cursors_init();
-
-	unicode_init();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 1645dd849b..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,629 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * addressbook.c: 
- *
- * Author:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-
-#include "addressbook.h"
-
-#include <ebook/e-book.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "addressbook/gui/widgets/e-addressbook-search.h"
-
-#include <select-names/e-select-names.h>
-#include <select-names/e-select-names-manager.h>
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-ldap-server-dialog.h"
-
-#include <addressbook/printing/e-contact-print.h>
-
-#define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	EAddressbookView *view;
-	EAddressbookSearch *search;
-	GtkWidget *vbox;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-} AddressbookView;
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	ECard *card;
-	EBook *book;
-	EContactEditor *ce;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	card = e_card_new("");
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-
-	ce = e_contact_editor_new (card, TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-			    GTK_SIGNAL_FUNC (add_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-			    GTK_SIGNAL_FUNC (commit_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-			    GTK_SIGNAL_FUNC (delete_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_object_sink(GTK_OBJECT(card));
-}
-
-#ifdef HAVE_LDAP
-static void
-null_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-}
-
-static void
-new_server_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	ELDAPServer *server = g_new (ELDAPServer, 1);
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	/* fill in the defaults */
-	server->name = g_strdup("");
-	server->host = g_strdup("");
-	server->port = g_strdup_printf("%d", 389);
-	server->description = g_strdup("");
-	server->rootdn = g_strdup("");
-	server->uri = g_strdup_printf ("ldap://%s:%s/%s", server->host, server->port, server->rootdn);
-	e_ldap_server_editor_show (server);
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-	
-	/* write out the new server info */
-	e_ldap_storage_add_server (server);
-
-	/* now update the view */
-	e_book_unload_uri (book);
-	if (! e_book_load_uri (book, server->uri, null_cb, NULL)) {
-		g_warning ("error calling load_uri!\n");
-	}
-}
-#endif
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-	g_assert (E_IS_BOOK (book));
-
-	gtk_widget_show(e_addressbook_search_dialog_new(book));
-}
-
-#if 0
-static void
-find_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	gint result;
-	GtkWidget* search_entry = gtk_entry_new();
-	gchar* search_text;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	GtkWidget* dlg = gnome_dialog_new ("Search Contacts", "Find",
-					   GNOME_STOCK_BUTTON_CANCEL, NULL);
-
-	gtk_object_get (view->view,
-			"query", &search_text,
-			NULL);
-	e_utf8_gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);
-	g_free (search_text);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
-			    search_entry, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (dlg);
-
-	gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-	/* If the user clicks "okay"...*/
-	if (result == 0) {
-		search_text = e_utf8_gtk_entry_get_text(GTK_ENTRY(search_entry));
-		gtk_object_set (view->view, 
-				"query", query, 
-				NULL);
-		g_free (search_text);
-	}
-}
-#endif
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_print(view->view);
-}
-
-static void
-show_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_show_all(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_stop(view->view);
-}
-
-static void
-update_view_type (AddressbookView *view)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (view->control);
-	EAddressbookViewType view_type;
-
-	if (!uic || bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", _("As _Minicards"), NULL);
-
-		break;
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", _("As _Table"), NULL);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}	
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-
-	update_view_type (view);
-}
-
-static void
-toggle_view_as_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = user_data;
-	EAddressbookViewType view_type;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	if (view_type == E_ADDRESSBOOK_VIEW_TABLE)
-		change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-	else
-		change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);
-}
-
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),
-/*	BONOBO_UI_UNSAFE_VERB ("ContactFind", find_contact_cb),*/
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactViewAll", show_all_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-#ifdef HAVE_LDAP
-	BONOBO_UI_UNSAFE_VERB ("ContactNewServer", new_server_cb),
-#endif
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	Bonobo_UIContainer remote_ui_container;
-
-	remote_ui_container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_ui_container);
-	bonobo_object_release_unref (remote_ui_container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, view);
-	
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook.xml",
-			       "evolution-addressbook");
-#ifdef HAVE_LDAP
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook-ldap.xml",
-			       "evolution-addressbook");
-#endif
-
-	update_view_type (view);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-	
-	if (activate)
-		control_activate (control, uic, view);
-	else
-		bonobo_ui_component_unset_container (uic);
-}
-
-static void
-addressbook_view_free(AddressbookView *view)
-{
-	if (view->properties)
-		bonobo_object_unref(BONOBO_OBJECT(view->properties));
-	g_free(view->uri);
-	g_free(view);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		AddressbookView *view = closure;
-
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-	} else {
-		GtkWidget *warning_dialog, *label, *href;
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-        
-        	label = gtk_label_new (
-        		_("We were unable to open this addressbook.  This either\n"
-			  "means you have entered an incorrect URI, or have tried\n"
-			  "to access an LDAP server and don't have LDAP support\n"
-			  "compiled in.  If you've entered a URI, check the URI for\n"
-			  "correctness and reenter.  If not, you probably have\n"
-			  "attempted to access an LDAP server.  If you wish to be\n"
-			  "able to use LDAP, you'll need to download and install\n"
-			  "OpenLDAP and recompile and install evolution.\n"));
-		gtk_misc_set_alignment(GTK_MISC(label),
-				       0, .5);
-		gtk_label_set_justify(GTK_LABEL(label),
-				      GTK_JUSTIFY_LEFT);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-				    label, TRUE, TRUE, 0);
-        	gtk_widget_show (label);
-
-		href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-				    href, FALSE, FALSE, 0);
-        	gtk_widget_show (href);
-
-		gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-		
-		gtk_object_destroy (GTK_OBJECT (warning_dialog));
-	}
-}
-
-static void destroy_callback(GtkWidget *widget, gpointer data)
-{
-	AddressbookView *view = data;
-	addressbook_view_free(view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		if (view && view->uri)
-			BONOBO_ARG_SET_STRING (arg, view->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	char *uri_data;
-	EBook *book;
-	
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		if (view->uri) {
-			/* we've already had a uri set on this view, so unload it */
-			e_book_unload_uri (book);
-			g_free (view->uri);
-		} else {
-			book = e_book_new ();
-		}
-
-		view->uri = g_strdup(BONOBO_ARG_GET_STRING (arg));
-		
-		if (!strncmp (view->uri, "file:", 5)) {
-			char *file_name = g_concat_dir_and_file(view->uri + 7, "addressbook.db");
-			uri_data = g_strdup_printf("file://%s", file_name);
-			g_free(file_name);
-		}
-		else {
-			uri_data = g_strdup (view->uri);
-		}
-
-		if (! e_book_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
-
-		g_free(uri_data);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-static void
-addressbook_query_changed (EAddressbookSearch *eas, AddressbookView *view)
-{
-	char *search_word, *search_query;
-	int search_type;
-
-	gtk_object_get(GTK_OBJECT(eas),
-		       "text", &search_word,
-		       "option_choice", &search_type,
-		       NULL);
-
-	if (search_word && strlen (search_word)) {
-		switch (search_type) {
-		case 0:
-			search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")",
-							search_word);
-			break;
-		case 1:
-			search_query = g_strdup_printf ("(contains \"full_name\" \"%s\")",
-							search_word);
-			break;
-		case 2:
-			search_query = g_strdup_printf ("(contains \"email\" \"%s\")",
-							search_word);
-			break;
-		default:
-			search_query = g_strdup ("(contains \"full_name\" \"\")");
-			break;
-		}
-	} else
-		search_query = g_strdup ("(contains \"full_name\" \"\")");
-
-	gtk_object_set (GTK_OBJECT(view->view),
-			"query", search_query,
-			NULL);
-
-	g_free (search_query);
-	g_free (search_word);
-}
-
-static void
-addressbook_menu_activated (EAddressbookSearch *eas, int id, AddressbookView *view)
-{
-	EBook *book;
-	switch (id) {
-	case 0:
-		e_addressbook_view_show_all(view->view);
-		break;
-	case 1:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		g_assert (E_IS_BOOK (book));
-
-		gtk_widget_show(e_addressbook_search_dialog_new(book));
-		break;
-	}
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 1);
-
-	view->vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	gtk_container_set_border_width(GTK_CONTAINER(view->vbox), GNOME_PAD_SMALL);
-
-	gtk_signal_connect( GTK_OBJECT( view->vbox ), "destroy",
-			    GTK_SIGNAL_FUNC( destroy_callback ),
-			    ( gpointer ) view );
-
-	/* Create the control. */
-	view->control = bonobo_control_new(view->vbox);
-
-	view->search = E_ADDRESSBOOK_SEARCH(e_addressbook_search_new());
-	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
-			    FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (view->search), "query_changed",
-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);
-	gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
-
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-	gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view),
-			   TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show( view->vbox );
-	gtk_widget_show( GTK_WIDGET(view->view) );
-	gtk_widget_show( GTK_WIDGET(view->search) );
-
-	view->properties = bonobo_property_bag_new (get_prop, set_prop, view);
-
-	bonobo_property_bag_add (
-		view->properties, PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,
-		BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);
-
-	bonobo_control_set_properties (view->control,
-					 view->properties);
-
-	view->uri = NULL;
-
-	gtk_signal_connect (GTK_OBJECT (view->control), "activate",
-			    control_activate_cb, view);
-
-	return view->control;
-}
-
-static BonoboObject *
-addressbook_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	return BONOBO_OBJECT (addressbook_factory_new_control ());
-}
-
-void
-addressbook_factory_init (void)
-{
-	static BonoboGenericFactory *addressbook_control_factory = NULL;
-
-	if (addressbook_control_factory != NULL)
-		return;
-
-	addressbook_control_factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID,
-								  addressbook_factory,
-								  NULL);
-
-	if (addressbook_control_factory == NULL) {
-		g_error ("I could not register a Addressbook factory.");
-	}
-}
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
deleted file mode 100644
index 66c5a7e4e6..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *addressbook_factory_new_control  (void);
-void           addressbook_factory_init         (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/addressbook.oafinfo b/addressbook/gui/component/addressbook.oafinfo
deleted file mode 100644
index a41848b25b..0000000000
--- a/addressbook/gui/component/addressbook.oafinfo
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
deleted file mode 100644
index 23b61d58be..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "e-cardlist-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-
-static void
-e_cardlist_model_destroy(GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	int i;
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_cardlist_model_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_cardlist_model_row_count (ETableModel *etc)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	return e_cardlist_model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_cardlist_model_value_at (ETableModel *etc, int col, int row)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return NULL;
-	value = e_card_simple_get_const(e_cardlist_model->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	ECard *card;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return;
-	e_card_simple_set(e_cardlist_model->data[row],
-			  col + 1,
-			  val);
-	gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]),
-		       "card", &card,
-		       NULL);
-
-	e_table_model_cell_changed(etc, col, row);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_cardlist_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_cardlist_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_cardlist_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_cardlist_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-void
-e_cardlist_model_add(ECardlistModel *model,
-		     ECard **cards,
-		     int count)
-{
-	int i;
-	model->data = g_realloc(model->data, model->data_count + count * sizeof(ECard *));
-	for (i = 0; i < count; i++) {
-		gboolean found = FALSE;
-		gchar *id = e_card_get_id(cards[i]);
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-				found = TRUE;
-			}
-		}
-		if (!found) {
-			gtk_object_ref(GTK_OBJECT(cards[i]));
-			model->data[model->data_count++] = e_card_simple_new (cards[i]);
-			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-		}
-	}
-}
-
-void
-e_cardlist_model_remove(ECardlistModel *model,
-			const char *id)
-{
-	int i;
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-e_cardlist_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-	
-	object_class->destroy = e_cardlist_model_destroy;
-
-	model_class->column_count = e_cardlist_model_col_count;
-	model_class->row_count = e_cardlist_model_row_count;
-	model_class->value_at = e_cardlist_model_value_at;
-	model_class->set_value_at = e_cardlist_model_set_value_at;
-	model_class->is_cell_editable = e_cardlist_model_is_cell_editable;
-	model_class->duplicate_value = e_cardlist_model_duplicate_value;
-	model_class->free_value = e_cardlist_model_free_value;
-	model_class->initialize_value = e_cardlist_model_initialize_value;
-	model_class->value_is_empty = e_cardlist_model_value_is_empty;
-	model_class->value_to_string = e_cardlist_model_value_to_string;
-}
-
-static void
-e_cardlist_model_init (GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	model->data = NULL;
-	model->data_count = 0;
-}
-
-ECard *
-e_cardlist_model_get(ECardlistModel *model,
-		     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-GtkType
-e_cardlist_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardlistModel",
-			sizeof (ECardlistModel),
-			sizeof (ECardlistModelClass),
-			(GtkClassInitFunc) e_cardlist_model_class_init,
-			(GtkObjectInitFunc) e_cardlist_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_cardlist_model_new (void)
-{
-	ECardlistModel *et;
-
-	et = gtk_type_new (e_cardlist_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
deleted file mode 100644
index 0b9a7a2265..0000000000
--- a/addressbook/gui/component/e-cardlist-model.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CARDLIST_MODEL_H_
-#define _E_CARDLIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-card-simple.h>
-
-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())
-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))
-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))
-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))
-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	ECardSimple **data;
-	int data_count;
-} ECardlistModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} ECardlistModelClass;
-
-
-GtkType e_cardlist_model_get_type (void);
-ETableModel *e_cardlist_model_new (void);
-
-/* Returns object with an extra ref count. */
-ECard *e_cardlist_model_get  (ECardlistModel  *model,
-			      int              row);
-void e_cardlist_model_add    (ECardlistModel  *model,
-			      ECard          **card,
-			      int              count);
-void e_cardlist_model_remove (ECardlistModel  *model,
-			      const char      *id);
-
-#endif /* _E_CARDLIST_MODEL_H_ */
diff --git a/addressbook/gui/component/e-ldap-server-dialog.c b/addressbook/gui/component/e-ldap-server-dialog.c
deleted file mode 100644
index 172f43280b..0000000000
--- a/addressbook/gui/component/e-ldap-server-dialog.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-ldap-server-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Toshok <toshok@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-ldap-server-dialog.h"
-
-typedef struct {
-	GladeXML *gui;
-	GtkWidget *dialog;
-	ELDAPServer *server;
-} ELDAPServerDialog;
-
-static void
-fill_in_server_info (ELDAPServerDialog *dialog)
-{
-	ELDAPServer *ldap_server = dialog->server;
-	GtkEditable *editable;
-	int position;
-
-	/* the name */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "name-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->name, strlen (ldap_server->name), &position);
-
-	/* the server description */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "description-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->description, strlen (ldap_server->description), &position);
-
-	/* the server hostname */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "server-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->host, strlen (ldap_server->host), &position);
-
-	/* the server port */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "port-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->port, strlen (ldap_server->port), &position);
-
-	/* the root dn */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "root-dn-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->rootdn, strlen (ldap_server->rootdn), &position);
-}
-
-static void
-extract_server_info (ELDAPServerDialog *dialog)
-{
-	ELDAPServer *ldap_server = dialog->server;
-	GtkEditable *editable;
-	char *description, *server, *port, *rootdn, *name;
-
-	/* the server name */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "name-entry"));
-	name = gtk_editable_get_chars(editable, 0, -1);
-	if (name && *name) {
-		if (ldap_server->name)
-			g_free(ldap_server->name);
-		ldap_server->name = name;
-	}
-
-	/* the server description */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "description-entry"));
-	description = gtk_editable_get_chars(editable, 0, -1);
-	if (description && *description) {
-		if (ldap_server->description)
-			g_free(ldap_server->description);
-		ldap_server->description = description;
-	}
-
-	/* the server hostname */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "server-entry"));
-	server = gtk_editable_get_chars(editable, 0, -1);
-	if (server && *server) {
-		if (ldap_server->host)
-			g_free(ldap_server->host);
-		ldap_server->host = server;
-	}
-
-	/* the server port */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "port-entry"));
-	port = gtk_editable_get_chars(editable, 0, -1);
-	if (port && *port) {
-		if (ldap_server->port)
-			g_free (ldap_server->port);
-		ldap_server->port = port;
-	}
-
-	/* the root dn */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "root-dn-entry"));
-	rootdn = gtk_editable_get_chars(editable, 0, -1);
-	if (rootdn && *rootdn) {
-		if (ldap_server->rootdn)
-			g_free (ldap_server->rootdn);
-		ldap_server->rootdn = rootdn;
-	}
-}
-
-void
-e_ldap_server_editor_show(ELDAPServer *server)
-{
-	ELDAPServerDialog *dialog = g_new0 (ELDAPServerDialog, 1);
-
-	dialog->server = server;
-	dialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/ldap-server-dialog.glade", NULL);
-
-	dialog->dialog = glade_xml_get_widget(dialog->gui, "ldap-server-dialog");
-
-	fill_in_server_info (dialog);
-
-	gnome_dialog_run (GNOME_DIALOG(dialog->dialog));
-
-	extract_server_info (dialog);
-
-	gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-}
diff --git a/addressbook/gui/component/e-ldap-server-dialog.h b/addressbook/gui/component/e-ldap-server-dialog.h
deleted file mode 100644
index e5ae169f5c..0000000000
--- a/addressbook/gui/component/e-ldap-server-dialog.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef __E_LDAP_SERVER_DIALOG_H__
-#define __E_LDAP_SERVER_DIALOG_H__
-
-#include "e-ldap-storage.h"
-
-void e_ldap_server_editor_show(ELDAPServer *server);
-
-#endif /* __E_LDAP_SERVER_DIALOG_H__ */
diff --git a/addressbook/gui/component/e-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c
deleted file mode 100644
index 518de69e0d..0000000000
--- a/addressbook/gui/component/e-ldap-storage.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-/* The ldap server file goes like this:
-
-   <?xml version="1.0"?>
-   <contactservers>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <description>This is my company address book.</description>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-     </contactserver>
-   </contactservers>
-
-   FIXME: Do we want to use a namespace for this?
-   FIXME: Do we want to have an internationalized description?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-ldap-storage.h"
-#include "e-ldap-server-dialog.h"
-
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#define LDAPSERVER_XML "ldapservers.xml"
-
-static gboolean load_ldap_data (EvolutionStorage *storage, const char *file_path);
-static gboolean save_ldap_data (const char *file_path);
-
-GHashTable *servers;
-EvolutionStorage *storage;
-static char *ldapservers;
-
-void
-setup_ldap_storage (EvolutionShellComponent *shell_component,
-		    const char *evolution_homedir)
-{
-	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
-
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	if (shell_client == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		return;
-	}
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-	storage = evolution_storage_new (_("External Directories"));
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		return;
-	}
-
-	/* save the storage for later */
-	servers = g_hash_table_new (g_str_hash, g_str_equal);
-
-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);
-
-	if (ldapservers)
-		g_free (ldapservers);
-	ldapservers = g_strdup_printf ("%s/" LDAPSERVER_XML, evolution_homedir);
-	load_ldap_data (storage, ldapservers);
-}
-
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-load_ldap_data (EvolutionStorage *storage,
-		const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* check to see if a ldapserver.xml.new file is
-                   there.  if it is, rename it and run with it */
-		char *new_path = g_strdup_printf ("%s.new", file_path);
-		struct stat sb;
-
-		if (stat (new_path, &sb) == 0) {
-			int rv;
-
-			rv = rename (new_path, file_path);
-			g_free (new_path);
-
-			if (0 > rv) {
-				g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));
-				return FALSE;
-			}
-			else {
-				goto tryagain;
-			}
-		}
-
-		g_free (new_path);
-		return TRUE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "contactservers") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *path;
-		ELDAPServer *server;
-
-		if (strcmp (child->name, "contactserver")) {
-			g_warning ("unknown node '%s' in %s", child->name, file_path);
-			continue;
-		}
-
-		server = g_new (ELDAPServer, 1);
-
-		server->name = get_string_value (child, "name");
-		server->description = get_string_value (child, "description");
-		server->port = get_string_value (child, "port");
-		server->host = get_string_value (child, "host");
-		server->rootdn = get_string_value (child, "rootdn");
-		server->scope = get_string_value (child, "scope");
-		server->uri = g_strdup_printf ("ldap://%s:%s/%s??%s", server->host, server->port, server->rootdn, server->scope);
-
-		path = g_strdup_printf ("/%s", server->name);
-		evolution_storage_new_folder (storage, path, server->name,
-					      "contacts", server->uri,
-					      server->description, FALSE);
-
-		g_hash_table_insert (servers, server->name, server);
-
-		g_free (path);
-	}
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-static void
-ldap_server_foreach(gpointer key, gpointer value, gpointer user_data)
-{
-	ELDAPServer *server = (ELDAPServer*)value;
-	xmlNode *root = (xmlNode*)user_data;
-	xmlNode *server_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactserver");
-
-	xmlAddChild (root, server_root);
-
-	xmlNewChild (server_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) server->name);
-	xmlNewChild (server_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) server->description);
-
-	xmlNewChild (server_root, NULL, (xmlChar *) "port",
-		     (xmlChar *) server->port);
-	xmlNewChild (server_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) server->host);
-	xmlNewChild (server_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) server->rootdn);
-	xmlNewChild (server_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) server->scope);
-}
-
-static gboolean
-save_ldap_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	int fd, rv;
-	xmlChar *buf;
-	int buf_size;
-	char *new_path = g_strdup_printf ("%s.new", file_path);
-
-	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "contactservers", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_hash_table_foreach (servers, ldap_server_foreach, root);
-
-	fd = open (new_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	fchmod (fd, 0600);
-
-	xmlDocDumpMemory (doc, &buf, &buf_size);
-
-	if (buf == NULL) {
-		g_error ("Failed to write ldapserver.xml: xmlBufferCreate() == NULL");
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new ldapserver.xml: %s\n", strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));
-			unlink (new_path);
-			return FALSE;
-		}
-		return TRUE;
-	}
-}
-
-void
-e_ldap_storage_add_server (ELDAPServer *server)
-{
-	char *path;
-	/* add it to our hashtable */
-	g_hash_table_insert (servers, server->name, server);
-
-	/* and then to the ui */
-	path = g_strdup_printf ("/%s", server->name);
-	evolution_storage_new_folder (storage, path, server->name, "contacts",
-				      server->uri, server->description, FALSE);
-
-	g_free (path);
-
-	save_ldap_data (ldapservers);
-}
-
-void
-e_ldap_storage_remove_server (char *name)
-{
-	char *path;
-	ELDAPServer *server;
-
-	/* remove it from our hashtable */
-	server = (ELDAPServer*)g_hash_table_lookup (servers, name);
-	g_hash_table_remove (servers, name);
-
-	g_free (server->name);
-	g_free (server->description);
-	g_free (server->host);
-	g_free (server->port);
-	g_free (server->rootdn);
-	g_free (server->scope);
-	g_free (server->uri);
-
-	g_free (server);
-
-	/* and then from the ui */
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	save_ldap_data (ldapservers);
-}
diff --git a/addressbook/gui/component/e-ldap-storage.h b/addressbook/gui/component/e-ldap-storage.h
deleted file mode 100644
index 9d3e35b4db..0000000000
--- a/addressbook/gui/component/e-ldap-storage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __E_LDAP_STORAGE_H__
-#define __E_LDAP_STORAGE_H__
-
-#include "evolution-shell-component.h"
-
-typedef struct {
-	char *name;
-	char *description;
-	char *host;
-	char *port;
-	char *rootdn;
-	char *scope;
-	char *uri; /* filled in from the above */
-} ELDAPServer;
-
-void setup_ldap_storage (EvolutionShellComponent *shell_component,
-			 const char *evolution_homedir);
-void e_ldap_storage_add_server (ELDAPServer *server);
-void e_ldap_storage_remove_server (char *name);
-
-#endif /* __E_LDAP_STORAGE_H__ */
diff --git a/addressbook/gui/component/ldap-server-dialog.glade b/addressbook/gui/component/ldap-server-dialog.glade
deleted file mode 100644
index a4dad9c2c2..0000000000
--- a/addressbook/gui/component/ldap-server-dialog.glade
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>newserver</name>
-  <program_name>newserver</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>ldap-server-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>ldap-server-dialog</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table2</name>
-	<rows>5</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>0</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>description-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>server-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>port-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>root-dn-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment1</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label1</name>
-	    <label>Description:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label2</name>
-	    <label>LDAP Server:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>Port Number:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label4</name>
-	    <label>Root DN:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>name-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label5</name>
-	    <label>Name:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/ldap-server-dialog.glade.h b/addressbook/gui/component/ldap-server-dialog.glade.h
deleted file mode 100644
index c99dfa3cb5..0000000000
--- a/addressbook/gui/component/ldap-server-dialog.glade.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Description:");
-gchar *s = N_("LDAP Server:");
-gchar *s = N_("Port Number:");
-gchar *s = N_("Root DN:");
-gchar *s = N_("Name:");
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index 1d8db60890..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames.h
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
deleted file mode 100644
index 2bc8154daf..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-module Addressbook {
-
-	interface SelectNames : Bonobo::Unknown {
-		struct Section {
-			string id;
-			string title;
-		};
-
-		typedef sequence<Section> SectionList;
-
-		exception DuplicateID {};
-		exception SectionNotFound {};
-
-		void add_section (in string id, in string title)
-			raises (DuplicateID);
-
-		Bonobo::Control get_entry_for_section (in string section_id)
-			raises (SectionNotFound);
-
-		void activate_dialog (in string section_id);
-	};
-
-};
-};
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
deleted file mode 100644
index e66c3aa38a..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
deleted file mode 100644
index e66c3aa38a..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
deleted file mode 100644
index 7c5d2672b0..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-# CORBA stuff
-
-IDLS = \
-	Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED = \
-	Evolution-Addressbook-SelectNames.h		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c
-
-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl
-
-oafdir = $(datadir)/oaf
-oaf_DATA = evolution-addressbook-select-names.oafinfo
-
-#
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-lib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 		\
-	$(IDL_GENERATED)		\
-	e-select-names-bonobo.c		\
-	e-select-names-bonobo.h		\
-	e-select-names-factory.c	\
-	e-select-names-factory.h	\
-	e-select-names-manager.c	\
-	e-select-names-manager.h	\
-	e-select-names-model.c		\
-	e-select-names-model.h		\
-	e-select-names-table-model.c	\
-	e-select-names-table-model.h	\
-	e-select-names-text-model.c	\
-	e-select-names-text-model.h	\
-	e-select-names.c		\
-	e-select-names.h
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = select-names.glade
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	select-names.glade.h	\
-	$(oaf_DATA)		\
-	$(IDLS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
deleted file mode 100644
index d4e2d32cfc..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include <gal/util/e-util.h>
-#include "e-select-names-manager.h"
-
-#include "e-select-names-bonobo.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT
-};
-typedef enum _EntryPropertyID EntryPropertyID;
-
-
-/* PropertyBag implementation for the entry widgets.  */
-
-static void
-entry_get_property_fn (BonoboPropertyBag *bag,
-		       BonoboArg *arg,
-		       unsigned int arg_id,
-		       void *user_data)
-{
-	GtkWidget *widget;
-	char *text;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		gtk_object_get (GTK_OBJECT (widget), "text", &text, NULL);
-		BONOBO_ARG_SET_STRING (arg, text);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       gpointer user_data)
-{
-	GtkWidget *widget;
-	const char *text;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		text = BONOBO_ARG_GET_STRING (arg);
-		gtk_object_set (GTK_OBJECT (widget), "text", text, NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-
-static POA_Evolution_Addressbook_SelectNames *
-create_servant (void)
-{
-	POA_Evolution_Addressbook_SelectNames *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SelectNames_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_SelectNames_add_section (PortableServer_Servant servant,
-			      const CORBA_char *id,
-			      const CORBA_char *title,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_add_section (priv->manager, id, title);
-}
-
-static Bonobo_Control
-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
-					const CORBA_char *section_id,
-					CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-	GtkWidget *entry_widget;
-	BonoboControl *control;
-	BonoboPropertyBag *property_bag;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	entry_widget = e_select_names_manager_create_entry (priv->manager, section_id);
-	gtk_widget_show (entry_widget);
-
-	if (entry_widget == NULL) {
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_Evolution_Addressbook_SelectNames_SectionNotFound,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	control = bonobo_control_new (entry_widget);
-
-	property_bag = bonobo_property_bag_new (entry_get_property_fn, entry_set_property_fn, entry_widget);
-	bonobo_property_bag_add (property_bag, "text", ENTRY_PROPERTY_ID_TEXT,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, property_bag);
-
-	return bonobo_object_corba_objref (BONOBO_OBJECT (control));
-}
-
-static void
-impl_SelectNames_activate_dialog (PortableServer_Servant servant,
-				  const CORBA_char *section_id,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (object);
-	priv = select_names->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->manager));
-
-	g_free (priv);
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_Evolution_Addressbook_SelectNames__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->add_section           = impl_SelectNames_add_section;
-	epv->get_entry_for_section = impl_SelectNames_get_entry_for_section;
-	epv->activate_dialog       = impl_SelectNames_activate_dialog;
-
-	vepv = &SelectNames_vepv;
-	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->Evolution_Addressbook_SelectNames_epv = epv;
-}
-
-static void
-class_init (ESelectNamesBonoboClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = impl_destroy;
-
-	corba_class_init ();
-}
-
-static void
-init (ESelectNamesBonobo *select_names)
-{
-	ESelectNamesBonoboPrivate *priv;
-
-	priv = g_new (ESelectNamesBonoboPrivate, 1);
-
-	priv->manager = e_select_names_manager_new ();
-
-	select_names->priv = priv;
-}
-
-
-void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 Evolution_Addressbook_SelectNames corba_object)
-{
-	g_return_if_fail (select_names != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
-
-	bonobo_object_construct (BONOBO_OBJECT (select_names), corba_object);
-}
-
-ESelectNamesBonobo *
-e_select_names_bonobo_new (void)
-{
-	POA_Evolution_Addressbook_SelectNames *servant;
-	Evolution_Addressbook_SelectNames corba_object;
-	ESelectNamesBonobo *select_names;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	select_names = gtk_type_new (e_select_names_bonobo_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (select_names), servant);
-	e_select_names_bonobo_construct (select_names, corba_object);
-
-	return select_names;
-}
-
-
-E_MAKE_TYPE (e_select_names_bonobo, "ESelectNamesBonobo", ESelectNamesBonobo, class_init, init, PARENT_TYPE)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
deleted file mode 100644
index 4531c1e024..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-
-
-typedef struct _ESelectNamesBonobo        ESelectNamesBonobo;
-typedef struct _ESelectNamesBonoboPrivate ESelectNamesBonoboPrivate;
-typedef struct _ESelectNamesBonoboClass   ESelectNamesBonoboClass;
-
-struct _ESelectNamesBonobo {
-	BonoboObject parent;
-
-	ESelectNamesBonoboPrivate *priv;
-};
-
-struct _ESelectNamesBonoboClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType             e_select_names_bonobo_get_type   (void);
-void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,
-						      Evolution_Addressbook_SelectNames corba_object);
-ESelectNamesBonobo *e_select_names_bonobo_new        (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_SELECT_NAMES_BONOBO_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
deleted file mode 100644
index 9a45692071..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "e-select-names-bonobo.h"
-
-#include "e-select-names-factory.h"
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-
-static BonoboGenericFactory *factory = NULL;
-
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	return BONOBO_OBJECT (e_select_names_bonobo_new ());
-}
-
-
-gboolean
-e_select_names_factory_init (void)
-{
-	if (factory != NULL)
-		return TRUE;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		return FALSE;
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h
deleted file mode 100644
index f65d5aaa9e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index f93d94b276..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names.h"
-#include <gal/e-text/e-entry.h>
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_destroy (GtkObject *object);
-static void e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-/**
- * e_select_names_manager_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesManager class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesManager class.
- **/
-GtkType
-e_select_names_manager_get_type (void)
-{
-	static GtkType manager_type = 0;
-
-	if (!manager_type) {
-		GtkTypeInfo manager_info = {
-			"ESelectNamesManager",
-			sizeof (ESelectNamesManager),
-			sizeof (ESelectNamesManagerClass),
-			(GtkClassInitFunc) e_select_names_manager_class_init,
-			(GtkObjectInitFunc) e_select_names_manager_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		manager_type = gtk_type_unique (gtk_object_get_type (), &manager_info);
-	}
-
-	return manager_type;
-}
-
-/**
- * e_select_names_manager_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesManager that wraps the @VCard.
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));
-	return manager;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesManager::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_select_names_manager_destroy;
-	object_class->get_arg = e_select_names_manager_get_arg;
-	object_class->set_arg = e_select_names_manager_set_arg;
-}
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	gtk_object_unref(GTK_OBJECT(manager->sections));
-	gtk_object_unref(GTK_OBJECT(manager->entries));
-}
-
-
-/* Set_arg handler for the manager */
-static void
-e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the manager */
-static void
-e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void *
-section_copy(const void *sec, void *data)
-{
-	const ESelectNamesManagerSection *section = sec;
-	ESelectNamesManagerSection *newsec;
-	
-	newsec = g_new(ESelectNamesManagerSection, 1);
-	newsec->id = g_strdup(section->id);
-	newsec->title = g_strdup(section->title);
-	newsec->model = section->model;
-	if (newsec->model)
-		gtk_object_ref(GTK_OBJECT(newsec->model));
-	return newsec;
-}
-
-static void
-section_free(void *sec, void *data)
-{
-	ESelectNamesManagerSection *section = sec;
-	g_free(section->id);
-	g_free(section->title);
-	if (section->model)
-		gtk_object_unref(GTK_OBJECT(section->model));
-	g_free(section);
-}
-
-static void *
-entry_copy(const void *ent, void *data)
-{
-	const ESelectNamesManagerEntry *entry = ent;
-	ESelectNamesManagerEntry *newent;
-	
-	newent = g_new(ESelectNamesManagerEntry, 1);
-	newent->id = g_strdup(entry->id);
-	newent->entry = entry->entry;
-	if (newent->entry)
-		gtk_object_ref(GTK_OBJECT(newent->entry));
-	return newent;
-}
-
-static void
-entry_free(void *ent, void *data)
-{
-	ESelectNamesManagerEntry *entry = ent;
-	g_free(entry->id);
-	if (entry->entry)
-		gtk_object_unref(GTK_OBJECT(entry->entry));
-	g_free(entry);
-}
-
-/**
- * e_select_names_manager_init:
- */
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = e_list_new(section_copy, section_free, manager);
-	manager->entries  = e_list_new(entry_copy, entry_free, manager);
-}
-
-void                          e_select_names_manager_add_section               (ESelectNamesManager *manager,
-										const char *id,
-										const char *title)
-{
-	ESelectNamesManagerSection *section;
-	
-	section = g_new(ESelectNamesManagerSection, 1);
-	section->id = g_strdup(id);
-	section->title = g_strdup(title);
-	section->model = e_select_names_model_new();
-	e_list_append(manager->sections, section);
-	section_free(section, manager);
-}
-
-static void
-entry_destroyed(EEntry *entry, ESelectNamesManager *manager)
-{
-	if(!GTK_OBJECT_DESTROYED(manager)) {
-		EIterator *iterator = e_list_get_iterator(manager->entries);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerEntry *this_entry = e_iterator_get(iterator);
-			if(entry == this_entry->entry) {
-				e_iterator_delete(iterator);
-				break;
-			}
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(manager));
-}
-
-GtkWidget                    *e_select_names_manager_create_entry              (ESelectNamesManager *manager,
-										const char *id)
-{
-	ETextModel *model;
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-			EEntry *eentry;
-			eentry = E_ENTRY(e_entry_new());
-
-			entry = g_new(ESelectNamesManagerEntry, 1);
-			entry->entry = eentry;
-			entry->id = (char *)id;
-			model = e_select_names_text_model_new(section->model);
-			e_list_append(manager->entries, entry);
-			g_free(entry);
-
-			gtk_object_set(GTK_OBJECT(eentry),
-				       "model", model,
-				       "editable", TRUE,
-				       "use_ellipsis", TRUE,
-				       "allow_newlines", FALSE,
-				       NULL);
-			gtk_signal_connect(GTK_OBJECT(eentry), "destroy",
-					   GTK_SIGNAL_FUNC(entry_destroyed), manager);
-			gtk_object_ref(GTK_OBJECT(manager));
-			return GTK_WIDGET(eentry);
-		}
-	}
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	switch(button) {
-	case 0: {
-		EList *list = manager->sections;
-		EIterator *iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerSection *section = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, section->id);
-			if (section->model)
-				gtk_object_unref(GTK_OBJECT(section->model));
-			section->model = source;
-			/* Don't ref because get_source returns a conceptual ref_count of 1. */
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		list = manager->entries;
-		iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerEntry *entry = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, entry->id);
-			if (source) {
-				ETextModel *model = e_select_names_text_model_new(source);
-				if (model) {
-					gtk_object_set(GTK_OBJECT(entry->entry),
-						       "model", model,
-						       NULL);
-					gtk_object_unref(GTK_OBJECT(source));
-				}
-				gtk_object_unref(GTK_OBJECT(model));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		break;
-	}
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-void                          e_select_names_manager_activate_dialog           (ESelectNamesManager *manager,
-										const char *id)
-{
-	EIterator *iterator;
-	
-	if (manager->names) {
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-	} else {
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		iterator = e_list_get_iterator(manager->sections);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section->model);
-			e_select_names_add_section(manager->names, section->id, section->title, newmodel);
-			gtk_object_unref(GTK_OBJECT(newmodel));
-		}
-		gtk_signal_connect(GTK_OBJECT(manager->names), "clicked",
-				   GTK_SIGNAL_FUNC(e_select_names_clicked), manager);
-		gtk_signal_connect(GTK_OBJECT(manager->names), "destroy",
-				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), 
-				   &manager->names);
-		gtk_widget_show(GTK_WIDGET(manager->names));
-	}
-}
-
-/* Of type ECard */
-EList                    *e_select_names_manager_get_cards                 (ESelectNamesManager *manager,
-									    const char *id)
-{
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			return e_select_names_model_get_cards(section->model);
-		}
-	}
-	return NULL;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
deleted file mode 100644
index 13cddaac7d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MANAGER_H__
-#define __E_SELECT_NAMES_MANAGER_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include "e-select-names.h"
-
-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())
-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))
-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))
-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))
-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))
-
-typedef struct _ESelectNamesManager ESelectNamesManager;
-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;
-
-struct _ESelectNamesManager {
-	GtkObject object;
-	
-	EList *sections;
-	EList *entries;
-
-	ESelectNames *names;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-};
-
-ESelectNamesManager *e_select_names_manager_new               (void);
-void                 e_select_names_manager_add_section       (ESelectNamesManager *manager,
-							       const char *id,
-							       const char *title);
-GtkWidget           *e_select_names_manager_create_entry      (ESelectNamesManager *manager,
-							       const char *id);
-void                 e_select_names_manager_activate_dialog   (ESelectNamesManager *manager,
-							       const char *id);
-
-/* Of type ECard */
-EList               *e_select_names_manager_get_cards         (ESelectNamesManager *manager,
-							       const char *id);
-
-/* Standard Gtk function */			      
-GtkType              e_select_names_manager_get_type          (void);
-
-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
deleted file mode 100644
index 0bbbe588a6..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-model.h"
-#include <gal/util/e-util.h>
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	E_SELECT_NAMES_MODEL_LAST_SIGNAL
-};
-
-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-static void e_select_names_model_init (ESelectNamesModel *model);
-static void e_select_names_model_class_init (ESelectNamesModelClass *klass);
-
-static void e_select_names_model_destroy (GtkObject *object);
-static void e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-/**
- * e_select_names_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesModel class.
- **/
-GtkType
-e_select_names_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesModel",
-			sizeof (ESelectNamesModel),
-			sizeof (ESelectNamesModelClass),
-			(GtkClassInitFunc) e_select_names_model_class_init,
-			(GtkObjectInitFunc) e_select_names_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (gtk_object_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/**
- * e_select_names_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesModel that wraps the @VCard.
- */
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	return model;
-}
-
-/**
- * e_select_names_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesModel that wraps the @VCard.
- */
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	model->data = e_list_duplicate(old->data);
-	model->id = g_strdup(old->id);
-	model->title = g_strdup(old->title);
-	return model;
-}
-
-static void
-e_select_names_model_class_init (ESelectNamesModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_select_names_model_signals, E_SELECT_NAMES_MODEL_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ESelectNamesModel::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	klass->changed = NULL;
-
-	object_class->destroy = e_select_names_model_destroy;
-	object_class->get_arg = e_select_names_model_get_arg;
-	object_class->set_arg = e_select_names_model_set_arg;
-}
-
-/*
- * ESelectNamesModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_model_destroy (GtkObject *object)
-{
-	ESelectNamesModel *model;
-	
-	model = E_SELECT_NAMES_MODEL (object);
-
-	gtk_object_unref(GTK_OBJECT(model->data));
-}
-
-
-/* Set_arg handler for the model */
-static void
-e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-	
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void *
-data_copy(const void *sec, void *data)
-{
-	const ESelectNamesModelData *section = sec;
-	ESelectNamesModelData *newsec;
-	
-	newsec = g_new(ESelectNamesModelData, 1);
-	newsec->type = section->type;
-	newsec->card = section->card;
-	if (newsec->card)
-		gtk_object_ref(GTK_OBJECT(newsec->card));
-	newsec->string = g_strdup(section->string);
-	return newsec;
-}
-
-static void
-data_free(void *sec, void *data)
-{
-	ESelectNamesModelData *section = sec;
-	if (section->card)
-		gtk_object_unref(GTK_OBJECT(section->card));
-	g_free(section->string);
-	g_free(section);
-}
-
-/**
- * e_select_names_model_init:
- */
-static void
-e_select_names_model_init (ESelectNamesModel *model)
-{
-	model->data = e_list_new(data_copy, data_free, model);
-}
-
-static void *
-copy_func(const void *data, void *user_data)
-{
-	GtkObject *object = (void *) data;
-	if (object)
-		gtk_object_ref(object);
-	return object;
-}
-
-static void
-free_func(void *data, void *user_data)
-{
-	GtkObject *object = data;
-	if (object)
-		gtk_object_unref(object);
-}
-
-/* Of type ECard */
-EList                    *e_select_names_model_get_cards                 (ESelectNamesModel *model)
-{
-	EList *list = e_list_new(copy_func, free_func, NULL);
-	EIterator *iterator = e_list_get_iterator(model->data);
-	EIterator *new_iterator = e_list_get_iterator(list);
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		ECard *card;
-		ECardSimple *simple;
-		if (node->card) {
-			card = node->card;
-			gtk_object_ref(GTK_OBJECT(card));
-		} else {
-			card = e_card_new("");
-		}
-		simple = e_card_simple_new(card);
-		e_card_simple_set_arbitrary(simple, "text_version", "string", node->string);
-		e_iterator_insert(new_iterator, card, FALSE);
-		gtk_object_unref(GTK_OBJECT(card));
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	return list;
-}
-
-EList                    *e_select_names_model_get_data                 (ESelectNamesModel *model)
-{
-	return model->data;
-}
-
-static void
-e_select_names_model_changed           (ESelectNamesModel *model)
-{
-	gtk_signal_emit(GTK_OBJECT(model),
-			e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-}
-
-void
-e_select_names_model_insert            (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model, or NULL if the list is empty. */
-					int index,
-					char *data)
-{
-	gchar **strings = e_strsplit(data, ",", -1);
-	int i;
-	if (iterator == NULL) {
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};
-
-		e_list_append(model->data, &new);
-		iterator = e_list_get_iterator(model->data);
-
-		index = 0;
-	} else {
-		gtk_object_ref(GTK_OBJECT(iterator));
-	}
-	if (strings[0]) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		gchar *temp = g_strdup_printf("%.*s%s%s", index, node->string, strings[0], node->string + index);
-		g_free(node->string);
-		node->string = temp;
-		index += strlen(strings[0]);
-
-		for (i = 1; strings[i]; i++) {
-			ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			gchar *temp2 = g_strdup_printf("%s%s", strings[i], node->string + index);
-
-			g_free(node->string);
-			node->type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;
-			node->string = temp;
-			if (node->card)
-				gtk_object_unref(GTK_OBJECT(node->card));
-			node->card = NULL;
-
-			node = g_new(ESelectNamesModelData, 1);
-			node->type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;
-			node->card = NULL;
-			node->string = temp2;
-			e_iterator_insert(iterator, node, 0);
-			index = strlen(strings[i]);
-			g_free(node->string);
-			g_free(node);
-		}
-	}
-	e_select_names_model_changed(model);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-void
-e_select_names_model_insert_length     (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					char *data,
-					int length)
-{
-	gchar *string = g_new(char, length + 1);
-	strncpy(string, data, length);
-	string[length] = 0;
-	e_select_names_model_insert(model, iterator, index, string);
-	g_free(string);
-}
-
-void
-e_select_names_model_delete            (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					int length)
-{
-	while (length > 0 && e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		int this_length = strlen(node->string);
-		if (this_length <= index + length) {
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			g_free(node->string);
-			node->string = temp;
-			length -= this_length - index;
-		} else {
-			gchar *temp = g_strdup_printf("%.*s%s", index, node->string, node->string + index + length);
-			g_free(node->string);
-			node->string = temp;
-			break;
-		}
-		
-		if (length > 0) {
-			e_iterator_next(iterator);
-			if (e_iterator_is_valid(iterator)) {
-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);
-				gchar *temp = g_strdup_printf("%s%s", node->string, node2->string);
-				g_free(node2->string);
-				node2->string = temp;
-				e_iterator_prev(iterator);
-				e_iterator_delete(iterator);
-				length --;
-			}
-		}
-	}
-	e_select_names_model_changed(model);
-}
-
-void
-e_select_names_model_replace           (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					int length,
-					char *data)
-{
-	if (iterator == NULL) {
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};
-
-		e_list_append(model->data, &new);
-		iterator = e_list_get_iterator(model->data);
-
-		index = 0;
-	} else {
-		gtk_object_ref(GTK_OBJECT(iterator));
-	}
-	while (length > 0 && e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		int this_length = strlen(node->string);
-		if (this_length <= index + length) {
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			g_free(node->string);
-			node->string = temp;
-			length -= this_length - index;
-		} else {
-			gchar *temp = g_strdup_printf("%.*s%s", index, node->string, node->string + index + length);
-			g_free(node->string);
-			node->string = temp;
-			length = 0;
-		}
-
-		if (length > 0) {
-			e_iterator_next(iterator);
-			if (e_iterator_is_valid(iterator)) {
-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);
-				gchar *temp = g_strdup_printf("%s%s", node->string, node2->string);
-				g_free(node2->string);
-				node2->string = temp;
-				e_iterator_prev(iterator);
-				e_iterator_delete(iterator);
-			}
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node;
-		e_iterator_last(iterator);
-		if (e_iterator_is_valid(iterator)) {
-			node = (void *) e_iterator_get(iterator);
-			index = strlen(node->string);
-		} else
-			index = 0;
-	}
-	e_select_names_model_insert (model, iterator, index, data);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-
-void
-e_select_names_model_add_item          (ESelectNamesModel *model,
-					EIterator *iterator, /* NULL for at the beginning. */
-					ESelectNamesModelData *data)
-{
-	e_iterator_insert(iterator, data, FALSE);
-	e_select_names_model_changed(model);
-}
-
-void
-e_select_names_model_remove_item       (ESelectNamesModel *model,
-					EIterator *iterator)
-{
-	e_iterator_delete(iterator);
-	e_select_names_model_changed(model);
-}
-
-
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
deleted file mode 100644
index 4ea1bdc8db..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MODEL_H__
-#define __E_SELECT_NAMES_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
-#define E_SELECT_NAMES_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))
-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))
-#define E_IS_SELECT_NAMES_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))
-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))
-
-typedef enum   _ESelectNamesModelDataType ESelectNamesModelDataType;
-typedef struct _ESelectNamesModelData ESelectNamesModelData;
-typedef struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-
-enum _ESelectNamesModelDataType {
-	E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,
-	E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS,
-};
-
-struct _ESelectNamesModelData {
-	ESelectNamesModelDataType type;
-	ECard *card;
-	char *string;
-};
-
-struct _ESelectNamesModel {
-	GtkObject object;
-
-	char *id;
-	char *title;
-	
-	EList *data; /* Of type ESelectNamesModelData. */
-};
-
-struct _ESelectNamesModelClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-};
-
-ESelectNamesModel *e_select_names_model_new               (void);
-ESelectNamesModel *e_select_names_model_duplicate         (ESelectNamesModel *old);
-
-/* These lengths are allowed to go over objects and act just like the text model does. */
-void               e_select_names_model_insert            (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   char *data);
-void               e_select_names_model_insert_length     (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   char *data,
-							   int length);
-void               e_select_names_model_delete            (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   int length);
-void               e_select_names_model_replace           (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   int replacement_length,
-							   char *data);
-
-void               e_select_names_model_add_item          (ESelectNamesModel *model,
-							   EIterator *iterator, /* NULL for at the beginning. */
-							   ESelectNamesModelData *data);
-void               e_select_names_model_remove_item       (ESelectNamesModel *model,
-							   EIterator *iterator);
-
-/* Of type ECard */
-EList             *e_select_names_model_get_cards         (ESelectNamesModel *model);
-
-/* Of type ESelectNamesModelData */
-EList             *e_select_names_model_get_data          (ESelectNamesModel *model);
-
-/* Standard Gtk function */			      
-GtkType            e_select_names_model_get_type          (void);
-
-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */
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
deleted file mode 100644
index 37abcddc70..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <gal/util/e-util.h>
-#include "e-select-names-table-model.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_table_model_init       (ESelectNamesTableModel *model);
-static void e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass);
-
-static void e_select_names_table_model_destroy    (GtkObject *object);
-static void e_select_names_table_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_table_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,
-						      ESelectNamesTableModel *model);
-
-
-static void
-e_select_names_table_model_add_source (ESelectNamesTableModel *model,
-				       ESelectNamesModel     *source)
-{
-	model->source = source;
-	if (model->source)
-		gtk_object_ref(GTK_OBJECT(model->source));
-	model->source_changed_id = gtk_signal_connect(GTK_OBJECT(model->source), "changed",
-						      GTK_SIGNAL_FUNC(e_select_names_table_model_model_changed),
-						      model);
-}
-
-static void
-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)
-{
-	if (model->source_changed_id)
-		gtk_signal_disconnect(GTK_OBJECT(model->source), model->source_changed_id);
-	if (model->source)
-		gtk_object_unref(GTK_OBJECT(model->source));
-	model->source = NULL;
-	model->source_changed_id = 0;
-}
-
-/**
- * e_select_names_table_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTableModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTableModel class.
- **/
-GtkType
-e_select_names_table_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTableModel",
-			sizeof (ESelectNamesTableModel),
-			sizeof (ESelectNamesTableModelClass),
-			(GtkClassInitFunc) e_select_names_table_model_class_init,
-			(GtkObjectInitFunc) e_select_names_table_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (e_table_model_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/**
- * e_select_names_table_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesTableModel that wraps the @VCard.
- */
-ETableModel *
-e_select_names_table_model_new (ESelectNamesModel *source)
-{
-	ETableModel *model = E_TABLE_MODEL(gtk_type_new(e_select_names_table_model_get_type()));
-	gtk_object_set(GTK_OBJECT(model),
-		       "source", source,
-		       NULL);
-	return model;
-}
-
-static void
-fill_in_info (ESelectNamesTableModel *model)
-{
-	if (model->source) {
-		EList *list = e_select_names_model_get_data(model->source);
-		EIterator *iterator = e_list_get_iterator(list);
-		int count = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			count ++;
-		}
-		model->count = count;
-		model->data = g_new(ESelectNamesTableModelData, count);
-		count = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesModelData *data = e_iterator_get(iterator);
-			switch (data->type) {
-			case E_SELECT_NAMES_MODEL_DATA_TYPE_CARD: {
-				ECardSimple *simple = e_card_simple_new(data->card);
-				model->data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-				if ((model->data[count].name == 0) || *model->data[count].name == 0) {
-					model->data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-				}
-				if (model->data[count].name == 0)
-					model->data[count].name = g_strdup("");
-				model->data[count].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-				if (model->data[count].email == 0)
-					model->data[count].email = g_strdup("");
-				gtk_object_unref(GTK_OBJECT(simple));
-				count ++;
-				break;
-			}
-			case E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS:
-				model->data[count].name =  e_strdup_strip(data->string);
-				model->data[count].email = e_strdup_strip(data->string);
-				count ++;
-				break;
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	int i;
-	for (i = 0; i < model->count; i++) {
-		g_free(model->data[i].name);
-		g_free(model->data[i].email);
-	}
-	g_free(model->data);
-	model->data = NULL;
-	model->count = -1;
-}
-
-/*
- * ESelectNamesTableModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_table_model_destroy (GtkObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_select_names_table_model_row_count (ETableModel *etc)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->count == -1) {
-		if (e_select_names_table_model->source) {
-			fill_in_info(e_select_names_table_model);
-		} else {
-			return 0;
-		}
-	}
-	return e_select_names_table_model->count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->data == NULL) {
-		fill_in_info(e_select_names_table_model);
-	}
-	switch (col) {
-	case 0:
-		if (e_select_names_table_model->data[row].name == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].name;
-		break;
-	case 1:
-		if (e_select_names_table_model->data[row].email == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].email;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_table_model_init:
- */
-static void
-e_select_names_table_model_init (ESelectNamesTableModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-
-	model->count = -1;
-	model->data = NULL;
-}
-
-static void
-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_table_model_destroy;
-	object_class->get_arg = e_select_names_table_model_get_arg;
-	object_class->set_arg = e_select_names_table_model_set_arg;
-
-	table_model_class->column_count = e_select_names_table_model_col_count;
-	table_model_class->row_count = e_select_names_table_model_row_count;
-	table_model_class->value_at = e_select_names_table_model_value_at;
-	table_model_class->set_value_at = e_select_names_table_model_set_value_at;
-	table_model_class->is_cell_editable = e_select_names_table_model_is_cell_editable;
-	table_model_class->duplicate_value = e_select_names_table_model_duplicate_value;
-	table_model_class->free_value = e_select_names_table_model_free_value;
-	table_model_class->initialize_value = e_select_names_table_model_initialize_value;
-	table_model_class->value_is_empty = e_select_names_table_model_value_is_empty;
-	table_model_class->value_to_string = e_select_names_table_model_value_to_string;
-}
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
deleted file mode 100644
index 7a051d337c..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__
-#define __E_SELECT_NAMES_TABLE_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-table/e-table-model.h>
-
-#define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())
-#define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))
-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-
-typedef struct {
-	char *name;
-	char *email;
-} ESelectNamesTableModelData;
-
-typedef struct _ESelectNamesTableModel ESelectNamesTableModel;
-typedef struct _ESelectNamesTableModelClass ESelectNamesTableModelClass;
-
-struct _ESelectNamesTableModel {
-	ETableModel parent;
-
-	ESelectNamesModel *source;
-	int source_changed_id;
-
-	int count;
-	ESelectNamesTableModelData *data; /* This is used as an array. */
-};
-
-struct _ESelectNamesTableModelClass {
-	ETableModelClass parent_class;
-};
-
-ETableModel *e_select_names_table_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_table_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TABLE_MODEL_H__ */
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
deleted file mode 100644
index 71934c46dc..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-text-model.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);
-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);
-
-static void e_select_names_text_model_destroy    (GtkObject *object);
-static void e_select_names_text_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_text_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void  e_select_names_text_model_set_text      (ETextModel *model, gchar *text);
-static void  e_select_names_text_model_insert        (ETextModel *model, gint position, gchar *text);
-static void  e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length);
-static void  e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static void e_select_names_text_model_model_changed (ESelectNamesModel *source,
-						     ESelectNamesTextModel *model);
-
-
-ETextModelClass *parent_class;
-#define PARENT_TYPE e_text_model_get_type()
-
-/**
- * e_select_names_text_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTextModel class.
- **/
-GtkType
-e_select_names_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTextModel",
-			sizeof (ESelectNamesTextModel),
-			sizeof (ESelectNamesTextModelClass),
-			(GtkClassInitFunc) e_select_names_text_model_class_init,
-			(GtkObjectInitFunc) e_select_names_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (PARENT_TYPE, &model_info);
-	}
-
-	return model_type;
-}
-
-/**
- * e_select_names_text_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesTextModel that wraps the @VCard.
- */
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = E_TEXT_MODEL(gtk_type_new(e_select_names_text_model_get_type()));
-	gtk_object_set(GTK_OBJECT(model),
-		       "source", source,
-		       NULL);
-	e_select_names_text_model_model_changed (source, E_SELECT_NAMES_TEXT_MODEL(model));
-	return model;
-}
-
-static void
-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *text_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	text_model_class = E_TEXT_MODEL_CLASS(klass);
-
-	parent_class = gtk_type_class(PARENT_TYPE);
-
-	gtk_object_add_arg_type ("ESelectNamesTextModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_text_model_destroy;
-	object_class->get_arg = e_select_names_text_model_get_arg;
-	object_class->set_arg = e_select_names_text_model_set_arg;
-
-	text_model_class->set_text      = e_select_names_text_model_set_text;
-	text_model_class->insert        = e_select_names_text_model_insert;
-	text_model_class->insert_length = e_select_names_text_model_insert_length;
-	text_model_class->delete        = e_select_names_text_model_delete;
-}
-
-static int
-get_length(EIterator *iterator)
-{
-	const ESelectNamesModelData *data = e_iterator_get(iterator);
-	return strlen(data->string);
-}
-
-static void
-e_select_names_text_model_set_text    	(ETextModel *model, gchar *text)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-	int length = 0;
-	if (model->text) {
-		length = strlen(model->text);
-	}
-	
-	e_iterator_reset(iterator);
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_replace(source,
-				     iterator,
-				     0,
-				     length,
-				     text);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_insert      	(ETextModel *model, gint position, gchar *text)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_insert(source,
-				    iterator,
-				    position,
-				    text);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_insert_length(source,
-					   iterator,
-					   position,
-					   text,
-					   length);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_delete        (ETextModel *model, gint position, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			e_select_names_model_delete(source,
-						    iterator,
-						    position,
-						    length);
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_model_changed (ESelectNamesModel     *source,
-					 ESelectNamesTextModel *model)
-{
-	EList *list = e_select_names_model_get_data(source);
-	EIterator *iterator = e_list_get_iterator(list);
-	int length = 0;
-	int length_count = 0;
-	int *lengthsp;
-	char *string;
-	char *stringp;
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesModelData *data = e_iterator_get(iterator);
-		length += strlen(data->string);
-		length ++;
-		length_count++;
-	}
-	if (length > 0)
-		length --;
-
-	g_free(model->lengths);
-	model->lengths = g_new(int, length_count + 1);
-	lengthsp = model->lengths;
-
-	string = g_new(char, length + 1);
-	stringp = string;
-	*stringp = 0;
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesModelData *data = e_iterator_get(iterator);
-		int this_length;
-
-		strcpy(stringp, data->string);
-		this_length = strlen(stringp);
-		stringp += this_length;
-		*(stringp++) = ',';
-		*(lengthsp++) = this_length;
-	}
-	if (stringp != string) {
-		stringp --;
-		*stringp = 0;
-	}
-	*lengthsp = -1;
-	g_free(E_TEXT_MODEL(model)->text);
-	E_TEXT_MODEL(model)->text = string;
-	e_text_model_changed(E_TEXT_MODEL(model));
-}
-
-
-static void
-e_select_names_text_model_add_source (ESelectNamesTextModel *model,
-				      ESelectNamesModel     *source)
-{
-	model->source = source;
-	if (model->source)
-		gtk_object_ref(GTK_OBJECT(model->source));
-	model->source_changed_id = gtk_signal_connect(GTK_OBJECT(model->source), "changed",
-						      GTK_SIGNAL_FUNC(e_select_names_text_model_model_changed),
-						      model);
-}
-
-static void
-e_select_names_text_model_drop_source (ESelectNamesTextModel *model)
-{
-	if (model->source_changed_id)
-		gtk_signal_disconnect(GTK_OBJECT(model->source), model->source_changed_id);
-	if (model->source)
-		gtk_object_unref(GTK_OBJECT(model->source));
-	model->source = NULL;
-	model->source_changed_id = 0;
-}
-
-/*
- * ESelectNamesTextModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-	
-	e_select_names_text_model_drop_source(model);
-	g_free(model->lengths);
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-
-/* Set_arg handler for the model */
-static void
-e_select_names_text_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_text_model_drop_source(model);
-		e_select_names_text_model_add_source(model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT(*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_text_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_text_model_init:
- */
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-	model->lengths = NULL;
-}
-
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
deleted file mode 100644
index 3d6bed468e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-text/e-text-model.h>
-
-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))
-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-
-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;
-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;
-
-struct _ESelectNamesTextModel {
-	ETextModel parent;
-
-	ESelectNamesModel *source;
-	int source_changed_id;
-	int *lengths;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_text_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
deleted file mode 100644
index ece38c5efe..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-select-names.h"
-#include <gal/e-table/e-table-simple.h>
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/component/e-cardlist-model.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-table-model.h"
-
-static void e_select_names_init		(ESelectNames		 *card);
-static void e_select_names_class_init	(ESelectNamesClass	 *klass);
-static void e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char         *title;
-	ETableModel  *model;
-	ESelectNamesModel *source;
-	ESelectNames *names;
-} ESelectNamesChild;
-
-GtkType
-e_select_names_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"ESelectNames",
-			sizeof (ESelectNames),
-			sizeof (ESelectNamesClass),
-			(GtkClassInitFunc) e_select_names_class_init,
-			(GtkObjectInitFunc) e_select_names_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_class_init (ESelectNamesClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = e_select_names_set_arg;
-	object_class->get_arg = e_select_names_get_arg;
-	object_class->destroy = e_select_names_destroy;
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"35\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-        	<grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);
-
-static void
-set_book(EBook *book, EBookStatus status, ETableModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *model;
-	EBook *book;
-	GtkWidget *table;
-	char *filename;
-	char *uri;
-
-	model = e_addressbook_model_new();
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       NULL);
-
-	book = e_book_new();
-	gtk_object_ref(GTK_OBJECT(model));
-	gtk_object_ref(GTK_OBJECT(book));
-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf("file://%s", filename);
-	e_book_load_uri(book, uri, (EBookCallback) set_book, model);
-	g_free(uri);
-	g_free(filename);
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-	return table;
-}
-
-static void
-set_current_selection(ETableScrolled *table, int row, ESelectNames *names)
-{
-	names->currently_selected = row;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);
-	e_select_names->gui = gui;
-
-	e_select_names->children = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->child_count = 0;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_select_names)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_select_names),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-	
-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);
-
-	e_select_names->table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));
-	e_select_names->model = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "model");
-
-	e_select_names->currently_selected = -1;
-
-	gtk_signal_connect(GTK_OBJECT(e_select_names->table), "cursor_change",
-			   GTK_SIGNAL_FUNC(set_current_selection), e_select_names);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->model));
-	gtk_object_unref(GTK_OBJECT(child->source));
-	g_free(key);
-}
-
-static void
-e_select_names_destroy (GtkObject *object) {
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-	
-	gtk_object_unref(GTK_OBJECT(e_select_names->gui));
-	g_hash_table_foreach(e_select_names->children, (GHFunc) e_select_names_child_free, e_select_names);
-	g_hash_table_destroy(e_select_names->children);
-}
-
-GtkWidget*
-e_select_names_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_select_names_get_type ()));
-	return widget;
-}
-
-static void
-e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *editor;
-
-	editor = E_SELECT_NAMES (o);
-	
-	switch (arg_id){
-	default:
-		return;
-	}
-}
-
-static void
-e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *e_select_names;
-
-	e_select_names = E_SELECT_NAMES (object);
-
-	switch (arg_id) {
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-button_clicked(GtkWidget *button, ESelectNamesChild *child)
-{
-	ESelectNames *names = child->names;
-	int row = names->currently_selected;
-	if (row != -1) {
-		ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(names->model), row);
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,
-					     card,
-					     NULL};
-		char *name, *email;
-		ECardSimple *simple = e_card_simple_new(card);
-		EIterator *iterator;
-
-		name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-		if (name && *name && email && *email) {
-			new.string = g_strdup_printf("\"%s\" <%s>", name, email);
-		} else if (email && *email) {
-			new.string = g_strdup_printf("%s", email);
-		} else {
-			new.string = g_strdup("");
-		}
-
-		iterator = e_list_get_iterator(e_select_names_model_get_data(child->source));
-		e_iterator_last(iterator);
-		e_select_names_model_add_item(child->source, iterator, &new);
-
-		gtk_object_unref(GTK_OBJECT(simple));
-		gtk_object_unref(GTK_OBJECT(card));
-		g_free(email);
-		g_free(name);
-		g_free(new.string);
-	}
-}
-
-static void
-remove_address(ETableScrolled *table, int row, ESelectNamesChild *child)
-{
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(child->source));
-	e_iterator_reset(iterator);
-	for (; row > 0; row--) {
-		e_iterator_next(iterator);
-	}
-	e_select_names_model_remove_item(child->source, iterator);
-}
-
-void
-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *alignment;
-	GtkTable *table;
-	char *label;
-
-	ETableModel *model;
-	GtkWidget *etable;
-
-	if (g_hash_table_lookup(e_select_names->children, id)) {
-		return;
-	}
-
-	table = GTK_TABLE(glade_xml_get_widget (e_select_names->gui, "table-recipients"));
-
-	child = g_new(ESelectNamesChild, 1);
-
-	child->names = e_select_names;
-	child->title = g_strdup(_(name));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-	label = g_strdup_printf("%s ->", child->title);
-	button = gtk_button_new_with_label(label);
-	g_free(label);
-	gtk_container_add(GTK_CONTAINER(alignment), button);
-	gtk_widget_show_all(alignment);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_clicked), child);
-	gtk_table_attach(table, alignment,
-			 0, 1,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-	
-	model = e_select_names_table_model_new(source);
-	etable = e_table_scrolled_new (model, NULL, SPEC2, NULL);
-	
-	gtk_signal_connect(GTK_OBJECT(etable), "double_click",
-			   GTK_SIGNAL_FUNC(remove_address), child);
-
-	child->model = model;
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->model));
-	gtk_object_ref(GTK_OBJECT(child->source));
-	
-	gtk_widget_show(etable);
-	
-	gtk_table_attach(table, etable,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-}
-
-static void *
-card_copy(const void *value, void *closure)
-{
-	gtk_object_ref(GTK_OBJECT(value));
-	return (void *)value;
-}
-
-static void
-card_free(void *value, void *closure)
-{
-	gtk_object_unref(GTK_OBJECT(value));
-}
-
-EList *
-e_select_names_get_section(ESelectNames *e_select_names, char *id)
-{
-	ESelectNamesChild *child;
-	int i;
-	int rows;
-	EList *list;
-	
-	child = g_hash_table_lookup(e_select_names->children, id);
-	if (!child)
-		return NULL;
-	rows = e_table_model_row_count(child->model);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i);
-		e_list_append(list, card);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-	return list;
-}
-
-ESelectNamesModel *
-e_select_names_get_source(ESelectNames *e_select_names,
-			  char *id)
-{
-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names->children, id);
-	if (child) {
-		if (child->source)
-			gtk_object_ref(GTK_OBJECT(child->source));
-		return child->source;
-	} else
-		return NULL;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
deleted file mode 100644
index dba100e8f0..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SELECT_NAMES_H__
-#define __E_SELECT_NAMES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <e-util/e-list.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include "e-select-names-model.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ESelectNames - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_SELECT_NAMES_TYPE			(e_select_names_get_type ())
-#define E_SELECT_NAMES(obj)			(GTK_CHECK_CAST ((obj), E_SELECT_NAMES_TYPE, ESelectNames))
-#define E_SELECT_NAMES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SELECT_NAMES_TYPE, ESelectNamesClass))
-#define E_IS_SELECT_NAMES(obj)		(GTK_CHECK_TYPE ((obj), E_SELECT_NAMES_TYPE))
-#define E_IS_SELECT_NAMES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SELECT_NAMES_TYPE))
-
-typedef struct _ESelectNames       ESelectNames;
-typedef struct _ESelectNamesClass  ESelectNamesClass;
-
-struct _ESelectNames
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *model;
-	int currently_selected;
-};
-
-struct _ESelectNamesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_select_names_new          (void);
-GtkType    e_select_names_get_type     (void);
-
-void       e_select_names_add_section  (ESelectNames *e_select_names,
-				       	char         *name,
-				       	char         *id,
-				       	ESelectNamesModel *source);
-ESelectNamesModel *e_select_names_get_source   (ESelectNames *e_select_names,
-						char *id);
-/* Returns a ref counted list of addresses. */
-EList     *e_select_names_get_section  (ESelectNames *e_select_names,
-				       	char         *id);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_SELECT_NAMES_H__ */
diff --git a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
deleted file mode 100644
index e66c3aa38a..0000000000
--- a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade
deleted file mode 100644
index b60972d094..0000000000
--- a/addressbook/gui/component/select-names/recipient.glade
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Recipient</name>
-  <program_name>recipient</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkHBox</class>
-    <name>hbox-top</name>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkAlignment</class>
-      <name>alignment1</name>
-      <xalign>1.08033e-07</xalign>
-      <yalign>0</yalign>
-      <xscale>1</xscale>
-      <yscale>0</yscale>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>text-button</name>
-	<can_focus>True</can_focus>
-	<label>-&gt;</label>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade
deleted file mode 100644
index 90ca93bd3a..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Select-names</name>
-  <program_name>select-names</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>select-names.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-top</name>
-  <visible>False</visible>
-  <title>Select Names</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>3</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <label>Find...</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<label>Select name from List:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>table-source</name>
-	<creation_function>e_addressbook_create_ebook_table</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-recipients</name>
-	<rows>1</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel2</name>
-	  <label>Message Recipients</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/select-names.glade.h b/addressbook/gui/component/select-names/select-names.glade.h
deleted file mode 100644
index 1cb9702956..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Select Names");
-gchar *s = N_("Find...");
-gchar *s = N_("Select name from List:");
-gchar *s = N_("Message Recipients");
diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/gui/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
deleted file mode 100644
index 1016d38301..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-categories.c		\
-	e-contact-editor-categories.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-save-as.c			\
-	e-contact-save-as.h
-
-noinst_PROGRAMS =		\
-	contact-editor-test
-
-contact_editor_test_SOURCES = 	\
-	test-editor.c
-
-contact_editor_test_LDADD =					\
-	libecontacteditor.a					\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(GNOMEGNORBA_LIBS)					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-	$(top_builddir)/e-util/libeutil.la			\
-	$(GNOME_PRINT_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	categories.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)			\
-	e-contact-editor-strings.h	\
-	fulladdr.glade.h		\
-	fullname-strings.h		\
-	categories-strings.h		\
-	e-contact-editor-confirm-delete.glade.h
diff --git a/addressbook/gui/contact-editor/arrow.png b/addressbook/gui/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/gui/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/briefcase.png b/addressbook/gui/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/gui/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/categories-strings.h b/addressbook/gui/contact-editor/categories-strings.h
deleted file mode 100644
index 813018a00e..0000000000
--- a/addressbook/gui/contact-editor/categories-strings.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("categories");
-gchar *s = N_("Item(s) belong to these categories:");
-gchar *s = N_("Available Categories:");
diff --git a/addressbook/gui/contact-editor/categories.glade b/addressbook/gui/contact-editor/categories.glade
deleted file mode 100644
index bf78008940..0000000000
--- a/addressbook/gui/contact-editor/categories.glade
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>categories-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Item(s) belong to these categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Available Categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index 5d49fd06ff..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2455 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Contact-editor</name>
-  <program_name>contact-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>2</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button31</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Phone Types</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <label>New phone type</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment9</name>
-	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>Contact Editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-general</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>14</rows>
-	<columns>8</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>text-address</name>
-	  <width>1</width>
-	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <has_default>True</has_default>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <value_in_list>False</value_in_list>
-	  <ok_if_empty>True</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></items>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>True</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Home</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone2</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Business _Fax</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone3</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Mobile</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone4</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Primary Email</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-email1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0</xalign>
-	  <yalign>0</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <visible>False</visible>
-	    <label>_This is the mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Job title:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-jobtitle</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>cellphone.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>envelope.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>house.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-company</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Office:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-office</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Nickname:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-nickname</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Manager's Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-manager</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 7df9cb8cb4..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-GtkType
-e_contact_editor_address_get_type (void)
-{
-	static GtkType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type)
-		{
-			static const GtkTypeInfo contact_editor_address_info =
-			{
-				"EContactEditorAddress",
-				sizeof (EContactEditorAddress),
-				sizeof (EContactEditorAddressClass),
-				(GtkClassInitFunc) e_contact_editor_address_class_init,
-				(GtkObjectInitFunc) e_contact_editor_address_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info);
-		}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_ADDRESS);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable) {
-		e_utf8_gtk_editable_set_text(editable, string);
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (address) {
-		fill_in_field(editor, "entry-street" , address->street );
-		fill_in_field(editor, "entry-po"     , address->po     );
-		fill_in_field(editor, "entry-ext"    , address->ext    );
-		fill_in_field(editor, "entry-city"   , address->city   );
-		fill_in_field(editor, "entry-region" , address->region );
-		fill_in_field(editor, "entry-code"   , address->code   );
-		fill_in_field(editor, "entry-country", address->country);
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (!address) {
-		address = e_card_delivery_address_new();
-		editor->address = address;
-	}
-	address->street  = extract_field(editor, "entry-street" );
-	address->po      = extract_field(editor, "entry-po"     );
-	address->ext     = extract_field(editor, "entry-ext"    );
-	address->city    = extract_field(editor, "entry-city"   );
-	address->region  = extract_field(editor, "entry-region" );
-	address->code    = extract_field(editor, "entry-code"   );
-	address->country = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index a74e1bd967..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
-GtkType    e_contact_editor_address_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c
deleted file mode 100644
index 045f128b48..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-categories.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <e-contact-editor-categories.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_destroy         (GtkObject *object);
-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);
-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);
-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);
-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);
-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);
-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);
-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);
-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);
-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);
-static char * e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CATEGORIES
-};
-
-GtkType
-e_contact_editor_categories_get_type (void)
-{
-	static GtkType contact_editor_categories_type = 0;
-
-	if (!contact_editor_categories_type)
-		{
-			static const GtkTypeInfo contact_editor_categories_info =
-			{
-				"EContactEditorCategories",
-				sizeof (EContactEditorCategories),
-				sizeof (EContactEditorCategoriesClass),
-				(GtkClassInitFunc) e_contact_editor_categories_class_init,
-				(GtkObjectInitFunc) e_contact_editor_categories_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_categories_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_categories_info);
-		}
-
-	return contact_editor_categories_type;
-}
-
-static void
-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorCategories::categories", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_CATEGORIES);
- 
-	object_class->set_arg = e_contact_editor_categories_set_arg;
-	object_class->get_arg = e_contact_editor_categories_get_arg;
-	object_class->destroy = e_contact_editor_categories_destroy;
-}
-
-gchar *builtin_categories[] = {
-	"Business",
-	"Competition",
-	"Favorites",
-	"Gifts",
-	"Goals/Objectives",
-	"Holiday",
-	"Holiday Cards",
-	"Hot Contacts",
-	"Ideas",
-	"International",
-	"Key Customer",
-	"Miscellaneous",
-	"Personal",
-	"Phone Calls",
-	"Status",
-	"Strategies",
-	"Suppliers",
-	"Time & Expenses",
-	"VIP",
-	"Waiting",
-};
-
-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))
-
-static void
-add_list_unique(EContactEditorCategories *categories, char *string)
-{
-	int k;
-	char *temp = e_strdup_strip(string);
-	char **list = categories->category_list;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for (k = 0; k < categories->list_length; k++) {
-		if (!strcmp(list[k], temp)) {
-			categories->selected_list[k] = TRUE;
-			break;
-		}
-	}
-	if (k == categories->list_length) {
-		categories->selected_list[categories->list_length] = TRUE;
-		list[categories->list_length++] = temp;
-	} else {
-		g_free(temp);
-	}
-}
-
-static void
-do_parse_categories(EContactEditorCategories *categories)
-{
-	char *str = categories->categories;
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	char **list;
-	int count = 1;
-
-	e_table_model_pre_change(categories->model);
-
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-
-	for (i = 0; str[i]; i++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (!str[i])
-				i--;
-			break;
-		case ',':
-			count ++;
-			break;
-		}
-	}
-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);
-	categories->category_list = list;
-
-	categories->selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);
-
-	for (count = 0; count < BUILTIN_CATEGORY_COUNT; count++) {
-		list[count] = g_strdup(builtin_categories[count]);
-		categories->selected_list[count] = 0;
-	}
-
-	categories->list_length = count;
-
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(categories, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(categories, copy);
-	g_free(copy);
-	e_table_model_changed(categories->model);
-}
-
-static void
-e_contact_editor_categories_entry_change (GtkWidget *entry, 
-					  EContactEditorCategories *categories)
-{
-	g_free(categories->categories);
-	categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	do_parse_categories(categories);
-}
-
-#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
-  <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
-  <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-        <ETableState> \
-		<column source=\"0\"/>						\
-		<column source=\"1\"/>						\
-        	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>	\
-        </ETableState> \
-</ETableSpecification>"
-
-static void
-e_contact_editor_categories_init (EContactEditorCategories *categories)
-{
-	GladeXML *gui;
-	GtkWidget *table;
-	GtkWidget *e_table;
-
-	categories->list_length = 0;
-	categories->category_list = NULL;
-	categories->selected_list = NULL;
-	categories->categories = NULL;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);
-	categories->gui = gui;
-
-	table = glade_xml_get_widget(gui, "table-categories");
-	gtk_widget_ref(table);
-	gtk_container_remove(GTK_CONTAINER(table->parent), table);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)->vbox), table, TRUE, TRUE, 0);
-	gtk_widget_unref(table);
-
-	categories->entry = glade_xml_get_widget(gui, "entry-categories");
-	
-	gtk_signal_connect(GTK_OBJECT(categories->entry), "changed",
-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);
-
-	categories->model = e_table_simple_new(e_contact_editor_categories_col_count, 
-					       e_contact_editor_categories_row_count,
-					       e_contact_editor_categories_value_at,
-					       e_contact_editor_categories_set_value_at,
-					       e_contact_editor_categories_is_cell_editable,
-					       e_contact_editor_categories_duplicate_value,
-					       e_contact_editor_categories_free_value,
-					       e_contact_editor_categories_initialize_value,
-					       e_contact_editor_categories_value_is_empty,
-					       e_contact_editor_categories_value_to_string,
-					       categories);
-
-	e_table = e_table_scrolled_new (categories->model, NULL, INITIAL_SPEC, NULL);
-
-	gtk_object_sink(GTK_OBJECT(categories->model));
-	
-	gtk_widget_show(e_table);
-
-	gtk_table_attach_defaults(GTK_TABLE(table),
-				  e_table, 
-				  0, 1,
-				  3, 4);
-}
-
-void
-e_contact_editor_categories_destroy (GtkObject *object)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);
-	int i;
-
-	if (categories->gui)
-		gtk_object_unref(GTK_OBJECT(categories->gui));
-
-	g_free(categories->categories);
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-}
-
-GtkWidget*
-e_contact_editor_categories_new (char *categories)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"categories", categories,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);
-	
-	switch (arg_id){
-	case ARG_CATEGORIES:
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg));
-		break;
-	}
-}
-
-static void
-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);
-
-	switch (arg_id) {
-	case ARG_CATEGORIES:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories->categories);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_contact_editor_categories_row_count (ETableModel *etc, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	return categories->list_length;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if (col == 0)
-		return (void *) categories->selected_list[row];
-	else
-		return categories->category_list[row];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if ( col == 0 ) {
-		char **strs;
-		int i, j;
-		char *string;
-		categories->selected_list[row] = (gboolean) val;
-		strs = g_new(char *, categories->list_length + 1);
-		for (i = 0, j = 0; i < categories->list_length; i++) {
-			if (categories->selected_list[i])
-				strs[j++] = categories->category_list[i];
-		}
-		strs[j] = 0;
-		string = g_strjoinv(", ", strs);
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string);
-		g_free(string);
-		g_free(strs);
-	}
-	if ( col == 1 )
-		return;
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)
-{
-	return col == 0;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return (void *)value;
-	else
-		return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)
-{
-	if (col == 0)
-		return;
-	else
-		g_free(value);
-}
-
-static void *
-e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup("");
-}
-
-static gboolean
-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.h b/addressbook/gui/contact-editor/e-contact-editor-categories.h
deleted file mode 100644
index 3edff76b4b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-categories.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_CATEGORIES_H__
-#define __E_CONTACT_EDITOR_CATEGORIES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorCategories - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())
-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))
-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))
-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-
-
-typedef struct _EContactEditorCategories       EContactEditorCategories;
-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;
-
-struct _EContactEditorCategories
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	char *categories;
-	GtkWidget *entry;
-	ETableModel *model;
-
-	int list_length;
-	char **category_list;
-	gboolean *selected_list;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorCategoriesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_categories_new(char *categories);
-GtkType    e_contact_editor_categories_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_CATEGORIES_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index 7f52321021..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-contact-editor-confirm-delete</name>
-  <program_name>e-contact-editor-confirm-delete</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeMessageBox</class>
-  <name>confirm-dialog</name>
-  <message_box_type>GNOME_MESSAGE_BOX_QUESTION</message_box_type>
-  <message>Are you sure you want
-to delete this contact?</message>
-  <title>Delete Contact?</title>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
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
deleted file mode 100644
index 7168db0a5c..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Are you sure you want\n"
-              "to delete this contact?");
-gchar *s = N_("Delete Contact?");
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 05e8d45702..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-GtkType
-e_contact_editor_fullname_get_type (void)
-{
-	static GtkType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type)
-		{
-			static const GtkTypeInfo contact_editor_fullname_info =
-			{
-				"EContactEditorFullname",
-				sizeof (EContactEditorFullname),
-				sizeof (EContactEditorFullnameClass),
-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,
-				(GtkObjectInitFunc) e_contact_editor_fullname_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_fullname_info);
-		}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_NAME);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			e_utf8_gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefix);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffix);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (!name) {
-		name = e_card_name_new();
-		editor->name = name;
-	}
-
-	name->prefix     = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffix     = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index bde6733976..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardName *name;
-	GladeXML *gui;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);
-GtkType    e_contact_editor_fullname_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h
deleted file mode 100644
index bb9c0b5b30..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-strings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Add");
-gchar *s = N_("_Delete");
-gchar *s = N_("Phone Types");
-gchar *s = N_("New phone type");
-gchar *s = N_("Add");
-gchar *s = N_("New phone type");
-gchar *s = N_("Contact Editor");
-gchar *s = N_("_Full Name...");
-gchar *s = N_("File As:");
-gchar *s = N_("Web page address:");
-gchar *s = N_("Wants to receive _HTML mail");
-gchar *s = N_("_Business");
-gchar *s = N_("_Home");
-gchar *s = N_("Business _Fax");
-gchar *s = N_("_Mobile");
-gchar *s = N_("Primary Email");
-gchar *s = N_("B_usiness");
-gchar *s = N_("_This is the mailing address");
-gchar *s = N_("C_ontacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("_Job title:");
-gchar *s = N_("_Company:");
-gchar *s = N_("_Address...");
-gchar *s = N_("General");
-gchar *s = N_("_Department:");
-gchar *s = N_("_Office:");
-gchar *s = N_("_Profession:");
-gchar *s = N_("_Nickname:");
-gchar *s = N_("_Spouse:");
-gchar *s = N_("_Birthday:");
-gchar *s = N_("_Assistant's name:");
-gchar *s = N_("_Manager's Name:");
-gchar *s = N_("Anni_versary:");
-gchar *s = N_("No_tes:");
-gchar *s = N_("Details");
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
deleted file mode 100644
index c4e8ed8640..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1748 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <e-contact-editor-categories.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *card);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_destroy (GtkObject *object);
-
-#if 0
-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);
-#endif
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_fields(EContactEditor *editor);
-static void set_address_field(EContactEditor *editor, int result);
-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-GtkType
-e_contact_editor_get_type (void)
-{
-  static GtkType contact_editor_type = 0;
-
-  if (!contact_editor_type)
-    {
-      static const GtkTypeInfo contact_editor_info =
-      {
-        "EContactEditor",
-        sizeof (EContactEditor),
-        sizeof (EContactEditorClass),
-        (GtkClassInitFunc) e_contact_editor_class_init,
-        (GtkObjectInitFunc) e_contact_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_editor_info);
-    }
-
-  return contact_editor_type;
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_editor_set_arg;
-  object_class->get_arg = e_contact_editor_get_arg;
-  object_class->destroy = e_contact_editor_destroy;
-}
-
-static void
-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	GtkWidget *pixmap;
-	gchar *image_temp;
-	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
-		gtk_container_add(GTK_CONTAINER(button),
-				  pixmap);
-		g_free(image_temp);
-		gtk_widget_show(pixmap);
-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
-	}
-}
-
-static void
-_replace_buttons(EContactEditor *editor)
-{
-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);
-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	gtk_object_get(GTK_OBJECT(widget),
-		       "active", &wants_html,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(editor->card),
-		       "wants_html", wants_html,
-		       NULL);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	string = e_utf8_gtk_entry_get_text(entry);
-
-	e_card_simple_set_email(editor->simple, editor->email_choice, string);
-
-	g_free (string);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const ECardName *name, char *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name) {
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (EContactEditor *editor)
-{
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	char *filestring;
-	char *trystring;
-	ECardName *name = editor->name;
-	int i;
-	int style;
-
-	filestring = e_utf8_gtk_entry_get_text(file_as);
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style(name, editor->company, i);
-		if (!strcmp(trystring, filestring)) {
-			g_free(trystring);
-			g_free(filestring);
-			return i;
-		}
-		g_free(trystring);
-	}
-	g_free (filestring);
-	return -1;
-}
-
-static void
-file_as_set_style(EContactEditor *editor, int style)
-{
-	char *string;
-	int i;
-	GList *strings = NULL;
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	GtkWidget *widget;
-		
-
-	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
-		strings = g_list_append(strings, string);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense(editor->name, editor->company, i)) {
-			char *u;
-			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO(widget)) {
-		GtkCombo *combo = GTK_COMBO(widget);
-		gtk_combo_set_popdown_strings(combo, strings);
-		g_list_foreach(strings, (GFunc) g_free, NULL);
-		g_list_free(strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkWidget *file_as;
-	int style = 0;
-	char *string;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	GtkWidget *file_as;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   phone_entry_changed, editor);
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-	widget = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   email_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   address_text_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   name_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   company_entry_changed, editor);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
-			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "address", &new_address,
-			       NULL);
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	else if (editor->card)
-		gtk_object_get(GTK_OBJECT(editor->card),
-			       "categories", &categories,
-			       NULL);
-	dialog = GNOME_DIALOG(e_contact_editor_categories_new(categories));
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-	if (result == 0) {
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "categories", &categories,
-			       NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			gtk_object_set(GTK_OBJECT(editor->card),
-				       "categories", categories,
-				       NULL);
-		g_free(categories);
-	}
-	gtk_object_destroy(GTK_OBJECT(dialog));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-gboolean
-e_contact_editor_confirm_delete(GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GladeXML *gui;
-	int result;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);
-
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));
-
-	gnome_dialog_set_parent(dialog, parent);
-	
-	result = gnome_dialog_run_and_close(dialog);
-
-	gtk_object_unref(GTK_OBJECT(gui));
-
-	return !result;
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (ce->simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 ce->card);
-		
-		file_close_cb(widget, data);
-	}
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor->app),
-				  (GtkCallback) add_field_callback,
-				  e_contact_editor);
-
-	_replace_buttons(e_contact_editor);
-	set_entry_changed_signals(e_contact_editor);
-
-	wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail");
-	if (wants_html && GTK_IS_TOGGLE_BUTTON(wants_html))
-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",
-				   wants_html_changed, e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_name_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_addr_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   categories_clicked, e_contact_editor);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (e_contact_editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (e_contact_editor->app);
-		e_contact_editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->email_list) {
-		g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->email_list);
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-	}
-	if (e_contact_editor->email_popup) {
-		gtk_widget_unref(e_contact_editor->email_popup);
-	}
-	
-	if (e_contact_editor->phone_list) {
-		g_list_foreach(e_contact_editor->phone_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->phone_list);
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-	}
-	if (e_contact_editor->phone_popup) {
-		gtk_widget_unref(e_contact_editor->phone_popup);
-	}
-	
-	if (e_contact_editor->address_list) {
-		g_list_foreach(e_contact_editor->address_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->address_list);
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-	}
-	if (e_contact_editor->address_popup) {
-		gtk_widget_unref(e_contact_editor->address_popup);
-	}
-	
-	if (e_contact_editor->simple)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->simple));
-
-	if (e_contact_editor->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	return ce;
-}
-
-static void
-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		gtk_object_set(GTK_OBJECT(editor->simple),
-			       "card", editor->card,
-			       NULL);
-		fill_in_info(editor);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(e_contact_editor->simple);
-		extract_info(e_contact_editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->card);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->is_new_card ? TRUE : FALSE;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.width;
-	*y += button->allocation.height;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &request);
-
-	mh = request.height;
-	mw = request.width;
-
-	*x -= mw;
-	if (*x < 0)
-		*x = 0;
-	
-	if (*y < 0)
-		*y = 0;
-	
-	if ((*x + mw) > gdk_screen_width ())
-		*x = gdk_screen_width () - mw;
-	
-	if ((*y + mh) > gdk_screen_height ())
-		*y = gdk_screen_height () - mh;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)
-{
-	gint menu_item;
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);
-	if ( menu_item != -1 ) {
-#if 0
-		if (menu_item == g_list_length (*list)) {
-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);
-		} else {
-#endif
-			GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-			if (label_widget && GTK_IS_LABEL(label_widget)) {
-				gtk_object_set(GTK_OBJECT(label_widget),
-					       "label", g_list_nth_data(*list, menu_item),
-					       NULL);
-			}
-#if 0
-		}
-#endif
-	}
-	return menu_item;
-}
-
-static void
-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)
-{
-	GnomeUIInfo *info;
-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };
-	GnomeUIInfo end = GNOMEUIINFO_END;
-	int length;
-	int i;
-
-	info = *infop;
-
-	if ( info )
-		g_free(info);
-	length = g_list_length( list );
-	info = g_new(GnomeUIInfo, length + 2);
-	for (i = 0; i < length; i++) {
-		info[i] = singleton;
-		info[i].label = _(list->data);
-		list = list->next;
-	}
-	info[i] = end;
-
-	*infop = info;
-}
-
-#if 0
-static void
-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
-{
-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
-					       "e_contact_editor_label");
-
-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
-						      "e_contact_editor_dialog_entry");
-	
-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_list");
-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_info");
-	switch (button) {
-	case 0:
-		if (label && GTK_IS_LABEL(label)) {
-			gtk_object_set(GTK_OBJECT(label),
-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),
-				       NULL);
-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));
-			g_free(*info);
-			*info = NULL;
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static GtkWidget *
-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)
-{
-	GtkWidget *dialog_entry = gtk_entry_new();
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, entry_id);
-	GtkWidget *label = glade_xml_get_widget(editor->gui, label_id);
-	
-	GtkWidget *dialog = gnome_dialog_new(title,
-					     NULL);
-	
-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox),
-			  gtk_widget_new (gtk_frame_get_type(),
-					  "border_width", 4,
-					  "label", title,
-					  "child", gtk_widget_new(gtk_alignment_get_type(),
-								  "child", dialog_entry,
-								  "xalign", .5,
-								  "yalign", .5,
-								  "xscale", 1.0,
-								  "yscale", 1.0,
-								  "border_width", 9,
-								  NULL),
-					  NULL));
-
-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),
-					       "Add",
-					       GNOME_STOCK_PIXMAP_ADD);
-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);
-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
-	
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   _dialog_clicked, editor);
-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",
-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));
-	
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_entry", entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_label", label);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_dialog_entry", dialog_entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_list", list);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_info", info);
-
-	gtk_widget_show_all(dialog);
-	return dialog;
-}
-#endif
-
-static void
-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int which;
-	int i;
-	gchar *label;
-	gchar *entry;
-	int result;
-	if ( widget == glade_xml_get_widget(editor->gui, "button-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone4") ) {
-		which = 4;
-	} else
-		return;
-	
-	label = g_strdup_printf("label-phone%d", which);
-	entry = g_strdup_printf("entry-phone%d", which);
-
-	if (editor->phone_list == NULL) {
-		static char *info[] = {
-			N_("Assistant"),
-			N_("Business"),
-			N_("Business 2"),
-			N_("Business Fax"),
-			N_("Callback"),
-			N_("Car"),
-			N_("Company"),
-			N_("Home"),
-			N_("Home 2"),
-			N_("Home Fax"),
-			N_("ISDN"),
-			N_("Mobile"),
-			N_("Other"),
-			N_("Other Fax"),
-			N_("Pager"),
-			N_("Primary"),
-			N_("Radio"),
-			N_("Telex"),
-			N_("TTY/TDD")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			gtk_widget_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-		const ECardPhone *phone = e_card_simple_get_phone(editor->simple, i);
-		gboolean checked;
-		checked = phone && phone->number && *phone->number;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
-	
-	if (result != -1) {
-		editor->phone_choice[which - 1] = result;
-		set_fields(editor);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->email_list == NULL) {
-		static char *info[] = {
-			N_("Primary Email"),
-			N_("Email 2"),
-			N_("Email 3")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->email_list = g_list_append(editor->email_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			gtk_widget_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-		const char *string = e_card_simple_get_email(editor->simple, i);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
-	
-	if (result != -1) {
-		editor->email_choice = result;
-		set_fields(editor);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	if (editor->address_list == NULL) {
-		static char *info[] = {
-			N_("Business"),
-			N_("Home"),
-			N_("Other")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->address_list = g_list_append(editor->address_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->address_info == NULL) {
-		e_contact_editor_build_ui_info(editor->address_list, &editor->address_info);
-
-		if ( editor->address_popup )
-			gtk_widget_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-	}
-	
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-		gboolean checked;
-		checked = address && address->data && *address->data;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		ECardName *name;
-		const ECardDate *anniversary;
-		const ECardDate *bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-		gboolean wants_html, wants_html_set;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as",       &file_as,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       key, string,
-				       NULL);
-		else
-			gtk_object_set(GTK_OBJECT(card),
-				       key, NULL,
-				       NULL);
-
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_single_field(EContactEditor *editor, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	ECardSimple *simple = editor->simple;
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    string);
-		else
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    NULL);
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				gtk_object_set(GTK_OBJECT(card),
-					       "file_as", string,
-					       NULL);
-
-			if (string) g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			extract_single_field(editor, list->data);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
deleted file mode 100644
index fae6939595..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-	GnomeUIInfo *email_info;
-	GnomeUIInfo *phone_info;
-	GnomeUIInfo *address_info;
-	GtkWidget *email_popup;
-	GtkWidget *phone_popup;
-	GtkWidget *address_popup;
-	GList *email_list;
-	GList *phone_list;
-	GList *address_list;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-
-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);
-GtkType    e_contact_editor_get_type (void);
-
-
-gboolean e_contact_editor_confirm_delete(GtkWindow *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 7209c5e8f8..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(card);
-	
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h
deleted file mode 100644
index d1c84dc596..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-save-as.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void
-e_contact_save_as(gchar *title, ECard *card);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/email.png b/addressbook/gui/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/gui/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index e46064bb92..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fulladdr</name>
-  <program_name>fulladdr</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h
deleted file mode 100644
index 7db13fcf4d..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Address");
-gchar *s = N_("_Address:");
-gchar *s = N_("_City:");
-gchar *s = N_("_PO Box:");
-gchar *s = N_("Address _2:");
-gchar *s = N_("_State/Province:");
-gchar *s = N_("USA");
-gchar *s = N_("Canada");
-gchar *s = N_("Finland");
-gchar *s = N_("_ZIP Code:");
-gchar *s = N_("Countr_y:");
diff --git a/addressbook/gui/contact-editor/fullname-strings.h b/addressbook/gui/contact-editor/fullname-strings.h
deleted file mode 100644
index 4d4303270a..0000000000
--- a/addressbook/gui/contact-editor/fullname-strings.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Full Name");
-gchar *s = N_("\n"
-              "Mr.\n"
-              "Mrs.\n"
-              "Dr.\n"
-              "");
-gchar *s = N_("\n"
-              "Sr.\n"
-              "Jr.\n"
-              "I\n"
-              "II\n"
-              "III\n"
-              "Esq.\n"
-              "");
-gchar *s = N_("_First:");
-gchar *s = N_("_Title:");
-gchar *s = N_("_Middle:");
-gchar *s = N_("_Last:");
-gchar *s = N_("_Suffix:");
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index f2dfa23834..0000000000
--- a/addressbook/gui/contact-editor/fullname.glade
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fullname</name>
-  <program_name>fullname</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fullname-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkfullname</name>
-  <visible>False</visible>
-  <title>Check Full Name</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkfullname</name>
-      <border_width>8</border_width>
-      <rows>5</rows>
-      <columns>3</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>21</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-title</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Mr.
-Mrs.
-Dr.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-title</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-suffix</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Sr.
-Jr.
-I
-II
-III
-Esq.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-suffix</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-first</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-middle</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-last</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_First:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-first</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>_Title:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-title</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>_Middle:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-middle</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_Last:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-last</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_Suffix:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-suffix</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/head.png b/addressbook/gui/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/gui/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netfreebusy.png b/addressbook/gui/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/gui/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netmeeting.png b/addressbook/gui/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/gui/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/phone.png b/addressbook/gui/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/gui/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/snailmail.png b/addressbook/gui/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/gui/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	gtk_object_unref (GTK_OBJECT (ce));
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/gui/contact-editor/web.png b/addressbook/gui/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/gui/contact-editor/web.png
+++ /dev/null
diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/addressbook/gui/search/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
deleted file mode 100644
index d932aaac77..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-ruledir = $(datadir)/evolution
-rule_DATA = addresstypes.xml
-
-EXTRA_DIST = addresstypes.xml
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeaddressbooksearch.a
-
-libeaddressbooksearch_a_SOURCES =		\
-	e-addressbook-search-dialog.c		\
-	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml
deleted file mode 100644
index bf64e841b0..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="name">
-  <title>Name</title>
-   <input type="optionlist" name="name-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "full_name" ${name})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "full_name" ${name}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "full_name" ${name})))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "full_name" ${name}))</code>
-    </option>
-    <option value="begin">
-        <title>begins with</title>
-	<code>(beginswith "full_name" ${name})</code>
-    </option>
-    <option value="end">
-        <title>ends in</title>
-	<code>(endswith "full_name" ${name})</code>
-    </option>
-   </input>
-   <input type="string" name="name"/>
- </part>
- <part name="email">
-  <title>Email</title>
-   <input type="optionlist" name="email-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "email" ${email})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "email" ${email}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "email" ${email})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "email" ${email}))</code>
-    </option>
-   </input>
-   <input type="address" name="email"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-</partset>
-</filterdescription>
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
deleted file mode 100644
index 60f92cfff4..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-minicard-view-widget.h"
-#include <gal/widgets/e-scroll-frame.h>
-
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_destroy       (GtkObject *object);
-
-static ECanvasClass *parent_class = NULL;
-
-#define PARENT_TYPE (gnome_dialog_get_type())
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-};
-
-GtkType
-e_addressbook_search_dialog_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "EAddressbookSearchDialog",
-        sizeof (EAddressbookSearchDialog),
-        sizeof (EAddressbookSearchDialogClass),
-        (GtkClassInitFunc) e_addressbook_search_dialog_class_init,
-        (GtkObjectInitFunc) e_addressbook_search_dialog_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (PARENT_TYPE, &info);
-    }
-
-  return type;
-}
-
-static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-
-	object_class->set_arg       = e_addressbook_search_dialog_set_arg;
-	object_class->get_arg       = e_addressbook_search_dialog_get_arg;
-	object_class->destroy       = e_addressbook_search_dialog_destroy;
-}
-
-static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
-{
-	FilterPart *part;
-
-	view->context = rule_context_new();
-	/* FIXME: hide this in a class */
-	rule_context_add_part_set(view->context, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-	view->rule = filter_rule_new();
-	part = rule_context_next_part(view->context, NULL);
-	if (part == NULL) {
-		g_warning("Problem loading search for addressbook no parts to load");
-		return gtk_entry_new();
-	} else {
-		filter_rule_add_part(view->rule, filter_part_clone(part));
-		return filter_rule_get_widget(view->rule, view->context);
-	}
-}
-
-static char *
-get_query (EAddressbookSearchDialog *view)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	filter_rule_build_code(view->rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-button_press (GtkWidget *widget, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	gtk_widget_show(dialog->scrolled_window);
-	query = get_query(dialog);
-	gtk_object_set(GTK_OBJECT(dialog->view),
-		       "query", query,
-		       NULL);
-	g_free(query);
-}
-
-static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
-{
-	GtkWidget *button;
-	GnomeDialog *dialog = GNOME_DIALOG (view);
-
-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
-
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, FALSE, FALSE, 0);
-	gtk_widget_show(view->search);
-
-	button = gtk_button_new_with_label(_("Search"));
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_press), view);
-	gtk_widget_show(button);
-
-	view->view = e_minicard_view_widget_new();
-	gtk_widget_show(view->view);
-
-	view->scrolled_window = e_scroll_frame_new(NULL, NULL);
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(view->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
-	
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EBook *book)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	gtk_object_set(GTK_OBJECT(view->view),
-		       "book", book,
-		       NULL);
-	return GTK_WIDGET(view);
-}
-
-static void
-e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set(GTK_OBJECT(emvw->view),
-			       "book", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		gtk_object_get(GTK_OBJECT(emvw->view),
-			       "book", &(GTK_VALUE_OBJECT (*arg)),
-			       NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_destroy (GtkObject *object)
-{
-	EAddressbookSearchDialog *view;
-
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	gtk_object_unref((GtkObject *)view->context);
-	gtk_object_unref((GtkObject *)view->rule);
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
deleted file mode 100644
index dc54275a77..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-
-#include <gnome.h>
-#include <ebook/e-book.h>
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())
-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))
-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;
-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;
-
-struct _EAddressbookSearchDialog
-{
-	GnomeDialog parent;
-
-	GtkWidget *search;
-	GtkWidget *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *scrolled_window;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EBook *book);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index 472fd2593f..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index 91e361bee1..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-minicard\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/e-reflow		\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/misc			\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeminicard.a
-
-libeminicard_a_SOURCES =			\
-	e-addressbook-model.c			\
-	e-addressbook-model.h			\
-	e-addressbook-search.c			\
-	e-addressbook-search.h			\
-	e-addressbook-view.c			\
-	e-addressbook-view.h			\
-	e-minicard-control.c			\
-	e-minicard-control.h			\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-minicard-view-widget.c		\
-	e-minicard-view-widget.h		\
-	e-minicard-view.c			\
-	e-minicard-view.h			\
-	e-minicard-widget.c			\
-	e-minicard-widget.h			\
-	e-minicard.c				\
-	e-minicard.h
-
-noinst_PROGRAMS =				\
-	minicard-widget-test			\
-	minicard-label-test			\
-	minicard-test				\
-	reflow-test
-#	minicard-view-test
-
-minicard_label_test_SOURCES = 	\
-	test-minicard-label.c
-
-minicard_label_test_LDADD =				\
-	$(EXTRA_GNOME_LIBS)				\
-	libeminicard.a					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la
-
-minicard_test_SOURCES = 	\
-	test-minicard.c
-
-minicard_test_LDADD =							\
-	$(EXTRA_GNOME_LIBS)						\
-	libeminicard.a							\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la
-
-reflow_test_SOURCES = 	\
-	test-reflow.c
-
-reflow_test_LDADD =							\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	libeminicard.a							\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la
-
-#minicard_view_test_SOURCES = 	\
-#	test-minicard-view.c
-
-#minicard_view_test_LDADD =						\
-#	$(EXTRA_GNOME_LIBS)						\
-#	$(BONOBO_GNOME_LIBS)						\
-#	libeminicard.a							\
-#	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/libversit/libversit.la				\
-#	$(top_builddir)/addressbook/ename/libename.la			\
-#	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-#	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	$(top_builddir)/e-util/libeutil.la
-
-minicard_widget_test_SOURCES = 	\
-	e-minicard-widget-test.c
-
-minicard_widget_test_LDADD =						\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	libeminicard.a							\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/e-util/libeutil.la
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = alphabet.glade 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	alphabet.glade.h
diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade
deleted file mode 100644
index bc6e5f3798..0000000000
--- a/addressbook/gui/widgets/alphabet.glade
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>alphabet</name>
-  <program_name>alphabet</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alphabet.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window2</name>
-  <visible>False</visible>
-  <title>window2</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkScrolledWindow</class>
-    <name>scrolledwindow-top</name>
-    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-    <widget>
-      <class>GtkViewport</class>
-      <name>viewport1</name>
-      <border_width>4</border_width>
-      <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<width>27</width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-1</name>
-	  <label>123</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-a</name>
-	  <label>a</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-b</name>
-	  <label>b</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-c</name>
-	  <label>c</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-d</name>
-	  <label>d</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-e</name>
-	  <label>e</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-f</name>
-	  <label>f</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-g</name>
-	  <label>g</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-h</name>
-	  <label>h</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-i</name>
-	  <label>i</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-j</name>
-	  <label>j</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-k</name>
-	  <label>k</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-l</name>
-	  <label>l</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-m</name>
-	  <label>m</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-n</name>
-	  <label>n</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-o</name>
-	  <label>o</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-p</name>
-	  <label>p</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-q</name>
-	  <label>q</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-r</name>
-	  <label>r</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-s</name>
-	  <label>s</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-t</name>
-	  <label>t</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-u</name>
-	  <label>u</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-v</name>
-	  <label>v</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-w</name>
-	  <can_focus>True</can_focus>
-	  <label>w</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-x</name>
-	  <label>x</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-y</name>
-	  <label>y</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-z</name>
-	  <label>z</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/widgets/alphabet.glade.h b/addressbook/gui/widgets/alphabet.glade.h
deleted file mode 100644
index 2448eeb4fc..0000000000
--- a/addressbook/gui/widgets/alphabet.glade.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("window2");
-gchar *s = N_("123");
-gchar *s = N_("a");
-gchar *s = N_("b");
-gchar *s = N_("c");
-gchar *s = N_("d");
-gchar *s = N_("e");
-gchar *s = N_("f");
-gchar *s = N_("g");
-gchar *s = N_("h");
-gchar *s = N_("i");
-gchar *s = N_("j");
-gchar *s = N_("k");
-gchar *s = N_("l");
-gchar *s = N_("m");
-gchar *s = N_("n");
-gchar *s = N_("o");
-gchar *s = N_("p");
-gchar *s = N_("q");
-gchar *s = N_("r");
-gchar *s = N_("s");
-gchar *s = N_("t");
-gchar *s = N_("u");
-gchar *s = N_("v");
-gchar *s = N_("w");
-gchar *s = N_("x");
-gchar *s = N_("y");
-gchar *s = N_("z");
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index 830b70879c..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
-
-/*
- * EAddressbookModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE,
-};
-
-static void
-remove_book_view(EAddressbookModel *model)
-{
-	if (model->book_view && model->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->create_card_id);
-	if (model->book_view && model->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->remove_card_id);
-	if (model->book_view && model->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->modify_card_id);
-
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-
-	if (model->book_view)
-		gtk_object_unref(GTK_OBJECT(model->book_view));
-
-	model->book_view = NULL;
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	int i;
-
-	if (model->get_view_idle)
-		g_source_remove(model->get_view_idle);
-
-	remove_book_view(model);
-
-	if (model->book)
-		gtk_object_unref(GTK_OBJECT(model->book));
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	return addressbook->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1 || row >= addressbook->data_count )
-		return NULL;
-
-	value = e_card_simple_get_const(addressbook->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	ECard *card;
-	if (addressbook->editable) {
-		if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= addressbook->data_count )
-			return;
-		e_card_simple_set(addressbook->data[row],
-				  col + 1,
-				  val);
-		gtk_object_get(GTK_OBJECT(addressbook->data[row]),
-			       "card", &card,
-			       NULL);
-		e_book_commit_card(addressbook->book, card, NULL, NULL);
-		
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-addressbook_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return E_ADDRESSBOOK_MODEL(etc)->editable;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	ECard *card;
-	ECardSimple *simple;
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etm);
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST - 1; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple,
-				  col + 1,
-				  val);
-	}
-	e_card_simple_sync_card(simple);
-	e_book_add_card(addressbook->book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(simple));
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-addressbook_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-addressbook_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-addressbook_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-create_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	model->data = g_realloc(model->data, (model->data_count + g_list_length((GList *)cards)) * sizeof(ECard *));
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( ; cards; cards = cards->next) {
-		model->data[model->data_count++] = e_card_simple_new (E_CARD(cards->data));
-		e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-	}
-}
-
-static void
-remove_card(EBookView *book_view,
-	    const char *id,
-	    EAddressbookModel *model)
-{
-	int i;
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-modify_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	for ( ; cards; cards = cards->next) {
-		int i;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_simple_get_id(model->data[i]), e_card_get_id(E_CARD(cards->data))) ) {
-				gtk_object_unref(GTK_OBJECT(model->data[i]));
-				model->data[i] = e_card_simple_new(E_CARD(cards->data));
-				gtk_object_ref(GTK_OBJECT(model->data[i]));
-				e_table_model_row_changed(E_TABLE_MODEL(model), i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-e_addressbook_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = addressbook_destroy;
-	object_class->set_arg   = e_addressbook_model_set_arg;
-	object_class->get_arg   = e_addressbook_model_get_arg;
-
-	gtk_object_add_arg_type ("EAddressbookModel::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookModel::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookModel::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	
-	model_class->column_count = addressbook_col_count;
-	model_class->row_count = addressbook_row_count;
-	model_class->value_at = addressbook_value_at;
-	model_class->set_value_at = addressbook_set_value_at;
-	model_class->is_cell_editable = addressbook_is_cell_editable;
-	model_class->append_row = addressbook_append_row;
-	model_class->duplicate_value = addressbook_duplicate_value;
-	model_class->free_value = addressbook_free_value;
-	model_class->initialize_value = addressbook_initialize_value;
-	model_class->value_is_empty = addressbook_value_is_empty;
-	model_class->value_to_string = addressbook_value_to_string;
-}
-
-static void
-e_addressbook_model_init (GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	model->book = NULL;
-	model->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	model->book_view = NULL;
-	model->get_view_idle = 0;
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->data = NULL;
-	model->data_count = 0;
-	model->editable = TRUE;
-	model->first_get_view = TRUE;
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EAddressbookModel *model = closure;
-	int i;
-	remove_book_view(model);
-	model->book_view = book_view;
-	if (model->book_view)
-		gtk_object_ref(GTK_OBJECT(model->book_view));
-	model->create_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  model);
-	model->remove_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  model);
-	model->modify_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  model);
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	g_free(model->data);
-	model->data = NULL;
-	model->data_count = 0;
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-static gboolean
-get_view(EAddressbookModel *model)
-{
-	if (model->book && model->query) {
-		if (model->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities(model->book);
-			if (strstr(capabilities, "local")) {
-				e_book_get_book_view(model->book, model->query, book_view_loaded, model);
-			}
-			model->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view(model->book, model->query, book_view_loaded, model);
-	}
-
-	model->get_view_idle = 0;
-	return FALSE;
-}
-
-ECard *
-e_addressbook_model_get_card(EAddressbookModel *model,
-			     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-static void
-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *model;
-
-	model = E_ADDRESSBOOK_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (model->book)
-			gtk_object_unref(GTK_OBJECT(model->book));
-		model->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		if (model->book) {
-			gtk_object_ref(GTK_OBJECT(model->book));
-			if (model->get_view_idle == 0)
-				model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-		}
-		break;
-	case ARG_QUERY:
-		if (model->query)
-			g_free(model->query);
-		model->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (model->get_view_idle == 0)
-			model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-		break;
-	case ARG_EDITABLE:
-		model->editable = GTK_VALUE_BOOL (*arg);
-		break;
-	}
-}
-
-static void
-e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *e_addressbook_model;
-
-	e_addressbook_model = E_ADDRESSBOOK_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_addressbook_model->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_addressbook_model->query);
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_addressbook_model->editable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GtkType
-e_addressbook_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookModel",
-			sizeof (EAddressbookModel),
-			sizeof (EAddressbookModelClass),
-			(GtkClassInitFunc) e_addressbook_model_class_init,
-			(GtkObjectInitFunc) e_addressbook_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_addressbook_model_new (void)
-{
-	EAddressbookModel *et;
-
-	et = gtk_type_new (e_addressbook_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
-
-void   e_addressbook_model_stop    (EAddressbookModel *model)
-{
-	remove_book_view(model);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 860fb641ac..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_MODEL_H_
-#define _E_ADDRESSBOOK_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define E_ADDRESSBOOK_MODEL_TYPE        (e_addressbook_model_get_type ())
-#define E_ADDRESSBOOK_MODEL(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModel))
-#define E_ADDRESSBOOK_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_MODEL_TYPE))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_MODEL_TYPE))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECardSimple **data;
-	int data_count;
-
-	int create_card_id, remove_card_id, modify_card_id;
-
-	guint editable : 1;
-	guint first_get_view : 1;
-} EAddressbookModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} EAddressbookModelClass;
-
-
-GtkType e_addressbook_model_get_type (void);
-ETableModel *e_addressbook_model_new (void);
-
-/* Returns object with ref count of 1. */
-ECard *e_addressbook_model_get_card(EAddressbookModel *model,
-				    int                row);
-void   e_addressbook_model_stop    (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-search.c b/addressbook/gui/widgets/e-addressbook-search.c
deleted file mode 100644
index e58e72d560..0000000000
--- a/addressbook/gui/widgets/e-addressbook-search.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-addressbook-search.h"
-#include <gal/widgets/e-unicode.h>
-
-static void e_addressbook_search_init		(EAddressbookSearch		 *card);
-static void e_addressbook_search_class_init	(EAddressbookSearchClass	 *klass);
-static void e_addressbook_search_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_destroy (GtkObject *object);
-
-enum {
-	QUERY_CHANGED,
-	MENU_ACTIVATED,
-
-	LAST_SIGNAL
-};
-
-static gint eas_signals [LAST_SIGNAL] = { 0, };
-
-static GtkHBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_OPTION_CHOICE,
-	ARG_TEXT,
-};
-
-GtkType
-e_addressbook_search_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookSearch",
-			sizeof (EAddressbookSearch),
-			sizeof (EAddressbookSearchClass),
-			(GtkClassInitFunc) e_addressbook_search_class_init,
-			(GtkObjectInitFunc) e_addressbook_search_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_hbox_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_search_class_init (EAddressbookSearchClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	object_class->set_arg = e_addressbook_search_set_arg;
-	object_class->get_arg = e_addressbook_search_get_arg;
-	object_class->destroy = e_addressbook_search_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookSearch::option_choice", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_OPTION_CHOICE);
-	gtk_object_add_arg_type ("EAddressbookSearch::text", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_TEXT);
-
-	eas_signals [QUERY_CHANGED] =
-		gtk_signal_new ("query_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookSearchClass, query_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	eas_signals [MENU_ACTIVATED] =
-		gtk_signal_new ("menu_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookSearchClass, menu_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, eas_signals, LAST_SIGNAL);
-}
-
-static void
-eas_query_changed(EAddressbookSearch *eas)
-{
-	gtk_signal_emit(GTK_OBJECT (eas),
-			eas_signals [QUERY_CHANGED]);
-}
-
-static void
-eas_menu_activated(EAddressbookSearch *eas, int item)
-{
-	gtk_signal_emit(GTK_OBJECT (eas),
-			eas_signals [MENU_ACTIVATED],
-			item);
-}
-
-static void
-eas_menubar_activated(GtkWidget *widget, EAddressbookSearch *eas)
-{
-	int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasMenuId"));
-
-	eas_menu_activated(eas, id);
-}
-
-typedef enum {
-	EAS_CLEAR = 0,
-} EasMenuId;
-
-
-typedef struct {
-	char *text;
-	char *name;
-	int id;
-} EasMenuItem;
-
-static EasMenuItem eas_menu_items[] = {
-	{ N_("Show All"), "all", 0 },
-	{ NULL, "sep", -1 },
-	{ N_("Advanced"), "advanced", 1},
-	{ NULL, NULL, 0 }
-};
-
-static void
-eas_pack_menubar(EAddressbookSearch *eas)
-{
-	GtkWidget *menu, *menuitem;
-	int i;
-
-	menu = gtk_menu_new ();
-	for (i = 0; eas_menu_items[i].name; i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(eas_menu_items[i].text));
-
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		gtk_object_set_data (GTK_OBJECT (item), "EasMenuId", GINT_TO_POINTER(eas_menu_items[i].id));
-
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (eas_menubar_activated),
-				    eas);
-	}
-	gtk_widget_show_all (menu);
-
-	menuitem = gtk_menu_item_new_with_label(_("Search"));
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-
-	gtk_widget_show (menuitem);
-
-	gtk_menu_bar_append (GTK_MENU_BAR(eas->menubar), menuitem);
-	gtk_widget_set_sensitive (eas->menubar, TRUE);
-}
-
-typedef enum {
-	EAS_ANY = 0,
-	EAS_FULL_NAME = 1,
-	EAS_EMAIL = 2,
-} EasChoiceId;
-
-
-typedef struct {
-	char *text;
-	char *name;
-	int id;
-} EasChoice;
-
-static EasChoice eas_choices[] = {
-	{ N_("Any field contains"), "x-evolution-any-field", EAS_ANY },
-	{ N_("Name contains"), "full_name", EAS_FULL_NAME },
-	{ N_("Email contains"), "email", EAS_EMAIL },
-	{ NULL, NULL, 0 }
-};
-
-static void
-eas_option_activated(GtkWidget *widget, EAddressbookSearch *eas)
-{
-	int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasChoiceId"));
-
-	eas->option_choice = id;
-	eas_query_changed(eas);
-}
-
-static void
-eas_entry_activated(GtkWidget *widget, EAddressbookSearch *eas)
-{
-	eas_query_changed(eas);
-}
-
-static void
-eas_pack_option_menu(EAddressbookSearch *eas)
-{
-	GtkWidget *menu;
-	int i;
-
-	menu = gtk_menu_new ();
-	for (i = 0; eas_choices[i].name; i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(eas_choices[i].text));
-
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		gtk_object_set_data (GTK_OBJECT (item), "EasChoiceId", GINT_TO_POINTER(eas_choices[i].id));
-
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (eas_option_activated),
-				    eas);
-	}
-	gtk_widget_show_all (menu);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (eas->option), 
-				  menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (eas->option), 0);
-	gtk_widget_set_sensitive (eas->option, TRUE);
-}
-
-static void
-e_addressbook_search_init (EAddressbookSearch *eas)
-{
-	GtkWidget *spacer;
-
-	gtk_box_set_spacing(GTK_BOX(eas), GNOME_PAD);
-
-	eas->menubar = gtk_menu_bar_new();
-	eas_pack_menubar(eas);
-	gtk_widget_show(eas->menubar);
-	gtk_box_pack_start(GTK_BOX(eas), eas->menubar, FALSE, FALSE, 0);
-
-	eas->option = gtk_option_menu_new();
-	eas_pack_option_menu(eas);
-	gtk_widget_show(eas->option);
-	gtk_box_pack_start(GTK_BOX(eas), eas->option, FALSE, FALSE, 0);
-
-	eas->entry = gtk_entry_new();
-	gtk_signal_connect (GTK_OBJECT (eas->entry), "activate",
-			    GTK_SIGNAL_FUNC (eas_entry_activated), eas);
-	gtk_widget_show(eas->entry);
-	gtk_box_pack_start(GTK_BOX(eas), eas->entry, TRUE, TRUE, 0);
-	eas->option_choice = 0;
-
-	spacer = gtk_drawing_area_new();
-	gtk_widget_show(spacer);
-	gtk_box_pack_start(GTK_BOX(eas), spacer, FALSE, FALSE, 0);
-	gtk_widget_set_usize(spacer, 100, 1);
-}
-
-static void
-e_addressbook_search_destroy (GtkObject *object)
-{
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_addressbook_search_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_search_get_type ()));
-	return widget;
-}
-
-static void
-e_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		GTK_VALUE_ENUM (*arg) = eas->option_choice;
-		break;
-
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(eas->entry));
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_search_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		eas->option_choice = GTK_VALUE_ENUM (*arg);
-		gtk_option_menu_set_history (GTK_OPTION_MENU (eas->option), eas->option_choice);
-		eas_query_changed(eas);
-		break;
-
-	case ARG_TEXT:
-		e_utf8_gtk_editable_set_text(GTK_EDITABLE(eas->entry), GTK_VALUE_STRING (*arg));
-		eas_query_changed(eas);
-		break;
-
-	default:
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-addressbook-search.h b/addressbook/gui/widgets/e-addressbook-search.h
deleted file mode 100644
index 5b229ee03e..0000000000
--- a/addressbook/gui/widgets/e-addressbook-search.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-search.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_SEARCH_H__
-#define __E_ADDRESSBOOK_SEARCH_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EAddressbookSearch - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_ADDRESSBOOK_SEARCH_TYPE			(e_addressbook_search_get_type ())
-#define E_ADDRESSBOOK_SEARCH(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearch))
-#define E_ADDRESSBOOK_SEARCH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearchClass))
-#define E_IS_ADDRESSBOOK_SEARCH(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))
-
-typedef enum {
-	E_ADDRESSBOOK_SEARCH_NONE, /* initialized to this */
-	E_ADDRESSBOOK_SEARCH_TABLE,
-	E_ADDRESSBOOK_SEARCH_MINICARD
-} EAddressbookSearchType;
-
-
-typedef struct _EAddressbookSearch       EAddressbookSearch;
-typedef struct _EAddressbookSearchClass  EAddressbookSearchClass;
-
-struct _EAddressbookSearch
-{
-	GtkHBox parent;
-	
-	/* item specific fields */
-	GtkWidget *menubar;
-	GtkWidget *option;
-	GtkWidget *entry;
-	int        option_choice;
-};
-
-struct _EAddressbookSearchClass
-{
-	GtkHBoxClass parent_class;
-
-	void (*query_changed)  (EAddressbookSearch *search);
-	void (*menu_activated) (EAddressbookSearch *search, int item);
-};
-
-GtkWidget *e_addressbook_search_new        (void);
-GtkType    e_addressbook_search_get_type   (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_ADDRESSBOOK_SEARCH_H__ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 3d081ab14c..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-addressbook-view.h"
-
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/widgets/e-popup-menu.h>
-
-#include "e-addressbook-model.h"
-
-#include "e-minicard-view-widget.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "e-card-simple.h"
-#include "e-card.h"
-#include "e-book.h"
-
-#include "glade/glade-xml.h"
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-
-static void e_addressbook_view_init		(EAddressbookView		 *card);
-static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);
-static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_destroy (GtkObject *object);
-static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);
-
-static GtkTableClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_TYPE,
-};
-
-GtkType
-e_addressbook_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookView",
-			sizeof (EAddressbookView),
-			sizeof (EAddressbookViewClass),
-			(GtkClassInitFunc) e_addressbook_view_class_init,
-			(GtkObjectInitFunc) e_addressbook_view_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_view_class_init (EAddressbookViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	object_class->set_arg = e_addressbook_view_set_arg;
-	object_class->get_arg = e_addressbook_view_get_arg;
-	object_class->destroy = e_addressbook_view_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_TYPE);
-}
-
-static void
-e_addressbook_view_init (EAddressbookView *eav)
-{
-	eav->view_type = E_ADDRESSBOOK_VIEW_NONE;
-
-	eav->book = NULL;
-	eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-
-	eav->object = NULL;
-	eav->widget = NULL;
-}
-
-static void
-e_addressbook_view_destroy (GtkObject *object)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	if (eav->book)
-		gtk_object_unref(GTK_OBJECT(eav->book));
-	g_free(eav->query);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_addressbook_view_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ()));
-	return widget;
-}
-
-static void
-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (eav->book)
-			gtk_object_unref(GTK_OBJECT(eav->book));
-		if (GTK_VALUE_OBJECT(*arg)) {
-			eav->book = E_BOOK(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(eav->book));
-		}
-		else
-			eav->book = NULL;
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "book", eav->book,
-				       NULL);
-		break;
-	case ARG_QUERY:
-		g_free(eav->query);
-		eav->query = g_strdup(GTK_VALUE_STRING(*arg));
-		if (!eav->query)
-			eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "query", eav->query,
-				       NULL);
-		break;
-	case ARG_TYPE:
-		change_view_type(eav, GTK_VALUE_ENUM(*arg));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		if (eav->book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav->book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = eav->query;
-		break;
-	case ARG_TYPE:
-		GTK_VALUE_ENUM (*arg) = eav->view_type;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-
-typedef struct {
-	EAddressbookView *view;
-	char letter;
-} LetterClosure;
-
-static void
-jump_to_letter(GtkWidget *button, LetterClosure *closure)
-{
-	if (closure->view->widget && E_IS_MINICARD_VIEW_WIDGET(closure->view->widget))
-		e_minicard_view_widget_jump_to_letter(E_MINICARD_VIEW_WIDGET(closure->view->widget), closure->letter);
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	g_free(closure);
-}
-
-static void
-connect_button (EAddressbookView *view, GladeXML *gui, char letter)
-{
-	char *name;
-	GtkWidget *button;
-	LetterClosure *closure;
-	name = g_strdup_printf("button-%c", letter);
-	button = glade_xml_get_widget(gui, name);
-	g_free(name);
-	if (!button)
-		return;
-	closure = g_new(LetterClosure, 1);
-	closure->view = view;
-	closure->letter = letter;
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(jump_to_letter), closure);
-	gtk_signal_connect(GTK_OBJECT(button), "destroy",
-			   GTK_SIGNAL_FUNC(free_closure), closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget;
-	char letter;
-	GladeXML *gui = glade_xml_new (EVOLUTION_GLADEDIR "/alphabet.glade", NULL);
-
-	widget = glade_xml_get_widget(gui, "scrolledwindow-top");
-	if (!widget) {
-		return NULL;
-	}
-	
-	connect_button(view, gui, '1');
-	for (letter = 'a'; letter <= 'z'; letter ++) {
-		connect_button(view, gui, letter);
-	}
-	
-	gtk_object_unref(GTK_OBJECT(gui));
-	return widget;
-}
-
-static void
-create_minicard_view (EAddressbookView *view)
-{
-	GtkWidget *scrollframe;
-	GtkWidget *alphabet;
-	GtkWidget *minicard_view;
-	GtkWidget *minicard_hbox;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	minicard_hbox = gtk_hbox_new(FALSE, 0);
-
-	minicard_view = e_minicard_view_widget_new();
-
-	view->object = GTK_OBJECT(minicard_view);
-	view->widget = minicard_hbox;
-
-	scrollframe = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);
-
-
-	gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);
-
-	alphabet = create_alphabet(view);
-	if (alphabet) {
-		gtk_object_ref(GTK_OBJECT(alphabet));
-		gtk_widget_unparent(alphabet);
-		gtk_box_pack_start(GTK_BOX(minicard_hbox), alphabet, FALSE, FALSE, 0);
-		gtk_object_unref(GTK_OBJECT(alphabet));
-	}
-
-	gtk_table_attach(GTK_TABLE(view), minicard_hbox,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show_all( GTK_WIDGET(minicard_hbox) );
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-}
-
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		ECard *card = e_addressbook_model_get_card(model, row);
-		EBook *book;
-		EContactEditor *ce;
-		
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &book,
-			       NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		ce = e_contact_editor_new (card, FALSE);
-
-		gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-				    GTK_SIGNAL_FUNC (add_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-				    GTK_SIGNAL_FUNC (commit_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-				    GTK_SIGNAL_FUNC (delete_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-typedef struct {
-	EBook *book;
-	ECard *card;
-	GtkWidget *widget;
-} CardAndBook;
-
-static void
-card_and_book_free (CardAndBook *card_and_book)
-{
-	gtk_object_unref(GTK_OBJECT(card_and_book->card));
-	gtk_object_unref(GTK_OBJECT(card_and_book->book));
-}
-
-static void
-save_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_contact_save_as(_("Save as VCard"), card_and_book->card);
-	card_and_book_free(card_and_book);
-}
-
-static void
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) {
-		/* Add the card in the contact editor to our ebook */
-		e_book_remove_card (card_and_book->book,
-				    card_and_book->card,
-				    NULL,
-				    NULL);
-	}
-	card_and_book_free(card_and_book);
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		CardAndBook *card_and_book;
-		
-		EPopupMenu menu[] = {
-			{"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-			{"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-			{"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},
-			{"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0}, 
-			{NULL, NULL, NULL, 0}
-		};
-		
-		card_and_book = g_new(CardAndBook, 1);
-		card_and_book->card = e_addressbook_model_get_card(model, row);
-		card_and_book->widget = GTK_WIDGET(table);
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &(card_and_book->book),
-			       NULL);
-		
-		gtk_object_ref(GTK_OBJECT(card_and_book->book));
-		
-		e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, card_and_book);
-		return TRUE;
-	} else
-		return FALSE;
-}
-#define SPEC "<?xml version=\"1.0\"?>      \
-<ETableSpecification click-to-add=\"true\" draw-grid=\"true\" _click-to-add-message=\"* Click here to add a contact *\">   \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"2\" _title=\"Email\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Primary\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Organization\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Mobile\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Car\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Business Fax\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Home Fax\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Business 2\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Home 2\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"ISDN\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Pager\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"Email 2\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Email 3\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Web Site\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Department\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Office\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"Title\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"Profession\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Manager\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Assistant\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Nickname\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Spouse\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Note\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Free-busy URL\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"3\"/>                 \
-    <column source=\"4\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *model;
-	ECardSimple *simple;
-	GtkWidget *table;
-	
-	simple = e_card_simple_new(NULL);
-
-	model = e_addressbook_model_new();
-
-	/* Here we create the table.  We give it the three pieces of
-	   the table we've created, the header, the model, and the
-	   initial layout.  It does the rest.  */
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	view->object = GTK_OBJECT(model);
-	view->widget = table;
-
-	gtk_signal_connect(GTK_OBJECT(table), "double_click",
-			   GTK_SIGNAL_FUNC(table_double_click), view);
-	gtk_signal_connect(GTK_OBJECT(table), "right_click",
-			   GTK_SIGNAL_FUNC(table_right_click), view);
-
-	gtk_table_attach(GTK_TABLE(view), table,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show( GTK_WIDGET(table) );
-
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-
-static void
-change_view_type (EAddressbookView *view, EAddressbookViewType view_type)
-{
-	if (view_type == view->view_type)
-		return;
-
-	if (view->widget) {
-		gtk_widget_destroy (view->widget);
-		view->widget = NULL;
-	}
-	view->object = NULL;
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		create_minicard_view (view);
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		create_table_view (view);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}
-
-	view->view_type = view_type;
-
-	gtk_object_set(view->object,
-		       "query", view->query,
-		       "book", view->book,
-		       NULL);
-}
-
-static void
-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)
-{
-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	gtk_object_unref(GTK_OBJECT(printable));
-	gtk_object_unref(GTK_OBJECT(table));
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       5 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		gnome_print_master_print(master);
-		gtk_object_unref(GTK_OBJECT(master));
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		gtk_object_unref(GTK_OBJECT(master));
-		break;
-	case GNOME_PRINT_CANCEL:
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-void
-e_addressbook_view_print(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		gtk_object_get (view->object,
-				"query", &query,
-				"book", &book,
-				NULL);
-		print = e_contact_print_dialog_new(book, query);
-		g_free(query);
-		gtk_widget_show_all(print);
-	} else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
-		GtkWidget *dialog;
-		EPrintable *printable;
-
-		dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-		gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-						       NULL, NULL, NULL);
-		
-		printable = e_table_scrolled_get_printable(E_TABLE_SCROLLED(view->widget));
-
-		gtk_object_ref(GTK_OBJECT(view->widget));
-
-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view->widget);
-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);
-		
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);
-		gtk_widget_show(dialog);
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was deleted\n", __FILE__, __FUNCTION__);
-}
-
-void
-e_addressbook_view_delete_selection(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
-		e_minicard_view_widget_remove_selection (E_MINICARD_VIEW_WIDGET(view->object), card_deleted_cb, NULL);
-}
-
-void
-e_addressbook_view_show_all(EAddressbookView *view)
-{
-	gtk_object_set(GTK_OBJECT(view),
-		       "query", NULL,
-		       NULL);
-}
-
-void
-e_addressbook_view_stop(EAddressbookView *view)
-{
-	switch(view->view_type) {
- 	case E_ADDRESSBOOK_VIEW_MINICARD:
-		e_minicard_view_widget_stop(E_MINICARD_VIEW_WIDGET (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		e_addressbook_model_stop(E_ADDRESSBOOK_MODEL (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_NONE:
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index 60da283a75..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_VIEW_H__
-#define __E_ADDRESSBOOK_VIEW_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EAddressbookView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())
-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))
-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-
-typedef enum {
-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
-	E_ADDRESSBOOK_VIEW_TABLE,
-	E_ADDRESSBOOK_VIEW_MINICARD
-} EAddressbookViewType;
-
-
-typedef struct _EAddressbookView       EAddressbookView;
-typedef struct _EAddressbookViewClass  EAddressbookViewClass;
-
-struct _EAddressbookView
-{
-	GtkTable parent;
-	
-	/* item specific fields */
-	EAddressbookViewType view_type;
-
-	EBook *book;
-	char  *query;
-
-	GtkObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *vbox;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-};
-
-GtkWidget *e_addressbook_view_new               (void);
-GtkType    e_addressbook_view_get_type          (void);
-
-void       e_addressbook_view_print             (EAddressbookView *view);
-void       e_addressbook_view_delete_selection  (EAddressbookView *view);
-void       e_addressbook_view_show_all          (EAddressbookView *view);
-void       e_addressbook_view_stop              (EAddressbookView *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c
deleted file mode 100644
index d69f422f63..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-minicard-control.c
- *
- * Authors:
- *    Chris Lahey <clahey@helixcode.com>
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "addressbook/backend/ebook/e-book.h"
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#if 0
-enum {
-	PROP_RUNNING
-} MyArgs;
-
-#define RUNNING_KEY  "Clock::Running"
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GtkObject *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		gboolean b = GPOINTER_TO_UINT (gtk_object_get_data (clock, RUNNING_KEY));
-		BONOBO_ARG_SET_BOOLEAN (arg, b);
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GtkClock *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		guint i;
-
-		i = BONOBO_ARG_GET_BOOLEAN (arg);
-
-		if (i)
-			gtk_clock_start (clock);
-		else
-			gtk_clock_stop (clock);
-
-		gtk_object_set_data (GTK_OBJECT (clock), RUNNING_KEY,
-				     GUINT_TO_POINTER (i));
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-#endif
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-	  data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	ECard *card;
-	char *vcard;
-	GtkWidget *minicard = data;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	card = e_card_new(vcard);
-	g_free(vcard);
-	gtk_object_set(GTK_OBJECT(minicard),
-		       "card", card,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	char                *vcard;
-	ECard               *card;
-	EMinicardWidget     *minicard = data;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	gtk_object_get (GTK_OBJECT (minicard),
-			"card", &card,
-			NULL);
-	vcard = e_card_get_vcard(card);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-  GtkWidget *minicard = data;
-  ECard *card;
-  char *vcard;
-  gint length;
-  
-  gtk_object_get (GTK_OBJECT (minicard),
-		  "card", &card, NULL);
-  vcard = e_card_get_vcard(card);
-  length = strlen (vcard);
-  g_free (vcard);
-
-  return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = closure;
-	e_book_add_card(book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-save_in_addressbook(GtkWidget *button, EMinicardWidget *minicard)
-{
-	EBook *book;
-	gchar *path, *uri;
-	ECard *card;
-
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	gtk_object_get(GTK_OBJECT(minicard),
-		       "card", &card,
-		       NULL);
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (! e_book_load_uri (book, uri, book_open_cb, card)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	GtkWidget	   *minicard;
-	GtkWidget          *button;
-	GtkWidget          *vbox;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(save_in_addressbook), minicard);
-	gtk_widget_show (button);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard);
-
-#if 0
-	/* Create the properties. */
-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);
-	bonobo_control_set_properties (control, pb);
-
-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,
-				 BONOBO_ARG_BOOLEAN, NULL,
-				 "Whether or not the clock is running", 0);
-#endif
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_minicard_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595",
-			e_minicard_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a EMinicard control factory.");
-}
diff --git a/addressbook/gui/widgets/e-minicard-control.h b/addressbook/gui/widgets/e-minicard-control.h
deleted file mode 100644
index 4a0da88435..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __E_MINICARD_CONTROL_H__
-#define __E_MINICARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_minicard_control_factory_init (void);
-
-#endif /* __E_MINICARD_CONTROL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
deleted file mode 100644
index 3bdf1f2c47..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard-label.h"
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-static void e_minicard_label_init		(EMinicardLabel		 *card);
-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
-static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_label_realize (GnomeCanvasItem *item);
-static void e_minicard_label_unrealize (GnomeCanvasItem *item);
-static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags);
-
-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_FIELD,
-	ARG_FIELDNAME,
-	ARG_TEXT_MODEL,
-	ARG_MAX_FIELD_NAME_WIDTH,
-};
-
-GtkType
-e_minicard_label_get_type (void)
-{
-  static GtkType minicard_label_type = 0;
-
-  if (!minicard_label_type)
-    {
-      static const GtkTypeInfo minicard_label_info =
-      {
-        "EMinicardLabel",
-        sizeof (EMinicardLabel),
-        sizeof (EMinicardLabelClass),
-        (GtkClassInitFunc) e_minicard_label_class_init,
-        (GtkObjectInitFunc) e_minicard_label_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_label_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_label_info);
-    }
-
-  return minicard_label_type;
-}
-
-static void
-e_minicard_label_class_init (EMinicardLabelClass *klass)
-{
-  GtkObjectClass *object_class;
-  GnomeCanvasItemClass *item_class;
-
-  object_class = (GtkObjectClass*) klass;
-  item_class = (GnomeCanvasItemClass *) klass;
-
-  parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-  gtk_object_add_arg_type ("EMinicardLabel::width", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READWRITE, ARG_WIDTH); 
-  gtk_object_add_arg_type ("EMinicardLabel::height", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READABLE, ARG_HEIGHT);
-  gtk_object_add_arg_type ("EMinicardLabel::has_focus", GTK_TYPE_BOOL, 
-			   GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-  gtk_object_add_arg_type ("EMinicardLabel::field", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELD);
-  gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELDNAME);
-  gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,
-			   GTK_ARG_READWRITE, ARG_TEXT_MODEL);
-  gtk_object_add_arg_type ("EMinicardLabel::max_field_name_length", GTK_TYPE_DOUBLE,
-			   GTK_ARG_READWRITE, ARG_MAX_FIELD_NAME_WIDTH);
- 
-  object_class->set_arg = e_minicard_label_set_arg;
-  object_class->get_arg = e_minicard_label_get_arg;
-  /*  object_class->destroy = e_minicard_label_destroy; */
-  
-  /* GnomeCanvasItem method overrides */
-  item_class->realize     = e_minicard_label_realize;
-  item_class->unrealize   = e_minicard_label_unrealize;
-  item_class->event       = e_minicard_label_event;
-}
-
-static void
-e_minicard_label_init (EMinicardLabel *minicard_label)
-{
-  minicard_label->width = 10;
-  minicard_label->height = 10;
-  minicard_label->rect = NULL;
-  minicard_label->fieldname = NULL;
-  minicard_label->field = NULL;
-
-  minicard_label->max_field_name_length = -1;
-
-  e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
-}
-
-static void
-e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardLabel *e_minicard_label;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard_label = E_MINICARD_LABEL (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
-		e_minicard_label_resize_children(e_minicard_label);
-		e_canvas_item_request_reflow (item);
-		break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard_label->field && (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))
-			e_canvas_item_grab_focus(e_minicard_label->field);
-		break;
-	case ARG_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", GTK_VALUE_OBJECT (*arg), NULL);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		e_minicard_label->max_field_name_length = GTK_VALUE_DOUBLE (*arg);
-		break;
-	}
-}
-
-static void
-e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardLabel *e_minicard_label;
-	char *temp;
-	ETextModel *tempmodel;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
-		break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_FIELD:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_FIELDNAME:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_TEXT_MODEL:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "model", &tempmodel, NULL );
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->max_field_name_length;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_label_realize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
-	  (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
-	e_canvas_item_request_reflow(item);
-	
-	if (!item->canvas->aa)
-	  {
-	  }
-}
-
-void
-e_minicard_label_construct (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasGroup *group;
-	GdkFont *font;
-
-	font = ((GtkWidget *) item->canvas)->style->font;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	e_minicard_label->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard_label->width - 1,
-				 "y2", (double) e_minicard_label->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-	e_minicard_label->fieldname =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
-
-	e_minicard_label->field =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 "editable", TRUE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_label_unrealize (GnomeCanvasItem *item)
-{
-  EMinicardLabel *e_minicard_label;
-
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-  EMinicardLabel *e_minicard_label;
- 
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  switch( event->type )
-    {
-    case GDK_FOCUS_CHANGE:
-      {
-	GdkEventFocus *focus_event = (GdkEventFocus *) event;
-	if ( focus_event->in )
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", "grey50", 
-				   "fill_color", "grey90",
-				   NULL );
-	    e_minicard_label->has_focus = TRUE;
-	  }
-	else
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", NULL, 
-				   "fill_color", NULL,
-				   NULL );
-	    e_minicard_label->has_focus = FALSE;
-	  }
-      }
-      break;
-    case GDK_BUTTON_PRESS:
-    case GDK_BUTTON_RELEASE: 
-    case GDK_MOTION_NOTIFY:
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY: {
-	    gboolean return_val;
-#if 0
-	    GnomeCanvasItem *field;
-	    ArtPoint p;
-	    double inv[6], affine[6];
-	    
-	    field = e_minicard_label->field;
-	    art_affine_identity (affine);
-	    
-	    if (field->xform != NULL) {
-		    if (field->object.flags & GNOME_CANVAS_ITEM_AFFINE_FULL) {
-			    art_affine_multiply (affine, affine, field->xform);
-		    } else {
-			    affine[4] += field->xform[0];
-			    affine[5] += field->xform[1];
-		    }
-	    }
-	    
-	    art_affine_invert (inv, affine);
-	    switch(event->type) {
-	    case GDK_MOTION_NOTIFY:
-		    p.x = event->motion.x;
-		    p.y = event->motion.y;
-		    art_affine_point (&p, &p, inv);
-		    event->motion.x = p.x;
-		    event->motion.y = p.y;
-		    break;
-	    case GDK_BUTTON_PRESS:
-	    case GDK_BUTTON_RELEASE:
-		    p.x = event->button.x;
-		    p.y = event->button.y;
-		    art_affine_point (&p, &p, inv);
-		    event->button.x = p.x;
-		    event->button.y = p.y;
-		    break;
-	    case GDK_ENTER_NOTIFY:
-	    case GDK_LEAVE_NOTIFY:
-		    p.x = event->crossing.x;
-		    p.y = event->crossing.y;
-		    art_affine_point (&p, &p, inv);
-		    event->crossing.x = p.x;
-		    event->crossing.y = p.y;
-		    break;
-	    default:
-		    break;
-	    }
-#endif	    
-	    gtk_signal_emit_by_name(GTK_OBJECT(e_minicard_label->field), "event", event, &return_val);
-	    return return_val;
-	    break;
-    }
-    default:
-	    break;
-    }
-  
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-    return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-  else
-    return 0;
-}
-
-static void
-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
-{
-	double left_width;
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_width", (double) ( left_width ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) ( e_minicard_label->width - 8 - left_width ),
-			       NULL );
-}
-
-static void
-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
-{
-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
-	
-	gint old_height;
-	gdouble text_height;
-	gdouble left_width;
-
-	old_height = e_minicard_label->height;
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname), 
-		       "text_height", &text_height,
-		       NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->field), 
-		       "text_height", &text_height,
-		       NULL);
-
-	if (e_minicard_label->height < text_height)
-		e_minicard_label->height = text_height;
-	e_minicard_label->height += 3;
-
-	gnome_canvas_item_set( e_minicard_label->rect,
-			       "x2", (double) e_minicard_label->width - 1,
-			       "y2", (double) e_minicard_label->height - 1,
-			       NULL );
-
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	e_canvas_item_move_absolute(e_minicard_label->field, left_width + 6, 1);
-
-	if (old_height != e_minicard_label->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-GnomeCanvasItem *
-e_minicard_label_new(GnomeCanvasGroup *parent)
-{
-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
-	e_minicard_label_construct(item);
-	return item;
-}
-
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
deleted file mode 100644
index 08eb51ee53..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <gnome.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardLabel - A label doing focus with non-marching ants.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the label
- * height       double          R               height of the label
- * field        string          RW              text in the field label
- * fieldname    string          RW              text in the fieldname label
- */
-
-#define E_MINICARD_LABEL_TYPE			(e_minicard_label_get_type ())
-#define E_MINICARD_LABEL(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_LABEL_TYPE, EMinicardLabel))
-#define E_MINICARD_LABEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_LABEL_TYPE, EMiniCardLabelClass))
-#define E_IS_MINICARD_LABEL(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-#define E_IS_MINICARD_LABEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-
-
-typedef struct _EMinicardLabel       EMinicardLabel;
-typedef struct _EMinicardLabelClass  EMinicardLabelClass;
-
-struct _EMinicardLabel
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	double width;
-	double height;
-	double max_field_name_length;
-	GnomeCanvasItem *fieldname;
-	GnomeCanvasItem *field;
-	GnomeCanvasItem *rect;
-
-	gboolean has_focus;
-};
-
-struct _EMinicardLabelClass
-{
-	GnomeCanvasGroupClass parent_class;
-};
-
-
-GtkType    e_minicard_label_get_type (void);
-GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
-void e_minicard_label_construct (GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
deleted file mode 100644
index c6809bf1d0..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view-widget.h"
-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_destroy       (GtkObject *object);
-static void e_minicard_view_widget_reflow        (ECanvas *canvas);
-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-GtkType
-e_minicard_view_widget_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "EMinicardViewWidget",
-        sizeof (EMinicardViewWidget),
-        sizeof (EMinicardViewWidgetClass),
-        (GtkClassInitFunc) e_minicard_view_widget_class_init,
-        (GtkObjectInitFunc) e_minicard_view_widget_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (e_canvas_get_type (), &info);
-    }
-
-  return type;
-}
-
-static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	gtk_object_add_arg_type ("EMinicardViewWidget::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardViewWidget::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-
-	object_class->set_arg       = e_minicard_view_widget_set_arg;
-	object_class->get_arg       = e_minicard_view_widget_get_arg;
-	object_class->destroy       = e_minicard_view_widget_destroy;
-
-	widget_class->realize       = e_minicard_view_widget_realize;
-	widget_class->size_allocate = e_minicard_view_widget_size_allocate;
-
-	canvas_class->reflow        = e_minicard_view_widget_reflow;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-	view->rect = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (void)
-{
-	return GTK_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));
-}
-
-static void
-e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (emvw->book)
-			gtk_object_unref(GTK_OBJECT(emvw->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			emvw->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			if (emvw->book)
-				gtk_object_ref(GTK_OBJECT(emvw->book));
-		} else
-			emvw->book = NULL;
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "book", emvw->book,
-				       NULL);
-		break;
-	case ARG_QUERY:
-		emvw->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "query", emvw->query,
-				       NULL);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emvw->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(emvw->query);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_destroy (GtkObject *object)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);
-
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	g_free(view->query);
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	view->rect = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color", "white",
-		NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		NULL );
-	gtk_object_set(GTK_OBJECT(view->emv),
-		       "book", view->book,
-		       "query", view->query,
-		       NULL);
-
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS(parent_class)->realize (widget);
-}
-
-static void
-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-	
-	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-		gnome_canvas_item_set( view->emv,
-				       "height", (double) allocation->height,
-				       NULL );
-		gnome_canvas_item_set( view->emv,
-				       "minimum_width", (double) allocation->width,
-				       NULL );
-		gtk_object_get(GTK_OBJECT(view->emv),
-			       "width", &width,
-			       NULL);
-		width = MAX(width, allocation->width);
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1);
-		gnome_canvas_item_set( view->rect,
-				       "x2", (double) width,
-				       "y2", (double) allocation->height,
-				       NULL );
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	gtk_object_get(GTK_OBJECT(view->emv),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-	gnome_canvas_item_set( view->rect,
-			       "x2", (double) width,
-			       "y2", (double) GTK_WIDGET(canvas)->allocation.height,
-			       NULL );	
-}
-
-void
-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,
-					EBookCallback  cb,
-					gpointer       closure)
-{
-	if (view->emv)
-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view->emv), cb, closure);
-}
-
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter)
-{
-	if (view->emv)
-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view->emv), letter);
-}
-
-void
-e_minicard_view_widget_stop(EMinicardViewWidget *view)
-{
-	e_minicard_view_stop(E_MINICARD_VIEW(view->emv));
-}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
deleted file mode 100644
index cf20c9a4df..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gnome.h>
-#include "e-minicard-view.h"
-#include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_MINICARD_VIEW_WIDGET_TYPE			(e_minicard_view_widget_get_type ())
-#define E_MINICARD_VIEW_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget))
-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-
-
-typedef struct _EMinicardViewWidget       EMinicardViewWidget;
-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
-
-struct _EMinicardViewWidget
-{
-	ECanvas parent;
-
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *emv;
-
-	EBook *book;
-	char *query;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-};
-
-GtkType    e_minicard_view_widget_get_type (void);
-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,
-						    EBookCallback  cb,
-						    gpointer       closure);
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter);
-void       e_minicard_view_widget_stop             (EMinicardViewWidget *view);						    
-
-GtkWidget *e_minicard_view_widget_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
deleted file mode 100644
index 7169e41542..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view.h"
-#include "e-minicard.h"
-#include "e-contact-editor.h"
-static void e_minicard_view_init		(EMinicardView		 *reflow);
-static void e_minicard_view_class_init	(EMinicardViewClass	 *klass);
-static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_destroy (GtkObject *object);
-static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event);
-static void canvas_destroy (GtkObject *object, EMinicardView *view);
-static void disconnect_signals (EMinicardView *view);
-
-static EReflowSortedClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-GtkType
-e_minicard_view_get_type (void)
-{
-  static GtkType reflow_type = 0;
-
-  if (!reflow_type)
-    {
-      static const GtkTypeInfo reflow_info =
-      {
-        "EMinicardView",
-        sizeof (EMinicardView),
-        sizeof (EMinicardViewClass),
-        (GtkClassInitFunc) e_minicard_view_class_init,
-        (GtkObjectInitFunc) e_minicard_view_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      reflow_type = gtk_type_unique (e_reflow_sorted_get_type (), &reflow_info);
-    }
-
-  return reflow_type;
-}
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-	
-	parent_class = gtk_type_class (e_reflow_sorted_get_type ());
-	
-	gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	
-	object_class->set_arg   = e_minicard_view_set_arg;
-	object_class->get_arg   = e_minicard_view_get_arg;
-	object_class->destroy   = e_minicard_view_destroy;
-
-	item_class->event       = e_minicard_view_event;
-	
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->book = NULL;
-	view->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	view->book_view = NULL;
-	view->get_view_idle = 0;
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-	view->canvas_destroy_id = 0;
-	view->first_get_view = TRUE;
-	
-	gtk_object_set(GTK_OBJECT(view),
-		       "empty_message", _("\n\nThere are no items to show in this view\n\n"
-					  "Double-click here to create a new Contact."),
-		       NULL);
-
-	E_REFLOW_SORTED(view)->compare_func = (GCompareFunc) e_minicard_compare;
-	E_REFLOW_SORTED(view)->string_func  = (EReflowStringFunc) e_minicard_get_card_id;
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view),
-							      e_minicard_get_type(),
-							      "card", cards->data,
-							      NULL);
-		e_reflow_add_item(E_REFLOW(view), item);
-	}
-}
-
-static void
-modify_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		ECard *card = cards->data;
-		gchar *id = e_card_get_id(card);
-		GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id);
-		if (item && !GTK_OBJECT_DESTROYED(item)) {
-			gnome_canvas_item_set(item,
-					      "card", card,
-					      NULL);
-			e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), id);
-		}
-	}
-}
-
-static void
-remove_card(EBookView *book_view, const char *id, EMinicardView *view)
-{
-	e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id);
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EMinicardView *view = closure;
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-
-	if (!view->canvas_destroy_id)
-		view->canvas_destroy_id = 
-			gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)->canvas),
-					   "destroy", GTK_SIGNAL_FUNC(canvas_destroy),
-					   view);
-
-	view->book_view = book_view;
-	if (view->book_view)
-		gtk_object_ref(GTK_OBJECT(view->book_view));
-	
-
-	view->create_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  view);
-	view->remove_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  view);
-	view->modify_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  view);
-
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_unref, NULL);
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_destroy, NULL);
-	g_list_free(E_REFLOW(view)->items);
-	E_REFLOW(view)->items = NULL;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view));
-}
-
-static gboolean
-get_view(EMinicardView *view)
-{
-	if (view->book && view->query) {
-		if (view->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities(view->book);
-			if (strstr(capabilities, "local")) {
-				e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-			}
-			view->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-	}
-
-	view->get_view_idle = 0;
-	return FALSE;
-}
-
-static void
-e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardView *view;
-
-	item = GNOME_CANVAS_ITEM (o);
-	view = E_MINICARD_VIEW (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (view->book)
-			gtk_object_unref(GTK_OBJECT(view->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			view->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			gtk_object_ref(GTK_OBJECT(view->book));
-			if (view->get_view_idle == 0)
-				view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		}
-		else
-			view->book = NULL;
-		break;
-	case ARG_QUERY:
-		g_free(view->query);
-		view->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (view->get_view_idle == 0)
-			view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardView *e_minicard_view;
-
-	e_minicard_view = E_MINICARD_VIEW (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard_view->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_minicard_view->query);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_destroy (GtkObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->get_view_idle)
-		g_source_remove(view->get_view_idle);
-	if (view->canvas_destroy_id)
-		gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)->canvas),
-				      view->canvas_destroy_id);
-	disconnect_signals(view);
-	g_free(view->query);
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static gboolean
-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
- 
-	view = E_MINICARD_VIEW (item);
-
-	switch( event->type ) {
-	case GDK_2BUTTON_PRESS:
-		if (((GdkEventButton *)event)->button == 1)
-		{
-			ECard *card;
-			EContactEditor *ce;
-			EBook *book;
-
-			card = e_card_new("");
-
-			gtk_object_get(GTK_OBJECT(view), "book", &book, NULL);
-			g_assert (E_IS_BOOK (book));
-
-			ce = e_contact_editor_new (card, TRUE);
-
-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-					    GTK_SIGNAL_FUNC (add_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-					    GTK_SIGNAL_FUNC (commit_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-					    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-			gtk_object_sink(GTK_OBJECT(card));
-		}
-		return TRUE;
-	default:
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-		else
-			return FALSE;
-		break;
-	}
-}
-
-static void
-disconnect_signals(EMinicardView *view)
-{
-	if (view->book_view && view->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->create_card_id);
-	if (view->book_view && view->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->remove_card_id);
-	if (view->book_view && view->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->modify_card_id);
-
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-}
-
-static void
-canvas_destroy(GtkObject *object, EMinicardView *view)
-{
-	disconnect_signals(view);
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	if (view->book) {
-		EReflow *reflow = E_REFLOW(view);
-		GList *list;
-		for (list = reflow->items; list; list = g_list_next(list)) {
-			GnomeCanvasItem *item = list->data;
-			gboolean has_focus;
-			gtk_object_get(GTK_OBJECT(item),
-				       "has_focus", &has_focus,
-				       NULL);
-			if (has_focus) {
-				ECard *card;
-				gtk_object_get(GTK_OBJECT(item),
-					       "card", &card,
-					       NULL);
-				e_book_remove_card(view->book, card, cb, closure);
-				return;
-			}
-		}
-	}
-}
-
-static int
-compare_to_letter(EMinicard *card, char *letter)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (*letter == '1')
-		return 1;
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return strncasecmp(file_as, letter, 1);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-
-void
-e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter)
-{
-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),
-			     (GCompareFunc) compare_to_letter,
-			     &letter);
-}
-
-void
-e_minicard_view_stop             (EMinicardView *view)
-{
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-	view->book_view = NULL;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index e4c1be870a..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include <gnome.h>
-#include <gal/widgets/e-reflow-sorted.h>
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardView - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * book         EBook           RW              book to query
- * query        string          RW              query string
- *
- * From EReflowSorted:   (you should really know what you're doing if you set these.)
- * compare_func  GCompareFunc   RW              compare function
- * string_func   EReflowStringFunc RW           string function
- *
- * From EReflow:
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
- */
-
-#define E_MINICARD_VIEW_TYPE			(e_minicard_view_get_type ())
-#define E_MINICARD_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView))
-#define E_MINICARD_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-
-
-typedef struct _EMinicardView       EMinicardView;
-typedef struct _EMinicardViewClass  EMinicardViewClass;
-
-struct _EMinicardView
-{
-	EReflowSorted parent;
-	
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	int canvas_destroy_id;
-
-	int create_card_id, remove_card_id, modify_card_id;
-
-	guint first_get_view : 1;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowSortedClass parent_class;
-};
-
-GtkType    e_minicard_view_get_type (void);
-void       e_minicard_view_remove_selection (EMinicardView *view,
-					     EBookCallback  cb,
-					     gpointer       closure);
-void       e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter);
-void       e_minicard_view_stop             (EMinicardView *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c
deleted file mode 100644
index f6489f2a6a..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard-widget.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Widget Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *minicard;
-  ECard *card;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Widget Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Widget Test", NULL);
-
-  minicard = e_minicard_widget_new();
-  card = e_card_new(TEST_VCARD);
-  gtk_object_set(GTK_OBJECT(minicard),
-		 "card", card,
-		 NULL);
-
-  gnome_app_set_contents( GNOME_APP( app ), minicard );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c
deleted file mode 100644
index 3f765425e4..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard-widget.h"
-#include "e-minicard.h"
-
-static void e_minicard_widget_init		(EMinicardWidget		 *card);
-static void e_minicard_widget_class_init	(EMinicardWidgetClass	 *klass);
-static void e_minicard_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_destroy (GtkObject *object);
-static void e_minicard_widget_size_request	 (GtkWidget	    *widget, GtkRequisition    *requisition);
-static void e_minicard_widget_size_allocate	 (GtkWidget	    *widget, GtkAllocation     *allocation);
-static void e_minicard_widget_reflow             (ECanvas           *canvas);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-GtkType
-e_minicard_widget_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-		{
-			static const GtkTypeInfo info =
-			{
-				"EMinicardWidget",
-				sizeof (EMinicardWidget),
-				sizeof (EMinicardWidgetClass),
-				(GtkClassInitFunc) e_minicard_widget_class_init,
-				(GtkObjectInitFunc) e_minicard_widget_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			type = gtk_type_unique (e_canvas_get_type (), &info);
-		}
-
-	return type;
-}
-
-static void
-e_minicard_widget_class_init (EMinicardWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass   *ecanvas_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-	ecanvas_class = E_CANVAS_CLASS(klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	object_class->set_arg = e_minicard_widget_set_arg;
-	object_class->get_arg = e_minicard_widget_get_arg;
-	object_class->destroy = e_minicard_widget_destroy;
-
-	widget_class->size_request  = e_minicard_widget_size_request;
-	widget_class->size_allocate = e_minicard_widget_size_allocate;
-
-	ecanvas_class->reflow = e_minicard_widget_reflow;
-
-	gtk_object_add_arg_type ("EMinicardWidget::card", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_CARD);
-}
-
-static void
-e_minicard_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	if (height <= 0)
-		height = 1;
-	widget->requisition.height = height;
-	widget->requisition.width  = 200;
-	requisition->height = height;
-	requisition->width  = 200;
-}
-
-static void
-e_minicard_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gnome_canvas_item_set( emw->item,
-			       "width", (double) allocation->width,
-			       NULL );
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	height = MAX(height, allocation->height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS( emw ), 0, 0, allocation->width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
-			       NULL );
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
-}
-
-static void e_minicard_widget_reflow(ECanvas *canvas)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(canvas);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-
-	height = MAX(height, GTK_WIDGET(emw)->allocation.height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(emw), 0, 0, GTK_WIDGET(emw)->allocation.width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) GTK_WIDGET(emw)->allocation.width,
-			       "y2", (double) height,
-			       NULL );	
-	
-	gtk_widget_queue_resize(GTK_WIDGET(canvas));
-}
-
-static void
-e_minicard_widget_init (EMinicardWidget *emw)
-{
-	emw->rect = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
-					   "fill_color", "white",
-					   NULL );
-
-	emw->item = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					  e_minicard_get_type(),
-					  "width", (double) 100,
-					  NULL );
-
-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( emw ),
-					 0, 0,
-					 100, 100 );
-	
-	emw->card = NULL;
-}
-
-static void
-e_minicard_widget_destroy (GtkObject *object)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	if (emw->card)
-		gtk_object_unref(GTK_OBJECT(emw->card));
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_minicard_widget_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ()));
-	return widget;
-}
-
-static void
-e_minicard_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	switch (arg_id){
-	case ARG_CARD:
-		if (emw->card)
-			gtk_object_unref(GTK_OBJECT(emw->card));
-		if (GTK_VALUE_OBJECT(*arg)) {
-		  emw->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(emw->card));
-		}
-		else
-			emw->card = NULL;
-		if (emw->item)
-			gtk_object_set(GTK_OBJECT(emw->item),
-				       "card", emw->card,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (emw->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emw->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
deleted file mode 100644
index 95b56cf3de..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_WIDGET_H__
-#define __E_MINICARD_WIDGET_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include <gal/widgets/e-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardWidget - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_MINICARD_WIDGET_TYPE			(e_minicard_widget_get_type ())
-#define E_MINICARD_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget))
-#define E_MINICARD_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass))
-#define E_IS_MINICARD_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-#define E_IS_MINICARD_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-
-
-typedef struct _EMinicardWidget       EMinicardWidget;
-typedef struct _EMinicardWidgetClass  EMinicardWidgetClass;
-
-struct _EMinicardWidget
-{
-	ECanvas parent;
-	
-	/* item specific fields */
-	GnomeCanvasItem *item;
-
-	GnomeCanvasItem *rect;
-	ECard *card;
-};
-
-struct _EMinicardWidgetClass
-{
-	ECanvasClass parent_class;
-};
-
-
-GtkWidget *e_minicard_widget_new(void);
-GtkType    e_minicard_widget_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
deleted file mode 100644
index 4dda2cee1d..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,816 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include <gal/e-text/e-text.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-minicard-view.h"
-
-static void e_minicard_init		(EMinicard		 *card);
-static void e_minicard_class_init	(EMinicardClass	 *klass);
-static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_destroy (GtkObject *object);
-static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_realize (GnomeCanvasItem *item);
-static void e_minicard_unrealize (GnomeCanvasItem *item);
-static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
-
-static void e_minicard_resize_children( EMinicard *e_minicard );
-static void remodel( EMinicard *e_minicard );
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-typedef struct _EMinicardField EMinicardField;
-
-struct _EMinicardField {
-	ECardSimpleField field;
-	GnomeCanvasItem *label;
-};
-
-#define E_MINICARD_FIELD(field) ((EMinicardField *)(field))
-
-static void
-e_minicard_field_destroy(EMinicardField *field)
-{
-	gtk_object_destroy(GTK_OBJECT(field->label));
-	g_free(field);
-}
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_CARD
-};
-
-GtkType
-e_minicard_get_type (void)
-{
-  static GtkType minicard_type = 0;
-
-  if (!minicard_type)
-    {
-      static const GtkTypeInfo minicard_info =
-      {
-        "EMinicard",
-        sizeof (EMinicard),
-        sizeof (EMinicardClass),
-        (GtkClassInitFunc) e_minicard_class_init,
-        (GtkObjectInitFunc) e_minicard_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_info);
-    }
-
-  return minicard_type;
-}
-
-static void
-e_minicard_class_init (EMinicardClass *klass)
-{
-  GtkObjectClass *object_class;
-  GnomeCanvasItemClass *item_class;
-
-  object_class = (GtkObjectClass*) klass;
-  item_class = (GnomeCanvasItemClass *) klass;
-
-  parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-  gtk_object_add_arg_type ("EMinicard::width", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READWRITE, ARG_WIDTH); 
-  gtk_object_add_arg_type ("EMinicard::height", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READABLE, ARG_HEIGHT);
-  gtk_object_add_arg_type ("EMinicard::has_focus", GTK_TYPE_ENUM,
-			   GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-  gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
- 
-  object_class->set_arg = e_minicard_set_arg;
-  object_class->get_arg = e_minicard_get_arg;
-  object_class->destroy = e_minicard_destroy;
-  
-  /* GnomeCanvasItem method overrides */
-  item_class->realize     = e_minicard_realize;
-  item_class->unrealize   = e_minicard_unrealize;
-  item_class->event       = e_minicard_event;
-}
-
-static void
-e_minicard_init (EMinicard *minicard)
-{
-	/*   minicard->card = NULL;*/
-	minicard->rect = NULL;
-	minicard->fields = NULL;
-	minicard->width = 10;
-	minicard->height = 10;
-	minicard->has_focus = FALSE;
-  
-	minicard->card = NULL;
-	minicard->simple = e_card_simple_new(NULL);
-
-	minicard->changed = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard = E_MINICARD (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
-			e_minicard->width = GTK_VALUE_DOUBLE (*arg);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_START ||
-			     GTK_VALUE_ENUM(*arg) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			} else if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			}
-		}
-		else
-			e_canvas_item_grab_focus(item);
-		break;
-	case ARG_CARD:
-		if (e_minicard->card)
-			gtk_object_unref (GTK_OBJECT(e_minicard->card));
-		e_minicard->card = E_CARD(GTK_VALUE_OBJECT (*arg));
-		if (e_minicard->card)
-			gtk_object_ref (GTK_OBJECT(e_minicard->card));
-		gtk_object_set(GTK_OBJECT(e_minicard->simple),
-			       "card", e_minicard->card,
-			       NULL);
-		remodel(e_minicard);
-		e_canvas_item_request_reflow(item);
-		e_minicard->changed = FALSE;
-		break;
-	}
-}
-
-static void
-e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->width;
-	  break;
-	case ARG_HEIGHT:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->height;
-	  break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_CARD:
-		e_card_simple_sync_card(e_minicard->simple);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->card);
-		break;
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
-
-static void
-e_minicard_destroy (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	g_list_foreach(e_minicard->fields, (GFunc) e_minicard_field_destroy, NULL);
-	g_list_free(e_minicard->fields);
-
-	if (e_minicard->card)
-		gtk_object_unref (GTK_OBJECT(e_minicard->card));
-	if (e_minicard->simple)
-		gtk_object_unref (GTK_OBJECT(e_minicard->simple));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_minicard_realize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-	GnomeCanvasGroup *group;
-	GtkWidget *canvas;
-
-	e_minicard = E_MINICARD (item);
-	group = GNOME_CANVAS_GROUP( item );
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_minicard->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard->width - 1,
-				 "y2", (double) e_minicard->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-
-	e_minicard->header_rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 2,
-				 "y1", (double) 2,
-				 "x2", (double) e_minicard->width - 3,
-				 "y2", (double) e_minicard->height - 3,
-				 "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				 NULL );
-
-	e_minicard->header_text =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "width", (double) ( e_minicard->width - 12 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-#if 0
-				 "font", "fixed-bold-10",
-#endif
-				 "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				 "text", "",
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	remodel(e_minicard);
-	e_canvas_item_request_reflow(item);
-
-	if (!item->canvas->aa) {
-	}
-}
-
-static void
-e_minicard_unrealize (GnomeCanvasItem *item)
-{
-  EMinicard *e_minicard;
-
-  e_minicard = E_MINICARD (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-static void
-save_as (GtkWidget *widget, EMinicard *minicard)
-{
-	e_card_simple_sync_card(minicard->simple);
-	e_contact_save_as(_("Save as VCard"), minicard->card);
-}
-
-static void
-delete (GtkWidget *widget, EMinicard *minicard)
-{
-	EBook *book;
-	
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas))))) {
-		e_card_simple_sync_card(minicard->simple);
-		
-		gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(minicard)->parent),
-			       "book", &book,
-			       NULL);
-		
-		/* Add the card in the contact editor to our ebook */
-		e_book_remove_card (book,
-				    minicard->card,
-				    card_changed_cb,
-				    NULL);
-	}
-}
-
-static void
-print (GtkWidget *widget, EMinicard *minicard)
-{
-	e_card_simple_sync_card(minicard->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(minicard->card));
-}
-
-static void
-print_envelope (GtkWidget *widget, EMinicard *minicard)
-{
-	e_card_simple_sync_card(minicard->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(minicard->card));
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-	
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			if ( focus_event->in ) {
-				gnome_canvas_item_set( e_minicard->rect, 
-						       "outline_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL], 
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_rect, 
-						       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_text, 
-						       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-						       NULL );
-				e_minicard->has_focus = TRUE;
-			} else {
-				EBook *book = NULL;
-
-				if (e_minicard->changed) {
-				
-					e_card_simple_sync_card(e_minicard->simple);
-
-					if (E_IS_MINICARD_VIEW(GNOME_CANVAS_ITEM(e_minicard)->parent)) {
-					
-						gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(e_minicard)->parent),
-							       "book", &book,
-							       NULL);
-					
-					}
-				
-					if (book) {
-					
-						/* Add the card in the contact editor to our ebook */
-						e_book_commit_card (book,
-								    e_minicard->card,
-								    card_changed_cb,
-								    NULL);
-					} else {
-						remodel(e_minicard);
-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));
-					}
-					e_minicard->changed = FALSE;
-				}
-					
-				gnome_canvas_item_set( e_minicard->rect, 
-						       "outline_color", NULL, 
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_rect, 
-						       "fill_color_gdk", 
-						       &canvas->style->bg[GTK_STATE_NORMAL],
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_text, 
-						       "fill_color_gdk", 
-						       &canvas->style->fg[GTK_STATE_NORMAL],
-						       NULL );
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			e_canvas_item_grab_focus(item);
-		} else if (event->button.button == 3) {
-			if (E_IS_MINICARD_VIEW(item->parent)) {
-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-						      {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},
-						      {"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0},
-						      {NULL, NULL, NULL, 0}};
-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);
-			} else {
-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-						      {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},
-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-						      {NULL, NULL, NULL, 0}};
-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);
-			}
-		}
-		break;
-
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			EContactEditor *ce;
-			EBook *book = NULL;
-			if (E_IS_MINICARD_VIEW(item->parent)) {
-				
-				gtk_object_get(GTK_OBJECT(item->parent),
-					       "book", &book,
-					       NULL);
-			}
-			ce = e_contact_editor_new (e_minicard->card, FALSE);
-
-			if (book != NULL) {
-				gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-						    GTK_SIGNAL_FUNC (add_card_cb), book);
-				gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-						    GTK_SIGNAL_FUNC (commit_card_cb), book);
-				gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-						    GTK_SIGNAL_FUNC (delete_card_cb), book);
-			}
-
-			gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-					    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-			return TRUE;
-		}
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab || 
-		    event->key.keyval == GDK_KP_Tab || 
-		    event->key.keyval == GDK_ISO_Left_Tab) {
-			GList *list;
-			for (list = e_minicard->fields; list; list = list->next) {
-				EMinicardField *field = E_MINICARD_FIELD(list->data);
-				GnomeCanvasItem *item = field->label;
-				EFocus has_focus;
-				gtk_object_get(GTK_OBJECT(item),
-					       "has_focus", &has_focus,
-					       NULL);
-				if (has_focus != E_FOCUS_NONE) {
-					if (event->key.state & GDK_SHIFT_MASK)
-						list = list->prev;
-					else
-						list = list->next;
-					if (list) {
-						EMinicardField *field = E_MINICARD_FIELD(list->data);
-						GnomeCanvasItem *item = field->label;
-						gnome_canvas_item_set(item,
-								      "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,
-								      NULL);
-						return 1;
-					} else {
-						return 0;
-					}
-				}
-			}
-		}
-	default:
-		break;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_minicard_resize_children( EMinicard *e_minicard )
-{
-	GList *list;
-	
-	if (e_minicard->header_text) {
-		gnome_canvas_item_set( e_minicard->header_text,
-				       "width", (double) e_minicard->width - 12,
-				       NULL );
-	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
-				       "width", (double) e_minicard->width - 4.0,
-				       NULL );
-	}
-}
-
-static void
-field_changed (EText *text, EMinicard *e_minicard)
-{
-	ECardSimpleType type;
-	char *string;
-
-	type = GPOINTER_TO_INT
-		(gtk_object_get_data(GTK_OBJECT(text),
-				     "EMinicard:field"));
-	gtk_object_get(GTK_OBJECT(text),
-		       "text", &string,
-		       NULL);
-	e_card_simple_set(e_minicard->simple,
-			  type,
-			  string);
-	g_free(string);
-	e_minicard->changed = TRUE;
-}
-
-static void
-add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	ECardSimpleType type;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	type = e_card_simple_type(e_minicard->simple, field);
-	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-	string = e_card_simple_get(e_minicard->simple, field);
-
-	new_item = e_minicard_label_new(group);
-	gnome_canvas_item_set( new_item,
-			       "width", e_minicard->width - 4.0,
-			       "fieldname", name,
-			       "field", string,
-			       "max_field_name_length", left_width,
-			       NULL );
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
-	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			    "EMinicard:field",
-			    GINT_TO_POINTER(field));
-
-	minicard_field = g_new(EMinicardField, 1);
-	minicard_field->field = field;
-	minicard_field->label = new_item;
-
-	e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
-	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
-	g_free(name);
-	g_free(string);
-}
-
-static gdouble
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	ECardSimpleField field;
-	gdouble width = -1;
-	GdkFont *font;
-
-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		gdouble this_width;
-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-		this_width = gdk_text_width(font, name, strlen(name));
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	return width;
-}
-
-static void
-remodel( EMinicard *e_minicard )
-{
-	int count = 0;
-	if (e_minicard->simple) {
-		ECardSimpleField field;
-		GList *list;
-		char *file_as;
-		gdouble left_width = -1;
-
-		if (e_minicard->header_text) {
-			file_as = e_card_simple_get(e_minicard->simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-			gnome_canvas_item_set( e_minicard->header_text,
-					       "text", file_as ? file_as : "",
-					       NULL );
-			g_free(file_as);
-		}
-		
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (list)
-				minicard_field = list->data;
-			if (minicard_field && minicard_field->field == field) {
-				GList *this_list = list;
-				char *string;
-				
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
-					gtk_object_set(GTK_OBJECT(minicard_field->label),
-						       "field", string,
-						       NULL);
-					count ++;
-				} else {
-					e_minicard_field_destroy(minicard_field);
-				}
-				list = g_list_remove_link(list, this_list);
-				g_list_free_1(this_list);
-				g_free(string);
-			} else {
-				char *string;
-				if (left_width == -1) {
-					left_width = get_left_width(e_minicard);
-				}
-
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					add_field(e_minicard, field, left_width);
-					count++;
-				}
-				g_free(string);
-			}
-		}
-		
-		g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(list);
-	}
-}
-
-static void
-e_minicard_reflow( GnomeCanvasItem *item, int flags )
-{
-	EMinicard *e_minicard = E_MINICARD(item);
-	if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		GList *list;
-		gdouble text_height;
-		gint old_height;
-		
-		old_height = e_minicard->height;
-
-		gtk_object_get( GTK_OBJECT( e_minicard->header_text ),
-				"text_height", &text_height,
-				NULL );
-		
-		e_minicard->height = text_height + 10.0;
-		
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "y2", text_height + 9.0,
-				       NULL );
-		
-		for(list = e_minicard->fields; list; list = g_list_next(list)) {
-			EMinicardField *field = E_MINICARD_FIELD(list->data);
-			GnomeCanvasItem *item = field->label;
-			gtk_object_get (GTK_OBJECT(item),
-					"height", &text_height,
-					NULL);
-			e_canvas_item_move_absolute(item, 2, e_minicard->height);
-			e_minicard->height += text_height;
-		}
-		e_minicard->height += 2;
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "y2", (double) e_minicard->height - 1,
-				       NULL );
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "x2", (double) e_minicard->width - 1.0,
-				       "y2", (double) e_minicard->height - 1.0,
-				       NULL );
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "x2", (double) e_minicard->width - 3.0,
-				       NULL );
-
-		if (old_height != e_minicard->height)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-char *
-e_minicard_get_card_id (EMinicard *minicard)
-{
-	g_return_val_if_fail(minicard != NULL, NULL);
-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);
-
-	if (minicard->card) {
-		return e_card_get_id(minicard->card);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	g_return_val_if_fail(minicard1 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);
-	g_return_val_if_fail(minicard2 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);
-
-	if (minicard1->card && minicard2->card) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(minicard1->card),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(minicard2->card),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-	} else {
-		return 0;
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index a0272ee58b..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicard - A small card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the card
- * height       double          R               height of the card
- * card		ECard*		RW		Pointer to the ECard
- */
-
-#define E_MINICARD_TYPE			(e_minicard_get_type ())
-#define E_MINICARD(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard))
-#define E_MINICARD_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE))
-
-
-typedef struct _EMinicard       EMinicard;
-typedef struct _EMinicardClass  EMinicardClass;
-typedef enum _EMinicardFocusType EMinicardFocusType;
-
-enum _EMinicardFocusType {
-	E_MINICARD_FOCUS_TYPE_START,
-	E_MINICARD_FOCUS_TYPE_END
-};
-
-struct _EMinicard
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-	
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *header_rect;
-	GnomeCanvasItem *header_text;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-	
-	gboolean has_focus;
-	
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	void (* resize) (EMinicard *minicard);
-};
-
-
-GtkType    e_minicard_get_type    (void);
-char      *e_minicard_get_card_id (EMinicard *minicard);
-int        e_minicard_compare     (EMinicard *minicard1, EMinicard *minicard2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
deleted file mode 100644
index 0566a85760..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard-label.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard-label.h"
-#include <gal/widgets/e-canvas.h>
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *label;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( label,
-			 "width", (double) allocation->width,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Label Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard label canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void button_press_callback( GtkWidget *widget, gpointer data )
-{
-  gnome_canvas_item_grab_focus( label );
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Label Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Label Test", NULL);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));
-  gnome_canvas_item_set( label,
-			 "width", (double) 100,
-			 "height", (double) 100,
-			 "fieldname", "Full Name:",
-			 "field", "Christopher James Lahey",
-			 NULL );
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "button_press_event",
-		      GTK_SIGNAL_FUNC( button_press_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
deleted file mode 100644
index c03d11d07e..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <e-util/e-canvas.h>
-#include "e-minicard-view.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-
-	gnome_CORBA_init_with_popt_table (
-		"Reflow Test", VERSION,
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-
-	orb = gnome_CORBA_ORB ();
-
-	if (bonobo_init (orb, NULL, NULL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-}
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width, allocation->height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width, last_alloc.height );
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS)
-		gnome_canvas_item_set(reflow,
-				      "book", book,
-				      NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollbar;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  CORBA_exception_init (&ev);
-  init_bonobo (argc, argv);
-
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_minicard_view_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gtk_box_pack_start(GTK_BOX(vbox), canvas, TRUE, TRUE, 0);
-
-  scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)));
-
-  gtk_box_pack_start(GTK_BOX(vbox), scrollbar, FALSE, FALSE, 0);
-
-  gnome_app_set_contents( GNOME_APP( app ), vbox );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-  bonobo_main ();
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c
deleted file mode 100644
index e16ca675b3..0000000000
--- a/addressbook/gui/widgets/test-minicard.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *card;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( card,
-			 "width", (double) allocation->width,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Test", NULL);
-
-  canvas = gnome_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  for ( i = 0; i < 1; i++ )
-    {
-      card = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				    e_minicard_get_type(),
-				    "width", (double) 100,
-				    NULL );
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
deleted file mode 100644
index 2a8e7093fe..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include "e-minicard.h"
-#include <gal/widgets/e-scroll-frame.h>
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation->height - 1);
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollframe;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Reflow Test", VERSION, argc, argv);
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_reflow_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-  for ( i = 0; i < 200; i++ )
-    {
-      GnomeCanvasItem *item;
-      ECard *card = e_card_new (TEST_VCARD);
-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),
-				    e_minicard_get_type(),
-				    "card", card,
-				    NULL);
-      e_reflow_add_item(E_REFLOW(reflow), item);
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),
-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));
-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-			     GTK_POLICY_AUTOMATIC,
-			     GTK_POLICY_NEVER);
-  
-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);
-
-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore
deleted file mode 100644
index 96194f7fd7..0000000000
--- a/addressbook/printing/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-print-test
-contact-print-style-editor-test
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
deleted file mode 100644
index a28f8bf7c1..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-ecpsdir    = $(datadir)/evolution/ecps
-
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	$(GNOME_PRINT_CFLAGS)			\
-        $(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontactprint.a
-
-libecontactprint_a_SOURCES = 			\
-	e-contact-print-envelope.c		\
-	e-contact-print-envelope.h		\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h			\
-	e-contact-print.c			\
-	e-contact-print.h
-
-noinst_PROGRAMS =	\
-	contact-print-test	\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(GNOME_PRINT_LIBS) 
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(GNOME_PRINT_LIBS)
-
-EXTRA_DIST = \
-	$(glade_DATA)	\
-	$(ecps_DATA)	\
-	e-contact-print.glade.h
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index c702728e4e..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include "e-contact-print-envelope.h"
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 10.0)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_string_n (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static gint
-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, ECard *ecard)
-{
-	ECardSimple *card = e_card_simple_new(ecard);
-	char *address;
-	EcpeLine *linelist;
-	double x;
-	double y;
-	GnomeFont *font;
-	
-
-	gnome_print_rotate(pc, 90);
-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);
-
-	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);
-	linelist = ecpe_break(address);
-	font = gnome_font_new("Helvetica", 12);
-	ecpe_linelist_dimensions(font, address, linelist, &x, &y);
-	x = (ENVELOPE_WIDTH - x) / 2;
-	y = (ENVELOPE_HEIGHT - y) / 2;
-	ecpe_linelist_print(pc, font, address, linelist, x, y);
-	gtk_object_unref(GTK_OBJECT(font));
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	ECard *card = NULL;
-	GtkWidget *preview;
-
-	card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card);
-		
-		gnome_print_master_print(master);
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card);
-		
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		break;
-	case GNOME_PRINT_CANCEL:
-		gtk_object_unref(GTK_OBJECT(card));
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_envelope_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print envelope", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
deleted file mode 100644
index 45aa051401..0000000000
--- a/addressbook/printing/e-contact-print-envelope.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);
-
-#endif /* E_CONTACT_PRINT_ENVELOPE_H */
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
deleted file mode 100644
index 5eb5cadacf..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-contact-print-style-editor.h"
-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);
-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);
-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy        (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD
-};
-
-GtkType
-e_contact_print_style_editor_get_type (void)
-{
-  static GtkType contact_print_style_editor_type = 0;
-
-  if (!contact_print_style_editor_type)
-    {
-      static const GtkTypeInfo contact_print_style_editor_info =
-      {
-        "EContactPrintStyleEditor",
-        sizeof (EContactPrintStyleEditor),
-        sizeof (EContactPrintStyleEditorClass),
-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,
-        (GtkObjectInitFunc) e_contact_print_style_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
-    }
-
-  return contact_print_style_editor_type;
-}
-
-static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkVBoxClass *vbox_class;
-
-  object_class = (GtkObjectClass*) klass;
-  vbox_class = (GtkVBoxClass *) klass;
-
-  parent_class = gtk_type_class (gtk_vbox_get_type ());
-  
-  object_class->set_arg = e_contact_print_style_editor_set_arg;
-  object_class->get_arg = e_contact_print_style_editor_get_arg;
-  object_class->destroy = e_contact_print_style_editor_destroy;
-}
-
-#if 0
-static void
-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
-{
-	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
-			 left, right, top, bottom,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-}
-#endif
-
-static void
-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
-{
-	GladeXML *gui;
-
-	/*   e_contact_print_style_editor->card = NULL;*/
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL);
-	e_contact_print_style_editor->gui = gui;
-	gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),
-			    GTK_WIDGET(e_contact_print_style_editor));
-}
-
-void
-e_contact_print_style_editor_destroy (GtkObject *object)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);
-	gtk_object_unref(GTK_OBJECT(e_contact_print_style_editor->gui));
-}
-
-GtkWidget*
-e_contact_print_style_editor_new (char *filename)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));
-	return widget;
-}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-	
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
-	switch (arg_id) {
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
deleted file mode 100644
index cf0f17f889..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactPrintStyleEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
- */
-
-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-
-
-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;
-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;
-
-struct _EContactPrintStyleEditor
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-};
-
-struct _EContactPrintStyleEditorClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType    e_contact_print_style_editor_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
deleted file mode 100644
index e99cfe6d39..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <gnome.h>
-#include <libgnomeprint/gnome-font.h>
-
-typedef struct _EContactPrintStyle EContactPrintStyle;
-typedef enum _EContactPrintType EContactPrintType;
-
-enum _EContactPrintType {
-	E_CONTACT_PRINT_TYPE_CARDS,
-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,
-	E_CONTACT_PRINT_TYPE_PHONE_LIST
-};
-
-struct _EContactPrintStyle
-{
-	gchar *title;
-	EContactPrintType type;
-	gboolean sections_start_new_page;
-	guint num_columns;
-	guint blank_forms;
-	gboolean letter_tabs;
-	gboolean letter_headings;
-	GnomeFont *headings_font;
-	GnomeFont *body_font;
-	gboolean print_using_grey;
-	gint paper_type;
-	gdouble paper_width;
-	gdouble paper_height;
-	gint paper_source;
-	gdouble top_margin;
-	gdouble left_margin;
-	gdouble bottom_margin;
-	gdouble right_margin;
-	gint page_size;
-	gdouble page_width;
-	gdouble page_height;
-	gboolean orientation_portrait;
-	GnomeFont *header_font;
-	gchar *left_header;
-	gchar *center_header;
-	gchar *right_header;
-	GnomeFont *footer_font;
-	gchar *left_footer;
-	gchar *center_footer;
-	gchar *right_footer;
-	gboolean reverse_on_even_pages;
-};
-
-#endif /* E_CONTACT_PRINT_TYPES_H */
-
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
deleted file mode 100644
index 337f0f2007..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include "e-contact-print.h"
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-multipage.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <ctype.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintMaster *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	gchar *query;
-
-	GList *cards;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_string(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_string(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_string_n(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_string_n(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_string(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_string(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_string(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_string(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	unsigned char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_string(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_string(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_string(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)
-{
-	GList *cards = ctxt->cards;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		ECardSimple *simple = e_card_simple_new(card);
-		guchar *file_as;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if ( file_as && (!ctxt->character || *ctxt->character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!ctxt->character)
-				ctxt->character = g_strdup(" ");
-			*ctxt->character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_card(simple, ctxt);
-		ctxt->first_contact = FALSE;
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(ctxt->character);
-	if (book_view)
-		gtk_object_unref(GTK_OBJECT(book_view));
-	if (ctxt->type == GNOME_PRINT_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_master_print(ctxt->master);
-	}
-	gtk_object_unref(GTK_OBJECT(ctxt->pc));
-	gtk_object_unref(GTK_OBJECT(ctxt->master));
-	if (ctxt->book)
-		gtk_object_unref(GTK_OBJECT(ctxt->book));
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free(ctxt->cards);
-	gtk_object_unref(GTK_OBJECT(ctxt->style->headings_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->body_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->header_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->footer_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_heading_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_tab_font));
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-card_compare (ECard *card1, ECard *card2) {
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(card1),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card2),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)
-{
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		gtk_object_ref(GTK_OBJECT(card));
-		ctxt->cards = g_list_insert_sorted(ctxt->cards, card, (GCompareFunc) card_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	gtk_object_ref(GTK_OBJECT(book_view));
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "card_added",
-			   GTK_SIGNAL_FUNC(create_card),
-			   ctxt);
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "sequence_complete",
-			   GTK_SIGNAL_FUNC(complete_sequence),
-			   ctxt);
-}
-
-static void
-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-#if 0
-static double
-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	double height = 0;
-	int field;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			if ( 1 ) /* field is a phone field. */ {
-				gchar *field = string;
-				height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-				height += .2 * gnome_font_get_size (ctxt->style->body_font);
-			}
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	double xoff, dotwidth;
-	int dotcount;
-	char *dots;
-	int i;
-	char *file_as;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x, ctxt->y, -1, e_card_get_string_fileas(card));
-	
-	xoff = column_width - 9 * gnome_font_get_size (ctxt->style->body_font);
-	dotwidth = xoff - 
-		gnome_font_get_width_string(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_string(ctxt->style->body_font, " ");
-	dotcount = dotwidth / gnome_font_get_width(ctxt->style->body_font, '.');
-	dots = g_new(gchar, dotcount + 1);
-	for (i = 0; i < dotcount; i++)
-		dots[i] = '.';
-	dots[dotcount] = 0;
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff - dotcount * gnome_font_get_width(ctxt->style->body_font, '.'), ctxt->y, -1, dots);
-	g_free(dots);
-		
-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {
-		if ( 1 ) /* field is a phone field. */ {
-			gchar *field = e_card_get_string(card, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, 
-					 ctxt->x + column_width - gnome_font_get_width_string(ctxt->style->body_font, 
-											      field),
-					 ctxt->y,
-					 -1,
-					 field);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-	}
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	ECard *card = NULL;
-	int i;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-	/*
-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {
-	*/
-	for (i=0; i < 30; i++) {
-		guchar *file_as = e_card_get_string_fileas(card);
-		if ( file_as && (!character || *character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!character)
-				character = g_strdup(" ");
-			*character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!first_contact) && (ctxt->y - e_contact_get_card_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_phone_list(card, ctxt, shown_fields);
-		first_contact = FALSE;
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(character);
-}
-#endif
-
-static void
-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	switch ( ctxt->style->type ) {
-	case E_CONTACT_PRINT_TYPE_CARDS:
-		e_contact_do_print_cards( book, query, ctxt);
-		break;
-#if 0
-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:
-		e_contact_do_print_phone_list( book, query, ctxt );
-		break;
-#endif
-	default:
-		break;
-	}
-}
-
-static void lowify( char *data )
-{
-	for ( ; *data; data++ )
-		*data = tolower((unsigned char) *data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_new_from_full_name( data );
-		if ( font ) {
-			gtk_object_unref( GTK_OBJECT(*variable) );
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-	style->headings_font = gnome_font_new("Helvetica-Bold", 8);
-	style->body_font = gnome_font_new("Helvetica", 6);
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-	style->header_font = gnome_font_new("Helvetica", 6);
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-	style->footer_font = gnome_font_new("Helvetica", 6);
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->childs; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");
-	EBook *book = NULL;
-	char *query = NULL;
-	ECard *card = NULL;
-	gdouble font_size;
-	if (uses_book) {
-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");
-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");
-	} else {
-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-	}
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->cards = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			complete_sequence(NULL, ctxt);
-		}
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->cards = NULL;
-			gtk_object_ref(GTK_OBJECT(book));
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			gtk_object_ref(GTK_OBJECT(card));
-			complete_sequence(NULL, ctxt);
-		}
-		break;
-	case GNOME_PRINT_CANCEL:
-		if (uses_book)
-			gtk_object_unref(GTK_OBJECT(book));
-		else
-			gtk_object_unref(GTK_OBJECT(card));
-		g_free(query);
-		gnome_dialog_close(dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	gtk_object_ref(GTK_OBJECT(book));
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);
-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);
-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_card_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print card", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
deleted file mode 100644
index be24c9fc60..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2009 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Printing</name>
-  <program_name>printing</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-print.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>print-edit-style</name>
-  <visible>False</visible>
-  <title>Page Setup:</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox-contact-print-style-editor</name>
-      <homogeneous>False</homogeneous>
-      <spacing>5</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>16</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label>Style name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>label-style-name</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkNotebook</class>
-	<name>notebook1</name>
-	<can_focus>True</can_focus>
-	<show_tabs>True</show_tabs>
-	<show_border>True</show_border>
-	<tab_pos>GTK_POS_TOP</tab_pos>
-	<scrollable>False</scrollable>
-	<tab_hborder>2</tab_hborder>
-	<tab_vborder>2</tab_vborder>
-	<popup_enable>False</popup_enable>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>5</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame5</name>
-	      <label>Preview:</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>7</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame6</name>
-	      <label>Options</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkAlignment</class>
-		<name>alignment4</name>
-		<xalign>0</xalign>
-		<yalign>0</yalign>
-		<xscale>0</xscale>
-		<yscale>0</yscale>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table1</name>
-		  <border_width>8</border_width>
-		  <rows>6</rows>
-		  <columns>5</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>0</row_spacing>
-		  <column_spacing>0</column_spacing>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label5</name>
-		    <label>Include:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label4</name>
-		    <label>Sections:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment2</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton1</name>
-		      <can_focus>True</can_focus>
-		      <label>Immediately follow each other</label>
-		      <active>True</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton1</name>
-		    <can_focus>True</can_focus>
-		    <label>Letter tabs on side</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton2</name>
-		    <can_focus>True</can_focus>
-		    <label>Headings for each letter</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>5</top_attach>
-		      <bottom_attach>6</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment3</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton2</name>
-		      <can_focus>True</can_focus>
-		      <label>Start on a new page</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label6</name>
-		    <label>Number of columns:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label7</name>
-		    <label>Blank forms at end:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment6</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton2</name>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>2</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment5</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton1</name>
-		      <width>45</width>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>1</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox3</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>8</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame7</name>
-		<label>Fonts</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table2</name>
-		  <border_width>8</border_width>
-		  <rows>2</rows>
-		  <columns>2</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>13</row_spacing>
-		  <column_spacing>8</column_spacing>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment7</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button6</name>
-		      <can_focus>True</can_focus>
-		      <label>Font...</label>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment8</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button5</name>
-		      <width>90</width>
-		      <can_focus>True</can_focus>
-		      <label>Font...</label>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox4</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label10</name>
-		      <label>Headings</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry3</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>10 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox5</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label9</name>
-		      <label>Body</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry2</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>8 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame8</name>
-		<label>Shading</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>checkbutton3</name>
-		  <can_focus>True</can_focus>
-		  <label>Print using gray shading</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label1</name>
-	  <label>Format</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>True</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame9</name>
-	      <label>Paper</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox16</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox17</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label21</name>
-		    <label>Type:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow1</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist1</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label26</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox18</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label24</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox5</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label27</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry9</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label28</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry10</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox19</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label25</name>
-		    <label>Paper source:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCombo</class>
-		    <name>combo1</name>
-		    <value_in_list>False</value_in_list>
-		    <ok_if_empty>True</ok_if_empty>
-		    <case_sensitive>False</case_sensitive>
-		    <use_arrows>True</use_arrows>
-		    <use_arrows_always>False</use_arrows_always>
-		    <items></items>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <child_name>GtkCombo:entry</child_name>
-		      <name>combo-entry1</name>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame10</name>
-	      <label>Margins</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table4</name>
-		<border_width>15</border_width>
-		<rows>2</rows>
-		<columns>4</columns>
-		<homogeneous>True</homogeneous>
-		<row_spacing>6</row_spacing>
-		<column_spacing>9</column_spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label29</name>
-		  <label>Top:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label30</name>
-		  <label>Bottom:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label31</name>
-		  <label>Left:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry11</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry12</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry13</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry14</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label32</name>
-		  <label>Right:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame11</name>
-	      <label>Page</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox8</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox20</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label33</name>
-		    <label>Size:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow2</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist2</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label35</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox21</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label34</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox6</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label36</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry15</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label37</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry16</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame12</name>
-	      <label>Orientation</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox4</name>
-		<homogeneous>False</homogeneous>
-		<spacing>10</spacing>
-
-		<widget>
-		  <class>Placeholder</class>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox9</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>5</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment9</name>
-		    <xalign>0</xalign>
-		    <yalign>1</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton3</name>
-		      <can_focus>True</can_focus>
-		      <label>Portrait</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment10</name>
-		    <xalign>0</xalign>
-		    <yalign>0</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton4</name>
-		      <can_focus>True</can_focus>
-		      <label>Landscape</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label2</name>
-	  <label>Paper</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox10</name>
-	  <border_width>8</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table5</name>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>True</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment15</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button11</name>
-		<can_focus>True</can_focus>
-		<label>Font...</label>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text10</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text11</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text12</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text13</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text14</name>
-	      <height>5</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text15</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment16</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox14</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label14</name>
-		  <label>Header</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry7</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment17</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox15</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label15</name>
-		  <label>Footer:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry8</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment14</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button10</name>
-		<can_focus>True</can_focus>
-		<label>Font...</label>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkToolbar</class>
-	      <name>toolbar1</name>
-	      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-	      <type>GTK_TOOLBAR_ICONS</type>
-	      <space_size>5</space_size>
-	      <space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <tooltips>True</tooltips>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton4</name>
-	    <can_focus>True</can_focus>
-	    <label>Reverse on even pages</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label3</name>
-	  <label>Header/Footer</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/printing/e-contact-print.glade.h b/addressbook/printing/e-contact-print.glade.h
deleted file mode 100644
index b3b03d6d68..0000000000
--- a/addressbook/printing/e-contact-print.glade.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Page Setup:");
-gchar *s = N_("Style name:");
-gchar *s = N_("Preview:");
-gchar *s = N_("Options");
-gchar *s = N_("Include:");
-gchar *s = N_("Sections:");
-gchar *s = N_("Immediately follow each other");
-gchar *s = N_("Letter tabs on side");
-gchar *s = N_("Headings for each letter");
-gchar *s = N_("Start on a new page");
-gchar *s = N_("Number of columns:");
-gchar *s = N_("Blank forms at end:");
-gchar *s = N_("Fonts");
-gchar *s = N_("Font...");
-gchar *s = N_("Font...");
-gchar *s = N_("Headings");
-gchar *s = N_("10 pt. Tahoma");
-gchar *s = N_("Body");
-gchar *s = N_("8 pt. Tahoma");
-gchar *s = N_("Shading");
-gchar *s = N_("Print using gray shading");
-gchar *s = N_("Format");
-gchar *s = N_("Paper");
-gchar *s = N_("Type:");
-gchar *s = N_("label26");
-gchar *s = N_("Dimensions:");
-gchar *s = N_("Width:");
-gchar *s = N_("Height:");
-gchar *s = N_("Paper source:");
-gchar *s = N_("Margins");
-gchar *s = N_("Top:");
-gchar *s = N_("Bottom:");
-gchar *s = N_("Left:");
-gchar *s = N_("Right:");
-gchar *s = N_("Page");
-gchar *s = N_("Size:");
-gchar *s = N_("label26");
-gchar *s = N_("Dimensions:");
-gchar *s = N_("Width:");
-gchar *s = N_("Height:");
-gchar *s = N_("Orientation");
-gchar *s = N_("Portrait");
-gchar *s = N_("Landscape");
-gchar *s = N_("Paper");
-gchar *s = N_("Font...");
-gchar *s = N_("Header");
-gchar *s = N_("Footer:");
-gchar *s = N_("Font...");
-gchar *s = N_("Reverse on even pages");
-gchar *s = N_("Header/Footer");
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index fb17271f6b..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index 72cca146dd..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 53ca294d36..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 5844851bfb..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index d4dccc0b87..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-contact-print-style-editor.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *editor;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-	static int count = 2;
-	count --;
-	if ( count <= 0 )
-		exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact print style editor widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Style Editor Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-
-  app = gnome_app_new("Contact Print Style Editor Test", NULL);
-
-  editor = e_contact_print_style_editor_new("");
-  
-  gnome_app_set_contents( GNOME_APP( app ), editor );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
deleted file mode 100644
index 1b73fda3da..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-contact-print.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *print;
-
-static gint test_close(GnomeDialog *dialog, gpointer data)
-{
-	exit(0);
-	return 1;
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact print code" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GList *shown_fields = NULL;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-  
-  shown_fields = g_list_append(shown_fields, "First field");
-  shown_fields = g_list_append(shown_fields, "Second field");
-  shown_fields = g_list_append(shown_fields, "Third field");
-  shown_fields = g_list_append(shown_fields, "Fourth field");
-
-  print = e_contact_print_dialog_new(NULL, NULL);
-  gtk_widget_show_all(print);
-  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/art/.cvsignore b/art/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/art/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
\ No newline at end of file
diff --git a/art/Makefile.am b/art/Makefile.am
deleted file mode 100644
index 7a5cd77d59..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-
-images_DATA = \
-	briefcase.png       		\
-	cellphone.png       		\
-	envelope.png        		\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.png 	\
-	evolution-contacts.png 		\
-	evolution-inbox-mini.png 	\
-	evolution-inbox.png 		\
-	evolution-notes-mini.png 	\
-	evolution-notes.png 		\
-	evolution-tasks-mini.png 	\
-	evolution-tasks.png 		\
-	evolution-today.png 		\
-	globe.png           		\
-	house.png           		\
-	malehead.png			\
-	service-close.png		\
-	service-configure.png		\
-	service-down.png		\
-	service-left.png		\
-	service-right.png		\
-	service-up.png			\
-	splash.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	fetch-mail.png			\
-	forward.png			\
-	move-message.png		\
-	reply-to-all.png		\
-	reply.png
-
-EXTRA_DIST = \
-	add-service.png	\
-	attachment.xpm \
-	compose-message.png \
-	copy-message.png \
-	empty.xpm \
-	fetch-mail.png \
-	forward.png \
-	mail-new.xpm \
-	mail-read.xpm \
-	mail-replied.xpm \
-	mark.xpm \
-	meeting.xpm \
-	move-message.png \
-	priority-high.xpm \
-	priority-low.xpm \
-	reply.png \
-	reply-to-all.png \
-	tree-expanded.xpm \
-	tree-unexpanded.xpm \
-	score-lowest.xpm \
-	score-lower.xpm \
-	score-low.xpm \
-	score-normal.xpm \
-	score-high.xpm \
-	score-higher.xpm \
-	score-highest.xpm \
-	$(images_DATA)
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index 024b203fe0..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index 62ddebe678..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 1bcc0386d2..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"     ...        ",
-"    .   . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    .  .  .     ",
-"    .     .     ",
-"     .   .      ",
-"      ...       ",
-"                "};
diff --git a/art/briefcase.png b/art/briefcase.png
deleted file mode 100644
index 424ad09632..0000000000
--- a/art/briefcase.png
+++ /dev/null
diff --git a/art/cellphone.png b/art/cellphone.png
deleted file mode 100644
index c8d70ae663..0000000000
--- a/art/cellphone.png
+++ /dev/null
diff --git a/art/compose-message.png b/art/compose-message.png
deleted file mode 100644
index 2b0b97c791..0000000000
--- a/art/compose-message.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index bd7c71d0a1..0000000000
--- a/art/copy-message.png
+++ /dev/null
diff --git a/art/empty.xpm b/art/empty.xpm
deleted file mode 100644
index aca06618b1..0000000000
--- a/art/empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/envelope.png b/art/envelope.png
deleted file mode 100644
index 77acd63100..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index 5386190d96..0000000000
--- a/art/evolution-calendar-mini.png
+++ /dev/null
diff --git a/art/evolution-calendar.png b/art/evolution-calendar.png
deleted file mode 100644
index 76afca6b6f..0000000000
--- a/art/evolution-calendar.png
+++ /dev/null
diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png
deleted file mode 100644
index 685812c137..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution-contacts.png b/art/evolution-contacts.png
deleted file mode 100644
index 0d2cfb7e5f..0000000000
--- a/art/evolution-contacts.png
+++ /dev/null
diff --git a/art/evolution-inbox-mini.png b/art/evolution-inbox-mini.png
deleted file mode 100644
index dbc20fcef1..0000000000
--- a/art/evolution-inbox-mini.png
+++ /dev/null
diff --git a/art/evolution-inbox.png b/art/evolution-inbox.png
deleted file mode 100644
index 3b0f90b292..0000000000
--- a/art/evolution-inbox.png
+++ /dev/null
diff --git a/art/evolution-notes-mini.png b/art/evolution-notes-mini.png
deleted file mode 100644
index f5b5d776d0..0000000000
--- a/art/evolution-notes-mini.png
+++ /dev/null
diff --git a/art/evolution-notes.png b/art/evolution-notes.png
deleted file mode 100644
index f82006b894..0000000000
--- a/art/evolution-notes.png
+++ /dev/null
diff --git a/art/evolution-tasks-mini.png b/art/evolution-tasks-mini.png
deleted file mode 100644
index d23b5a0be7..0000000000
--- a/art/evolution-tasks-mini.png
+++ /dev/null
diff --git a/art/evolution-tasks.png b/art/evolution-tasks.png
deleted file mode 100644
index 0878645f9f..0000000000
--- a/art/evolution-tasks.png
+++ /dev/null
diff --git a/art/evolution-today.png b/art/evolution-today.png
deleted file mode 100644
index 010bcb8cc7..0000000000
--- a/art/evolution-today.png
+++ /dev/null
diff --git a/art/fetch-mail.png b/art/fetch-mail.png
deleted file mode 100644
index 30cda0564d..0000000000
--- a/art/fetch-mail.png
+++ /dev/null
diff --git a/art/forward.png b/art/forward.png
deleted file mode 100644
index 45ac85807b..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/globe.png b/art/globe.png
deleted file mode 100644
index 84bebd7e9a..0000000000
--- a/art/globe.png
+++ /dev/null
diff --git a/art/house.png b/art/house.png
deleted file mode 100644
index df43ec6181..0000000000
--- a/art/house.png
+++ /dev/null
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index dee13fb6b3..0000000000
--- a/art/mail-new.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * mail_new_xpm[] = {
-"16 16 48 1",
-" 	c None",
-".	c #000000",
-"+	c #202020",
-"@	c #817968",
-"#	c #F5F5F5",
-"$	c #4D493C",
-"%	c #736C5C",
-"&	c #F5EEEE",
-"*	c #FFEDC7",
-"=	c #FAF3EC",
-"-	c #FCE6B5",
-";	c #60594D",
-">	c #D3C29E",
-",	c #746D5D",
-"'	c #F5F1F1",
-")	c #FDEECD",
-"!	c #F8F4ED",
-"~	c #FAE3B3",
-"{	c #645F4F",
-"]	c #C9BA98",
-"^	c #71685A",
-"/	c #FCF5EA",
-"(	c #FFE8B7",
-"_	c #F5DEB2",
-":	c #FFEABD",
-"<	c #90856F",
-"[	c #7C7361",
-"}	c #E4D1A9",
-"|	c #C9B996",
-"1	c #FFEBC2",
-"2	c #887F6B",
-"3	c #726B59",
-"4	c #D1BF9C",
-"5	c #8B816C",
-"6	c #FFE9BA",
-"7	c #F9E2B2",
-"8	c #FFE8B8",
-"9	c #F6DFB3",
-"0	c #D4C19D",
-"a	c #534D42",
-"b	c #CFBF9C",
-"c	c #645F51",
-"d	c #C2B293",
-"e	c #C4B393",
-"f	c #C4B495",
-"g	c #C5B596",
-"h	c #CCBC99",
-"i	c #4C483D",
-"                ",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,')!*~{~].  ",
-" .#**^/*({*_].  ",
-" .#*:<{#{[-}|.  ",
-" .#12**{((34|.  ",
-" .#5*_67890ab.  ",
-" .cdeeedffghi.  ",
-"  ...........   ",
-"                ",
-"                "};
diff --git a/art/mail-read.xpm b/art/mail-read.xpm
deleted file mode 100644
index 81bcdf8fd3..0000000000
--- a/art/mail-read.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * mail_read_xpm[] = {
-"16 16 51 1",
-" 	c None",
-".	c #010101",
-"+	c #D9D6D0",
-"@	c #C3C0B9",
-"#	c #EFEDE8",
-"$	c #F7F7F6",
-"%	c #FAFAFA",
-"&	c #B6B4AE",
-"*	c #737373",
-"=	c #C2BFB8",
-"-	c #F5F4F2",
-";	c #FAFAF9",
-">	c #FFFFFF",
-",	c #D2CFC9",
-"'	c #707070",
-")	c #5D5B57",
-"!	c #868580",
-"~	c #E5E2DB",
-"{	c #FBFBF8",
-"]	c #716E6B",
-"^	c #62605C",
-"/	c #F8F7F2",
-"(	c #DDDAD4",
-"_	c #929191",
-":	c #969390",
-"<	c #92908A",
-"[	c #A1A0A0",
-"}	c #F7F5F1",
-"|	c #FBFAF7",
-"1	c #A5A29D",
-"2	c #908D87",
-"3	c #F9F7F3",
-"4	c #F0EEE8",
-"5	c #DDD9D2",
-"6	c #797873",
-"7	c #F9F8F4",
-"8	c #74726E",
-"9	c #E3E0D9",
-"0	c #7D7A77",
-"a	c #FAF9F6",
-"b	c #F8F6F2",
-"c	c #FAF8F5",
-"d	c #F7F5F2",
-"e	c #E2DFD8",
-"f	c #090808",
-"g	c #D7D4CE",
-"h	c #D8D5CF",
-"i	c #D6D3CD",
-"j	c #DAD7D1",
-"k	c #E0DCD5",
-"l	c #222221",
-"                ",
-"     .....      ",
-"    .+++++.     ",
-"   .++++++@.    ",
-"  .+++++#$%&.   ",
-" .*==-;>>>>,'.  ",
-" .>)>>>>>>>!~.  ",
-" .>{]>>>>>^/(.  ",
-" .>{{_::<[{}(.  ",
-" .>{|1{{{2345.  ",
-" .>|6{{{77895.  ",
-" .>0{}abcd~8e.  ",
-" .fghhhi++jkl.  ",
-"  ...........   ",
-"                ",
-"                "};
diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm
deleted file mode 100644
index 9b398da7e0..0000000000
--- a/art/mail-replied.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * mail_replied_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #000000",
-")	c #928F8B",
-"!	c #FFFFFF",
-"~	c #F7F6F4",
-"{	c #B5B2AC",
-"]	c #003366",
-"^	c #EFEFEF",
-"/	c #CCCCCC",
-"(	c #AEABA6",
-"_	c #B0ADA7",
-":	c #F5F3F0",
-"<	c #83817E",
-"[	c #E1DFDA",
-"}	c #E2DFD9",
-"|	c #002C59",
-"1	c #002850",
-"2	c #00254A",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,=''''''''' ",
-" .#**)'!!!!!!!' ",
-" .#*~{'!]]]]^/' ",
-" .#~(*'!]]]^^/' ",
-" .#_*:'!]]]]^/' ",
-" .<[}}'!]^]]|/' ",
-"  ....'!^^^12/' ",
-"      '!//////3 ",
-"      ''4'''''' "};
diff --git a/art/malehead.png b/art/malehead.png
deleted file mode 100644
index ada9545c85..0000000000
--- a/art/malehead.png
+++ /dev/null
diff --git a/art/mark.xpm b/art/mark.xpm
deleted file mode 100644
index 710cd0e872..0000000000
--- a/art/mark.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mark_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #36592A",
-"                ",
-"                ",
-"                ",
-"                ",
-"           .    ",
-"          ..    ",
-"         ..     ",
-"    .   ..      ",
-"    .. ...      ",
-"     ....       ",
-"     ...        ",
-"      ..        ",
-"      .         ",
-"                ",
-"                ",
-"                "};
diff --git a/art/meeting.xpm b/art/meeting.xpm
deleted file mode 100644
index bf182fbd8f..0000000000
--- a/art/meeting.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-static char * meeting_xpm[] = {
-"16 16 45 1",
-" 	c None",
-".	c #000000",
-"+	c #161616",
-"@	c #A7A7A7",
-"#	c #8A8A8A",
-"$	c #757575",
-"%	c #686868",
-"&	c #555555",
-"*	c #434343",
-"=	c #2F2F2F",
-"-	c #2B2B2B",
-";	c #FFFFFF",
-">	c #CACACA",
-",	c #C0C0C0",
-"'	c #B6B6B6",
-")	c #D8D5CD",
-"!	c #CFCFCF",
-"~	c #AEADA5",
-"{	c #7F7D78",
-"]	c #85847F",
-"^	c #92908A",
-"/	c #E0DFD7",
-"(	c #A09E98",
-"_	c #E6E5E0",
-":	c #E5E3DF",
-"<	c #A5A49D",
-"[	c #9D9B95",
-"}	c #D5D5D5",
-"|	c #B4B1AB",
-"1	c #83817C",
-"2	c #D44D41",
-"3	c #A7453E",
-"4	c #919089",
-"5	c #E2E1DB",
-"6	c #9C9A94",
-"7	c #DEDBD5",
-"8	c #D9D6CE",
-"9	c #E79E3C",
-"0	c #934238",
-"a	c #B4B1AA",
-"b	c #807F79",
-"c	c #82817C",
-"d	c #7E7D78",
-"e	c #ACA9A3",
-"f	c #A3A09A",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............  ",
-" +@#$%&&***=-.  ",
-" .;;>;;,;;';).  ",
-" .!~{~~]~~{~^.  ",
-" .;/(_:<))[)~.  ",
-" .}|1||2333|4.  ",
-" .;56783990)~.  ",
-" .}|1||3000|4.  ",
-" .)ab~~c~~def.  ",
-" .............  ",
-"                ",
-"                "};
diff --git a/art/move-message.png b/art/move-message.png
deleted file mode 100644
index f9a3443109..0000000000
--- a/art/move-message.png
+++ /dev/null
diff --git a/art/pin.png b/art/pin.png
deleted file mode 100644
index fff34d7d96..0000000000
--- a/art/pin.png
+++ /dev/null
diff --git a/art/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 8858f5bf94..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #A7453E",
-"                ",
-"                ",
-"                ",
-"        .       ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"       ..       ",
-"       ..       ",
-"       .        ",
-"                ",
-"      ..        ",
-"      ..        ",
-"                ",
-"                ",
-"                "};
diff --git a/art/priority-low.xpm b/art/priority-low.xpm
deleted file mode 100644
index ad53e9e0cc..0000000000
--- a/art/priority-low.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_low_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #21405A",
-"                ",
-"                ",
-"                ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"     ......     ",
-"      ....      ",
-"      ....      ",
-"       ..       ",
-"       ..       ",
-"                ",
-"                ",
-"                "};
diff --git a/art/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index 6f42de1de0..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index cc8be8511f..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/score-high.xpm b/art/score-high.xpm
deleted file mode 100644
index bb7bd47562..0000000000
--- a/art/score-high.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_high_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-higher.xpm b/art/score-higher.xpm
deleted file mode 100644
index 696e74bed5..0000000000
--- a/art/score-higher.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_higher_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-highest.xpm b/art/score-highest.xpm
deleted file mode 100644
index d8dab65079..0000000000
--- a/art/score-highest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_highest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-low.xpm b/art/score-low.xpm
deleted file mode 100644
index e071741adc..0000000000
--- a/art/score-low.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_low_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lower.xpm b/art/score-lower.xpm
deleted file mode 100644
index 74da90d670..0000000000
--- a/art/score-lower.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lower_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm
deleted file mode 100644
index 9beee1849f..0000000000
--- a/art/score-lowest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lowest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-normal.xpm b/art/score-normal.xpm
deleted file mode 100644
index 82b618cb8d..0000000000
--- a/art/score-normal.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * score_normal_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #17D1EA",
-"@	c #FFFFFF",
-"#	c #EF9815",
-"                ",
-"                ",
-"    ...         ",
-"   .+.+.        ",
-"   .@#@.        ",
-"   .@@@.        ",
-"   ..@..        ",
-"  ..@@@..       ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-"  .@@@@@.       ",
-"   ##@##        ",
-"   ## ##        ",
-"                "};
diff --git a/art/send.png b/art/send.png
deleted file mode 100644
index fb95df6016..0000000000
--- a/art/send.png
+++ /dev/null
diff --git a/art/service-close.png b/art/service-close.png
deleted file mode 100644
index a45e8cb91c..0000000000
--- a/art/service-close.png
+++ /dev/null
diff --git a/art/service-configure.png b/art/service-configure.png
deleted file mode 100644
index 7eacacc421..0000000000
--- a/art/service-configure.png
+++ /dev/null
diff --git a/art/service-down.png b/art/service-down.png
deleted file mode 100644
index e5b6bf6e93..0000000000
--- a/art/service-down.png
+++ /dev/null
diff --git a/art/service-left.png b/art/service-left.png
deleted file mode 100644
index 828bee5ed3..0000000000
--- a/art/service-left.png
+++ /dev/null
diff --git a/art/service-right.png b/art/service-right.png
deleted file mode 100644
index 21d974bbb7..0000000000
--- a/art/service-right.png
+++ /dev/null
diff --git a/art/service-up.png b/art/service-up.png
deleted file mode 100644
index fda040d181..0000000000
--- a/art/service-up.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index d6c9dcd176..0000000000
--- a/art/splash.png
+++ /dev/null
diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm
deleted file mode 100644
index fc748953eb..0000000000
--- a/art/tree-expanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+.....+.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm
deleted file mode 100644
index 0dfb12a0a5..0000000000
--- a/art/tree-unexpanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+.....+.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index eec4b5f56d..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="evolution"
-
-
-. $srcdir/macros/autogen.sh
diff --git a/calendar/.cvsignore b/calendar/.cvsignore
deleted file mode 100644
index b7f7dea650..0000000000
--- a/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-*.lo
diff --git a/calendar/AUTHORS b/calendar/AUTHORS
deleted file mode 100644
index 7e482aef97..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Miguel de Icaza <miguel@kernel.org>
-Federico Mena <federico@helixcode.com>
-Arturo Esponosa <arturo@nuclecu.unam.mx>
-Russell Steinthal <rms39@columbia.edu>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index 426ee0b488..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,7413 +0,0 @@
-2000-11-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Removed the old recurrence page.
-	Wheeeeeeeeee!
-
-	* gui/event-editor.c (make_recurrence_special): Clear the monthly
-	widgets.
-	(make_recur_monthly_special): Create the monthly widgets.
-	(clear_widgets): Clear the monthly values.
-	(simple_recur_to_comp_object): Fill in the monthly values.
-	(fill_recurrence_widgets): Fill in the monthly and yearly source
-	values.
-	(dialog_to_comp_object): Take in a CalComponent instead of using
-	the event editor's directly.
-	(recur_to_comp_object): Likewise.
-	(simple_recur_to_comp_object): Likewise.
-	(EventEditorPrivate): Removed the widgets from the old recurrence
-	page.
-	(get_widgets): Likewise.
-	(clear_widgets): Likewise.
-	(dialog_to_comp_object): If the description or summary are empty,
-	just clear the description list or summary property, respectively,
-	instead of saving empty ones.
-	(simple_recur_to_comp_object): Set the week_start field.
-
-	* gui/main.c: Fix includes, and add calendar-config.h.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages
-	file should not be in SOURCES.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore
-	files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (check_all_day): Block signals from the
-	toggle button.
-	(date_changed_cb): Merged check_dates() and check_times() into
-	this function; provide better behavior as well.
-	(check_dates): Removed function.
-	(check_times): Removed function.
-	(init_widgets): Connect to the "changed" signal on the start_time
-	and end_time widgets.
-	(check_all_day): Use a better test.
-
-	* gui/Makefile.am: Clean the idl-generated sources properly.
-	* cal-client/Makefile.am: Likewise.
-
-2000-11-03  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: added some checks for the type of an
-	incoming iCal component before passing it off to the CalComponent
-	routines.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/dialogs/task-editor.c (init_widgets): The date editor's
-	signal is now "changed".
-	(completed_changed): Renamed callback to reflect the name of the
-	signal.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so
-	all calendar gui shows up localized.
-	
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to
-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.
-	(fill_recurrence_widgets): Likewise.
-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The
-	weekday picker is not the immediate child of the recurrence
-	special container.
-	(fill_recurrence_widgets): Call make_recurrence_special() after
-	setting the recurrence period type.
-	(fill_ending_date): Call make_recurrence_ending_special().  This
-	would be so much nicer if GTK+ were model/view all over.
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and
-	add changed_hash.
-
-	* conduits/calendar/calendar-conduit.h: ditto
-	
-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function
-	to get the next "really" changed item (changed status can be cleared now)
-	(compute_status): Compute status based on changed_hash
-	(pre_sync): Fill changed_hash and counts adds/mods/dels
-	(set_status_cleared): New callback handler - avoid double syncing
-	(for_each_modified): Use next_changed_item to iterate
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): New callback handler - mark/unmark archive status
-	(conduit_get_gpilot_conduit): Adjust signal connects
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We
-	split it from the radio callback so that we can call it explicitly
-	from fill_recurrence_widgets().
-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as
-	appropriate.
-
-2000-10-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (new_calendar): Removed the geometry and
-	hidden arguments.  This code is ancient.
-	(all_calendars): Made static.  This sucks; configuration should be
-	notification-based instead of "let's iterate through all open
-	calendars".
-	(active_calendars): Removed.  Functions can check the length of
-	the all_calendars list if they are interested.
-
-	* gui/event-editor.c (sync_entries): Do not take in an extra data
-	pointer.
-	(summary_changed_cb): Use a single call back to sync both entries.
-	(sync_date_edits): New function to sync two EDateEdit widgets.
-	(init_widgets): Connect the general and recurrence starting date
-	widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (sync_entries): New function.
-	(general_summary_changed_cb): Sync the general summary to the
-	recurrence summary widget.
-	(recurrence_summary_changed_cb): Vice-versa.
-	(init_widgets): Hook to the summaries.
-
-	* event-editor-dialog.glade: Do not expand/fill the start and end
-	date so that the "all day event" button is not pushed all the way
-	to the right.
-	Decrease the spacing between the recurrence sentence widgets.
-	Remove a spurious empty label that was lurking around the
-	recurrence widgets.
-	Make the alarm widgets expand the right way.
-	Delete old recurrence widgets.
-
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (init_widgets): Connect to the recurrence
-	ending menu.
-	(recur_ending_selection_done_cb): Implemented.
-	(make_recurrence_ending_special): Implemented.
-	(make_recur_ending_until_special): Implemented.
-	(fill_ending_date): Implemented.
-	(make_recur_ending_count_special): Implemented.
-	(simple_recur_to_comp_object): Fill in the ending date.
-	(clear_widgets): Clear the recurrence ending widgets.
-
-	* gui/event-editor-dialog.glade: Moved the recurrence type radio
-	buttons to a single hbox to save space.
-	Fixed the lower value of the recurrence interval spin button.
-	Removed the stale widgets from the recurrence ending date part.
-
-2000-10-27  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA
-	strings of 0 length, but then didn't NULL terminate them.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting): 
-	Check boundary case of fast sync
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto
-
-2000-10-27    <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove
-	invalid test.
-	(local_record_from_comp): If the event is all day, mark it as timeless
-	(comp_from_remote_record): Timeless events take up all day
-
-	* conduits/todo/todo-conduit.c (add_archive_record): ditto
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper
-	number of parameters
-
-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto
-
-2000-10-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new
-	recurrence page.  Replace the old widget pointers with the new
-	ones.  Modified the relevant functions accordingly and added
-	plenty of new ones.
-	(event_editor_get_cal_client): New function.
-	(fill_recurrence_widgets): This is *THE* tricky function for you.
-	It has to discriminate whether we get a recurrence we support for
-	editing or not.  And this is not trivial.  Sigh.
-	(event_editor_update_widgets): Added preconditions and API docs.
-
-	* event-editor-dialog.glade: Fixed all the spacings/
-	paddings/packing options so that the widgets will look right if
-	the dialog box is resized.  Also fixes some misaligned widgets.
-
-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed
-	incorrect assertion.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha
-
-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: brushed up some code to deal with
-	the organizer entry, and solidified the CORBA memory-freeing
-	issues.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* removed the Evolution-Composer generated files, due
-	to a tip on how we do things.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation
-	bugs, and finished the initial integration with the mailer.
-
-	* gui/Makefile.am: made the build us the Evolution-Composer.idl
-	from the composer directory.
-
-2000-10-25  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/Evolution-Composer.idl: added this from the composer IDL sources
-
-	* gui/Makefile.am: changed to reflect the above IDL and the associated
-	orbit-idl generated files.
-
-	* gui/Evolution-Composer.h,
-	  gui/Evolution-Composer-common.c,
-	  gui/Evolution-Composer-stubs.c,
-	  gui/Evolution-Composer-skels.c:
-	the generated files, as per the above description.
-
-	* gui/e-meeting-edit.c: more work towards mailer integration.
-
-2000-10-24  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's
-	CORBA interfaces, though it's not yet working.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use
-	new e-pilot-map lookup function
-	(match): ditto
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES):
-	* gui/dialogs/Makefile.am (INCLUDES):
-	* gui/Makefile.am (INCLUDES):
-	* cal-util/Makefile.am (INCLUDES):
-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* conduits/calendar/calendar-conduit.h: ditto
-
-	* conduits/todo/todo-conduit.c: ditto
-
-	* conduits/calendar/Makefile.am: Add libeconduit-static.la
-
-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Add libeconduit-static.la
-
-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write
-	(pre_sync): Use e_pilot_map_read
-
-2000-10-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/cal-prefs-dialog.c
-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.
-
-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function
-	to save the state of the table to a given file.
-
-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field
-	so we can access it to save the state.
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): call
-	e_calendar_table_save_state() to save the state of the TaskPad.
-	(setup_widgets): load the state of the TaskPad.
-
-	* gui/calendar-config.c: added support for the default view.
-
-	* gui/gnome-cal.c (gnome_calendar_construct):
-	(gnome_calendar_set_view_internal): use/set the default view setting.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-meeting-editor.c: added more (working) integration with the
-	meeting schedular.
-
-2000-10-20  Jesse Pavel <jpavel@helixcode.com>
-
-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion
-	of the code back into operation, because the icalproperty_remove_parameter()
-	function is now implemented.
-
-	* gui/e-meeting-editor.c: added more (unworking) integration with the
-	meeting schedular.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_destroy): New destroy
-	handler to properly stop the timer, sync the log and unref
-	the URI.
-	(cal_backend_last_client_gone): Just emit the signal,
-	clean up work is done in cal_backend_destroy now.
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the
-	uri we are replacing NOT the new uri.
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/Makefile.am: Fix build
-
-	* conduits/calendar/Makefile.am: Fix build
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (delete_archive_record):
-	Don't throw an error
-
-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/
-
-	* gui/calendar-commands.c (properties_cmd): ditto.
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_value_at): use
-	cal_component_has_alarms().
-
-2000-10-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added
-	_click-to-add-message, though I'm not sure if i18n will work.
-
-	* cal-util/cal-recur.c (cal_obj_time_add_hours):
-	(cal_obj_time_add_minutes):
-	(cal_obj_time_add_seconds): updated to handle -ve args.
-
-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling
-	mktime().
-
-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the
-	callback if the event ends exactly on the interval start time.
-
-	* gui/e-week-view.c (e_week_view_reshape_event_span):
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	* gui/e-day-view.c (e_day_view_reshape_long_event):
-	(e_day_view_reshape_day_event): use cal_component_has_alarms().
-
-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().
-
-2000-10-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-config.c (config_read): set default MonthVPanePosition
-	to 1 rather than 0, so if you move the hpane you'll see the date
-	navigator.
-
-2000-10-19  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/event-editor.[ch]: added a public function which causes the
-	event editor to reload its widgets to the associated CalComponent.
-
-	* gui/e-meeting-edit.c: added rudimentary support for the phat
-	e-meeting-time-selector widget, though it has no effect on the
-	component yet.
-
-	* gui/Makefile.am: the meeting editor depends on the meeting widget
-	library, now.
-
-	* gui/e-itip-control.glade: I added another toolbar button that summons
-	from the hoary deep the meeting time widget.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.
-
-	* gui/event-editor.c (create_menu, create_toolbar): kill.
-	(event_editor_destroy): upd.
-	(event_editor_construct): update to new UI handler, cast
-	priv->general_summary to a widget not an object.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.
-	(debug_xml_cb): add debugging hook.
-
-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR
-
-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.
-
-2000-10-17  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-2000-10-16  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: You can now add incoming iTip
-	messages to your calendar store.
-
-	* gui/e-itip-control.glade: added a progress bar dialog
-	in case the calendar loading takes a long time.
-
-2000-10-16  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff
-	is in the conduits now and uses the logging facility.
-
-	* pcs/cal-backend-file.c: ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal-backend.c: ditto
-
-	* pcs/cal.c: ditto
-
-	* pcs/cal.h: ditto
-
-	* idl/evolution-calendar.idl: ditto
-
-	* cal-util/cal-component.h: ditto
-
-	* cal-util/cal-component.c: ditto
-
-	* cal-client/cal-client.c: ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Take a stab at storing recurrence stuff on the pilot properly
-
-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the
-	event until after the update in case its a new item
-
-2000-10-16  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm
-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know
-	if you like these or not, I might work on these some more but
-	I wanted to put these versions up anyway to get feedback..
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
-	already in INCLUDES
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added an
-	"evolution:shell-component-icon" attribute.
-
-2000-10-12  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.{c,glade}: Made the control much more
-	relavent to the function at hand.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
-	columns to a min width of 18 and resizable to FALSE.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	(update_pixmaps):
-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,
-	and removed a lot of old unused stuff. We'll use plain buttons for
-	the view buttons for now, until Bonobo toolbars support radio buttons.
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not
-	NULL before using it.
-	(gnome_calendar_update_view_buttons): check button is not NULL.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
-	hour format the wrong way round.
-
-2000-10-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
-	Store recurrence stuff on the desktop properly
-	(get_ical_day): Utility function
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component-factory.c: Disable the executive summary.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType
-	as a param because its impossible to determine after a delete.
-	(cal_backend_remove_object): Calculate CalObjType and pass
-	it to cal_backend_log_entry
-	(cal_backend_update_object): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill
-	unused variables.
-	(add_archive_record): Don't kill the sync if this happens
-	(update_record): Kill old function
-	(replace_record): New function to handle replace_record signal
-	(conduit_get_gpilot_conduit): Listen for replace record signal
-	(add_record): Always add a new record, never replace
-	(replace_record): Always replace an existing record
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: set a default size for the control.
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added information about the
-	text/calendar MIME type, so that the evolution-calendar is called
-	to deal with iMIP attachments.
-
-	* gui/e-itip-control.[ch]: These files implement a Bonobo
-	control that will eventually deal with iMIP/iTIP messages from
-	the mailer. Right now, it's not working.
-
-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned
-	control.
-
-	* gui/Makefile.am: added references to the files I created.
-
-	* gui/main.c: called the initialization function of the Bonobo
-	control factory.
-
-2000-10-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/task-assigned-to.xpm gui/task-assigned.xpm
-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:
-	New versions of the icons for the tasklist/pad.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir
-	as we need it to save the config settings.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/main.c (main): call calendar_config_write_on_exit() to write
-	out some special config settings (as the mail component does).
-
-	* gui/calendar-commands.c (properties_cmd): changed to use the new
-	preferences dialog.
-	(update_all_config_settings): new function to iterate over all the
-	calendars and update the config settings.
-
-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.
-
-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
-	dialog.
-
-	* gui/calendar-config.[hc]: new files to handle loading/saving config
-	settings.
-
-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
-	plus minor changes.
-
-	* cal-util/test-recur.c: updated.
-
-	* gui/e-day-view-time-item.c:
-	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>
-
-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
-	(owner_set_cb):
-	(owner_unset_cb): updated the prototypes.
-
-	* gui/main.c (main): added call to calendar_config_write_on_exit().
-
-	* gui/component-factory.h:
-	* gui/component-factory.c (owner_set_cb): added global evolution_dir
-	just like the mail component, so we know we to store config stuff.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Updated to use the new ETable
-	specification stuff.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (map_sax_start_element): The
-	element is "pilot_id" not "pilotid".  Update both maps
-	(compute_pid): Utility function to set a local records pid
-	(local_record_from_comp): Compute the pid and status here,
-	no longer use the old cal_component pilot interfaces
-	(free_match): Its a *local not a **local
-
-	* conduits/calendar/calendar-conduit.c: same as above
-
-	* conduits/todo/todo-conduit.h: Have both a uid and pid map
-
-	* conduits/todo/calendar-conduit.h: same as above
-
-2000-10-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which
-	is based on the latest pilot link changes.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* Makefile.am: Added the executive-summary library and cflags
-
-	* gui/evolution-calendar.oafinfo: Added oaf servers for the
-	executive summary and executive summary factory.
-
-	* gui/calendar-summary.[ch]: New files to create the summary.
-
-	* gui/component-factory.c (summary_fn): Create the executive
-	summary component.
-	(component_factory_init): Start the summary factory as well.
-
-2000-10-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.[ch]: New widget to pick weekdays.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: upd.
-	(calendar_control_activate): upd.
-	(calendar_control_deactivate): upd.
-
-2000-10-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: when the user types in a new event, don't create
-	it until the user hits Return or switches focus. Removed the
-	editing_new_event flags.
-
-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can
-	start testing the recurrence code.
-
-	* cal-util/cal-recur.c: a few fixes.
-
-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to
-	return TRUE for long events, not FALSE.
-
-2000-10-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (print_todo_details): As a temporary solution to the
-	to-do printing, just print the summaries.  We'll use the ETable
-	printing stuff later.
-
-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.
-	(print_todo_details_cb): Likewise.
-	(print_day_summary): Initialize psi.events.  This code was
-	obviously never tested.
-	(print_todo_details): Likewise.
-	(print_day_details): Initialize pdi.slots.
-
-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b
-	confusion.  Fixes bugzilla #644.
-	(range_selector_new): Fix the whole localization mess by making
-	better use of strftime().  Now we generate whole date strings at a
-	time and compose them later.  Fixes bugzilla #643.
-
-2000-10-02  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters
-	in both the GUI and underlying iCal.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for organizers in the meeting
-	scheduler.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added code that makes changes to the underlying
-	iCAL structure of an event, when the user changes meeting information.
-
-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog
-	and accoutrements.
-
-2000-09-29  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c: updated to support RDATE end times or
-	durations. Note that if you have two RDATEs with the same start times,
-	but with different end dates/durations set, the results are
-	unpredictable. So the event editor dialog should check for this.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	make strftime() strings translatable, and changed the formats a bit.
-
-	* NOTE: someone needs to check print.c to make sure strftime strings
-	are OK for i18n.
-
-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
-	include the weekday if possible. Also changed EDayView struct so we
-	store the month & weekdays with the longest names rather than the
-	actual widths. This helps i18n.
-
-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
-	strftime strings, tried to see if weekday fits, and rearranged a
-	bit to make i18n easier.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
-	strftime strings, and updated to use new formats.
-
-	* gui/calendar-model.c: added use_24_hour_format boolean to
-	CalendarModelPrivate so we can display dates in 12-hour format if
-	requested. This meant adding a CalendarModel argument to a few
-	functions. Also added get/set functions to set use_24_hour_format.
-	I suppose ideally we should have an ECellDate renderer and this option
-	should go there.
-
-2000-09-27  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* gui/event-editor.c: changed a menu entry so that it will invoke
-	my meeting editor.
-
-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary
-	support for iTIP meeting scheduling. Currently, only the GUI works;
-	there is not yet any backend support.
-
-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]
-
-2000-09-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
-	window for the description field, since the default window height
-	doesn't seem to be working.
-
-	* cal-util/cal-component.h: added functions to get the actual
-	icalproperty lists for RRULE and EXRULE properties.
-
-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
-	test it a bit. Also fixed the call to generate_instances_for_year() so
-	it uses the chunk dates.
-
-2000-09-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (verbs): Removed the "about calendar"
-	command, since we don't want to have both "About Evolution" and
-	"About Calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler
-	update.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
-	is no map file.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Add since field to context
-
-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility
-	function
-	(map_sax_start_element): Look for the map timestamp as well
-	(map_write): Write the map timestamp
-	(pre_sync): Use the map time stamp when looking for changed entries
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure
-	we are in a valid timestamp
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file
-	name relevant to the actual calendar file, rather than just the
-	directory.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local
-	sax handler.
-
-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile
-	(map_sax_parse): Delete
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly
-	assign the CalObjChange type.
-	(cal_backend_log_sax_parse): Delete
-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function
-	(cal_backend_load): use above
-	(cal_backend_create): use above
-	(cal_backend_log_name): Take a uri instead of a backend param
-
-	* pcs/cal-backend-file.c: Get rid of useless hash functions
-	(cal_backend_file_load): Check to make sure path exists and is
-	local
-	(cal_backend_file_load): Unref the current uri if there is one
-	(cal_backend_file_create): ditto
-
-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before
-	shooting ourselves in the foot
-
-	* pcs/cal-backend-file.c (save): Fully implement backing up the
-	calendar before writing out the new entry.
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some
-	other cases where a slow sync is in order
-	(pre_sync): Pre load the uids, the map and the add/mod/del lists
-	(match_record): Use the map hash to match records
-	(iterate): Iterate using the pre-loaded uid list
-	(iterate_specific): Iterate using the add/mod/del lists
-	(purge): Delete all entries in the del list
-	(set_status): Set status by adding to an appropriate list
-	(set_pilot_id): Set pilot_id by updating map hash
-
-	* conduits/todo/todo-conduit.h: Add lists for added, modified and
-	deleted objects
-
-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id->uid map
-	file name
-	(map_sax_start_element): SAX handler to extract a pilot_id->uid
-	mapping
-	(map_sax_parse): Parse the given file and build a pilot_id->uid hash
-	(map_write_foreach): Write out individual mapping elements
-	(map_write): Write out the pilot_id->uid mapping
-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb
-
-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id
-
-	* conduits/todo/e-todo.conduit.in: A little renaming
-
-	* conduits/todo/Makefile.am: Fix build slightly
-
-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list
-	of CalObjChanges
-	(Cal_get_objects_in_range): Implement new corba function
-
-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL
-	(cal_backend_load): Track the uri so we can write the log file
-	to the same place
-	(cal_backend_log_name): Figure out the log filename/path based on
-	the calendar uri
-	(cal_backend_set_node_timet): Set an xml node property value from
-	a time_t
-	(cal_backend_log_entry): Adds a log entry to list waiting to be written
-	out
-	(cal_backend_log_sync): Syncs the log entries to disk
-	(cal_backend_log_sax_start_element): SAX callback for reading in
-	log entries
-	(cal_backend_log_sax_end_element): ditto
-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log
-	file looking for particular log entries and creating a CalObjChange
-	hash with the last change for each object
-	(cal_backend_get_log_entries): Returns a hash of objects of a given
-	type changed since the given time
-	(cal_backend_update_object): Add appropriate log entries
-	(cal_backend_remove_object): ditto
-	(cal_backend_get_changed_uids): Implement new idl interface call
-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list
-
-	* pcs/cal-backend-imc.[hc]: Remove crufty files
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New
-	function that returns the CalObjType for a uid.
-
-	* cal-client/cal-client.h: Update prototypes.
-
-	* cal-client/cal-client.c (build_change_list): Build a list
-	of CalObjChange items from a corba sequence.
-	(cal_client_get_changed_uids): New accessor method for the
-	similarly named addition to the idl file.
-
-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType
-	enum.
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility
-	method to free a list of CalObjChange objects.
-
-	* idl/evolution-calendar.idl: Add get_changed_uids method
-	and associated types.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
-	gui/e-week-view-event-item.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
-	to deal properly with gal.
-
-	* gui/check-filled.xpm: New file since we can't include it from
-	e-table anymore.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): add datadir
-
-	* gui/calendar-commands.c (calendar_control_activate): use it.
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/.cvsignore: Shush
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* Add headers with GPL notice and credit copyright to those appropriate
-
-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,
-	authors, copyright for about dialog.
-	(activate_sync_type): Tidy
-
-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*
-	to avoid conflicts.
-
-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes
-
-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto
-
-	* conduits/todo/todo.conduit.in: Removed
-
-	* conduits/todo/todo-conduit-control-applet.desktop: Removed
-
-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):
-	The config file will now be called e-todo-conduit
-	(todoconduit_save_configuration): ditto
-
-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.
-	(pre_sync): Remove commented out function that does not exist.
-
-	* conduits/todo/todo-conduit-control-applet.c: ditto
-
-	* conduits/todo/todo-conduit-config.h: ditto
-
-	* conduits/todo/todo-conduit.h: ditto
-
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: Re-write most UI handler code.
-
-2000-09-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Removed an unused
-	variable.
-
-	* gui/calendar-model.c (obj_updated_cb): See if the new object
-	matches the type of objects we were told to deal with.
-	(load_objects): Likewise.
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot
-	item from the hash if it exists in the first place.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (add_component): plug leakage
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.
-
-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*
-	for now
-	(cal_backend_file_create): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make
-	this actually fill in the todo record.
-	(find_record_in_repository): Add debug stuff
-	(iterate_specific): Use the already exisiting utility function
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct
-	the status and id types. g_strdup the uid since this is not a
-	constified return
-	(cal_backend_file_get_uid_by_pilot_id): correct the id type
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove `ui.xml' stuff.
-
-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
-
-2000-09-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the
-	"cal_loaded" signal of the client here.
-	(connect_load): Removed function.
-	(disconnect_load): Removed function.
-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal
-	structure instead of in a weird closure.  This gets rid of the
-	connect/disconnect mess as well.
-	(gnome_calendar_open): Store the URI in the GnomeCal.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c: Fixed a warning (removed unused variable
-	gfloat width from e_day_view_get_event_position.)
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup
-
-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to
-	EToDoLocalRecord, header cleanup
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use
-	description list instead of comment list for pilot todo note
-	(transmit): Check for null cal component properties, set priority
-	correctly, use description list instead of comment list.  Make
-	pilot record private when appropriate.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only
-	set the due date only if it exists
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Relying on the status
-	field is somewhat faulty since it is related to group scheduling
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):
-	Make log output a little more sensible
-	(comp_from_remote_record): Minor correction when making a CalComponent
-	from scratch.
-	(update_record): Use comp_from_remote_record for new items, rather
-	than repeating the code here.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function
-	since its no longer useful.  Fix naming of various fields from
-	the header changes.  Use GnomePilotRecord* stuff instead of
-	ICAL_PILOT_SYNC_*
-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes
-	a pilot id and loads the configuration here
-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
-	Unref the client and destroy the configuration if they exist here
-	(start_calendar_server): Change the default calendar name
-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid
-	(local_record_from_compobject): Rename from
-	local_record_from_icalobject.  Properly do the pilot id and status.
-	(comp_from_remote_record): Rename from ical_from_remote_record.
-	Handle due, complete, classification and pilot stuff properly
-	(pre_sync): Remove some old stuff.  We need to figure out how to
-	set some of the field values.
-	(set_status): Reflect pilot status changes from above
-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
-	now done by e_todo_context_destroy
-	(conduit_get_gpilot_conduit): Only set the context as object
-	data of the conduit.
-
-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
-	EToDoConduitContext.  Remove some unused struct fields.
-	For GCalLocalRecord, rename ical to comp.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.c: changed to use EDateEdit.
-
-	* gui/dialogs/task-editor-dialog.glade: added "None" option to
-	Classification option menu, and used custom widgets for the date
-	entries so we can use EDateEdit widgets.
-
-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
-	to be fixed at some point to handle invalid dates, i.e. when
-	e_date_edit_get_time returns -1.
-
-	* gui/calendar-model.c (ensure_task_complete):
-	(ensure_task_not_complete): new functions to set the related properties
-	to make sure a task is marked as complete on not, i.e. "Date Completed"
-	"Status" and "Percent" properties.
-
-2000-09-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): use the status field rather
-	than the completed date, as it is more reliable.
-	(get_is_overdue): use get_is_complete().
-	(calendar_model_mark_task_complete): check if it is already complete,
-	and if so don't update it.
-
-	* cal-util/cal-component.c (cal_component_get_status):
-	(cal_component_set_status): added functions to support the STATUS
-	property. Also added the property to CalComponentPrivate and set it
-	to NULL in free_icalcomponent(). Someone should check my code as I've
-	mainly done a Cut & Paste job.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-	* conduits/todo/todo-conduit.c: Convert "//" style comments
-	(local_record_from_ical_uid): Remove iCalObject cruft
-	(ical_from_remote_record): ditto
-	(free_match): Properly unref the CalComponent
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
-	cal component pilot stuff properly
-	(find_record_in_repository): Remove cruft
-	(ical_from_remote_record): Remove cruft
-	(update_record): Set the vtype immediately after creation. Remove cruft
-
-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff
-
-	* conduits/todo/todo-conduit-config.h: Move all the config stuff
-	here, I need to kill the warnings at some point
-
-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):
-	Set all the state variables correctly on a revert
-	(doSaveSettings): Update original state
-	(doHelp): Rename from about_cb
-	(main): Destroy configurations when done
-
-	* conduits/todo/Makefile.am: Tidy
-
-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
-	pilot ids
-	(cbf_pilot_equal): For hash table of pilot ids
-	(cal_backend_file_destroy): Destroy pilot id hash
-	(add_component): Insert the uid into the pilot hash
-	(remove_component): Remove the uid from the pilot hash
-	(cal_backend_file_load): Create the pilot hash
-	(cal_backend_file_create): ditto
-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash
-	(cal_backend_file_update_pilot_id): ditto
-
-	* cal-util/cal-component.h: Update prototypes
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
-	using ical X properties
-	(cal_component_set_pilot_id): ditto
-	(cal_component_get_pilot_status): ditto
-	(cal_component_set_pilot_status): ditto
-	(cal_component_free_pilot_id): Free a pilot id
-	(cal_component_free_pilot_status): Free a pilot status
-
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical' so that we get
-	`icalversion.h' from the build directory instead of taking it from
-	the installation directory, which is of course Wrong (tm).
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (cal_loaded_cb): New function with the
-	loading/creation state machine.  It is carefully modelled after
-	the state machine that started the Universe, so bow before it.
-	(gnome_calendar_construct): Do not connect to cal_loaded here.
-	(connect_load): The closure for the cal_loaded callback is a bit
-	tricky, so provide a function to create it and connect to the
-	signal.
-	(disconnect_load): Disconnect from the signal and free the
-	closure.
-	(gnome_calendar_load_cb): Removed obsolete buggy function.
-	(gnome_calendar_open): Use the new mechanism.
-
-	* gui/control-factory.c (set_prop): The default filename is now
-	calendar.ics.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (transmit): Use
-	icaltime_as_timet
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/Makefile.am: Tidy
-
-	* conduits/todo/Makefile.am: Tidy
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fall equinox cleanup!
-
-	OK, I know the equinox is not here yet, but weather has changed
-	enough to warrant it.
-
-	Sigh.  This place is definitely not the tropics.
-
-	* gui/gnome-cal.c (obj_updated_cb): Renamed from
-	gnome_calendar_object_updated_cb(); fixed prototype.
-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();
-	fixed prototype.
-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a
-	private structure so I don't have to rebuild the whole calendar
-	GUI directory every time something changes in the object.
-	(GnomeCalendarPrivate): Removed the property bag and the control
-	fields; they are local to the control-factory now.
-	(gnome_calendar_update_view_buttons): Remove the
-	ignore_view_button_clicks mess and just block the signal.
-	(gnome_calendar_set_view): Added a "focus" argument to indicate
-	whether we want the main widget in the specified view to grab the
-	focus.
-	(gnome_calendar_set_view_internal): Handle the focus argument here.
-	(gnome_calendar_set_view_buttons): Temporary hack to notify the
-	calendar about its buttons.
-	(gnome_calendar_get_selected_time_range): New function.
-	(gnome_calendar_get_cal_client): New function.
-
-	* gui/control-factory.c (calendar_properties_init): Keep the
-	property bag local to here; it does not need to be in the calendar
-	object yet.
-	(control_factory_fn): Renamed from control_factory().  Just use
-	control_factory_new_control().
-	(control_factory_new_control): Moved the stuff over from
-	create_control(), and keep the control local to here.  Check the
-	return value of bonobo_control_new().
-
-	* gui/calendar-commands.c (show_day_view_clicked): Remove the
-	ignore_view_button_clicks mess.
-	(new_calendar): Removed the useless "page" argument.
-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()
-	for now.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* cal-client/Makefile.am: Added -lunicode
-
-	* gui/dialogs/task-editor.c: More UTF-8 wrappers
-	(priority_index_to_value): Kill warning, add assertion
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use new cal_component_has_recurrences convenience function
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	ditto
-
-	* gui/calendar-model.c (calendar_model_value_at): ditto
-	(calendar_model_value_at): ditto
-
-	* gui/e-day-view.c (e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_reshape_day_event): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
-	ditto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use
-	new convenience functions and only get the recurrence
-	stuff if needed.  Free the recurrence stuff if used.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.h: Add new prototypes
-
-	* cal-util/cal-component.c (cal_component_has_exrules): Utility
-	function to determine whether a cal component has any exrules
-	(cal_component_has_exdates): Ditto for exdates
-	(cal_component_has_exceptions): Utility function to determine
-	whether a cal component has any exception rules
-	(cal_component_has_recurrences):Utility function to determine
-	whether a cal component has any recurrence rules
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if
-	there are no dates in the box
-
-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special
-	case for when there are exceptions but no rrules or rdates.
-	(cal_obj_remove_exceptions): Use date only compare func
-	(cal_obj_date_only_compare_func): New compare function that
-	compares the date only, not the time.
-
-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the
-	yearly recurrence type
-	(dialog_to_comp_object): We need to allocate icaltimetypes for the
-	exdate list
-	(fill_widgets): Handle a weekly recurrence with no particular day set
-	(dialog_to_comp_object): Kill all rrules if "None" is selected as
-	the recurrence type by the user
-
-2000-09-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
-	TaskEditor dialog.
-
-	* gui/dialogs/task-editor.[hc]:
-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
-	'Status' property (CalComponent doesn't support it yet), and use a
-	replacement for GnomeDateEdit, since we need to support setting 'None'
-	as the date.
-
-2000-09-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c (obj_updated_cb):
-	(obj_removed_cb): compare the updated object's uid with the one we
-	are editing, and just return if it doesn't match.
-
-2000-09-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
-	if the client has loaded successfully. Gets rid of a few warnings.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods
-
-	*gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list
-	is a list of icaltimetypes, not CalComponentDateTimes
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append
-	the exdate to the list AFTER we create the date value.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_recur_list): Free
-	the data, not the list element.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute
-	the event duration using the event start/end times, not the
-	interval times.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check
-	to see if r->enddate is (time_t)-1 and set to 0 if so
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include
-	directories and `$(BONOBO_GNOME_CFLAGS)'.
-	* conduits/todo/Makefile.am (INCLUDES): Likewise.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/event-editor.c: e_utf8 wrappers
-
-	* gui/gncal-todo.c: e_utf8_wrappers
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c,
-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:
-	Fixed some warnings.
-
-2000-09-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new): Use
-	gnome_calendar_construct() so that we can check for proper
-	creation of the client.
-	(gnome_calendar_destroy): Check that the client exists before we
-	unref it.
-	(gnome_calendar_construct): Do the CalClient creation here.  Bind
-	the views to it here as well instead of in setup_widgets().
-	(gnome_calendar_init): Call setup_widgets() here.
-
-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the
-	model.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Update for new libical.
-	Conduits should atleast compile now.
-
-	* conduits/calendar/calendar-conduit.c: ditto
-
-	* Makefile.am: Build the conduits only when they've been
-	enabled.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c: Make toolbar save and close button.
-	We should put a similar menu option in sometime.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (array_to_list): Use
-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(dialog_to_comp_object): Set the weekday start value and use
-	local not UTC time
-
-2000-08-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): No need to spit a warning
-	if removal fails.
-	(event_editor_destroy): Free the exception clist data.  Unref the
-	calendar client here.
-	(close_dialog): Just call gtk_object_destroy() on the event
-	editor; the destroy handler will free everything else.
-
-	* cal-client/cal-client.c (cal_client_object_exists): Removed
-	function; this is not useful because we operate asynchronously.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to
-	spit a warning if removal fails.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(recurrence_toggled): Make an ugly hack to get the recurrence
-	pages showing properly since we don't yet implement all of the
-	recurrence rule stuff.
-
-	* cal-client/cal-client.c (cal_client_object_exists): New function
-	to see if an object exists and is obtainable from the backend
-
-	* cal-client/cal-client.h: Add prototype
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed
-	callback to do hash cleanup
-	(gnome_calendar_edit_object): Set event editor calendar client.
-
-	* gui/event-editor.h: Add new prototype
-
-	* gui/event-editor.c: Trash signal stuff.  We will manipulate
-	the client directly.  Make the toolbar save and menu save items
-	work identically.  Add icons to the toolbar.
-	(save_event_object): Call cal_client_update_object
-	(close_dialog): Unref the client and disconnect signals
-	Actually destroy the event editor object.
-	(obj_updated_cb): New function.  Doesn't really do anything
-	yet but it will inform the user the event has changed elsewhere
-	in the future.
-	(obj_removed_cb): ditto
-	(event_editor_set_cal_client): New function to set the calendar
-	client
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit
-	the sequence to the cal component and use non UTC times.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.[hc]:
-	* gui/e-day-view-main-item.c:
-	* gui/e-week-view.[hc]:
-	* gui/e-week-view-main-item.c:
-	* gui/calendar-commands.c:
-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,
-	and a few other fixes.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.
-
-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the
-	dtstart/dtend on the component before adding it.
-	(e_day_view_on_editing_stopped): No need to check for an UID.
-	Update the summary properly.
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_week_view_key_press): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c: Make sure the is_utc flag is always
-	FALSE for icaltime_from_timet
-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.c (add_instance): Actually add the
-	comp_instance struct to the instances list.  We now appear
-	to able to keep events and todos between sessions. Yay!
-
-2000-08-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	Now the views monitor the client by themselves; it does not make
-	sense to proxy all notifications through the GnomeCal.  The
-	GnomeCal should just be a meta-widget that holds all the views.
-
-	At some later point we'll want to decouple the views from the
-	GnomeCal so that they can be embedded anywhere; they should emit
-	signals to request appropriate actions from the toplevel GUI
-	instead of calling the GnomeCal directly.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now
-	the day view monitors the client by itself.
-	(cal_loaded_cb): New callback; moved over from
-	e_day_view_update_all_events().
-	(obj_updated_cb): New callback; moved over from
-	e_day_view_update_event().
-	(obj_removed_cb): New callback; moved over from
-	e_day_view_remove_event().
-	(e_day_view_update_all_events): Removed function.
-	(e_day_view_update_event): Removed function.
-	(e_day_view_remove_event): Removed function.
-	(*): Use the day_view->client directly instead of fetching it from
-	the GnomeCal.
-	(e_day_view_destroy): Unref the client.
-	(e_day_view_reload_events): Check if the client is loaded.
-	(e_day_view_key_press): Set the vtype of the new component.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.
-	(cal_loaded_cb): New callback.
-	(obj_updated_cb): New callback.
-	(obj_removed_cb): New callback.
-	(e_week_view_update_all_events): Removed function.
-	(e_week_view_update_event): Removed function.
-	(e_week_view_remove_event): Removed function.
-	(*): Use the week_view->client directly.
-	(e_week_view_destroy): Unref the client.
-	(e_week_view_reload_events): Check if the client is loaded.
-
-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the
-	views.
-	(gnome_calendar_update_all): Do not update the views, since now
-	they do it themselves.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(setup_widgets): Remove all to-do list cruft.
-	(gnome_calendar_colors_changed): Likewise.
-	(gnome_calendar_todo_properties_changed): Likewise.
-
-	* gui/calendar-commands.h (todo_style_changed): Removed variable.
-
-	* gui/gncal-todo.c: Removed old clist cruft; just left in the
-	temporary dialog box for now.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/client-test.c:
-	* cal-client/cal-client.c:
-	* conduits/todo/todo-conduit.h:
-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_set_event_object
-
-	* gui/event-editor.c (event_editor_set_event_object): Rename
-	from event_editor_set_ical_object
-
-	* gui/event-editor.h: Update prototype
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment):
-	Call cal_component_commit_sequence after event changes. Default
-	to these being all day events.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC
-	times
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_is_loaded): New function.
-	We need this from code that dynamically updates from a client and
-	could not have connected to the "cal_loaded" signal right after
-	the client was created.
-
-	* gui/calendar-model.c (load_objects): Do not try to load the
-	objects if the client has not been loaded yet.
-	(cal_loaded_cb): Check the status value.
-
-	* gui/calendar-model.h (CalendarModel): Declare the private
-	structure here so that gdb will give me love.
-
-	* pcs/cal-factory.h (CalFactory): Likewise.
-
-	* pcs/cal.h (Cal): Likewise.
-
-	* cal-client/cal-listener.h (CalListener): Likewise.
-
-	* cal-client/cal-client.h (CalClient): Likewise.
-
-	* pcs/cal-backend.h (CalBackend): This no longer has a private
-	structure, so remove it.
-
-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the
-	vCalendar and old iCalendar cruft.
-	(libcal_utilinclude_HEADERS): Likewise.
-	Removed the obsolete iCalendar test program.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
-	as libical has the API for this
-
-	* cal-util/timeutil.c: ditto
-
-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
-	icaltime_as_timet
-
-	* gui/calendar-model.c: ditto
-
-	* gui/event-editor.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Remove the
-	icalcomponent from the toplevel calendar here.
-	(cal_backend_file_update_object): Do not remove it here.
-	(cal_backend_file_remove_object): Do not remove it here.
-	(add_component): Add the icalcomponent to the toplevel calendar if
-	asked to.
-	(cal_backend_file_update_object): Do not add it here.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to
-	null, only set recurrence rules and exception dates if there
-	are any
-
-2000-08-27  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (save): Write out the calendar object
-	(cal_backend_file_update_object): Remove/add the icalcomponent
-	from our master icalcomponent (the calendar)
-	(cal_backend_file_remove_object): Remove the icalcomponent
-	from our master icalcomponent
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/Makefile.am: Remove gnorba stuff
-
-	* gui/main.c: ditto
-
-	* gui/component-factory.c: ditto
-
-	* gui/control-factory.c: ditto
-
-	* gui/*.gnorba: ditto
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
-	debug code.
-
-	* gui/calendar-model.c (set_complete): Set the completed
-	date to the current date
-	(calendar_model_set_value_at): Handle complete field
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Don't attempt to
-	free this if its null
-	(calendar_model_duplicate_value): Implement for summary field
-	value
-	(calendar_model_initialize_value): Remove debug code
-
-	* gui/e-calendar-table.c: Correct etable init xml
-	(create_column): Pass the id to e_table_header_add_column
-	rather than a hard coded one
-	(e_calendar_table_init): Make sure summary column isn't
-	added twice.  Add an alarms column, else etable won't
-	work with columns who have an ID higher than that
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Properly append to list
-
-	* gui/event-editor.c (dialog_to_comp_object): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base
-	times are not UTC
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* Update for libical 0.19
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:
-	Fixed some warnings.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (save_event_object_cb): Make signal
-	names saner
-	(released_event_object_cb): ditto
-	(gnome_calendar_edit_object): ditto
-
-	* gui/event-editor.h: Make signal names saner
-
-	* gui/event-editor.c (event_editor_class_init): Make signal
-	names saner now that we don't use ical object
-	(save_event_object): ditto with callback names
-	(file_save_cb): ditto
-	(tb_save_and_close_cb): ditto
-	(event_editor_set_ical_object): ditto
-
-	* gui/e-day-view.c (e_day_view_update_event): Umm,
-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove owner field
-
-	* gui/event-editor.c (clear_widgets): Forget about owner field
-	(get_widgets): ditto
-	(fill_widgets): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_initialize_value): Handle
-	summary field
-	(calendar_model_value_is_empty): ditto
-	(calendar_model_free_value): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove status bar
-
-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow
-	a null list
-	(cal_component_set_rdate_list): Allow a null list
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit
-	the CalComponent sequence
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c: #include <e-util/e-cursors.h>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	Initialize time_min_x1 and hour_r to keep gcc happy.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
-	(e_day_view_update_main_canvas_drag): Initialize start_row.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	Initialize time_y_small_min, icon_x.
-
-	* Makefile.am (SUBDIRS): Re-enable the gui directory.
-
-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
-	out.
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
-	CalComponent
-	(e_week_view_on_new_appointment): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/prop.c: #if out some alarm stuff
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Updated
-	function.
-	(e_calendar_table_open_task): Updated function.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated
-	function.
-	(calendar_model_free_value): Updated function.
-	(calendar_model_initialize_value): Updated function.
-	(calendar_model_value_is_empty): Updated function.
-	(remove_object): Updated function.
-	(obj_updated_cb): Updated function.
-	(calendar_model_get_cal_client): Added inline docs.
-	(calendar_model_delete_task): Updated.
-	(calendar_model_mark_task_complete): Updated.
-	(calendar_model_get_cal_object): Updated.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (set_categories): New function.
-	(parse_time): Moved over from the old set_time_t().  This just
-	parses the time and leaves the warning dialog for the caller.
-	(set_datetime): New function.
-	(set_geo): Updated old function.
-	(set_percent): Updated old function.
-	(set_priority): Updated old function.
-	(set_summary): New function.
-	(set_url): New function.
-	(calendar_model_set_value_at): Updated function.
-	(calendar_model_is_cell_editable): Updated function.
-	(calendar_model_append_row): Updated.  Added an ugly hack to
-	accomodate ETable's lack of a real API for adding new items.
-	Also, don't try to set columns that are not editable.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_reload_events):
-	Use CalObjType
-
-	* gui/e-day-view.c (e_day_view_reload_events): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.h: Update prototypes
-
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):
-	Remove commented out portions.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	Tidy.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c
-	(e_day_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_day_view_reshape_long_event): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_reload_events): Use revamped CalClient
-	(e_day_view_update_event_cb): Use CalComponent
-	instead of iCalObject
-	(e_day_view_foreach_event_with_uid): ditto
-	(e_day_view_remove_event_cb): ditto
-	(e_day_view_update_event_label): ditto
-	(e_day_view_find_event_from_uid): ditto
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_new_appointment): ditto
-	(e_day_view_on_edit_appointment): ditto
-	(e_day_view_on_delete_occurrence): ditto
-	(e_day_view_on_delete_appointment): ditto
-	(e_day_view_on_unrecur_appointment): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_free_event_array): ditto
-	(e_day_view_add_event): ditto
-	(e_day_view_key_press): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_update_top_canvas_drag): ditto
-	(e_day_view_update_main_canvas_drag): ditto
-	(e_day_view_on_drag_data_get): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_week_view_reload_events): Use revamped CalClient
-	(e_week_view_reshape_event_span): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_week_view_update_event_cb): Use CalComponent instead of
-	iCalObject
-	(e_week_view_foreach_event_with_uid): ditto
-	(e_week_view_remove_event_cb): ditto
-	(e_week_view_free_events): ditto
-	(e_week_view_add_event): ditto
-	(e_week_view_on_editing_stopped): ditto
-	(e_week_view_find_event_from_uid): ditto
-	(e_week_view_key_press): ditto
-	(e_week_view_show_popup_menu): ditto
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_edit_appointment): ditto
-	(e_week_view_on_delete_occurrence): ditto
-	(e_week_view_on_delete_appointment): ditto
-	(e_week_view_on_unrecur_appointment): ditto
-
-	* gui/e-week-view.h: Update prototypes.
-
-2000-08-18  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.h: Update prototypes.
-
-	* gui/event-editor.c: Need to come back here later to fix the
-	alarm stuff.  The gui also needs to be completely redone to
-	support the fancier CalComponent settings (exrules, rdates, etc)
-	There are some warnings that I put in to mark some of these
-	spots
-	(event_editor_destroy): Use Calcomponent instead
-	of iCalObject
-	(make_title_from_comp): ditto
-	(clear_widgets): ditto
-	(fill_widgets): ditto
-	(classification_get): ditto
-	(dialog_to_comp_object): ditto
-	(save_ical_object): ditto
-	(close_dialog): ditto
-	(event_editor_set_ical_object): ditto
-
-2000-08-17  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of
-	iCalObject
-	(cancel_button): ditto
-	(gncal_todo_edit): ditto
-	(add_todo): ditto
-	(edit_todo): ditto
-	(delete_todo): ditto
-	(insert_in_clist): ditto
-	(gncal_todo_update): ditto
-
-	* gui/gncal-todo.h: Update prototypes
-
-2000-08-16  JP Rosevear  <jpr@helixcode.com>
-
-	Rework gnome-cal.c - alarms are a tad broken ATM so this
-	will need more cleaning later.
-
-	* gui/gnome-cal.c (snooze): Use CalComponent instead of
-	iCalObject
-	(edit): ditto
-	(audio_notification): ditto
-	(display_notification_cb): Use CalComponent member of
-	alarm_notify_closure rather than iCalObject
-	(display_notification): ditto
-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types
-	(gnome_calendar_tag_calendar_cb): New
-	cal_client_generate_instances callback to
-	mark_gtk_calendar_day's
-	(gnome_calendar_tag_calendar): Use above callback
-	(save_ical_object_cb): Use CalComponent instead of
-	iCalObject
-	(gnome_calendar_edit_object): ditto
-	(gnome_calendar_new_appointment): ditto
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/mark.c (mark_month_item_cb): Callback used to mark every
-	event in a month.
-	(mark_month_item): Use cal_client_generate_instances with
-	above callback
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/print.c (print_month_small): Use
-	cal_client_get_objects_in_range
-	(print_day_details_cb): Callback used to create columns and fill
-	events into a day view.  Code should be shared with e-day-view
-	in reality.  Maybe need to go back to layout.[hc] a bit later
-	(print_day_details): Use cal_client_generate_instances with
-	above callback. Iterate over results to expand events to fit.
-	(print_day_summary_cb): Callback to build list of event info
-	for a day
-	(print_day_summary): Use cal_client_generate_instances with
-	above callback to generate the required event info for printing
-	(print_todo_details_cb): Callback used create list of todo info
-	(print_todo_details): Use cal_client_generate_instances with
-	above callback to generate required todo info for printing.
-
-	* gui/layout.[hc]: No longer used.
-
-2000-08-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_is_overdue): Finished implementing.
-	(calendar_model_value_at): Handle the color field.
-
-2000-08-11  Seth Alves  <alves@hungry.com>
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id):
-	(cal_component_set_pilot_id):  stubs for pilot id accessors
-	(cal_component_get_pilot_status):
-	(cal_component_set_pilot_status): stubs for pilot status accessors
-
-	* conduits/calendar/calendar-conduit.c (transmit): start to
-	convert to cal-component interface
-
-	* conduits/todo/todo-conduit.c (transmit): same
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_geo): Generate a prettier string for
-	the geographical position.
-	(get_classification): New function.
-	(get_categories): New function.
-	(get_completed): New function.
-	(get_dtend): New function.
-	(get_dtstart): New function.
-	(get_due): New function.
-	(get_percent): New function.
-	(get_priority): New function.
-	(get_summary): New function.
-	(get_transparency): New function.
-	(get_url): New function.
-	(get_has_alarms): New function.
-	(get_has_recurrences): New function.
-	(get_is_complete): New function.
-	(get_is_overdue): New function.
-
-	* cal-util/cal-component.c (scan_property): Handle the GEO
-	property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_geo): Likewise.
-	(cal_component_set_geo): Likewise.
-	(cal_component_free_geo): Likewise.
-	(cal_component_set_exdate_list): Removed incorrect assertion.
-	(cal_component_set_exrule_list): Removed incorrect assertion.
-	(cal_component_get_next_alarm): Oops, this had not been
-	implemented at all.
-	(cal_component_has_rdates): New function.
-	(cal_component_has_rrules): New function.
-
-	* cal-util/cal-component.h (CalComponentField): Added the GEO
-	property.
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	PERCENT-COMPLETE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_percent): Likewise.
-	(cal_component_set_percent): Likewise.
-	(cal_component_free_percent): Likewise.
-	(scan_property): Handle the PRIORITY property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_priority): Likewise.
-	(cal_component_set_priority): Likewise.
-	(cal_component_free_priority): Likewise.
-
-	* cal-util/cal-component.h (CalComponentField): New enumeration
-	with the list of fields we support for ETable.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Update prototype.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.
-	Mostly moved over from calendar-commands.c:display_objedit().
-
-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!
-	(display_objedit): Removed.
-	(new_appointment_cb): New function.  Just call
-	gnome_calendar_new_appointment().
-	(display_objedit_today): Removed.
-	(calendar_control_activate): Removed the "New appointment for
-	today" option, since it is pretty useless.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): There.
-	A pretty function to generate recurrence instances atomically so
-	that clients don't have to jump through hoops.  Now we can get rid
-	of the ugly calendar_iterate() function.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/calendar-commands.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger
-	time from the current time.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c: Fixed a warning.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
-	Fixed some warnings.
-
-2000-08-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
-	method.  Takes in a time range and the type of component we are
-	interested in; returns a list of UIDs.  The idea is that
-	ocurrences get computed in the client; we can have multiple
-	recurrences in iCalendar and we cannot identify them trivially
-	across the wire.
-	(Cal): Removed the get_events_in_range() method.
-
-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.
-	(cal_backend_get_objects_in_range): New function.
-	(cal_backend_get_events_in_range): Removed.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):
-	Implemented new method.
-	(cal_backend_file_get_events_in_range): Removed.
-
-	* pcs/cal.c (Cal_get_events_in_range): Removed.
-	(uncorba_obj_type): New function.
-	(Cal_get_uids): Use uncorba_obj_type().
-	(Cal_get_n_objects): Likewise.
-	(Cal_get_objects_in_range): Implemented new method.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.
-	(cal_client_get_objects_in_range): Implemented.
-	(corba_obj_type): New function.
-	(cal_client_get_n_objects): Use corba_obj_type().
-	(cal_client_get_uids): Likewise.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_clone): New function.
-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE
-	property does not need incrementing.
-
-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use
-	CalComponent.  Deal with an empty summary property.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,
-	libical owns the string's memory, so do not free it.
-
-	* cal-client/client-test.c (create_client): Connect to the destroy
-	signal of the client here.
-
-	* cal-client/test.ics: New test file, modified from Eric Busboom's
-	test file from RFC 2445.
-
-2000-08-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (dump_component): This was gone for
-	some reason.
-	(main): Load a new test file.
-
-2000-08-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_commit_sequence): New
-	function to commit changes to the SEQUENCE property.
-	(cal_component_get_as_string): Ensure that the sequence has been
-	committed.
-
-	* cal-client/cal-client.c (cal_client_get_object): Use
-	CalComponent instead of the old iCalObject.
-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE
-	property before stringifying the object and piping it over to the
-	Wombat.
-
-2000-08-04  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if
-	oaf isn't initialized by the time the conduit starts, start it
-	up.  we do this because we need to start wombat with oaf, and
-	gpilotd doesn't currently start oaf.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): unref.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):
-	Added stub for now.
-	(cal_backend_file_update_pilot_id): Likewise.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]
-	from the list of sources.  The idea is to move vCalendar importing
-	to the GUI as a convenience function.
-
-2000-08-02  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
-	save (cbimc) after setting the pilot id and status.
-
-2000-08-02  Joe Shaw  <joe@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):
-	Fixed a g_return_if_fail that had two parameters and thus
-	wouldn't build.
-
-2000-08-03  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): updated to match
-	the new ETableModel append_row. This meant we could also get rid of
-	the row_being_added and idle_id hack.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Emit "model_pre_change" signals as
-	appropriate.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file
-	backend.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].
-
-	* cal-util/cal-component.c (cal_component_set_icalcomponent):
-	Return an operation success code for if we are passed a component
-	of a type we don't support.
-
-2000-07-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-recur.c (*): Use CalComponent and the new property
-	types instead of the old iCalObject stuff.
-	(cal_recur_generate_instances): Renamed from
-	cal_object_generate_events().  Ensure that the component has the
-	DTSTART property.
-	(generate_instances_for_year): Renamed from
-	cal_object_generate_events_for_year().
-	(cal_obj_expand_recurrence): Made static.
-	(cal_recur_from_icalrecurrencetype): New function.  We should
-	really convert this whole file to use struct icalrecurrencetype
-	instead.
-	(cal_recur_free): New function.
-
-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.
-	(CalRecurrence): Renamed from CalObjRecurrence.
-
-	* cal-util/timeutil.c (time_from_icaltimetype): New function.
-
-	* cal-util/Makefile.am: Commented out the test-recur program.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* Removed doc directory, since it is the old gnome-pim docs which
-	aren't used any more.
-
-	* Makefile.am (SUBDIRS): removed doc.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* gui/calendar-model.c: compile fix for Solaris
-	(works under Linux, too; don't know about others)
-
-	* this is a test of whether CVS merge does what I
-	think it will do.
-
-2000-07-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, it seems that we have all the interesting properties for
-	single-user calendars now.  RFC 2445 can bite me.
-
-	* cal-util/cal-component.c (scan_property): Handle the RRULE
-	property.  Yay!.
-	(scan_recur): Likewise, yow!
-	(get_recur_list): Likewise, yeehaw!
-	(get_recur_list): Likewise, honk honk!
-	(set_recur_list): Likewise, booooga booooga!
-	(cal_component_get_rrule_list): Likewise, squeek squeek!
-	(cal_component_set_rrule_list): That's it, I ran out of sounds.
-	(cal_component_free_recur_list): Likewise.
-	(scan_property): Handle the EXRULE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exrule_list): Likewise.
-	(cal_component_set_exrule_list): Likewise.
-	(set_period_list): Oops, free the old properties as well as
-	removing them.
-	(set_text_list): Ditto.
-	(cal_component_set_exdate_list): Ditto.
-
-	* cal-util/cal-component.c: Put all the functions used to free
-	returned values all together.
-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be
-	incremented since the RFC requires it.
-	(scan_property): Handle the EXDATE property.
-	(scan_exdate): Likewise.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exdate_list): Likewise.
-	(cal_component_set_exdate_list): Likewise.
-	(cal_component_free_exdate_list): Likewise.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Fixed a typo
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section
-
-2000-07-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_period_list): New function.
-	(scan_property): Handle the RDATE property.
-	(scan_period): Likewise.
-	(free_icalcomponent): Likewise.
-	(get_period_list): Likewise.
-	(set_period_list): Likewise.
-	(cal_component_get_rdate_list): Likewise.
-	(cal_component_set_rdate_list): Likewise.
-	(scan_text): Simplify a bit since we only handle the ALTREP
-	parameter; there is no need to iterate over all parameters.
-	(scan_datetime): Simplify; just handle the TZID parameter.
-	(scan_summary): Simplify; just handle the ALTREP parameter.
-	(cal_component_get_as_string): New function.
-
-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;
-	now we only expose the types of objects we know about.
-
-	* cal-util/cal-util.h (CalObjType): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.
-	(cal_client_get_uids): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.
-	(check_for_slow_setting): Likewise.
-
-	* pcs/cal-backend-imc.c (count_objects): Likewise.
-	(build_uids_list): Likewise.
-
-	* pcs/cal.c (Cal_get_uids): Likewise.
-	(Cal_get_n_objects): Likewise.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view
-	for Todo/Event items.
-
-	* gui/task-assigned-to.xpm:
-	* gui/task-recurring.xpm:
-	* gui/task-assigned.xpm:
-	* gui/task.xpm: new pixmaps (all the same at present) to go in the
-	icon column of the ETable.
-
-	* gui/event-editor.c: hid the silly 'Calendar' labels on the
-	GnomeDateEdits and hid the times when you select 'All day event'.
-	Also adjusted the time_t's so that when an all day event finishes on
-	say midnight 13th May, we show 12th May in the dialog, since it
-	implicitly includes all of that day up to midnight.
-
-	* gui/dialogs/task-editor-dialog.glade:
-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.
-
-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog
-	with our new ETable.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.h: added a few more fields.
-
-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a
-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.
-	For some reason an empty 'URL:' property appears and causes trouble.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Update for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):
-	Finish filling the trigger.  What a pain, again.
-	(cal_component_alarm_free_trigger): Implemented.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-
-	* conduits/calendar/calendar-conduit-control-applet.desktop:
-
-	* conduits/todo/todo-conduit-control-applet.desktop:
-		Added the Turkish desktop entries.
-
-2000-07-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free): Free the
-	icalcomponent if this is an unattached alarm.
-	(scan_alarm_property): Handle the TRIGGER property.
-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.
-	(cal_component_alarm_set_trigger): Ditto.  Less pain.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline
-	docs.
-	(cal_client_new): Ditto.
-	(cal_client_get_n_objects): Added inline docs.
-
-2000-07-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (CalComponentAlarm): New internal
-	represntation for alarm components.  We really don't map them to a
-	CalComponent because it is more convenient to handle them as
-	"child" structures.
-	(make_alarm): New function to create a CalComponentAlarm from an
-	icalcomponent representing a VALARM.
-	(scan_alarm_property): New function to scan a property from an
-	alarm component.  We support ACTION.
-	(cal_component_get_first_alarm): New function to start an iterator
-	over the alarms in a calendar component.
-	(cal_component_alarm_get_action): New function.
-	(cal_component_alarm_set_action): New function.
-
-2000-07-13  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.
-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"
-	events.
-
-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control
-	based on value from ical object during edit.
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c: Revert Michael's GnomeFont patch until the
-	gnome-print API stabilizes.
-
-2000-07-12  Michael Meeks  <michael@helixcode.com>
-
-	* gui/print.c (titled_box, print_text, print_month_small),
-	(bound_text): GnomeFont update.
-
-2000-07-12  Seth Alves  <alves@hungry.com>
-
-	* conduits/calendar/calendar-conduit.c: fixed various problems
-
-	* cal-client/Makefile.am: build a static version of the library
-	to link with the conduits
-
-	* cal-util/Makefile.am: same
-
-2000-07-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_completed): Ditto.
-	(cal_component_set_completed): Ditto.
-	(scan_property): Handle the TRANSPARENCY property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_transparency): Ditto.
-	(cal_component_set_transparency): Ditto.
-	(scan_property): Handle the URL property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_url): Ditto.
-	(cal_component_set_url): Ditto.
-
-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded
-	check for the URI.
-	(load_fn): Be more paranoid about the URI and notify the listener
-	if we got passed a bad URI.  Simplify the termination code a bit.
-	(create_fn): Likewise.
-	(queue_load_create_job): Be more paranoid about the URI.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove pilot stuff for now.
-
-	* Makefile.am (SUBDIRS): Remove `conduits'.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
-
-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want
-	calendar.conduit.in, not calendar.conduit.
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (SUBDIRS):
-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
-	the gui directory to here.
-
-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Remove
-	"close calendar" command.
-
-2000-07-08  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.
-
-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle
-	mouse wheel scrolling.
-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.
-
-2000-07-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_sequence): Ditto.
-	(cal_component_set_sequence): Ditto.
-	(cal_component_free_sequence): Ditto.
-	(cal_component_set_last_modified): Removed incorrect assertion.
-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence
-	number must be incremented when certain properties change, so we
-	store a flag that says if we need to bump it when piping the
-	object over the wire.
-	(free_icalcomponent): Reset need_sequence_inc.
-	(cal_component_set_dtstart): Set need_sequence_inc.
-	(cal_component_set_dtend): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	LAST-MODIFIED property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_last_modified): Ditto.
-	(cal_component_set_last_modified): Ditto.
-	(get_icaltimetype): New function to get struct icaltimetype
-	values.
-	(cal_component_get_created): Use get_icaltimetype().
-	(set_icaltimetype): New function to set struct icaltimetype
-	values.
-	(cal_component_set_created): Use set_icaltimetype().
-
-	* cal-util/cal-component.c (scan_property): Handle the CREATED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_free_icaltimetype): Ditto.
-	(cal_component_get_created): Ditto.
-	(cal_component_set_created): Ditto.
-	(cal_component_init): Do not create an UID here.
-	(ensure_mandatory_properties): New function to ensure that the
-	mandatory RFC properties are indeed in the component.  If they are
-	not, we create them on the fly.
-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().
-	(cal_component_set_icalcomponent): Ditto.
-	(cal_component_get_uid): Return the UID in a parameter, not as a
-	function return value, for consistency's sake.
-	(scan_property): Handle the DTSTAMP property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_dtstamp): Ditto.
-	(cal_component_set_dtstamp): Ditto.
-
-2000-07-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-todo.c (gncal_todo_update): Use &obj instead of &ico in
-	the call to cal_client_get_object(). The ToDo list should work now.
-
-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible
-	so it doesn't appear and then resize.
-
-2000-07-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): Use
-	CalComponentText instead of CalComponentPropSummary.  Removed the
-	latter typedef.
-	(cal_component_set_summary): Likewise.
-	(scan_property): Handle the CLASSIFICATION property.
-	(cal_component_get_classification): Ditto.
-	(cal_component_set_classification): Ditto.
-
-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed
-	from cal_component_free_description_list().  We can share this
-	function since both comments and descriptions have the same form.
-	(scan_text): Ditto.
-	(get_text_list): New function.
-	(set_text_list): New function.
-	(cal_component_get_description_list): Use get_text_list().
-	(cal_component_set_description_list): Use set_text_list().
-	(cal_component_set_uid): Add sanity check.
-	(cal_component_get_summary): Ditto.
-	(cal_component_get_description_list): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_get_due): Ditto.
-	(scan_property): Handle the COMMENT property.
-	(cal_component_get_comment_list): Ditto.
-	(cal_component_set_comment_list): Ditto.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.
-	This can appear multiple times, so we maintain a list.  We
-	compress them later to a single property with multiple values.
-	(cal_component_get_categories_list): Ditto.
-	(cal_component_set_categories_list): Ditto.
-	(cal_component_free_categories_list): Ditto.
-	(free_icalcomponent): Properly free the mappings.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_datetime): Handle date/time and
-	timezone pairs.
-	(scan_property): Handle DTSTART and DTEND.
-	(cal_component_free_datetime): Ditto.
-	(get_datetime): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(set_datetime): Ditto.
-	(cal_component_set_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_set_dtend): Ditto.
-	(scan_property): Handle DUE date.
-	(cal_component_get_due): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_description_list):
-	Handle the DESCRIPTION property.  There can be multiple
-	descriptions with parameters each, so we deal with a list instead
-	of a single structure.
-	(cal_component_set_description_list): Ditto.
-	(cal_component_free_description_list): Ditto.
-	(scan_property): Ditto.
-	(scan_description): Ditto.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): To avoid
-	passing a million parameters to setters/getters for properties
-	that support parameters, we now pass client-side structures
-	instead.  Here we use CalComponentPropSummary.
-	(cal_component_set_summary): Ditto.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component-factory.c: Make calendar die when evolution quits.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c: Change of plans.  We use an
-	icalcomponent from libical as our core representation so that we
-	can preserve extension fields and fields that we don't (yet)
-	support.  CalComponent is just a wrapper with a nice API that
-	provides non-iterative, random access to the ical's fields.
-	(cal_component_destroy): Free the thing correctly.
-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.
-	(cal_component_set_icalcomponent): New function to set the
-	CalComponent's data from an existing icalcomponent.
-	(cal_component_get_icalcomponent): New function.
-	(cal_component_set_new_vtype): New convenience function to create
-	an empty component.
-	(scan_icalcomponent): Core scanning function.
-	(scan_property): Another core scanning function.
-	(cal_component_get_uid): Use the property directly.
-	(cal_component_get_summary): Ditto.  Handle the altrep parameter
-	as well.
-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.
-	It is ridiculous how much code this involves.
-	(scan_summary): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Do not link and include the pilot stuff for the
-	calendar component, just for the Pilot conduit.  Commented out the
-	Pilot part so that Evolution can build.  Sigh, we'll have to
-	modify gnome-pilot to use OAF.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync
-	program conditional on HAVE_GNOME_PILOT, and add
-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the
-	appropriate places.
-
-2000-06-29  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal.c (Cal_get_uid_by_pilot_id):
-	(Cal_update_pilot_id):
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):
-	(cal_backend_imc_get_uid_by_pilot_id):
-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):
-	(cal_backend_update_pilot_id):  server code to service these:
-
-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.
-	also uses dirty bits on both sides to aid in syncing.
-
-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new
-	function -- ask the cal server to return uid given an object's
-	pilot id.
-	(cal_client_update_pilot_id): new function -- inform the
-	cal server of an objects pilot id and pilot dirty-flag.
-
-2000-06-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.[ch]: New files for the new iCalendar
-	component object.  Today's properties: basic component type, UID,
-	SUMMARY.
-
-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of
-	sources.
-
-2000-06-27  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler
-	assignment.
-
-2000-06-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value):
-	Implement.
-	(calendar_model_initialize_value): Implement.
-	(calendar_model_value_is_empty): Implement.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
-	using it!
-	(e_day_view_init): used new colors from tigert.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"
-	and "y" arguments.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
-	selection range. It just moves it on one day/week etc. This makes
-	it very handy for the keyboard shortcut code.
-
-	* gui/calendar-commands.c (calendar_control_activate): fixed bug
-	setting the radio button active.
-
-	* gui/e-day-view.[hc]: added support for keyboard navigation and
-	selection of the time range.
-
-2000-06-20  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.
-	(calendar_model_is_cell_editable): Implemented.
-
-	* cal-client/cal-client.c (cal_client_update_object): Take in an
-	iCalObject instead of a stringified version.
-
-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.
-	(gnome_calendar_remove_object): Removed.
-	(save_ical_object_cb): Use the CalClient function.
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-	(e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-	(e_week_view_key_press): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-	(e_week_view_on_delete_appointment): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-2000-06-19  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
-	space etc.
-
-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
-
-2000-06-18  Ettore Perazzoli <ettore@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Include from
-	`$(top_builddir)/libical/src/libical' too.  [For the generated
-	libical `icalversion.h' header.]
-	* cal-client/Makefile.am (INCLUDES): Likewise.
-
-2000-06-18  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
-	fixed a DnD bug.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on
-	installed ical.h
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c: added little buttons which are shown when there
-	are more events than will fit in a day. Clicking on the button takes
-	the user to the 1-Day view and shows the full day.
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText
-	items so we get tooltips automatically. Though we may want to use our
-	own code to show tooltips so we can show the tips when the mouse is
-	around the edges of the event box, and we may want to show the start
-	and end times of the event in full.
-
-	* gui/calendar-commands.c (calendar_control_activate):
-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the
-	radio buttons in the code easily. We need this if we want to jump to
-	another view programmatically.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.
-
-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out
-	references to functions which don't exist yet, so evolution still
-	compiles.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/test-recur.c: updated.
-
-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the
-	iCalObject struct being updated to support more of iCalendar.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* pcs/.cvsignore: added icalendar-test.
-
-2000-06-15  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate
-	noinst_PROGRAMS declarations into one so automake accepts it.
-	(INCLUDES): include libical src dir so we don't depend on having
-	ical.h already installed
-
-2000-06-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the
-	middle of the array (!), so use plain GArray everywhere.  Sigh.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar
-	again.
-
-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make
-	it use vCalendar again.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in
-	asynchronous fashion.  Finished implementing.
-	(obj_removed_cb): Implemented.  This one needs no juggling.
-	(calendar_model_set_cal_client): Only load the objects if we have
-	a client.
-	(calendar_model_destroy): Disconnect from the client's signals.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	calendar-model.[ch] to the list of sources.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,
-	return the computed value.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of
-	objects and the hash table of UID->array index.
-	(calendar_model_row_count): Return the length directly from the
-	array instead of asking the Wombat.
-	(calendar_model_value_at): Implemented.
-	(calendar_model_new): Create an empty model.  We provide a new
-	setter function now.
-	(calendar_model_construct): Removed function.
-	(calendar_model_set_cal_client): New function to set the calendar
-	client and object type at any time.  This lets us reuse a calendar
-	model object.
-
-	* cal-util/calobj.h (iCalObjectField): Just report whether the
-	object has alarms; not every single alarm.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_calendar_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL for the new args
-	@create_folder_fn and @remove_folder_fn.
-	(create_view): Updated to match the new
-	`EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not
-	"calendar".
-
-2000-06-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()
-	method.
-
-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):
-	Implemented.
-
-	* pcs/cal.c (Cal_get_n_objects): Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.
-	(cal_client_get_n_objects): Implemented.
-
-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify
-	the fields in an iCalObject.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL
-	summaries.
-
-2000-06-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still
-	need icons, though.
-
-2000-06-07  Seth Alves  <alves@hungry.com>
-
-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,
-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object
-
-	* cal-client/cal-client.c (cal_client_get_object): instead of
-	returning a text representation, decode the text and return an
-	iCalObject.  Also added CalClientGetStatus which indicates
-	success or type of failure.
-
-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out
-	ical_object_find_in_string since it is unused now.
-
-	* cal-client/client-test.c (list_uids): track get_object change
-	* gui/calendar-commands.c (calendar_iterate): same
-	* gui/e-day-view.c (e_day_view_update_event): same
-	* gui/e-week-view.c (e_week_view_update_event): same
-	* gui/print.c (print_day_details): same
-	(print_day_summary): same
-	(print_todo_details): same
-	* gui/gnome-cal.c (trigger_alarm_cb): same
-	* gui/gncal-todo.c (gncal_todo_update): same
-
-2000-06-06  Seth Alves  <alves@hungry.com>
-
-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems
-	* cal-util/calobj.c (ical_object_find_in_string): use libical
-	instead of libversit
-	(ical_object_to_string): same
-	(dump_icalobject): prints the contents of an icalobject for debugging
-
-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la
-	so we don't have to modify the build system of the released libical
-	* cal-client/Makefile.am (client_test_LDADD): same
-	* cal-util/Makefile.am (icalendar_test_LDADD): same
-
-2000-06-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_destroy): Removed from the public
-	header; made static.  Now everyone should use refcounting.
-
-	* pcs/cal-backend-imc.c (free_ical_object): Use
-	ical_object_unref().
-	(remove_object): Likewise.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (print): New function to call the print
-	engine.
-	(calendar_toolbar): Added the Print button.
-	(calendar_control_activate): Added the File/Print item.
-
-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow
-	start_time and end_time to be NULL.
-
-	* gui/e-week-view.c (e_week_view_get_selected_time_range):
-	Likewise.
-
-	* gui/print.c (range_selector_new): Show the range selector
-	widgets.  Use the correct radio group for all of them!
-	(print_calendar): Do the dialog box here.  We may want to split
-	this function later into smaller chunks.
-
-2000-06-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):
-	allow the right button to popup the menu, even when the event is
-	being edited.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView
-	when the right button is clicked, so that any event being edited is
-	saved before any action (e.g. opening the Event Editor dialog) is
-	started. Note that this won't work if we switch to asynchronous
-	notification.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.
-	(toolbar): Added an icon for the Save and Close command.
-	(save_ical_object): Recompute the title of the window here.  Maybe
-	it would be better to do it when we actually get the
-	"object_changed" signal from the CalClient.
-	(file_close_cb): Implemented.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
-	(gnome_calendar_add_object): Removed function, since it was
-	identical to gnome_calendar_update_object().  Modified the rest
-	of the code to use only the latter.
-	(gnome_calendar_remove_object): Be more paranoid about the UID.
-	(gnome_calendar_update_object): Ditto.  Also, renamed this
-	function from gnome_calendar_object_changed(), for consistency
-	with the lower-level CalClient interface.
-
-	* gui/event-editor.c (event_editor_class_init): New
-	"save_ical_object" signal to ask that our parent store the
-	calendar object to the backend.
-	(save_ical_object): New function to save the calendar object,
-	actually if just emits the signal.
-	(file_save_cb): Implemented.
-	(dialog_to_ical_object): We want priv->
-	alarm_program_run_program_entry (i.e. the entry inside the
-	GnomeFileEntry), not the file entry itself.
-	(dialog_to_ical_object): Only insert the recurrence ending date if
-	the event is recurrent!
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Fixed EXTRA_DIST.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Handler for the
-	"editor_closed" signal of the event editor; we just destroy it
-	then.
-
-	* gui/event-editor.c (app_delete_event_cb): Callback used when the
-	dialog is closed.  Release the iCalObject here instead of the
-	event editor's destroy handler, and emit the new "editor_closed"
-	signal.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
-	GnomeApp is now generated with Glade instead of being created in
-	the program code.  Otherwise we can't migrate the accelerators to
-	the new toplevel and they won't work.
-
-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
-	This lets us use the GnomeApp created by libglade and still have
-	signals and stuff.
-
-	* gui/event-editor.c (create_menu): Tell the UI handler that the
-	menubar is the GnomeApp's existing one, not to create a new one.
-	(create_toolbar): Tell the UI handler to use the GnomeApp's
-	existing toolbar.
-	(event_editor_focus): New function to raise/focus an event editor.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_focus().
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Put the
-	toolbar into a frame to make it look like standard GNOME toolbars.
-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
-	do evil things when its moved to the left or the right of the
-	window.
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
-	calendar objects to their respective event editors.
-
-	* gui/gnome-cal.c (gnome_calendar_init): Create the
-	object_editor_hash.
-	(gnome_calendar_destroy): Free the object_editor_hash.
-	(gnome_calendar_edit_object): New function to centralize the
-	launching of event editors; if one already exists for a particular
-	calendar object, we just raise its window.
-	(edit): Use gnome_calendar_edit_object().
-
-	* gui/calendar-commands.c (display_objedit): Use
-	gnome_calendar_edit_object().
-	(display_objedit_today): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_edit_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_edit_appointment): Likewise.
-
-	* gui/event-editor.c (event_editor_new): Do not take in an
-	iCalObject; rather provide an event_editor_set_ical_object()
-	function.  We need this because a single editor may be switched
-	between different calendar objects.  Also, do not show the event
-	editor; leave it up to the client code.
-	(event_editor_construct): Likewise.
-	(clear_widgets): New function to clear the widgets to default
-	values.
-	(fill_widgets): New function to fill in the widgets from the
-	iCalObject.  We don't do this in init_widgets() anymore.
-	(free_exception_clist_data): New function to free the exceptions
-	clist data.  We were leaking the row data.
-	(init_widgets): Hook to the destroy signal of the exceptions
-	clist.
-	(event_editor_set_ical_object): New function.  Now it also makes a
-	copy of the calendar object for the event editor; clients do not
-	need to copy it anymore.
-	(event_editor_destroy): Unref the UI handler as well.
-	(event_editor_class_init): New "ical_object_released" signal to
-	notify the parent that we are no longer editing the calendar
-	object.
-	(make_title_from_ico): Handle NULL objects.
-
-	* gui/event-editor.h (EventEditor): Removed fields that are no
-	longer used.
-
-2000-05-31  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am: added test-recur test program.
-
-	* cal-util/test-recur.c: new file to test the recurrence code.
-
-	* cal-util/.cvsignore: added test-recur.
-
-	* cal-util/cal-recur.c: updated.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_construct): Create the UI
-	handler after we have constructed the parent GnomeApp.
-	(main_menu): Menu template is now in place.
-	(toolbar): Tollbar template is now in place.
-	(create_toolbar): Turn off labels in the toolbar since it sucks;
-	it should support non-homogeneous buttons with horizontal icons
-	and text.
-
-2000-05-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the
-	flags argument, since now we just proxy the calendar object to the
-	calendar client.
-
-	* gui/event-editor.c (alarm_unit_get): Moved over from
-	event-editor-utils.c.
-
-	* gui/event-editor-utils.[ch]: Removed files, since the two
-	functions that were left there (i.e. the ones not present in
-	e-dialog-widgets) can simply be moved to event-editor.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	event-editor-utils.[ch] from the list of sources.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-utils.c: Moved many functions to
-	e-util/e-dialog-widgets.c.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Put the main notebook directly
-	under a simple GtkWindow.  We are going to pull out the notebook
-	and slap it into our custom-built GnomeApp, anwyays.
-
-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.
-	Added a BonoboUIHandler for its menu and toolbar.
-	(make_title_from_ico): Create a nice title for the window.
-	(get_widgets): Fetch the Glade widgets here instead of all over
-	the place.
-	(event_editor_new): Temporary hack to show the dialog here, just
-	so that I can test it.
-
-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (init_bonobo): Do not initialize libglade twice.
-
-	* gui/component-factory.c (create_view): Set the folder_uri
-	property, otherwise the calendar will not get loaded into the
-	view.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/main.c: Make it so that warnings don't crash calendar.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c: Removed.
-
-	* gui/main.c: New.
-
-	* gui/control-factory.c: New.
-	* gui/control-factory.h: New.
-
-	* gui/calendar-component-factory.c: New.
-	* gui/calendar-component-factory.c: New.
-
-	* gui/evolution-calendar-control.c (calendar_control_factory):
-	Renamed from `calendar_factory'.
-	(calendar_control_factory_init): Renamed from
-	`calendar_factory_init'.
-
-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.
-
-	* gui/evolution-calendar.gnorba: New.
-	* gui/evolution-calendar.oafinfo: New.
-
-2000-05-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (range_selector_new): New function to create the
-	custom range selector.
-	(print_dialog): New function to show the print dialog.
-	(print_calendar): Use the print dialog.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added libepaned.a.
-
-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.
-
-2000-05-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed
-	function.
-
-	* gui/mark.c (mark_month_item): Use
-	cal_client_get_events_in_range().
-
-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,
-	since we don't have a year view.
-
-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.
-	(gnome_calendar_get_current_view_name): Likewise.
-	(gnome_calendar_update_view_times): Likewise.
-	(gnome_calendar_direction): Likewise.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(gnome_calendar_time_format_changed): Likewise.
-	(gnome_calendar_get_current_time_range): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],
-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they
-	are no longer used.  Removed all the old Pilot crap.
-
-2000-05-20  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence
-	rules. These are only part finished, but people may like to check that
-	the architecture seems OK.
-
-2000-05-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of
-	the iCalObject so we detect the change in the "update_event" callback.
-	Maybe we should just update the view ourselves and then we wouldn't
-	need to detect any change in the callback.
-
-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to
-	get rid of any recurrence rules. Used when we 'unrecur' an event.
-
-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it
-	won't fit, or we end up adding a new event for each key press.
-	(e_day_view_update_event_label): don't update it if it doesn't have
-	an EText item (i.e. it isn't visible).
-
-	* gui/e-day-view-time-item.c: allow selection of times using this
-	column.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.
-	(time_add_day): Likewise.
-	(time_add_month): Likewise.
-	(time_add_year): Likewise.
-	(time_from_day): Of all functions, *this* one had to have a bug.
-	Set the tm.tm_isdst to -1 to specify that we don't know whether
-	the time is in DST or not.  This fixes *many* bugs upstream.
-	(time_week_begin): Likewise.  We never noticed this since the week
-	functions are never used.
-	(time_week_end): Likewise.
-
-2000-05-17  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c: hooked up more widget signals to callbacks
-	to the gladified dialog acts more like the original one.
-
-2000-05-16  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons
-	to the pages of the notebook.
-	(append_exception):
-	(recurrence_exception_added):
-	(recurrence_exception_deleted):
-	(recurrence_exception_changed): code to deal with the recurrence
-	exception list.
-
-2000-05-15  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c
-
-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c
-
-	* gui/event-editor-dialog.glade: glade file used by event-editor.c
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (display_notification): Use the alarm
-	notification dialog.
-	(display_notification_cb): New callback for the result of the
-	alarm notification dialog.
-
-	* gui/dialogs/alarm-notify.glade: New file with the alarm
-	notification dialog.
-
-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.
-
-	* gui/dialogs/Makefile.am: New file.
-
-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.
-
-2000-05-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and
-	plug leaks of str_ico and ico.
-
-	* gui/evolution-calendar-control.c (main): Initialize libglade.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-05-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to
-	compute the ending time of the occurrence.  This takes care of
-	recurring events that span multiple days.  Also, removed the DST
-	condition since it did not look right at all:  if you have a daily
-	appointment at 18:00, it still should happen at 18:00 even during
-	daylight savings.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil
-	functions instead of calculating the month's times by hand.  Use
-	cal_obj_instance_list_free() instead of freeing the list by hand.
-	Clip the range we pass to mark_gtk_calendar_day().
-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the
-	month by adding real day offsets.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (add_alarms_for_object): New function to add
-	today's alarms for a single object.
-	(gnome_calendar_object_updated_cb): Update the object's alarms.
-
-	* idl/evolution-calendar.idl (Cal): Added a
-	get_alarms_for_object() method.
-
-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New
-	function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):
-	Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New
-	function.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Now that we
-	depend on current gnome-libs we can make the toolbar detachable
-	again.
-
-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone
-	variable to make this compile on BSD systems (where timezone is
-	the name of a function)
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused
-	arguments.  Load the initial alarms here.
-	(load_alarms): New function to load a day's worth of alarms.
-	(gnome_calendar_class_init): Eeeek!  This was taking in an
-	incorrect argument type.
-	(gnome_calendar_init): Now the calendar keeps a hash table of
-	UIDs->queued alarms.  Create the hash table here.
-	(gnome_calendar_destroy): Destroy the alarms hash table.
-	(gnome_calendar_object_updated_cb): Remove the alarms for the
-	object and regenerate them.
-	(gnome_calendar_object_removed_cb): Remove the alarms for the
-	object.
-
-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just
-	the trigger time, the callback and the closure data.  Return an
-	opaque identifier for the alarm so that it can be removed by the
-	client code if needed.  Use the queue_alarm() helper function.
-	(queue_alarm): Helper function to actually queue the alarm and set
-	up the itimer.  Deal with a nonzero return value from
-	setitimer().
-	(alarm_remove): New function to remove an alarm based on its ID.
-	(pop_alarm): New helper function; pops the first alarm of the
-	queue and resets the timer as appropriate.
-	(alarm_ready): Simplified a lot by using pop_alarm().
-
-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().
-
-	* pcs/cal.c (build_instance_seq): New function to build a CORBA
-	sequence from the internal list of instances.
-	(Cal_get_events_in_range): Use build_instance_seq().
-	(Cal_get_alarms_in_range): Implemented new method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New
-	function with the get_alarms_in_range() engine.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):
-	Implemented the get_alarms_in_range() method.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New
-	client-side function for getting the alarms.
-	(build_instance_list): New helper function to build the
-	CalObjInstance list from the CORBA sequence.
-	(cal_client_get_events_in_range): Use build_instance_list().
-
-	* gui/calendar-commands.h: #include <cal-util/calobj.h>.  #include
-	"gnome-cal.h".
-
-	* gui/e-week-view.c: #include "calendar-commands.h" instead of
-	main.h; the latter is an obsolete file and will be killed.
-
-	* gui/evolution-calendar-control.c (main): Call init_bonobo()
-	before anything else.  We need the GTK+ object system initialized.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Move
-	"about" menuitem to the help menu.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST
-	sections.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-backend-imc.c: Set the format when creating a new
-	calendar.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-factory.c: Removed double free of method_string in
-	uri->method_string.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
-	of "evolution-calendar.h".
-
-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"
-	instead of "evolution-calendar.h".
-
-2000-05-08  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call
-	e_day_view_stop_editing_event here to avoid a divide by zero
-	a bit further on.  i'm not sure if this is the best fix for this.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just
-	an interface for calendar backends; this is an abstract class.
-	Put in the vtable for the backend methods.
-
-	* pcs/cal-backend.c (cal_backend_new): Removed function, since
-	CalBackend is not just an abstract class.
-	Removed implementation-specific functions and made public
-	functions call the virtual methods instead.
-
-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC
-	implementation; this implements a backend for iCalendar and
-	vCalendar files.  Moved the implementation-specific stuff from
-	cal-backend.[ch] to here.
-
-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to
-	here.  Added a CAL_UNKNOWN value for when the backend is not
-	loaded yet.
-	(cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN.
-	(save_to_vcal): Use the same VCProdIdProp value as in
-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the
-	vCalendar spec.
-	(ensure_uid): Return nothing, since the result value need not be
-	used anymore.
-	(add_object): Since we mark the calendar as dirty anyways, we do
-	not need to check the result value of ensure_uid() anymore.
-	(remove_object): Asssert that we know how to handle the object's
-	type.  We do this in add_object() anyways.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].
-
-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()
-	so that we can see the line number where they occur.
-
-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the
-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the
-	switch.
-
-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed
-	enumeration; it is stupid to translate all values for the
-	CalClient when it is going to translate them again.
-	(CalListenerClass::cal_loaded): This signal now passes the
-	LoadStatus directly from the CORBA side.
-
-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not
-	translate the status value.
-
-	* cal-client/cal-client.h (CalClientLoadStatus): Added the
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.
-
-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA
-	version of the LoadStatus result code.
-
-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the
-	hash table from method strings to the GtkTypes for backend class
-	types.
-	(cal_factory_init): Create the priv->methods hash table.
-	(cal_factory_destroy): Free the priv->methods hash table.
-	(cal_factory_register_method): New function to register a backend
-	class for a particular URI method.
-	(launch_backend_for_uri): New function to launch a backend for a
-	particular URI's method.
-	(load_backend): Use launch_backend_for_uri().  Move the error
-	notification code from load_fn() to here.
-	(create_backend): Use launch_backend_for_uri().  Move the error
-	notification code form create_fn() to here; it is #ifdefed out
-	since currently cal_backend_create() does not have any error
-	reporting capabilities.
-
-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a
-	PROTOCOL_NOT_SUPPORTED error code.
-
-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed
-	functions, since they were supposed to be internal only.
-	(CalFactory_load): Call queue_load_create_job() directly.
-	(CalFactory_create): Likewise.
-
-2000-05-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid
-	to NULL or we won't find any other occurrences of the event. Set the
-	editing_event_day/num to -1 instead.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the
-	positioning of the icons for long events.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to
-	terminate the string.
-
-2000-05-07  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,
-	just in case it hasn't moved, otherwise it won't appear.
-
-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to
-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH
-	since it must be >= the BAR_WIDTH.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):
-	Changed to "folder_uri" from "calendar_uri".
-	(set_prop): The uri given to us is a directory, so we append a
-	filename onto the end before we use it.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/timeutil.c (time_day_begin):
-	(time_day_end): changed these so they just do a simple localtime(),
-	update the struct tm, then do a mktime(). I don't know why it used to
-	look at the tm_isdst flags etc. From a little test program I wrote
-	which steps through testing every hour for a year it wasn't working
-	correctly, and the new code does.
-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.
-	My test program now works better.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	* gui/.cvsignore: ignore evolution-calendar.pure
-
-	* gui/Makefile.am: add support for building evolution-calendar.pure
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: finish editing event when user hits Return key.
-	(e_week_view_on_text_item_event): stop event signals after doing any
-	other calls, since otherwise it will also stop any other resulting
-	event signals.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the start/end times while editing.
-
-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we
-	now only want a single line of text.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): new function to
-	convert the summary field to a single line of text, by converting any
-	sequence of CR & LF characters to a single space.
-	(ical_object_create_from_vobject): call the above function. I think
-	all functions that load iCalObjects go through this.
-	(ical_new): called it here as well just in case.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/week-view.[hc]: removed.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-day-panel.[hc]:
-	* gui/gncal-day-view.[hc]:
-	* gui/gncal-full-day.[hc]:
-	* gui/gncal-week-view.[hc]:
-	* gui/layout.[hc]:
-	* gui/view-utils.[hc]: removed old calendar view files.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,
-	and ical_object_ref/unref() functions. I've updated all the gui/
-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe
-	just using ical_object_destroy() is OK there.
-
-	* gui/gncal-todo.c:
-	* gui/calendar-commands.c:
-	* gui/eventedit.c:
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use refcounting for iCalObjects.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c: try not to ever draw outside the event, even when
-	the event is very small.
-
-2000-05-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: don't allow recurring events to be resized or
-	dragged, and don't show the resize/drag cursors. Actually it may be
-	better to let the user do the resize/drag and then ask them what they
-	want to do - change the single occurrence or the entire series.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.
-
-	* gui/popup-menu.c: include e-gui-utils.h
-
-2000-05-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.
-
-	* gui/calendar-commands.c: when we switch views, grab the focus.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
-	cal_client_get_events_in_range(), and doesn't load any objects.
-	Also just return if it isn't visible.
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): call
-	g_list_sort() to sort the list rather than g_list_insert_sorted() for
-	each element. It is much more efficient.
-	Also changed it so that the co->ev_start/end fields are copied from
-	the CalObjInstance rather than the parameters to the function
-	(that is right, isn't it?)
-	Also freed the list elements, and finally the list.
-	(calendar_iterate): changed this to use cal_client_get_events_in_range
-	since that is more efficient than getting all the uids and then loading
-	and parsing all the events.
-
-	* pcs/cal-backend.c (save): output the '... saved' message before
-	freeing the string!
-
-	* gui/gncal-todo.c (gncal_todo_update):
-	* gui/e-week-view.c (e_week_view_update_event):
-	* gui/e-day-view.c (e_day_view_update_event):
-	* gui/calendar-commands.c (calendar_get_events_in_range):
-	(calendar_iterate): free obj_string after it is parsed.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): set the active
-	radio button here. Oops - it wasn't a Bonobo problem after all.
-
-	* gui/popup-menu.c (popup_menu): added call to
-	e_auto_kill_popup_menu_on_hide() to destroy the menu.
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu):
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
-	isn't useful any more, since the event editor keeps its own iCalObject.
-	So for now we make the menu commands available even when the event is
-	being edited in the event editor.
-	Also corrected misspellings of 'occurance' -> 'occurrence'.
-
-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
-	The event editor now uses its own independent iCalObject.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
-	uid for the new single instance. I'm not sure what we should do about
-	the creation/last modification times of the objects.
-
-	* gui/e-week-view.c (e_week_view_on_edit_appointment):
-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
-	iCalObject before passing it to the event editor, since it will change
-	the fields. If we don't duplicate it we won't know what has changed
-	when we get the "update_event" callback.
-
-	* gui/e-week-view.c (e_week_view_key_press):
-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
-	times of the new iCalObject. We may want to set the default alarm as
-	well.
-
-	* cal-util/calobj.c (ical_gen_uid): made this function public so we
-	can generate new uids if necessary.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new
-	function to get the currently seleted time range form the current view.
-
-	* gui/calendar-commands.c (display_objedit): use the above function
-	to get the time for the new appointment.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use a shallow copy of the ico when we update the
-	times (when resizing/dragging). Otherwise we won't detect that the
-	time has changed in the "update_event" callback.
-
-	Also added functions to get the currently selected time range.
-
-2000-04-30  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set
-	attendee and contact address correctly.
-
-	* pcs/cal-backend.c (icalendar_calendar_load): init priv->object_hash
-	when loading.
-	(cal_get_type_from_filename): if file extension is .ical, consider
-	the file an ical file.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_compare_dates): new function to see
-	if the event dates have changed (including any recurrence rules).
-	It is used for optimization when we get the "object_changed" signal.
-	We have to do far less work if the dates are unchanged.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: only draw the selection when we have the keyboard
-	focus, since the user expects to be able to type in a new event when
-	the selection is shown. Also keep the selection when we lose focus,
-	but just don't show it.
-
-	Also quite a few changes to cope with the new client/server
-	architecture.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	only draw the selection if the widget has the keyboard focus.
-
-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with
-	events longer than one day. And changed the code for updating events
-	in the new views.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c
-	(init_bonobo): OAFized.
-
-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.
-
-	* gui/evolution-calendar-control.c: New #define
-	`CONTROL_FACTORY_ID', varying according to whether we are
-	`USING_OAF'.
-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* gui/Makefile.am: Updated for OAF.
-
-	* pcs/cal-factory.h: Explicitly #include
-	"calendar/pcs/evolution-calendar.h" instead of just
-	"evolution-calendar.h".
-
-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use
-	OAF.
-
-	* cal-client/client-test.c (init_corba): New function, implemented
-	differently depending on `USING_OAF'.
-
-2000-04-27    <alves@hungry.com>
-
-	* pcs/cal-backend.c (cal_backend_load): fix memory leak
-	(save_to_vcal): same
-	(save): same
-	(cal_backend_load): same
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la
-
-	* pcs/.cvsignore: Added *.la and *.lo.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from
-	backend_destroy_cb.  Now we use it for the "last_client_gone"
-	signal from the backend.  Also, unref the backend to destroy it.
-	(add_backend): Connect to the "last_client_gone" signal of the
-	backend.
-	(cal_factory_get_n_backends): New function to query the number of
-	running backends.
-
-	* pcs/cal-backend.c (cal_backend_class_init): Register the new
-	"last_client_gone" signal.  It is emitted when the last Cal client
-	goes away.  It is used to notify the factory when a backend may be
-	safely destroyed.
-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last
-	client disconnects from the backend.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
-	iCalObjects by their UIDs instead of by their pointers.
-
-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* cal-client/Makefile.am: Add `$(datadir)/idl'.
-
-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
-	destroy -- used to unref the CalClient so wombat knows we are gone.
-	(gnome_calendar_class_init): added a class init for this widget.
-
-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico
-
-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico
-
-2000-04-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (main): The path to the test calendar
-	changed when we moved stuff around.  Users will have to tweak this
-	for their CVS setup, anyways.
-	(create_client): Create or load the calendar as appropriate.
-	(client_destroy_cb): Exit the main loop if both clients are gone.
-	(main): Connect to the "destroy" signal of the clients so that we
-	can terminate the test program.
-
-2000-04-24  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar.c (parse_person): allow for null CN
-	(parse_person): allow for null sent_by
-
-	* pcs/Makefile.am: build icalendar-test
-
-	* pcs/icalendar-test.c: a test which loads an ical file and
-	converts it to our internal format, and then saves it back out.
-
-2000-04-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files and pixmaps, and removed
-	old source files, which can be deleted.
-
-	* gui/e-week-view-titles-item.[hc]:
-	* gui/e-week-view-main-item.[hc]:
-	* gui/e-week-view-event-item.[hc]:
-	* gui/e-week-view.[hc]: new files implementing the week/month views.
-
-	* gui/yearview.xpm:
-	* gui/monthview.xpm:
-	* gui/weekview.xpm:
-	* gui/workweekview.xpm:
-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
-	intended to be the final pixmaps.
-
-	* gui/calendar-commands.c: added radio buttons to the toolbar to
-	switch between the calendar views, and moved the am_pm_flag here so we
-	can get rid of view-utils.c.
-
-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
-	widgets into 2 notebooks, and added the	selection_start_time and
-	selection_end_time fields.
-
-	* gui/goto.c: updated to use new selection time range.
-
-	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.
-
-	* gui/e-day-view.[hc]: changed the interface to support the new
-	selection time range, got rid of a few debugging messages and changed
-	a few bits.
-
-2000-04-21  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c: start on code to do the opposite of
-	icalendar.c (convert from iCalObjects to libical's icalcomponents).
-
-	* gui/calendar-commands.c (calendar_control_activate): moved
-	"About Calendar" into the View menu so it shows up.
-
-2000-04-20  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback
-	for listener's object updated signal.
-	(gnome_calendar_object_removed_cb): new function: callback for
-	listener's object removed signal.
-	(gnome_calendar_new): hook up listener's "obj_updated" and
-	"obj_removed" signals so if evolution is running twice,
-	they will both see changes right away.
-	(gnome_calendar_object_changed): don't call update_all, since
-	it will be called by the listener.
-	(gnome_calendar_remove_object): don't call update_all
-	(gnome_calendar_add_object): don't call update_all
-
-	* gui/gncal-full-day.c (child_realize): create fullday's gcs
-	even if pixmap_bell has already been created.  this was
-	causing crashes if the calendar was run twice.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* gui/eventedit.c (ee_rp_init_rule): changed the order around
-	a bit to avoid a Gtk-CRITICAL crash
-
-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate
-	the todo clist
-
-	* cal-client/cal-client.c (cal_client_get_uids): don't check
-	type against CALOBJ_TYPE_ANY since it will always match.
-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (remove_object): don't call save from here
-	because in all cases the caller of remove_object calls save
-
-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open
-	instead of checking on disk and calling load or create.
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use
-	cal_client_update_object -- editing and dragging events works again
-	(gnome_calendar_open): collapsed gnome_calendar_load and
-	gnome_calendar_create into this function.  added new type
-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or
-	CALENDAR_OPEN_OR_CREATE.
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): create
-	a property bag for this control
-	(set_prop): callback for property sets
-	(get_prop): callback for proprety gets
-
-	* gui/calendar-commands.c (calendar_set_uri): new function,
-	called when the "calendar_uri" property is set on the calendar-
-	control's property bag.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Fix include path.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.h (CalFactoryClass): We have a new
-	"last_calendar_gone" signal that Wombat can use to terminate
-	itself properly.
-
-	* pcs/cal-factory.c (cal_factory_class_init): Register the
-	"last_calendar_gone" signal.
-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead
-	of killing the factory.
-
-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.
-	(INCLUDES): Make the log domain be "wombat-pcs".
-
-2000-04-17  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (add_object): removed implicit save, since
-	we don't want to save as we load from disk.
-	(cal_backend_update_object): added a call to save, since it
-	isn't done by add_object now.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am: Renamed library from libcalutil to
-	libcal-util, to be consistent with libcal-client.  Install header
-	files in $(includedir)/evolution/cal-util.
-	(INCLUDES): Add "cal-util" log domain for glib.
-	(libcal_clientincludedir): The header files are now installed in
-	$(includedir)/evolution/cal-client.
-
-	* cal-util/cal-util.h: Fix includes.
-
-	* cal-client/client-test.c: Fix includes.
-
-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
-	it is for internal use by Wombat only.  The header files should
-	not be installed, either.  Removed all the old Tlacuache stuff.
-
-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
-	gncal.desktop.
-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
-	domain.
-
-	* gui/*.[ch]: Fix cal-util and cal-client includes.
-
-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.
-
-	* pcs/*.[ch]: Fix cal-util includes.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch
-	between linux's timezone variable and *bsd's method of getting the
-	gmt offset.
-
-2000-04-10  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (save_to_vcal): create and save an actual
-	vcalendar instead of a list of vcal objects.
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
-	we search headers in the evolution tree before installed headers.
-	(Otherwise when you do 'make install' lots of files in gui/ get
-	rebuilt, since they depend on the installed cal-client.h which has just
-	been updated.)
-
-2000-04-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
-	on the cal client.
-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved
-	gnome_calendar_update_all from gnome_calendar_load to here.
-
-	* gui/calendar-commands.c: minor cleanups
-
-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim
-	to write vcal to a file
-	(save): filled it with more gnome-pim code
-	(add_object): call save () after changing
-	(remove_object): same
-	(cal_backend_create): same
-	(cal_backend_remove_object): same
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Removed linking with libetable and libeminicard
-	since they weren't being used.
-
-2000-04-08  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_create): new function:
-	friendly wrapper for cal_client_create_calendar
-
-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create
-	if no filename is provided
-
-	* gui/prop.c (properties): calendar is a frame
-
-	* gui/calendar-commands.c (calendar_control_activate): sort out the
-	menus a bit, more of them show up now.
-
-	* gui/Makefile.am: don't build library or test, just the bonobo control
-
-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead
-	of a window, now.
-
-	* gui/gnome-cal.c (gnome_calendar_new): same
-
-	* gui/goto.c (goto_dialog): same
-
-2000-04-06  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): removed
-	uih from the argument list, added cal.  use cal as user_data
-	in callbacks rather than the control.
-	(calendar_control_deactivate): removed uih from argument list
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (setup_menu): removed
-	(setup_appbar): removed
-	(calendar_control_activate): new function -- does the work
-	that setup_appbar and setup_menu used to do.
-	(calendar_control_deactivate): undoes what calendar_control_activate
-	does by removing the toolbar items and menu items.
-
-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
-	common stuff is in a library
-
-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
-	based on a gtk_frame rather than a gnome_app
-
-	* gui/calendar-commands.c: split out some of main.c
-
-	* gui/evolution-calendar-control.c: bonobo bung so evolution
-	can use the calendar widget
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* pcs/.cvsignore: Added *.lo.
-
-2000-03-30  Seth Alves  <alves@hungry.com>
-
-        * gui/main.c (calendar_get_events_in_range):
-        cal_client_get_events_in_range returns a list of CalObjInstance *, not
-        a list of (char *) uid.
-
-	* Makefile.am (SUBDIRS): readded the gui directory
-
-	* gui/main.c: temporarily added alarm_defaults back in,
-	since the calendar doesn't link without it
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: remove the gui directory, which doesn't compile.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* pcs/Makefile.am: create a libpcs.la library, for use in the
-	wombat.
-
-2000-03-28  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
-
-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to
-	ical_object_find_in_string
-	(calendar_get_events_in_range): same
-	(session_save_state): commented out references
-	to gcal->client->filename
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object): Use
-	ical_object_to_string().
-
-	* cal-util/calobj.c (ical_object_to_string): Moved over from
-	pcs/cal-backend.c (was string_from_ical_object).
-	(get_calendar_base_vobject): Likewise, moved over from
-	pcs/cal-backend.c.
-
-	* cal-util/cal-util.c: Removed string_to_ical_object(); the
-	correct function is in calobj.[ch], called
-	ical_object_find_in_string().  Removed ical_object_to_string,
-	since we now implement it in calobj.c.
-
-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see
-	above.
-
-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object
-	instances now contain only the UID for the object, not the whole
-	string representation of the object.  This allows clients to
-	implement caching of objects if they wish.
-
-	* pcs/cal.c (Cal_get_events_in_range): Likewise.
-
-	* pcs/cal-backend.c (build_event_list): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range):
-	Likewise.
-
-	* cal-util/cal-util.h (CalObjInstance): Likewise.
-
-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.
-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not
-	NULL.
-
-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also
-	supports the Unknown interface.
-
-2000-03-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c: Fix includes.
-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().
-	(e_day_view_on_delete_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-2000-03-13  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.
-
-2000-03-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (gnome_calendar_locate): Removed function now that it
-	is no CORBA server in the GUI.
-	(save_default_calendar): Removed function.  Now the personal
-	calendar server will take care of saving modified calendars when
-	appropriate.
-	(close_cmd): Do not call unregister_calendar_services().
-
-	* gui/eventedit.c (ee_ok): Do not save the calendar.
-
-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-	* gui/gncal-full-day.c (delete_occurance): Likewise.
-	(delete_appointment): Likewise.
-	(unrecur_appointment): Likewise.
-	(child_focus_out): Likewise.
-	(update_from_drag_info): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to
-	create the CORBA server.
-
-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to
-	`client'.
-
-	* cal-client/cal-client.h (CalClient): Removed filename and
-	corba_server fields.
-
-2000-03-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (main): Do not pass the INIT_SERVER flag to
-	gnome_CORBA_init_with_popt_table().  Check for exceptions
-	properly.
-	(main): Initialize Bonobo.
-	(main): Call process_dates() to parse the dates from the command
-	line before we dump the events or the TODOs.
-	(main): Use bonobo_main() instead of gtk_main().
-
-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.
-	Do not call default_alarm() anymore, since that is a GUI issue.
-	(default_alarm): Removed function.
-	(alarm_defaults): Removed defaults data.
-
-	* pcs/tlacuache.c (calendar_notify): Removed stubs for
-	alarm_defaults, calendar_notify(), debug_alarms.
-
-2000-03-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the
-	Pilot conduit stuff for now.
-
-	* gui/calendar.c: Random #ifdefs to make it build, although this
-	file is going away.
-
-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
-
-	* gui/calendar-conduit.c: Fixup includes.
-
-	* gui/calendar-conduit.h: Fixup includes.
-
-2000-03-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
-	in the GnomeCalendar struct.
-
-	* gui/*.c: tracked change from Calendar * to CalClient
-
-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
-	(calendar_get_events_in_range): pulled this out of calendar.c and
-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.
-
-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also
-
-2000-03-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the
-	list of sources.  This was a miscommunication on our part.
-
-2000-03-05  Seth Alves  <alves@hungry.com>
-
-	* cal-client/cal-client-alarm.c: stubs for client side
-	access to alarm structures.  this will probably change,
-	since i don't know what i'm doing.
-
-	* cal-util/alarm-enums.h: enums for alarms needed by
-	both the client and the server
-
-	* remaining source files in calendar/... have been moved
-	to calendar/gui.
-
-	* gui/alarm.c: start to decouple the view from the model
-	in the alarm editing code
-
-2000-03-03  Seth Alves  <alves@hungry.com>
-
-	* cal-util/Makefile.am: new file -- things shared between
-	the client and server go in this directory
-
-	*  calobj.c calobj.h icalendar.c icalendar.h
-	timeutil.c timeutil.h cal-util.c cal-util.h where moved
-	backend stuff went into pcs.  shared stuff went into
-	cal-util.
-
-2000-03-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	At this point the calendar client and personal calendar server
-	files were moved to the idl/, cal-client/, and pcs/ directories.
-
-	* idl/Makefile.am: New file.
-
-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff
-	from calendar/Makefile.am to here.
-
-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from
-	calendar/Makefile.am to here.
-
-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
-
-	* calendar.h: Removed the references to cal-backend.h and its
-	stuff.  This file is going away soon!
-
-	* icalendar.c: #include <config.h>.  Also, we don't need to
-	include cal-backend.h or gnome.h.
-
-	* icalendar.h: Protect from multiple inclusions.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Use the gnome-config flags for orbit-idl.
-	Create a libcal-client library with the calendar client object.
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Removed stale rule for the conduit.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added *.lo.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added tlacuache and tl-test.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of
-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.
-
-2000-02-17  Seth Alves  <alves@hungry.com>
-
-	* cal-backend.h: moved CalendarFormat type def here
-
-	* cal-backend.c (cal_backend_load): if extension suggests
-	an ical file, attempt to load an iCal file.
-	(cal_get_type_from_filename): returns CAL_ICAL if file
-	extension is 'ics' or 'ifb', else returns CAL_VCAL
-	(icalendar_calendar_load): moved this here from
-	icalendar.c because it needs to call the static function
-	add_object.
-
-2000-02-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_remove_object): Implemented.
-
-	* cal.c (cal_notify_remove): Implemented.
-	(Cal_remove_object): Implemented.
-	(cal_get_epv): Fill in the remove_object field in the epv.
-
-	* cal-backend.c (cal_backend_remove_object): Implemented.
-	(notify_remove): New function to notify clients that an object was
-	removed.
-
-2000-02-16  Russell Steinthal  <rms39@columbia.edu>
-
-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer
-	from char* to iCalPerson*
-
-	* calobj.[ch]: Change iCalObject.related from list of char* to
-	list of iCalRelation*; assorted related fixes
-
-	* icalendar.c: interface between libical and the gnomecal
-	internal representation
-
-2000-02-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_update_object): Implemented.
-
-	* cal.c (cal_notify_update): New function to notify the listener
-	about an updated object.
-	(Cal_update_object): Implemented.
-	(Cal_get_uids): set_release() the sequence to TRUE.
-	(Cal_get_events_in_range): Likewise.
-
-	* cal-backend.c (remove_object): New function to remove objects
-	from a calendar backend.
-	(cal_backend_update_object): New public function to update an
-	object and notify clients about it.
-
-	* evolution-calendar.idl (Cal): Added update_object() and
-	delete_object() methods.
-	(Listener): Removed the obj_changed method and renamed obj_added
-	to obj_updated.  We now only have updated and removed notifiers.
-
-	* cal-listener.[ch]: Removed the "changed" notification code.
-	Changed the "added" notification code to the "updated"
-	notification.
-
-	* cal-client.c: Likewise.
-
-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the
-	factory and exit the main loop when the factory is destroyed.
-
-	* cal-factory.c (backend_destroy_cb): New callback used when a
-	backend is destroyed.  Removes the backend from the factory's hash
-	table and unrefs the factory if all backends go away.
-	(add_calendar_client): Free the environment.
-
-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to
-	initialize.
-
-	* cal-listener.c (cal_listener_new): Likewise.
-
-	* layout.c (layout_events): Plug li.partition memory leak.
-
-2000-02-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's
-	destroy signal.
-	(cal_backend_remove_cal): Killed function now that removal of Cal
-	objects is done in their destroy callback.
-	(cal_destroy_cb): New callback to remove a Cal from the backend's
-	list of clients.  Also, the backend destroys itself when there are
-	no more clients connected to it.
-	(save): New placeholder function to save a backend.
-	(destroy): New function to destroy a backend's data.
-	(cal_backend_destroy): Save the calendar and destroy it.
-
-	* cal.c (cal_destroy): Reset the priv->backend to NULL.
-
-	* cal-factory.c (add_calendar_client): There is no need to call
-	cal_backend_remove_cal(); we can now just destroy the Cal object.
-	(create_fn): Make sure we always unref the URI.
-	(load_fn): Move the URI unref to the end of the function for
-	safety.
-
-	* cal-factory.c (add_calendar_client): Unref the Cal only if
-	notification of the listener was unsuccessful.  Otherwise, the
-	calendar user agent (Listener side) keeps the reference.
-
-	* tl-test.c (list_uids): Free the calobj.
-
-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get
-	rid of the listener.
-	(load_or_create): Likewise.
-	(destroy_factory): New function to get rid of the factory.
-	(destroy_listener): New function to get rid of the listener.
-	(destroy_cal): New function to get rid of the calendar client
-	interface object.
-	(cal_client_destroy): Free all resources.
-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I
-	love memprof.
-
-	* cal-listener.c (cal_listener_destroy): Reset the priv->cal to
-	CORBA_OBJECT_NIL.
-
-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,
-	since the calendar user agent owns it.
-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user
-	agent owns it.
-
-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()
-	to get rid of the calendar client interface object.
-
-	* calobj.c (ical_object_create_from_vobject): Duplicate the
-	default "PUBLIC" string.
-
-2000-02-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Added documentation comment.
-	(load_fn): Do not print a message if the backend could not be
-	loaded due to a non-fatal error.
-	(queue_load_create_job): Moved the stuff from cal_factory_load()
-	to here.  Now this function serves to queue load or create
-	requests.
-	(cal_factory_load): Use queue_load_create_job().
-	(cal_factory_create): Implemented; use queue_load_create_job().
-	(create_fn): New job handler for creating new calendars.
-	(create_backend): New function to create a new backend with a new
-	calendar.
-	(add_backend): New helper function to add backends to the
-	factory's hash table.
-	(load_backend): Use add_backend() instead of adding the backend by
-	ourselves.
-
-	* cal-client.c (load_or_create): Moved the functionality from
-	cal_client_load_calendar() to here, and added an option to create
-	a new calendar instead of loading an existing one.
-	(cal_client_load_calendar): Use load_or_create().
-	(cal_client_create_calendar): Implemented.
-
-	* cal-backend.c (cal_backend_create): Implemented.
-
-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for
-	create requests.
-
-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.
-
-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.
-
-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.
-
-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.
-
-	* tl-test.c: New test program for the calendar client side; it
-	also exercises the server side by sending commands to it.
-
-	* Makefile.am: Added the tl-test program.
-
-	* tlacuache.gnorba: Updated.
-
-	* tlacuache.c (create_cal_factory): Use the right GOAD id.
-
-	* cal-client.c (cal_client_construct): Use the right GOAD id.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added get_uids() method to get a
-	list of UIDs based on object types.
-
-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in
-	the backend.
-
-	* cal.c (Cal_get_uids): Implemented get_uids() method.
-
-	* cal-client.c (cal_client_get_uids): Implemented client-side
-	function.
-
-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,
-	not the last link.
-	(cal_obj_uid_list_free): New function to free a list of UIDs.
-
-	* GnomeCal.idl (Repository): Removed unused method
-	get_object_by_id_list().  This is just for cleanup purposes and to
-	remind me exactly of what needs to be moved over to
-	evolution-calendar.idl.
-	(Repository): Removed unused get_objects() method.
-
-	* corba-cal.c (init_calendar_repo_class): Removed the unused
-	get_objects method.
-
-	* calobj.h (CalObjFindStatus): New status value enumeration for
-	the find function.
-
-	* calobj.c (ical_object_find_in_string): New function to parse a
-	complete calendar and find a calendar object in it.  This should
-	be used instead ical_object_new_from_string() in the future.
-
-	* evolution-calendar.idl (CalObjInstance): Added an uid field.
-	Now the idea is that whenever calendar object strings are passed
-	around, their UIDs are passed along with them so that the actual
-	object can be pulled from the whole VCAL object using its UID to
-	identify it.
-
-	* cal-util.h (CalObjInstance): Added uid field.
-
-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.
-
-	* cal-backend.c (build_event_list): Store the object's UID in the
-	instance structure.
-
-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA
-	structure.
-
-	* cal-client.c (cal_client_get_events_in_range): Copy the UID
-	field from the CORBA structure.
-
-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.
-
-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.
-
-	* gnome-cal.c: #include "alarm.h"
-	(mail_notify): Made static.
-
-	* alarm.h: #include "calobj.h"
-
-	* corba-cal-factory.h (init_corba_server): Fixed prototype.
-
-	* quick-view.c (create_items_for_event): Made static.
-
-	* gncal-todo.c (column_resized): Made static.
-
-	* layout.c (find_index): Made static.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (CalObjInstance): New struct to wrap
-	instances of calendar objects for recurrencies and alarms.
-	(Cal::get_events_in_range): New method to get ocurring and
-	recurring events by time range.
-
-	* cal-backend.c (cal_backend_get_events_in_range): New function to
-	get a list of event instances in a time range.
-	(string_from_ical_object): New internal function.
-	(cal_backend_get_object): Use string_from_ical_object() instead of
-	doing everything ourselves.
-	(cal_backend_get_events_in_range): New function to get a list of
-	the events that occur or recur in a specified time range.
-
-	* cal-client.c (cal_client_get_events_in_range): Implemented
-	client-side function.
-
-	* cal-util.h:
-	* cal-util.c: New files with utilities and types common to the
-	client and server parts.
-	(CalObjInstance): New structure to hold an instance of an actual
-	occurrence, recurrence, or alarm trigger of a calendar object.
-	(cal_obj_instance_list_free): New function to free a list of
-	calendar object instances.
-
-	* cal.c (Cal_get_events_in_range): Implemented new method.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
-	free(), not g_free(), since calendar_get_as_vcal_string() uses
-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
-	well.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (get_calendar_base_vobject): New function to
-	create the base VObject for a calendar.
-	(cal_backend_get_object): Create the base calendar and add the
-	sought object to it, then stringify it.
-
-	* evolution-calendar.idl (Listener::obj_added
-	Listener::obj_changed): Now these pass in just the UIDs, not the
-	complete objects.
-
-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,
-	not the object.
-	(Listener_obj_changed): Likewise.
-
-	* cal-client.h (CalClientClass): Made the obj_added and
-	obj_changed signals take in the UIDs, not the full objects.
-
-	* cal-client.c (obj_added_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field
-	to object_hash.  Now we hash all the calendar's objects here based
-	on their UIDs.
-	(ensure_uid): New function to create UIDs for calendar objects
-	that don't have them.
-	(add_object): Ensure the object has an UID before inserting it in
-	the calendar.
-	(cal_backend_get_object): New function.
-
-2000-02-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added the get_object() method.
-
-	* cal-client.c (cal_client_get_object): New function to get a
-	calendar object by its UID.
-
-	* cal.c (Cal_get_object): Implemented.
-
-	* cal-backend.c (cal_backend_get_object): New unfinished backend
-	function.  We need some reorganizing of how the calendar objects
-	are stored.
-
-2000-02-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated
-	sources.
-
-2000-02-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the
-	listener.  Store the calendar client interface object, and emit
-	our own cal_loaded signal.
-	(cal_client_load_calendar): Connect to the listener's signals.
-	(cal_client_class_init): Added the "obj_added", "obj_removed",
-	öbj_changed" signals.
-	(obj_added_cb): Handle the signal from the listener.
-	(obj_removed_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
-	cal-listener.[ch].
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl: Changed the namespace from
-	GNOME::Calendar to Evolution::Calendar.
-	(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo.  And I
-	never noticed it in the implementation.  Ain't M-/ grand?
-
-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to
-	evolution-calendar.idl.
-
-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to
-	Evolution_Calendar_foo.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c cal-client.h: New files with the calendar client
-	object.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (CalFactory_load): Check that the listener is not
-	nil and emit and exception if it is.
-
-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now
-	these raise the NilListener exception.
-
-	* tlacuache.c (calendar_notify): Error stub for alarms.
-	(alarm_defaults): Stub array.
-	(debug_alarms): Stub variable.
-	(main): Initialize gnome-vfs.
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* tlacuache.c: New main module for the Tlacuache personal calendar
-	server.
-
-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME
-	personal calendar server.
-
-	* Makefile.am: Added the stuff necessary to build Tlacuache.
-
-	* cal.c (Cal_get_uri): Convert the URI to a string before
-	returning it.
-
-	* cal-factory.c (CalFactory_create): Doh, this function is void.
-
-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_remove_cal): New function to remove a
-	calendar client interface object from a backend.
-	(cal_backend_load): Convert the URI to string and use
-	Parse_MIME_FromFileName().  The conversion is not very smart,
-	though.
-
-	* cal-factory.c (load_backend): Moved most of the error handling
-	upstream to load_fn().
-	(load_fn): Handle failure in case the backend could not be loaded.
-	(cal_factory_destroy): Free the backends and the backend hash
-	table.
-	(add_calendar_client): Implemented.  We create a Cal client
-	interface object and attach it to the backend, and we notify the
-	listener.
-
-2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().
-	Also, return a backend instead of a Cal client object.
-
-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a
-	string.
-
-	* cal-listener.c (Listener_cal_loaded): Pass the load status to
-	the signal.
-	(cal_listener_destroy): Better error checking.
-	(cal_listener_new): Better error checking.
-
-	* cal-listener.h (CalListenerLoadStatus): New enum for the load
-	status of a calendar.
-	(CalListenerClass): Added the status argument to the cal_loaded
-	signal.
-
-	* gnome-calendar.idl (cal_loaded): Added a load status code.
-
-	* cal-backend.h (CalBackendLoadStatus): Renamed from
-	CalBackendLoadResult.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c cal-backend.h: Moved the calendar backend here.
-	This is the actual calendar-handling object.
-	(load_from_vobject): Moved over from calendar.c.  Modified to use
-	a CalBackend instead of the old Calendar structure.
-	(add_object): Likewise.
-
-	* cal.c: Now the Cal object is just a calendar client interface
-	object; we use it as a "viewport" onto a CalBackend.  This also
-	lets us do correct resource management.
-
-	* cal-common.h: New file with common forward declarations; we
-	can't have circular dependencies between headers.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Queue a load job.
-	(load_fn): Load job handler.  Lookup the calendar by URI, load it
-	if it is not loaded, or just report it to the new listener if it is.
-
-	* job.c job.h: New files with a simple job queue manager.
-
-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the
-	whole calendar object string.  The client will be able to query
-	the calendar for the events it needs.
-
-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME
-	object.  We unref it when the listener is destroyed.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	The files from the gncal directory of the gnome-pim module on CVS
-	were moved here, to evolution/calendar, in preparation for the
-	Evolution work.  The calendar is being split into a model/view
-	architecture.  The model is a personal calendar server (PAS):  it
-	provides storage, notification, and event generation; the
-	views/controllers are the calendar user agents and things like
-	Pilot synchronizers.
-
-2000-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal.c: Removed the CORBA listener methods, adjusted for the new
-	IDL.
-
-	* cal-listener.c (cal_listener_init): Create the private
-	structure.  In it we hold a reference to the calendar the listener
-	is watching.
-	(cal_listener_destroy): Destroy the private structure and unref
-	the calendar.
-	(Listener_cal_loaded): Stuff the calendar into our private data.
-	(Listener_obj_added): Adjusted for new IDL.
-	(Listener_obj_removed): Likewise.
-
-	* gnome-calendar.idl: New IDL for the personal calendar server.
-
-	* cal.h cal.c: New files with the calendar object.
-
-	* cal-listener.h cal-listener.c: New files with the calendar
-	listener object.
-
-	* cal-factory.h cal-factory.c: New files with the calendar factory
-	object.
-
-2000-01-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Changes to remove todo capplet stuff from distro.
-
-2000-01-08  Vadim Strizhevsky  <vadim@optonline.net>
-
-	* calendar-conduit-control-applet.c: Added pilotID argument to
-	gpilotd_conduit_mgmt_new.
-
-
-2000-01-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you
-	can choose which state the object should have
-	(any/new/modified/...). Will also add one to choose type
-	(event/journal etc).
-
-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the
-	new version of get_number_of_objects.
-
-	* calendar-conduit.c (pre_sync): Calls various
- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.
-
-2000-01-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (start_calendar_server): Let's not call
-	g_error, but g_warning instead.
-	(pre_sync): Get record numbers info, total, new, deleted etc, and
-	tell gpilotd.
-
-1999-12-31  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1
-	day) to the date chooses by the user. This ensures the recurrence
-	also occurs on that date.
-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to
-	redisplay the box.
-
-	* calendar.h: Added an argument to calendar_new, to enable certain
-	features, such as initing alarms or nor.
-
-	* calendar.c (calendar_new): Implemented support for the
-	CALENDAR_INIT_ALARMS option to calendar_new.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Added
- 	CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This
- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess
- 	steintr should check it.
-
-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.
-
-1999-12-10  Russell Steinthal  <rms39@columbia.edu>
-
-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to
-	create default alarm box (widgets in that box should always be
-	sensitive, even if the enabled checkbutton is not set)
-
-1999-12-08  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (setSettings): Capplets now
-	sets first_sync on enable, this should make the conduit copy old
-	entries from the pilot to gnomecal.
-
-1999-12-07  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Check if local store is
-	empty. If, force slow sync.
-
-	* GnomeCal.idl (GNOME): Added get_number_of_objects.
-
-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the
- 	get_number_of_objects.
-
-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that
-	caused the capplet to always set the sync action to Disable upon start.
-
-1999-12-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (Conduits_second_DATA): Also install .desktop files
-	for conduit capplets in the gnome/apps menu dir.
-
-1999-12-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.
-
-1999-10-12  Clifford R. Conover  <rusty@zootweb.com>
-
-	* gncal-todo.c Todo List improvements.
-
-	Cleaned up todo item highlighting, added support for highlighting
- 	events due today, and events not due yet.  Colors are configurable
- 	on the Colors Tab of the properties window.
-
-	Renamed Frame in Properties window to Colors rather then Month
- 	Colors since we are now asking for Todo item colors.
-
-	Added ability to display time until todo item is due in list, it
- 	automatically selects the best denomination of time (up to weeks)
- 	and down to seconds to display.  This should be made configurable
- 	in a future version.
-
-	Changed Todo dialog to ask for time that event is due.  This
- 	allows more accurate tracking of then the item is due, before the
- 	dialog was only asking for the date of the todo item.
-
-1999-12-03  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.
-
-1999-12-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c: Enhanced debug support: can be toggled on and off by
-	SIGUSR1, reports alarms which could not be added
-
-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio
-	and display alarms.  Snooze interval can be configured in the
-	Properties box.
-
-1999-11-30  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up
-	some of the if's in set_status.
-
-1999-11-22  Russell Steinthal  <rms39@columbia.edu>
-
-	* Merged todo list coloring patch from stable
-	* Added myself to AUTHORS, about box (per Miguel)
-
-1999-11-22  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Writes some warning
- 	messages when pre_sync fails.
-
-1999-11-14  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an
-	install gnome-pilot... fixed... sorry.
-
-1999-11-12  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,
-	using solution suggested by James Henstridge, appears to be caused
-	by a (by now fixed) bug in my automake.
-
-1999-11-12  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Config code for timeout, make Alarms property page use a
-	vbox instead of an hbox so that the propbox stays a reasonable width.
-
-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load
-	from config file
-
-	* eventedit.c: Give some static functions external linkage so they
-	can be used elsewhere (make_spin_button); add some prototypes to
-	appease gcc.
-
-1999-11-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_day_change): Add call to
-	calendar_init_alarms() to schedule another day change alarm.
-
-1999-11-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,
-	now version 0.8.5. Consistent use of GSList/GList. Implemented
-	compare, default uses one that compares the contents of a struct
-	Appointment, but also has #ifdeffed code that does a field level
-	comparison, not complete, but perhaps educational.
-
-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
-	unwanted conditional on libcalendar_conduit_la_LDFLAGS
-
-1999-11-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (readStateCfg): Commented the
-	code out, thus the capplet works again.
-
-1999-11-04  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install
- 	dirs for their pilot-link. Also install a pretty icon for the
- 	calendar-conduit.
-
-	* calendar-conduit-control-applet.c: Modfied the
-	try/revert/ok/cancel scheme to be more intuitive, also uses a
-	GtkOptionMenu for the possible sync methods.
-
-	* calendar-conduit-control-applet.desktop: use the nice icon...
-
-	* calendar-conduit.c: Ack, had to define debug_alarms and
-	alarm_default, otherwise they are undefined. Is gncal code messy
-	or is this considered a way of configuring the cal engine ?
-	Implemented delete_all syncabs methods.
-
-	* calendar-pilot-sync.c: also had to declare debug_alarms and
- 	alarm_defaults, just as ugly.
-
-1999-11-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Add new alarm page to properties box
-
-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default
-	alarms, configurable in the properties box.
-
-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display
-	alarms
-
-1999-10-23  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_new): Correctly initialize calendar_day_end
-	and calendar_day_begin *before* installing day-change alarm.
-
-1999-10-21  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c, main.c: Added alarm debugging code
-
-	* main.c (open_ok): Show an error box if the user tries to open a
-	non-existent file; fixes bug #1818
-
-1999-10-19  Russell Steinthal  <rms39@columbia.edu>
-
-	* gnome-cal.c (calendar_notify): Fix typos which were causing
-	invalid times in audio notification dialogs; fixes Bug #2561
-
-1999-10-18  Russell Steinthal  <rms39@columbia.edu>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various
-	elements of the day view in paned windows so that the user can
-	adjust the relative sizes of the daily schedule, monthly calendar,
-	and to-do list.
-
-1999-10-18  Martin Norbäck  <norpan@bigfoot.com>
-
-	* gncal.desktop: Added swedish translation
-
-1999-10-13  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Hopefully the fixes the much-hated
-	gnome-pilot dependency.
-
-1999-10-07  Eskil Olsen   <deity@eskil.dk>
-
-	* calendar.c (calendar_object_changed): moved the pilot_status =
-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.
-
-	* calendar-conduit.c: more _free calls, vamped the noise on output.
-
-1999-10-06  Eskil Olsen   <deity@eskil.dk>
-
-	* *conduit*[ch]: checks return values from gpilotd_init/connect.
-
-	* calender.c (vcalendar_create_from_calendar): removed a set
- 	of cleanVObject cleanStrTbl, since the freed memory that the
-	function returned.
-
-1999-09-27  Timur Bakeyev  <mc@bat.ru>
-
-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get
-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.
-	See also 1999-07-19  Matt Martin <matt@abacusnet.net>
-
-1999-09-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* month-view.c (add_event): ditto
-	(mark_current_day): ditto
-	(month_view_set): ditto
-
-	* goto.c (goto_dialog): ditto.
-
-	* gnome-month-item.c (gnome_month_item_init): ditto.
-
-	* gncal-day-panel.c (gncal_day_panel_new): ditto.
-
-	* getdate.c (RelativeDate): ditto.
-
-	* eventedit.c (set_all_day): ditto.
-	(ee_rp_init_rule): ditto.
-
-	* calendar.c (vcalendar_create_from_calendar): ditto.
-
-	* calendar-conduit.c (update_record): ditto.
-
-	* calobj.c (ical_object_generate_events): Get rid of pointers to
-	values returned from localtime, as it uses a static buffer.
-
-1999-09-26  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: the g_free that was commented out since glib said
-	was a duplicate free, was supposed to be a free.
-
-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a
-	get_objects_by_id_list. Latter is not done.
-
-	* calendar-conduit.c: rewrote the way the conduit iterates over
-	records. It no longers fetches all entries (since that didn't work
-	with more then 285 entries. It now fetches the id list, and gets
-	each record. (will be using get_objects_by_id_list to get records
-	in amounts of 10 or so later, to reduce amount of corba calls).
-
-	* calendar-conduit.c: now sets alarm parameters when transferring
-	from gnomecal to pilot.
-
-1999-09-23  Eskil Olsen <deity@eskil.dk>
-
-	* calendar-conduit.c: better merge of summary/description
- 	when doing ical_from_remote (update_record), also handles
-	import from gnomecal to pilot better, and on both ways, repeat
-	events are much better now.
-
-1999-09-22  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: commented out a g_free that glib reported
-	as being a duplicate free.
-	* calendar-conduit.c: got gnomecal->pilot up and runnning.
-
-1999-02-06  Lauris Kaplinski <lauris@ariman.ee>
-
-	* gncal.desktop: Added Estonian translations.
-
-1999-09-14  Federico Mena Quintero  <federico@redhat.com>
-
-	* gncal-full-day.c (child_popup_menu): Set the data pointers for
-	all the items.
-
-1999-09-14  Kjartan Maraas  <kmaraas@online.no>
-
-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest
-	user-guide.
-
-1999-09-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* eventedit.c (ee_create_buttons): Make the OK button the default
-	button per Russell's suggestion.
-
-1999-08-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_object_changed): Modify the
-	object->last_mod field.
-	(calendar_add_object): Ditto.
-
-	Closes bug #676
-
-	* main.c (save_calendar_cmd): Fix problem in which we warned the
-	user about the calendar being modified the first time the calendar
-	was used.
-
-1999-08-22  Tomas Ogren  <stric@ing.umu.se>
-
-	* gnomecal.gnorba: "GenericFactoy" is wrong...
-
-1999-08-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Fix the hostname part.
-
-1999-08-07  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects
-	created on the pilot, but not dirty (because they have been synced
-	with some other program in the past)
-
-1999-07-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* month-view.c (month_view_init): Release points here.
-
-1999-08-02  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):
-	libcalendar_conduit now installs
-
-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments
-	correctly, when they are deleted on the pilot
-	(conduit_free_Appointment): protect against double-freeing parts
-	of the Appointment structure
-	(update_record): all-day events from the pilot are handled a bit
-	more reasonably
-
-1999-08-01  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day
-	appointment corruption bug is dead. Whoo!
-
-1999-07-31  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am: fixed this up slightly with respect to pilot conduits
-
-1999-07-30  Jonathan Blandford  <jrb@redhat.com>
-
-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
-
-1999-07-29  Jonathan Blandford  <jrb@redhat.com>
-
-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
-
-1999-07-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is
-	not set, set the repeatForever to 1.  This fixes all of the
-	birthdays problems I had.
-
-	Make the code not take arguments
-	(sync_cal_to_pilot): Nice event update information
-
-	* calendar.c (calendar_new): Add Event UID hash table.
-	(calendar_add_object): Add events to the hash table here.
-	(calendar_remove_object): Remove events here.
-	(calendar_object_find_event): Use the hash table here.
-
-	* main.c (save_calendar_cmd): The object is already destroyed by
-	gnome_dialog_run.
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn
-	archived bit on.
-
-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.
-	(ical_gen_uid): Add a serial number.  Isodates can be small.
-
-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the
-	pilot status.
-	(cal_repo_get_updated_objects): New method.  Returns a list of
-	modified and not-sycned objects
-
-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync
-	from the GnomeCalendar to the pilot.
-	(sync_object_to_pilot): Sync a single event to the pilot.
-	(try_alarm): Alarm syncing code.
-
-1999-07-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: New file.  Implements PalmPilot
-	syncronization with the Gnome Calendar.
-
-	* calobj.c (ical_object_new_from_string): New function.  Creates
-	an iCalObject from a vCalendar string that is supposed to contain
-	only one vEvent.
-
-	* calendar.c:
-	(calendar_save): Split this routine in two.
-
-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.
-
-	* main.c: Include gnorba.h, and corba-cal-factory.h here
-	(close_cmd): Kill the calendar server on shutdown.
-
-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE
-	need to handle intervals in the years.
-
-	* calendar.c (calendar_object_find_in_list, calendar_object_find,
-	calendar_object_find_todo, calendar_object_find_event): New
-	functions for looking up information.
-
-	* main.c (gnome_calendar_locate): New function.
-
-	* corba-cal.c (calendar_create_object): New file.  Implements the
-	corba server.
-
-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.
-
-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.
-	(ical_object_create_from_vobject): Load syncing information for
-	pilot.  Do it in a way compatible with KOrganizer.
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-19  Matt Martin <matt@abacusnet.net>
-
-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the
-	ISO date format to convert from GMT time.
-
-1999-07-17  Nat Friedman  <nat@gnome-support.com>
-
-	* calendar.c (calendar_add_object): Copy the new UID into the
- 	iCalObject structure.
-
-1999-07-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from
-	gnome-pim-1-0: Fixed cut&paste bug for day fontsets.
-
-1999-07-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Returns a UID.
-	(ical_object_new): Use a UID when creating an event.  Should get
-	syncing done easier.
-
-1999-07-14  Nicholas J Kreucher <nick@poetic.com>
-
-	* calobj.c (skip_numbers): Actually skip over the numbers.
-	(ical_object_to_vobject): Test the proper variable for storing the
-	proper information.
-
-1999-07-14  Jean-Noel Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>
-
-	* timeutil.c (time_add_month): Fixed the problem with next month
-	going from a 31-day to a 30-day by adjusting the date to the
-	closest day at the end of the month.
-
-1999-06-07  Mike McEwan  <mike@lotusland.demon.co.uk>
-
-        * timeutil.c (time_add_month): Tell ktime' that we don't know
-        about daylight saving time so that it does *not* make adjustments
-        when we traverse a DST boundary.
-        (time_year_begin): ditto.
-        (time_year_end): ditto.
-        (time_month_begin): ditto.
-        (time_month_end): ditto.
-
-1999-06-16  Anders Carlsson  <anders.carlsson@tordata.se>
-
-	* main.c (new_calendar): Realize the toplevel widget when
-	--hidden is passed to gnomecal. This fixes a segfault.
-
-1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.
-	(Bug #1367). Thanks to Owen Cliffe <oc197@ecs.soton.ac.uk> for
-	helping track it down.
-
-1999-06-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.
-
-1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU
-	extension, not available in other systems.
-
-1999-06-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): Work around broken software that
-	writes a broken month-of-day as "zero".  Use the dtstart date for
-	this on this event.
-
-1999-05-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (install-data-local): help files be gone.  They are
-	now installed from the Docbook stuff.
-
-1999-05-26  Russell Steinthal  <steintr@condor.penguinpowered.com>
-
-	* gncal-todo.c main.c main.h prop.c: Added support for priorities
-	for todo items.  Doesn't do much, but you can set them and sort by
-	them.  (Use the properties box to enable them; should they be on
-	by default?)
-
-1999-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Added missing break here.  It was causing
-	core dumps when invoked with --userfile.
-
-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,
-	to pin point the bug reported on gnome-list.
-
-	* calobj.c (load_recurrence): Make intervals always exist.  a 0
-	interval is wrong.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Set the canvas scroll region here,
-	not in size_allocate().  Also, use the correct width and height
-	based on the allocation and the precomputed minimum width/height
-	values.
-
-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the
-	scrolled window.
-
-	* main.c (setup_appbar): Use the correct type for the appbar.
-
-	* gncal-day-view.c: Removed unused function switch_to_day().
-
-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.
-
-1999-05-25  Nat Friedman  <nat@nat.org>
-
-	* doc/C/gnomecal.sgml: Fixed a typo.
-
-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into
- 	which the year view is placed.
-
-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view
- 	inside the scrolled window.
-	(idle_handler): Set the height of the year view to
- 	CALENDAR_HEIGHT.
-	(year_view_size_allocate): Set the scroll region of the year view
- 	canvas to allocation->width, CALENDAR_HEIGHT.
-
-1999-04-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (dump_todo): Add --todo flag to dump the todo contents.
-
-1999-04-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (add_activated): Use same hack used in edit_activated
-
-1999-04-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (edit_activated): Kill all grabs from the CList
-	before running the new dialog box.
-
-	This fixes the problem of button-3/Edit on the todo item blocking
-	the GUI (actually, the main window responds, but not the todo
-	window).
-
-1999-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for
-	button3.  The code for the nice popup menu was there but was not
-	getting invoked.
-
-1999-04-01 Steve Murphy <murf@e-tools.com>
-
-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences
-	use the weekday field as a simple integer for a single weekday.
-
-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of
-	weekdaylist. The interface only lets the user input a single value
-	anyway.
-
-	* calobj.c (ical_object_to_vobject): instead of code to output day
-	names from a bit array, use instead the value as an int and output
-	a single dayname.
-
-	* calobj.c (ical_object_generate_events): first_week_day gets the
-	day int instead of the first entry in the bit field. I inserted a
-	fair chunk of code to avoid calling generate if the day is out of
-	range for a month. It may be unneccessary, because mktime will
-	turn the extra days into a valid date the next month. But not all
-	mktimes are equal, I fear.
-
-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,
-	(Monthly), I added code to set the interval slot of the recur
-	struct; without this value, selecting a monthly recursing, by
-	date, would lead to an infinite loop broken only by a failure to
-	alloc more memory. Also, in the "by position" case, both
-	u.month_pos and u.month_day were being assigned values. This is a
-	mistake, as they are both part of an union, and the same
-	thing. The weekday field should get the recur_rr_month_weekday
-	value.
-
-	* eventedit.c (ee_rp_init_rule): set default day from the weekday
-	field instead of the u.month_day field, which is really the
-	month_pos value.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with
-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime
-	will generate a time corresponding to the end of the previous
-	month, which may have a mday anywhere from 28 to 31. The end time
-	just adds 1 to the month, so your end time may not cover the last
-	few days of this month, depending on what the biggest mday of last
-	month was. I changed it so tm_mday is set to 1 instead.
-
-1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use
-	the full year format for strftime().
-
-1999-03-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* calobj.c: Include <config.h> So that strings get translated.
-
-1999-03-26  Tomas Ogren  <stric@ing.umu.se>
-
-	* prop.c (build_hours_menu): Made it respect 12/24h settings..
-	Doesn't show until next time you open the dialog.. yet..
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work
-	* eventedit.c (get_exception_string): Did some i18n work
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
-	* main.c (poptOption): Added which views that are possible for
-	--view in the --help text (closes #367)
-	* main.c (dump_events): Added (short) month to the strftime and made
-	the strings i18n:able
-
-1999-03-23  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal/calobj.c: Added 2 paranthesis..
-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
-	which caused heavy alarm-corruption with alarms between 2 hrs and
-	2 days.
-
-1999-03-23  Nat Friedman  <nat@nat.org>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Set the
- 	recur->interval to the value of the recur_rr_month_period spin
- 	button if the event is being set "by day."  This closes bug #675
- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!
-
-1999-03-10  Clifford R. Conover <rconover@montana.edu>
-
-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when
-	adding a TODO item here.
-	(column_resized): New function
-	(init_column_sorting): New function.
-	(todo_click_column): New function.
-	(convert_time_t_to_char, make_overdue_todo_style): New functions.
-
-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New
-	function used to update the TODO when the properties have been
-	chagned for it.
-
-	* prop.c (prop_apply_todo): Apply TODO properties.
-
-	* gncal-day-panel.c (todo_list_properties_changed): Update the
-	TODO display here.
-
-	* eventedit.c (date_edit_new): Made public
-
-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)
-
-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support
-	for daylight time savings.
-
-1999-02-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP
-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently
-	has the focus.
-
-1999-02-27  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the
-	fontset string.
-	* mark.h (*_FONTSET): Likewise.
-
-1999-02-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of
-	the event.
-	(ical_object_create_from_vobject): Load the owner/organizer of the event.
-
-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes
-	crash on "delete this occurrance").
-
-1999-02-22  Timur Bakeyev  <mc@bat.ru>
-
-	* calendar.c: According to configured values, use either tm.tm_zone
-	or tzname. In last case, also declare it extern.
-
-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works
-	fine without it.
-
-1999-02-20  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c (init_username): Made use of g_get_{user,real}_name() instead
-	of our own home-brew...
-
-1999-02-17  Sergey Panov <sipan@mit.edu>
-
-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,
-	month-view.c,prop.c,quick-view.c,year-view.c: will define
-	fonts via fontset. Friendlier to locales that use iso8859-[^1]
-	and koi8-r encodings. Does not solve problem for Asian languiges
-	--- better solution is needed (e.g. standart GNOME fontstyles
-	defined in gtkrc).
-
-1999-02-16  Sergey Panov <sipan@mit.edu>
-
-	* main.c: Use N_() macro for color settings labels in
-	color_props structure.
-
-1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (goto_dialog): Indentation fixes.
-
-1999-02-15  Tomas Ogren  <stric@ing.umu.se>
-
-	* goto.c: Made a private copy of what localtime() returns, to be able
-	to keep the data after more calls to localtime().
-
-1999-02-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_default_calendar): New function.  Saves the
-	calendar if it is the user's default calendar
-
-	* gncal-full-day.c (unrecur_appointment):
-	* gncal-day-panel.c (day_view_range_activated):
-	* eventedit.c (ee_ok):
-	* gncal-todo.c (ok_button): Added autosave for the default
-	calendar.
-
-1999-02-09  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: Removed the gtk_widget_realize call.
-
-1999-02-06  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* gncal.desktop: Added Korean translations.
-
-1999-02-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (date_edit_new): New convenience function to create
-	a properly-configured date editor widget.
-
-1999-02-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_week_view_time_format_changed): New function to notify the
-	week view that the time format has changed.
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_day_panel_time_format_changed): New function to notify the
-	day panel that the time format has changed.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day
-	and week views that the time format has changed.
-
-1999-02-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_init): Set the title of the event
-	editor window.
-
-1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the
-	clipping rectangle here.
-
-	* view-utils.c (view_utils_draw_events): Remove the clipping
-	rectangle here, since the user of this function should not know
-	about it.
-
-1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Improve this draw
-	routine.  Now it can split the text in lines and fit as many
-	events as possible.
-	(nicetime): Return strings without spaces at the beginning.
-
-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear
-	operation here.
-
-1999-01-29 Jason Tackaberry <tack@dok.org>
-
-	* gncal-full-day.c (child_popup_menu): if the user clicks on an
-        event that is an occurance, the menu will allow the user to delete
-        all occurances of this event, or just the selected occurance.
-        (delete_occurance): added.
-
-        * eventedit.c (append_exception): force the clist to select the
-        new exception.  (fixes segfault)
-        (delete_exception): if the last exception in the clist is deleted,
-        move the selection index up. (fixes segfault)
-
-1999-01-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at
-	startup. Only works with GNOME window managers though :-(
-
-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.
-
-	(calendar_init_alarms): Schedule an alarm for midnight to change
-	the calendar_day_begin/calendar_day_end.
-
-	* alarm.c (alarm_ready): If we reschedule, there is no need to
-	activate any pending alarms.
-
-1999-01-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_new): Insert the summary text here.
-	(child_focus_in): No need to raise the window, since we have
-	Spiffo(tm) layout code.  Boy, this is old code.
-	(gncal_full_day_focus_child): Now that GtkText works better, we
-	can avoid synthesizing a click which was causing grief, anyway.
-	(child_button_press): Grab the focus before popping up the menu.
-
-	* layout.c (find_index): Added a sanity check.
-
-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child
-	before unparenting/destroying it.
-	(child_unrealize): Unrealize the widget.  What was I thinking?
-	(child_new): Save the focus_out_event signal connection id in
-	Child structure (in a new field).
-	(child_destroy): Disconnect from the focus_out_event signal, since
-	we don't want to get such an event when the widget is destroyed.
-	(gncal_full_day_destroy): Destroy the children properly; it was
-	leaking memory.
-
-1999-01-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_calendar_cmd): Warn if the calendar file has
-	changed.
-
-	* calendar.c (calendar_load, calendar_save): Keep track of the
-	modification time for the calendar file.
-
-1999-01-20  Nat Friedman  <nat@nat.org>
-
-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable
- 	characters such that hotkeys work.
-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.
-
-	* prop.c (properties): Connect gnome_help_pbox_display to the
- 	GnomePropertyBox help button.
-
-1999-01-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here
-	(it was being grabbed incorrectly, anyways).
-	(quick_view_map_event): Grab the mouse when the window is mapped.
-	This avoids the ugly "while (xGrabPointer () != Success)" hack.
-	(quick_view_button_release): Handle button releases here.
-
-1999-01-19  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: do gtk_widget_realize on the toplevel window..
-
-1999-01-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the little
-	calendar start up with the correct date.
-
-	* gncal-week-view.c (gncal_week_view_set): Add the month to the
-	date range display label.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c: Converted some more stuff to use the standards.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c (setup_appbar): New function to create the status bar.
-	(setup_menu): Install menu hints.
-
-	Menu items updated to match the standards.  New Settings menu
- 	created.
-
-1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
-
-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
-	  gncal/quick-view.c:
-	s/g_copy_strings/g_strconcat/
-
-1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	Rewrote the old and broken alarm system.  It never actually
-	worked properly.  Now it works properly, and I figured a nice way
-	to get the Audio alarm do something nicer (it is now like an alarm
-	clock :-).
-
-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to
-	actually distinguish which alarm was triggered.
-
-	* alarm.c (alarm_ready): The code was only activating the first
-	alarm.  Reschedule the timer upon delivery of an alarm.
-
-1998-12-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Use the allocation size instead of
-	the old fields in the canvas structure.
-
-	* goto.c (create_days): Use gtk_widget_set_usize() instead of
-	gnome_canvas_set_size().
-	* quick-view.c (setup_event_list): Likewise.
-
-1998-12-09  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.
-	* goto.c (goto_dialog): ditto
-	* prop.c (properties): ditto.
-
-1998-11-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.
-
-1998-11-23  Andrew T. Veliath  <andrewtv@usa.net>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Use
-	gtk_scrolled_window_add_with_viewport instead of
-	gtk_container_add (gtk changes).
-
-1998-11-23  Herbert V. Riedel <hvr@hvrlab.ml.org>
-
-	* eventedit.c: use GPOINTER_TO_INT
-
-	* gncal-todo.c: same.
-
-1998-11-22  Matthew Wilson  <msw@redhat.com>
-
-	* main.c: Fixed the popt event parsing callback to have the
-	correct number of arguments.  This stops it from segfaulting.
-
-1998-11-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug
-	where the classification buttons were not being set correctly.
-	(ee_store_general_values_to_ical): Take into account the fact that
-	radio group lists are stored in reverse order of insertion.
-
-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the
-	clist into.
-
-1998-11-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Backup the old file before saving
-	the caledar.
-
-1998-11-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c: Add ctype.h
-
-1998-10-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the
-	beginning of the current time unit (day/month/etc), otherwise it
-	does not work right, for example, you are on the 31st day of a
-	month and the next month is a 30-day one and you jump to the next
-	month.
-
-1998-10-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c: Changed a lot of stuff not to use the layout code
-	-- the month view's days are too small to display layout
-	usefully.  Now they display a little list of the events in each
-	day.  We also have a popup menu for the days in the month view.
-
-	* calendar.c (calendar_get_objects_in_range): Reverse the list so
-	that it is returned in increasing order.
-
-	* eventedit.c (event_editor_new_whole_day): New public function to
-	create an event for the complete span of day_begin to day_end.
-
-	* year-view.c (new_appointment): Use event_editor_new_whole_day().
-
-	* year-view.c (yv_popup_menu): Mark strings for i18n.
-
-1998-10-12  Ji Lee <g@ucsd.edu>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was
-	never being loaded from the spin button.
-
-1998-10-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_update): Create a list of children and
-	lay them out nicely.  Lots of functions added for this purpose.
-	(adjust_segment): Main event segment adjustment routine.
-	(adjust_children): Adjusts all the children in the month view.
-	(child_create_segments): Creates the segments for a particular event.
-	(layout_children): Uses the generic layout engine to organize the children.
-
-1998-10-08  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the
-	edit/delete buttons.
-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the
-	bug report.
-
-	* layout.c: Do some cleanup; now we pass a struct with the layout
-	algorithm's state instead of passing a trillion parameters around.
-
-	* gncal-full-day.c (layout_children): Use the new generic layout
-	engine.
-	(child_compare): Sort keys are start time then end time, not just
-	start time.  This produces somewhat nicer results for the layout
-	algorithm.
-
-	The new layout code uses a partition of the time range occupied by
-	the events, rather than using a fixed time granularity.  This is
-	better since the different parts of the program that use the
-	layout module will have different semantics regarding snapping the
-	event bounds to a fixed "time grid".
-
-1998-10-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* layout.[ch]: New files that abstract the event layout code from
-	gncal-full-day.c into something useful for other parts of the
-	program.  Now all event layout is done here.
-
-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of
-	sources.
-
-1998-10-07  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* main.c (main): Replaced the 'gnome_client_new_default' call with
-	'gnome_master_client'.
-
-1998-10-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* timeutil.c (time_day_begin): Changed name from
-	time_start_of_day() to be consistent with the other begin/end functions.
-	(time_day_end): Likewise.
-
-	* calobj.c (ical_object_get_first_weekday): New public function to
-	get the first toggled day in a weekday mask.  Since we do not
-	support multiple weekdays in a monthly-by-pos rule, we just fetch
-	the first toggled one.
-	(ical_object_generate_events): Added a missing break statement.
-
-	* timeutil.c (time_month_end): Made it consistent with the rest of
-	the time begin/end functions -- now it returns the first second of
-	the *next* month.
-	(time_week_end): Actually implemented this function.  It will be
-	used when the week view is rewritten.
-
-	* calobj.c (time_in_range): Fix off-by-one in the comparison of
-	the time against the end time.
-
-	* gncal-full-day.c (expand_space): Fixed bug where the columns not
-	were being expanded due to a missing "slot + j".
-
-1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_init): Use the font #defines.
-	(month_view_new): Set the colors of the month view upon creation.
-	(mark_current_day): New function to mark the current day in the
-	month view.
-	(month_view_set): Mark the current day.
-	(month_view_colors_changed): Mark the current day and colorify the
-	month item appropriately.
-
-	* month-view.h: Added year and month fields to the MonthView
-	structure.
-
-	* main.c: Renamed the Appointments color property, since it will
-	be used by the month view as well.
-
-	* goto.c (update): Set the current day's font and color.
-
-	* year-view.c (year_view_init): Set the fonts of the month items
-	when creating them.
-
-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.
-
-	* year-view.c (year_view_init): Use the new font #defines.
-
-	* prop.c (prop_apply_colors): Fixed to work with the
-	I-am-paranoid-and-I-need-to-size-my-ints changes to
-	GnomeColorPicker.
-	(color_spec_from_picker): Likewise.
-
-1998-09-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Colorify the month item and prepare it for
-	prelighting here.
-
-	* main.c (color_props):  Changed the default colors to something
-	not dull.
-
-	* year-view.c (compute_min_size): New function to compute the
-	minimum size of the year view properly.
-	(year_view_size_request): Added two new fields to the year view
-	structure that contain the minimum size.  Return this in the
-	size_request method.
-	(year_view_new): Call compute_min_size to save the minimum size
-	for later use.
-	(idle_handler): Make it resize the items correctly.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when
-	necessary.  This is needed becaues we now actually calculate a
-	minimum size for the month item based on the font sizes and paddings.
-	(check_heading_sizes): New function to calculate a minimum size
-	based on the headings' dimensions.
-	(check_day_sizes): New function to calculate a minimum size based
-	on the day number labels' dimensions.
-	(check_sizes): New function that computes a minimum size for the
-	month item.
-	(reshape): Now calls check_sizes() to ensure a minimum size for
-	the month item.
-
-	* year-view.c (mark_current_day): New function to mark the current
-	day in the year view.
-
-	* mark.c: Removed mark_current_day from here.
-
-1998-09-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec
-	and made it conform to the new prelighting mechanism.
-	(fake_mark_days): Set the proper day attributes.
-	(reconfigure_month): Use colorify_month_item().
-	(fake_mark_days): Use mark_month_item_index().
-
-	* mark.c (colorify_month_item): New public function to reset the
-	colors in a month item.
-	(get_attributes): New internal function that creates an array of
-	attributes for the days in a month item.  This is the basis of all
-	the new optimizations to month item marking.
-	(unmark_month_item): Now it uses the attributes array to unmark
-	only the days that need unmarking.
-	(mark_event_in_month): Update the day attributes array.
-	(month_item_prepare_prelight): Changed the definition of the
-	prelight color query function.  Use the new function.
-	(day_event): Do color changes based on the day attributes array.
-	(mark_month_item_index): New public function to mark a single day
-	by index.
-	(mark_event_in_month): Use mark_month_item_index().
-
-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an
-	int, not a GnomeMonthItemChild.
-	(gnome_month_item_child2num): Now returns an int, not a
-	GnomeMonthItemChild.
-	(gnome_month_item_num2day): Now takes an int, not a
-	GnomeMonthItemChild.
-
-	* goto.c (goto_dialog): Create the days before the year spin
-	button, because the year_changed callback expects the month item
-	to be created.  The new semantics of the spin button cause it to
-	emit a value_changed signal on the adjustment upon creation -- is
-	this the behavior we want from it?
-	(goto_dialog): Use gtk_window_set_modal() instead of the
-	deprectaed gnome_dialog_set_modal().
-
-	* quick-view.c (quick_view_new): Make it look not as crappy by
-	putting the title inside the frame.
-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.
-	(create_items_for_event): Query the text width/height from the
-	text item using the new object arguments, so that the size of the
-	popup window can be set properly.
-
-	* year-view.c (do_quick_view_popup): Calculate a nice date string
-	for the popup window.
-
-1998-09-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.[ch]: New file that presents a quick view of the
-	events in a particular day when the mouse is clicked on the year
-	view.  Work in progress.
-
-	* year-view.c (do_quick_view_popup): New function that creates a
-	quick view for the events in a day.
-
-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the
-	list of sources.
-
-1998-09-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Hotkey for File/Exit should be C-q, not C-x.
-
-1998-09-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (do_popup_menu): New function to execute the popup
-	menu in the year view.
-	(day_event): Invoke the popup menu with the context set to days.
-	(new_appointment): New function to create a new appointment from
-	the year view.
-	(do_jump): New function to do the appropriate view/date jumping
-	from the popup menu.
-
-	* main.c: Fixed two icons in the File menu.
-
-1998-09-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Added underlined shortcuts and accelerators to the main menu.
-
-1998-09-16  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal-week-view.c (<gtk/gtklabel.h>): Include.
-	* gncal-week-view.h (<gtk/gtkvbox.h>): Include.
-
-1998-09-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail
-	notification not beint sent until the program was terminated.
-
-1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach ->
-	forall from Gtk changes, bleah.
-
-	* year-view.c (day_event): New function to handle events from
-	days.  Jumps to the day that is clicked.
-
-	* main.c: Use a watch cursor while the previous/today/next
-	functions are doing their job.
-
-	* mark.c (month_item_prepare_prelight): New public utility
-	function to prepare a month item for prelighting.  It will store
-	the proper prelight information and attach the appropriate signals.
-	(mark_current_day): Make the current day bold as well (useful for
-	color-blind people, I guess).
-
-	* prop.c (set_current_day): Reset the date in the sample calendar
-	and mark the current day.
-	(fake_mark_days): Mark fake events in the sample calendar.
-
-	* year-view.c (year_view_set): Use the general prelighting engine.
-
-	* goto.c (day_event): Just process button presses, as prelighting
-	is done behind the scenes now.
-	(update): Use the general prelighting engine.
-
-	* prop.c (create_colors_page): We can now configure the colors of
-	the monthly calendars!  Wheeeeee!  There are still some nits to be
-	fixed, which are listed in the TODO file.
-	(build_color_spec): New function to build color specifications.
-	(parse_color_spec): New function to parse color specifications.
-
-	* mark.c: Modified all functions to use the configured colors.
-	* goto.c: Likewise.
-
-	* main.c (colors_changed): New function that notifies all
-	calendars that colors have changed.
-
-	* gnome-cal.c (gnome_calendar_colors_changed): New function that
-	notifies all the views that the colors have changed.
-
-	* month-view.c (month_view_colors_changed): New function that
-	notifies the month view that colors have changed.
-
-	* year-view.c (year_view_colors_changed): New function that
-	notifies the year view that colors have changed.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	outline and day box colors.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Added
-	outline_color, outline_color_gdk, day_box_color, and
-	day_box_color_gdk arguments to month items.  These are convenient
-	to quickly set the colors of the month item.
-	(gnome_month_item_get_arg): Likewise.
-
-	* main.[ch]: Added a global array of structures for color preferences.
-
-1998-08-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c: Small code cleanup.
-	(day_event): Upon receiving a LeaveNotify event, Reset the day's
-	background to the correct color.
-
-1998-08-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* mark.[ch]: New files with utility functions to mark calendars
-	with their events.
-
-	* mark.c (mark_month_item): New public function to mark a month
-	item with events.
-	(unmark_month_item): New public function to unmark all the days in
-	a month item to their default appearance.
-
-	* year-view.c (year_view_set): Use the new unmark_month_item() and
-	mark_month_item() to mark the months with events.
-
-	* goto.c (update): New function that updates the calendar in the
-	Go-to dialog by marking the days.
-
-	* timeutil.c (time_year_begin): Modified to take a time_t value.
-	(time_year_end): Likewise.
-	(time_month_begin): Actually implemented this function, which was
-	in the header file but not here.
-	(time_days_in_month): New public function that returns the number
-	of days in a month.
-
-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.
-
-	* year-view.c (unmark_days): Use unmark_month_item().
-
-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when
-	destroying the full day view.  The full day's destroy method is
-	unusual in that it destroys the list of child widgets itself, as
-	it does not have a remove method, so it needs to reset the list to
-	NULL.
-
-1998-08-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (build_month): Now does the correct thing
-	when the user wants weeks to start on Monday.  Now all the Monday
-	special casing, as far as day numbering is concerned, is only in
-	this function.
-
-	* year-view.c (mark_days): This function marks the days that have
-	events in them.  It also fixes a memory leak in the old
-	implementation (it was leaking the whole list).
-	(unmark_days): New function used to unmark all the days in the
-	year view.
-	(mark_event): New function that marks all the days that are
-	spanned by a time range.  It also fixes the bug in the old
-	implementation where it could possibly mark days past the ends of
-	the year (if the event crosses year boundaries, for example).
-
-	* timeutil.c (time_year_begin): Take the year parameter since year
-	1, not 1900.
-	(time_year_end): Likewise.
-
-	* year-view.c (year_view_size_allocate): Now changing the size of
-	the calendars is done in the idle loop.
-	(idle_handler): This function actually does the resizing of the items.
-
-	* year-view.h (struct _YearView): Added idle_id and need_resize
-	fields.
-
-1998-08-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Beginning of the new year view.  Sizing and event
-	marking needs to be finished.
-
-	* gnome-cal.c: Updated for year-view.
-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().
-
-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to
-	year-view.[ch].
-
-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the
-	list of source files.
-
-1998-08-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Set the heading color of the month item.
-
-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,
-	instead of goto.xpm.  Also, removed goto.xpm from cvs.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	the heading and day number fonts.  Added fields for heading and
-	day number label colors.
-
-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES
-	should be write-only.  Also, added arguments for heading and day
-	number fonts.  Added arguments for heading and day number colors.
-
-1998-08-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio
-	buttons properly.
-
-	* month-view.c (month_view_time_format_changed): New public
-	function that notifies the month view of a time format change.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): New public
-	function that notifies the calendar of a time format change.
-
-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().
-
-	* month-view.c (month_view_update): New public function to update
-	the month view when an event changes.  This is still unfinished.
-	(month_view_set): New public function to set the month in the
-	month view.
-
-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-
-	* timeutil.c (time_add_week): Implemented the time_add_week()
-	function, which was on the header file.
-	(time_add_month): Added public month-adding routine.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for
-	month view.
-	(gnome_calendar_goto): Likewise, and set the time on the month view.
-
-	* month-view.c (month_view_new): Now it takes the calendar plus
-	the time_t representing the month.
-
-	* gnome-month-item.h: Added documentation on the object arguments
-	for the month item.
-
-	* month-view.c (month_view_init): Added a month/year heading to
-	the month view.
-
-	* TODO: Updated the TODO list a bit.
-
-	* main.c (gnome_cal_file_menu): The preferences menu option should
-	go in the File menu.
-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.
-	(gnome_cal_menu): Renamed the Calendar menu to Edit.
-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".
-
-	* prop.c (hour_activated): Notify the property box that it has changed.
-
-	* main.c: Changed the Properties menu item to Preferences.  These
-	are global application preferences, not a single calendar's
-	properties.
-
-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the
-	configuration file.
-	(properties): Added a check button for weeks starting on Monday.
-	(properties): Beautified the Preferences dialog.
-
-	* month-view.c (month_view_init):
-	* goto.c (create_days): Set the month item to start weeks on
-	Monday if appropriate.
-
-	* main.c (init_calendar): A boolean is not an hour, so don't
-	range_check_hour() on it.
-	(init_calendar): Added a global week_starts_on_monday flag.
-
-	* main.h: Added global week_starts_on_monday flag.
-
-1998-08-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): If mail alarm or
-	program alarm are missing the action, then set an empty default.
-
-1998-08-18  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_day2index): New public
-	function to get the displayed day index of the specified date.
-
-	* gnome-cal.c (gnome_calendar_goto_today): New public function to
-	jump to the current day.
-
-	* goto.c (day_event): Jump to the selected day when the user
-	clicks the mouse, and prelight days as appropriate.
-
-	* timeutil.c (time_from_day): New public function to build a
-	time_t from a year/month/day triplet.
-
-	* gnome-month-item.c (gnome_month_item_num2child):
-	(gnome_month_item_child2num): New public functions to convert an
-	index into a child and vice-versa, respectively.
-	(gnome_month_item_num2day): New public function to convert a child
-	number into a displayed day number.
-
-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)
-
-	* gnome-month-item.c (create_items): Use g_strdup()ed day names
-	from the start.
-
-1998-08-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (gnome_toolbar): Made it use goto.xpm.
-
-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.
-
-1998-08-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually
-	recalculate the days using the month and year.
-
-	* main.c: Added "Go to" button to quickly jump to a specific date.
-
-	* goto.c: New file that defines the quick go-to date dialog.
-
-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.
-
-1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* main.c (new_calendar): Made title i18n friendly. This was bug
-	#215.
-
-	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
-	recur->_enddate, not to itself, when adding recurring event and
-	supplying an end date. This fixes (at least part of) bug #99.
-
-1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.[ch]: Start of the month view widget.  This will use
-	the generic month item and extend it to have the semantics desired
-	for the gnomecal month view.
-
-	* gnome-month-item.[ch]: New generic canvas item for the month
-	view and the "small calendars".  This is intended to be a
-	high-level display engine for monthly calendars.  This is a work
-	in progress.
-
-	* gnome-cal.h (GnomeCalendar): Added a month_view field.
-
-	* gnome-cal.c (setup_widgets): Create the month view and insert it
-	into the notebook.
-
-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to
-	the sources.
-
-1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (about_calendar_cmd): Use an array of const strings to
-	keep gcc happy.
-
-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
-	* calendar.c (calendar_object_compare_by_start): Likewise.
-	* gncal-full-day.c (child_compare_by_start): Likewise.
-
-1998-07-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: Add support for --view flag.
-	(session_save_state): Save the view mode;
-	(new_calendar): Now takes a view mode flag.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): New
-	function for enhancing the session management support for
-	gnomecal.
-	(gnome_calendar_set_view): New function that makes a given page
-	active.
-
-1998-07-01  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* gncal.desktop: Added Portuguese translation.
-
-Mon Jun 22 13:01:16 1998  Havoc Pennington  <hp@pobox.com>
-
-	* main.c (session_save_state): Use gnome_geometry_string to get
-	the geometry string.
-
-1998-06-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from
-	tm->tm_mday for the default_day.
-
-	* gnome-cal.c (gnome_calendar_new):
-	(gnome_calendar_goto): Use the start of the day -- things expect
-	it to be that way.
-
-1998-05-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in
-	ical->recur->interval from value in spin_button. This ixed an
-	infinnite loop.
-
-1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_draw): Paint the decorations correctly.
-	(child_draw_decor): Paint the recurrence/bell icons correctly.
-
-1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Use the contents of
-	ee->ical->dtstart for computing the predefined values of the recurrence.
-
-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc
-	destruction in the unrealization code and fix the pixmap unrefing.
-
-	* main.c (close_cmd): Remove a bad hack that disabled calendar
-	widget destruction.
-
-	* calobj.c (ical_object_generate_events): Fix for the weekly event
-	generation.  Was reported on the bug tracking system.
-
-1998-05-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_children): Implemented ultra-cool
-	layout for the events that share the same time range.  Gals and
-	guys you can now drop Outlook on the recycle bin.
-
-	Which reminds me.  We do not have a recycle bin.  How could that
-	happen in a project as cool as this one?  Someone explain this to
-	me.
-
-1998-05-18  Federico Mena  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.
-
-Sun May 17 17:55:03 1998  Havoc Pennington  <hp@pobox.com>
-
-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.
-
-1998-05-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the
-	range computation in place.
-
-	* gncal-year-view.c (year_view_mark_day): Use the same new version
-	of the range computation here.
-
-	* calobj.c (ical_object_generate_events): Fix the begin/end
-	condition.
-
-1998-05-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not add the spurious
-	padding.
-
-	* calobj.c (store_date_list): Bug fix:  I was using the wrong
-	pointer when saving the exception date list.
-	(set_date_list): Bug fix:  load correctly the complete exception
-	date list.
-	(set_date_list): Use ',' for the exception date separator as the
-	versit people can not get their standard right.
-
-	* gncal-full-day.c (unrecur_appointment): Support for making an
-	existing recurrent event `movable' for a day.
-
-	* calobj.c (ical_object_add_exdate): New routine, used to add
-	exception dates.
-	(ical_object_duplicate): New routine:  used to do the magic
-	recur->no-recur event.
-
-1998-05-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw
-
-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.
-
-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to
-	avoid the ugly warning.
-
-	* main.c (display_objedit): Default to the day the user is looking
-	at.
-
-1998-05-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value
-	changed signal if the value is the same.
-
-1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Only run the apply code once.
-
-1998-05-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (update): Draw the day at startup.
-	(gncal_day_panel_set): Fix selected-day display.
-	(gncal_day_panel_new): Switch day on double clicks, not on single
-	clicks.
-
-	* calobj.c (ical_object_compute_end): Removed debug messages.
-
-1998-04-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using
-	GnomePropertyDialog.
-
-1998-04-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to
-	fill a gtk_calendar with the events on a GnomeCalendar object.
-
-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day
-	we double clicked.
-
-1998-04-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (calendar_notify): Apply black magic to get mail
-	notifications to work.
-
-	* gncal-full-day.c (child_focus_out): Temporary optimization, the
-	child_focus_out is constantly calling the
-	gnome_calendar_object_changed when the property editor has been
-	invoked.  This happens every time the mouse moves crosses the main
-	window.
-
-	* calendar.c (calendar_object_changed): Reschedule alarms when a
-	calendar object has changed its times.
-
-Sat Apr 25 22:20:45 1998  Havoc Pennington  <hp@pobox.com>
-
-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox
-	out of class structure; use GnomeDialog vbox
-	instead. gnome_dialog_set_destroy instead of destroying in button
-	callbacks. Don't create buttons, separator, or vbox manually.
-	#include <libgnomeui/gnome-dialog.h>.
-
-1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;
-	Load snooze time and snooze count
-
-1998-04-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Actually save the to-do entries.
-
-	* gncal-todo.c (simple_todo_editor): Now you can add and edit
-	to-do entries.
-
-1998-04-22  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: Made it use popup_menu().
-
-	* popup-menu.c: New file with utility functions for creating popup
-	menus.  Maybe such a thing would be useful in libgnomeui, a la
-	gnome-app-helper?
-
-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.
-
-1998-04-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (properties): Added Calendar properties editor.
-	(properties): Make the code use a propery box.
-
-	* main.c: Save/load properties (fix to old commit).
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c: New widget for editing TODO lists.  This will be
-	worked on a lot.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.
-
-	* gncal-day-panel.c: Make it use the new TODO widget.
-
-1998-04-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not save with the global
-	time flag (Z at the end of the isodate).  When we figure out a way
-	to load times in GMT time, we will add this back
-
-	* view-utils.c (popup_menu): Moved this routine here as there are
-	more users of this code.
-
-	* gncal-day-view.c (gncal_day_view_class_init): Add button press
-	handler.
-	(new_appointment): New routine for creating appointments on a day.
-
-
-
-	* main.c (save_ok): Added call to gtk_window_set_wmclass.
-
-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime
-	should substract 1900 and gtk_calendar stores years relative to
-	year 0.
-
-	* gncal-week-view.c (gncal_week_view_new): Make the week view
-	descend from VBox so that we can add a label to it.
-	(gncal_week_view_set): Display the ending day of the week
-	correctly.
-
-	Added a label that displays the week range.
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c: Made it use GncalDayPanel.
-
-	* gncal-day-panel.c: New widget for the day view in the main
-	calendar toplevel.  It basically takes care of everything
-	gnome-cal did by hand with respect to the day view.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to
-	the rules.
-
-	* main.c: Added a separator between the About menu item and the
-	help topics.
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.
-
-1998-04-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New
-	public function that returns the y offset for the row
-	corresponding to the "day begin" time.
-
-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable
-	keystroke (not just Return) will activate the selected range.
-
-	* gncal-full-day.c (paint_back): Made it use the new paint_row
-	function instead of painting everything directly.  We calculate
-	areas in a smarter way so there is even less flicker than before,
-	especially when selecting regions.
-
-	* eventedit.c: Sensitize recurrence widgets properly.
-
-	* calobj.c (duration_callback): Pass the correct pointer type to
-	is_date_in_list().
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (duration_callback): Take exception dates into
-	account.
-
-	* gncal-full-day.c (new_appointment): Setup the event editor dates
-	to those of the currently displayed day.
-	(gncal_full_day_selection_range): Use sensible values in the case
-	no range is selected.
-	(new_appointment): Events now use the current day for event creation.
-
-	* view-utils.c: Pretty up the time display.
-
-	* calobj.c (ical_object_compute_end): Initialize
-	ico->recur->enddate, otherwise we loop forever during final date computation.
-
-	* eventedit.c: Now recurrence is toggled by a radio button in the
-	recurrence page, as the checkbox is confusing.
-
-	* calobj.c (is_date_in_list): Add support for the exclussion
-	dates.
-
-1998-04-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-year-view.c (double_click): Fix this routine as well.
-
-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to
-	the week.
-
-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the
-	proper range.  Now the year view actually matches this year.
-
-	* gnome-cal.html: Added small documentation.
-
-	* main.c: Add more icons to the menus;  Rename some menubar
-	entries;  Add `new' icon to the toolbar.
-	(dump_events): Added argument handling and dumping of events from
-	the command line.  Extremely cool.
-
-	* getdate.y: Taken from the CVS source code.  Used for date
-	parsing in the command line.
-
-	Internationalized getdate.y.  Wee!  It even works with spanish.
-
-	* calobj.c (ical_object_to_vobject): Add Quoted printable property
-	to items containing new lines.
-	(duration): Use unsigned integers, to work around buggy calendar
-	files generated by korganizer.
-
-	* main.c (save_calendar_cmd): Do not ask for file name if we are
-	saving.
-	(save_as_calendar_cmd): New command.
-
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm
-	management framework.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calobj.c (ical_new): Added mandatory status property.
-	(ical_object_to_vobject): Only store "related" list if it exists.
-	(store_list): Add terminating null char and free the correct data.
-
-	* main.c (save_calendar_cmd): Implemented calendar saving.
-	(open_calendar_cmd): Implemented calendar loading.
-	(new_calendar_cmd): Implemented calendar creation.
-	(new_calendar): Don't load our test calendar by default.
-
-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.
-
-	* eventedit.c (ee_store_recur_values_to_ical): Free/create
-	ical's recurrence appropriately.
-	(ee_rp_init_rule): Initialize all missing parameters from ical.
-	(ee_rp_init_ending_date): Initialize missing fields from ical.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_remove_object): Add support for
-	removing objects.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_init_recurrence_page): New function that creates
-	the recurrence page in the toplevel notebook.
-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_generate_events): Implement
-	RECUR_MONTHLY_BY_POS implemented.
-	(ical_object_create_from_vobject): Fix the alarm
-	initialization code.
-	(save_alarm): Save alarms.
-	(ical_object_generate_events): Fixed the recurrent code to take
-	into account the recur->endate field (if at all specified).
-
-	(ical_object_to_vobject): Implement recurrence rule saving.
-
-1998-04-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_store_alarm): Use menu_shell->children, not
-	menu->children.  Why does GtkMenu have a children field in the
-	object structure?
-	(check_dates): New function that insures that start_date < end_date.
-	(check_times): In addition to checking whether the event spans the
-	whole day, now it insures that start_time < end_time.
-
-	* gncal-full-day.c (child_set_size): Now children get bigger
-	temporarily while they are focused.  This allows the handles not
-	to "overlap" the rows used by the child and thus allow editing of
-	very thin events.
-	(recompute_motion): Fix for new child coordinates.
-	(gncal_full_day_expose): Make it use find_child_by_window()
-	instead of looking for it by hand.
-
-	* bell.xpm recur.xpm: XPM files for events with alarm and
-	recurrence, respectively.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.
-
-	* gncal-full-day.c (child_draw): Now children have a vertical
-	handle as well.  This can be used to move the child anytime, not
-	only when it is focused.
-	(recompute_motion): Modified for new drag behavior.
-
-	* eventedit.c (ee_init_general_page): The general_owner may be
-	null.  Do the proper thing when creating the label.
-	(ee_ok): Update the gnome calendar appropriately.
-
-	* timeutil.h:
-	* gncal-year-view.h: Add some missing prototypes.
-
-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu
-	items according to whether the ical object is being edited or not.
-
-	* eventedit.c (event_editor_new): Set the "being edited" flag on
-	the ical object (stored as the ical object's user data).
-	(event_editor_destroy): Release the flag.
-
-	* calobj.h: The iCalObject structure now has a generic user_data pointer.
-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):
-	Functions to set this data.
-
-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.
-
-	* main.c (about_calendar_cmd): Fixed my address and added Arturo
-	to the authors in the about box.
-
-	* gncal-full-day.c (find_child_by_window): Compare child's widget
-	windows by user_data (which will be the parent widget, that is,
-	the text widget).  We cannot assume that child->widget->window
-	will be *the* window we are interested on because there may be
-	child widgets with multiple windows.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_foreach): Define iterator routine.
-
-1998-04-15  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: Now using time_t for new and set.
-	  Random fixes, as well.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_3): New popup menus activated with
-	mouse button 3.
-	(create_appointment): Create a new appointment from the popup
-	menus.  See the FIXME.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows
-	array properly.
-
-	* gncal-year-view.c (gncal_year_view_new): Add missing year in
-	call to strftime.
-
-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks
-	from the return values of versit's fakeCString.
-
-1998-04-14  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: New widget for the year view.
-	* Makefile.am: added required compilation of the new files.
-
-1998-04-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_setup_time_frame): Fixed some table
-	expansions to make the dialog look nicer when resized.
-
-	* calobj.c (ignore_space): Fixed compiler warning about unused
-	computed value.
-	(ocurrencelist): Replace str by p confusion.  Removed unused
-	variables value and q.
-	(daynumber): Fixed a couple of warnings about unused values.
-	(load_recurrence): Removed unused variable c.  Added a default
-	clause to the switch(type).
-
-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.
-	Fixed a compiler warning by adding a missing cast.
-
-	* calobj.c (ical_object_create_from_vobject): Make the
-	load_recurrence() part work correctly.  Eliminated use of
-	syntax_error variable.
-
-1998-04-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_key_press): Unfocus the child and focus
-	the parent fullday widget when the user presses Esc.
-
-	* gncal-week-view.c (gncal_week_view_update): Now takes object and
-	flags parameters.
-	* gncal-day-view.c (gncal_day_view_update): Likewise.
-	* gncal-full-day.c (gncal_full_day_update): Likewise.
-	(child_focus_in): New function.  In conjunction with
-	child_focus_out(), these only display the handles in the child
-	when it is focused.  The result is that the user can see more of
-	the child's text when nothing is focused, and we can also display
-	fatter and nicer drag handles.
-
-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an
-	additional flags parameter
-	(gnome_calendar_update_all): Made function static.  Now takes
-	changed object and flags parameters as well.
-	(gnome_calendar_object_changed): Now takes additional flags
-	parameter to indicate what changed in the specified object.
-
-	* calobj.h (CalObjectChange): New enum with flags to describe what
-	has been changed in an object.
-
-	* gncal-full-day.h:
-	* gncal-full-day.c (gncal_full_day_focus_child): New function to
-	let the outside world decide which child to focus.
-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a
-	click because GtkText will not set the cursor when you focus it.
-
-	* gnome-cal.c (day_view_range_activated): Focus the new child in
-	the full day widget.
-
-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some
-	widgets to make it look prettier.
-	(ee_alarm_widgets): Likewise.
-	(ee_init_general_page): Likewise.
-	(ee_classification_widgets): Likewise.
-	(event_editor_init_widgets): Likewise.
-
-	* gnome-cal.c (day_view_range_activated): Create new object and
-	add it to the calendar.  You can now select a range in the
-	full-day view, hit Return, and a new event will be added at the
-	selected range.  I still have to figure out how to focus this new child.
-
-	* gncal-full-day.c (paint_back): Rewrote function to avoid
-	painting an area more than once -- eliminate flicker.
-	(paint_back_rows): New function that calls paint_back() only for
-	the area of the specified rows.
-	(gncal_full_day_button_press):
-	(gncal_full_day_button_release):
-	(gncal_full_day_motion): Made these functions use
-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!
-
-1998-04-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (setup_day_view): We now connect to the
-	range_activated signal of the fullday widget instead of catching
-	key presses ourselves.
-	(day_view_range_activated): New function that creates a new
-	iCalObject and inserts it into the calendar, not finished yet.
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (get_time_from_rows): New function, calculates
-	a pair of time_t values from the specified start and number of rows.
-
-	* gncal-full-day.h (GncalFullDayClass): New signal
-	"range_activated".  It is emitted when a range is selected and the
-	user hits Return.
-	(gncal_full_day_selection_range): New function, returns the
-	selected range.
-
-	* gncal-full-day.c (struct drag_info): Moved selection information
-	to their own fields instead of sharing the child's drag fields.
-	This allows us to keep the selection when a child is moved.
-	(recompute_motion): Made the case when (row < di->sel_click_row)
-	work correctly.
-
-1998-04-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating
-	on the day view.
-
-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):
-	New time manipulation functions.
-
-	* eventedit.c (ee_rp_init_frequency): Add the different frequency
-	editors to a notebook.  Make the notebook startup on the entry
-	selected recurrence type;
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (recompute_motion): Now we support selecting a
-	range in the main window (by clicking+dragging).  It flickers
-	horribly and is not perfect, but it is a start.
-
-1998-04-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: #include <string.h>
-
-	* gncal-full-day.c (child_map): Show instead of just map the child
-	widget (otherwise the text widget gets confused and will not focus).
-
-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".
-
-	* calobj.h: Added prototype for ical_object_to_vobject().
-
-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This
-	should be called when a calendar object is changed.
-
-	* gncal-full-day.c (update_from_drag_info): Call
-	gnome_calendar_object_changed() instead of updating manually.
-
-	* calendar.c (calendar_add_object):
-	(calendar_remove_object): Set the modified flag to true.
-
-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing
-	this function.
-
-1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.
-
-1998-04-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c: Removed unused global variable parent_class.
-
-	* eventedit.h: Renamed gtk_window field to window.
-	Made the parent_class field in the EventEditorClass structure be a
-	GtkWindowClass, not a gnome property box class.
-	Added prototype for event_editor_get_type().
-
-1998-04-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Use the new
-	gtk_table_set_homogeneous() instead of setting the variable directly.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_create_ae): Make it return void.
-	(ee_alarm_widgets): Remove some unused variables.
-	(ee_store_alarm): Make it return void.
-	#include <string.h>
-
-	* eventedit.h: #include "gnome-cal.h"
-
-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.
-
-	* calendar.h: Add prototype for calendar_load().
-
-	* timeutil.h: Add prototypes for time_add_*().
-
-	* calendar.c:
-	* calobj.c:
-	* eventedit.c:
-	* gnome-cal.c: #include "timeutil.h"
-
-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
-	width equal or larger to the title width.
-
-	* main.c: #include "eventedit.h"
-	(main): Add a return statement.
-	(new_calendar): Show stuff *after* the calendar has been loaded.
-
-	* gnome-cal.c (gnome_calendar_load): Update the day view.
-	(setup_widgets): Hackish setup of a day view widget - will fix later.
-	(gnome_calendar_init): Initialize all fields.
-
-	* gnome-cal.h: Added day_view field.  Maybe this should be changed
-	when the a complete day view panel is complete.
-
-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not
-	before.
-
-1998-04-06  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* versit/.cvsignore: New file.
-
-Fri Apr  3 22:31:54 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* calendar.c: Include <config.h>.
-
-1998-04-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (time_add_year, time_add_year, time_add_week):
-	Routines for time manipulation.
-
-	* calobj.c (ical_object_destroy): Full destruction of the object.
-
-	* eventedit.c: Finished the main event editor form;  It still
-	lacks the details and the recurrence bits.  It now adds events
-	and cancels.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): The "better" format
-	string for strftime() wasn't better, after all :-(
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: New full-day widget.  It is still a work in
-	progress.  It will be similar to M$ Schedule's nifty full day view
-	widget, but with Gtk's elegance :-)
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c: Object editor widget.  We dropped ObjEdit.
-
-	* timeutil.c (time_from_isodate): Fix.
-
-	* view-utils.c (view_utils_draw_events): Changed the display
-	formats.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Use better format
-	specifier for strftime().
-	(view_utils_draw_textured_frame): Ultra-nifty function to draw
-	textured "metal" frames, like Netscape's handles.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_update): Day events are now
-	cached inside the widget.  They get initialized at this time.
-
-	* view-utils.c (view_utils_draw_events): Use the list of events.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization
-	function.  We can't decide on a stupid border type :-)
-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default
-	shadow type.  Looks good.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: New main program that uses our new datatypes and
-	objects.
-
-	* calendar.c (calendar_load_from_vobject, calendar_load):
-	Implement loading of vCalendar objects and vCalendar files.
-
-	* calobj.c (ical_object_create_from_vobject): Implement loading of
-	vCalendar event and todo objects.
-
-	* timeutil.c (isodate_from_time_t): New function.
-
-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
-	from GnomeApp.  It holds all of the day views and arbitrates the
-	display.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.[ch]: New week view composite widget.  This
-	provides a full week view (7 day views plus busy time display --
-	the latter is currently unimplemented).
-
-1998-04-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c: New day view widget.  It is intended to be a
-	child widget of the week view composite widget.
-
-	* calendar.c (calendar_get_objects_in_range):
-	(calendar_get_events_in_range):
-	(calendar_get_journal_in_range):
-	(calendar_get_journal_in_range): These functions now take a
-	sort_func parameter, which is of type GCompareFunc.  If the
-	specified value is non-NULL, it will return a sorted list.
-	Otherwise, it will return an unordered list.
-	(calendar_compare_by_dtstart): Provide a generic sorting routine
-	for calendar objects.
-
-1998-04-01 Miguel de Icaza <miguel@kernel.org>
-
-	* Start from scratch
-
-Tue Mar 31 23:46:50 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* timeutil.c (format_simple_hour): `buf' now static.
-
-1998-03-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes
-	from libgnomeui.
-
-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.
-
-	* timeutil.c (format_simple_hour): New function, formats an
-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",
-	"19h", etc.  It is used by the day view widget for its labels.
-
-1998-03-31 Craig Small <csmall@small.dropbear.id.au>
-
-	* Now has (non working) session maangement
-	* Uses a clist for the dailylist like gtt
-
-Sat Mar 21 15:43:20 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.
-
-1998-03-12  Craig Small <csmall@small.dropbear.id.au>
-
-	* Now linked (in some horrible way) to the gtkcalendar widget.
-
-Sun Mar  8 16:38:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.
-	(gncal_LDADD): Don't include libsupport.a.
-
-	* gncal.c (main): Use new gnome_init.
-
-1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c (main): Added app_id "gncal".
-
-1998-02-19  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'
-
-1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.
-
-	* calcs.c (month_atoi): Replace buggy explicit loop string compare
-	with strcasecmp.
-	(day_atoi): Likewise.
-
-Sun Jan 25 23:38:30 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* menus.c: Replace "Quit" with "Exit".
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
deleted file mode 100644
index e17d581184..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
diff --git a/calendar/TODO b/calendar/TODO
deleted file mode 100644
index 4a5dd6c6ff..0000000000
--- a/calendar/TODO
+++ /dev/null
@@ -1,88 +0,0 @@
-Cal-util:
-
-- calobj.h depends on libversit/vcc.h, because it uses a VObject for
-  ical_object_create_from_vobject().  This should be an internal
-  function in the PCS and nothing else (we do not install libversit,
-  so our public libraries should not depend on it).
-
-- Or maybe we *should* install libversit, since the addressbook code
-  uses it as well.
-
-- timeutil has a lot of crap and some namespace pollution.  Clean it
-  up.
-
-PCS:
-
-- When loading a calendar, substitute duplicated UIDs by new ones, and
-  possibly print out a warning message.
-
------ Old Gnomecal TODO starts here -----
-
-Pilot:
-
-* Better support for untimed events (we have none now).
-
-* Hash objects based on their UIDs.
-
-* Add placeholders for deleted events, so that we can kill those
-  when syncing to the pilot.
-
-BUGS:
-
-- Recurrence end date is wrong.  An event that repeats daily will not
-  be included in the ending date of the recurrence (off-by-one
-  error?).
-
-- X-fields (extensions) are stripped from a vCal file when it is
-  saved.  They should be preserved.
-
-Features:
-
-- Add a calendar-week so that people know which week of the year it is
-
-Year view:
-
-- See why it is so fucking slow when opening its notebook page for the
-  first time.
-
-Month view:
-
-- Popup menu like in the year view.
-
-- Double click on a day takes you to the day view.
-
-- DnD of appointments to move them around.
-
-Week view:
-
-- Nice display as in the Palm Pilot.
-
-Day view:
-
-- Rewrite in terms of the canvas and make it pretty.
-
-Preferences:
-
-- BUG: 12/24 hours stuff is not consistent - I remember that on editing
-  new appointment you get the time-selectors always on 12-hr format
-
-Event editor dialog:
-
-- Make it figure out whether the alarm is in
-  minutes/hours/days/etc. (via a cascade of conditions) and set the
-  widgets appropriately.
-
-Gnome date selection widget:
-
-- Make the displayed date be localized properly -- use strftime().
-
-General:
-
-- Write online help.  Nice help.  Lots of help.
-
-- If you leave the calendar running overnight, the "current day"
-  marker in the GnomeMonthItems does not get updated.
-
-- Add categories support.  Color-coded categories.
-
-- Untimed events
diff --git a/calendar/cal-client/.cvsignore b/calendar/cal-client/.cvsignore
deleted file mode 100644
index e74f322903..0000000000
--- a/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile.in
-.deps
-.libs
-.pure
-Makefile
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-calendar-common.lo
-evolution-calendar-skels.lo
-evolution-calendar-stubs.lo
-cal-client.lo
-cal-listener.lo
-libcal-client.la
-client-test
-libcal-client-static.la
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
deleted file mode 100644
index dd5f3e60d2..0000000000
--- a/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# libcal-client
-#
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"cal-client\"			\
-	-I$(top_srcdir)/calendar			\
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libcal-client.la
-
-libcal_clientincludedir = $(includedir)/evolution/cal-client
-
-libcal_client_la_SOURCES =	\
-	$(CORBA_GENERATED)	\
-	cal-client.c		\
-	cal-listener.c		\
-	cal-listener.h
-
-libcal_clientinclude_HEADERS =	\
-	cal-client.h
-
-
-#
-# make a static library for use by calendar conduit's shared library
-#
-noinst_LTLIBRARIES = libcal-client-static.la
-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
-libcal_client_static_la_LDFLAGS = --all-static
-
-
-#
-# client-test program
-#
-
-noinst_PROGRAMS = client-test
-
-client_test_SOURCES =	\
-	client-test.c
-
-client_test_INCLUDES =			\
-	$(INCLUDES)			\
-	-DG_LOG_DOMAIN=\"client-test\"
-
-client_test_LDADD =						\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	-lunicode						\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a		\
-	libcal-client.la
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
deleted file mode 100644
index 3e7daf80c4..0000000000
--- a/calendar/cal-client/cal-client.c
+++ /dev/null
@@ -1,1408 +0,0 @@
-
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-
-#include "cal-client.h"
-#include "cal-listener.h"
-
-
-
-/* Loading state for the calendar client */
-typedef enum {
-	LOAD_STATE_NOT_LOADED,
-	LOAD_STATE_LOADING,
-	LOAD_STATE_LOADED
-} LoadState;
-
-/* Private part of the CalClient structure */
-struct _CalClientPrivate {
-	/* Load state to avoid multiple loads */
-	LoadState load_state;
-
-	/* The calendar factory we are contacting */
-	Evolution_Calendar_CalFactory factory;
-
-	/* Our calendar listener */
-	CalListener *listener;
-
-	/* The calendar client interface object we are contacting */
-	Evolution_Calendar_Cal cal;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_LOADED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_client_class_init (CalClientClass *class);
-static void cal_client_init (CalClient *client);
-static void cal_client_destroy (GtkObject *object);
-
-static guint cal_client_signals[LAST_SIGNAL];
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_client_get_type:
- * @void:
- *
- * Registers the #CalClient class if necessary, and returns the type ID assigned
- * to it.
- *
- * Return value: The type ID of the #CalClient class.
- **/
-GtkType
-cal_client_get_type (void)
-{
-	static GtkType cal_client_type = 0;
-
-	if (!cal_client_type) {
-		static const GtkTypeInfo cal_client_info = {
-			"CalClient",
-			sizeof (CalClient),
-			sizeof (CalClientClass),
-			(GtkClassInitFunc) cal_client_class_init,
-			(GtkObjectInitFunc) cal_client_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_client_info);
-	}
-
-	return cal_client_type;
-}
-
-/* Class initialization function for the calendar client */
-static void
-cal_client_class_init (CalClientClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	cal_client_signals[CAL_LOADED] =
-		gtk_signal_new ("cal_loaded",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, cal_loaded),
-				gtk_marshal_NONE__ENUM,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_ENUM);
-	cal_client_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_updated),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	cal_client_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_removed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_client_destroy;
-}
-
-/* Object initialization function for the calendar client */
-static void
-cal_client_init (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = g_new0 (CalClientPrivate, 1);
-	client->priv = priv;
-
-	priv->factory = CORBA_OBJECT_NIL;
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-}
-
-/* Gets rid of the factory that a client knows about */
-static void
-destroy_factory (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_factory(): could not see if the factory was nil");
-		priv->factory = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_factory(): could not release the factory");
-
-	CORBA_exception_free (&ev);
-	priv->factory = CORBA_OBJECT_NIL;
-}
-
-/* Gets rid of the listener that a client knows about */
-static void
-destroy_listener (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = client->priv;
-
-	if (!priv->listener)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-}
-
-/* Gets rid of the calendar client interface object that a client knows about */
-static void
-destroy_cal (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_cal(): could not see if the "
-			   "calendar client interface object was nil");
-		priv->cal = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_unref (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not unref the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not release the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-	priv->cal = CORBA_OBJECT_NIL;
-
-}
-
-/* Destroy handler for the calendar client */
-static void
-cal_client_destroy (GtkObject *object)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (object));
-
-	client = CAL_CLIENT (object);
-	priv = client->priv;
-
-	destroy_factory (client);
-	destroy_listener (client);
-	destroy_cal (client);
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	g_free (priv);
-	client->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Signal handlers for the listener's signals */
-
-/* Handle the cal_loaded signal from the listener */
-static void
-cal_loaded_cb (CalListener *listener,
-	       Evolution_Calendar_Listener_LoadStatus status,
-	       Evolution_Calendar_Cal cal,
-	       gpointer data)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_Cal cal_copy;
-	CalClientLoadStatus client_status;
-
-	client = CAL_CLIENT (data);
-	priv = client->priv;
-
-	g_assert (priv->load_state == LOAD_STATE_LOADING);
-
-	client_status = CAL_CLIENT_LOAD_ERROR;
-
-	switch (status) {
-	case Evolution_Calendar_Listener_SUCCESS:
-		CORBA_exception_init (&ev);
-		cal_copy = CORBA_Object_duplicate (cal, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_message ("cal_loaded(): could not duplicate the calendar client interface");
-			CORBA_exception_free (&ev);
-			goto error;
-		}
-		CORBA_exception_free (&ev);
-
-		priv->cal = cal_copy;
-		priv->load_state = LOAD_STATE_LOADED;
-
-		client_status = CAL_CLIENT_LOAD_SUCCESS;
-		goto out;
-
-	case Evolution_Calendar_Listener_ERROR:
-		client_status = CAL_CLIENT_LOAD_ERROR;
-		goto error;
-
-	case Evolution_Calendar_Listener_IN_USE:
-		client_status = CAL_CLIENT_LOAD_IN_USE;
-		goto error;
-
-	case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
-		client_status = CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED;
-		goto error;
-
-	default:
-		g_assert_not_reached ();
-	}
-
- error:
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
- out:
-
-	g_assert (priv->load_state != LOAD_STATE_LOADING);
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_LOADED],
-			 client_status);
-}
-
-/* Handle the obj_updated signal from the listener */
-static void
-obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_UPDATED], uid);
-}
-
-/* Handle the obj_removed signal from the listener */
-static void
-obj_removed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_REMOVED], uid);
-}
-
-
-
-/**
- * cal_client_construct:
- * @client: A calendar client.
- *
- * Constructs a calendar client object by contacting the calendar factory of the
- * calendar server.
- *
- * Return value: The same object as the @client argument, or NULL if the
- * calendar factory could not be contacted.
- **/
-CalClient *
-cal_client_construct (CalClient *client)
-{
-	CalClientPrivate *priv;
-	Evolution_Calendar_CalFactory factory, factory_copy;
-	CORBA_Environment ev;
-	int result;
-
-	CORBA_exception_init (&ev);
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-
-	factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (
-		"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
-		OAF_FLAG_NO_LOCAL, NULL, &ev);
-
-	result = CORBA_Object_is_nil (factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not see if the factory is NIL");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result) {
-		g_message ("cal_client_construct(): could not contact Wombat, "
-			   "the personal calendar server");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-	factory_copy = CORBA_Object_duplicate (factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not duplicate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	priv->factory = factory_copy;
-	return client;
-}
-
-/**
- * cal_client_new:
- *
- * Creates a new calendar client.  It should be initialized by calling
- * cal_client_load_calendar() or cal_client_create_calendar().
- *
- * Return value: A newly-created calendar client, or NULL if the client could
- * not be constructed because it could not contact the calendar server.
- **/
-CalClient *
-cal_client_new (void)
-{
-	CalClient *client;
-
-	client = gtk_type_new (CAL_CLIENT_TYPE);
-
-	if (!cal_client_construct (client)) {
-		g_message ("cal_client_new(): could not construct the calendar client");
-		gtk_object_unref (GTK_OBJECT (client));
-		return NULL;
-	}
-
-	return client;
-}
-
-/* Issues a load or create request */
-static gboolean
-load_or_create (CalClient *client, const char *str_uri, gboolean load)
-{
-	CalClientPrivate *priv;
-	Evolution_Calendar_Listener corba_listener;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE);
-
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv->listener = cal_listener_new ();
-	if (!priv->listener) {
-		g_message ("load_or_create(): could not create the listener");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded_cb),
-			    client);
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb),
-			    client);
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb),
-			    client);
-
-	corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
-		BONOBO_OBJECT (priv->listener));
-
-	CORBA_exception_init (&ev);
-
-	priv->load_state = LOAD_STATE_LOADING;
-
-	if (load)
-		Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
-	else
-		Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("load_or_create(): load/create request failed");
-		bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-		priv->listener = NULL;
-		priv->load_state = LOAD_STATE_NOT_LOADED;
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/**
- * cal_client_load_calendar:
- * @client: A calendar client.
- * @str_uri: URI of calendar to load.
- *
- * Makes a calendar client initiate a request to load a calendar.  The calendar
- * client will emit the "cal_loaded" signal when the response from the server is
- * received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the load request.
- **/
-gboolean
-cal_client_load_calendar (CalClient *client, const char *str_uri)
-{
-	return load_or_create (client, str_uri, TRUE);
-}
-
-/**
- * cal_client_create_calendar:
- * @client: A calendar client.
- * @str_uri: URI that will contain the calendar data.
- *
- * Makes a calendar client initiate a request to create a new calendar.  The
- * calendar client will emit the "cal_loaded" signal when the response from the
- * server is received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the create request.
- **/
-gboolean
-cal_client_create_calendar (CalClient *client, const char *str_uri)
-{
-	return load_or_create (client, str_uri, FALSE);
-}
-
-/**
- * cal_client_is_loaded:
- * @client: A calendar client.
- * 
- * Queries whether a calendar client has been loaded successfully.
- * 
- * Return value: TRUE if the client has been loaded, FALSE if it has not or if
- * the loading process is not finished yet.
- **/
-gboolean
-cal_client_is_loaded (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	return (priv->load_state == LOAD_STATE_LOADED);
-}
-
-/* Converts our representation of a calendar component type into its CORBA representation */
-static Evolution_Calendar_CalObjType
-corba_obj_type (CalObjType type)
-{
-	return (((type & CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)
-		| ((type & CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)
-		| ((type & CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0));
-}
-
-/**
- * cal_client_get_n_objects:
- * @client: A calendar client.
- * @type: Type of objects that will be counted.
- * 
- * Counts the number of calendar components of the specified @type.  This can be
- * used to count how many events, to-dos, or journals there are, for example.
- * 
- * Return value: Number of components.
- **/
-int
-cal_client_get_n_objects (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int n;
-	int t;
-
-	g_return_val_if_fail (client != NULL, -1);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, -1);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-	n = Evolution_Calendar_Cal_get_n_objects (priv->cal, t, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_n_objects(): could not get the number of objects");
-		CORBA_exception_free (&ev);
-		return -1;
-	}
-
-	CORBA_exception_free (&ev);
-	return n;
-}
-
-/**
- * cal_client_get_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @comp: Return value for the calendar component object.
- *
- * Queries a calendar for a calendar component object based on its unique
- * identifier.
- *
- * Return value: Result code based on the status of the operation.
- **/
-CalClientGetStatus
-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObj calobj_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, CAL_CLIENT_GET_NOT_FOUND);
-
-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	retval = CAL_CLIENT_GET_NOT_FOUND;
-	*comp = NULL;
-
-	CORBA_exception_init (&ev);
-	calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_object(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (calobj_str);
-	CORBA_free (calobj_str);
-
-	if (!icalcomp) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	*comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (*comp));
-		*comp = NULL;
-
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	retval = CAL_CLIENT_GET_SUCCESS;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/* Builds an UID list out of a CORBA UID sequence */
-static GList *
-build_uid_list (Evolution_Calendar_CalObjUIDSeq *seq)
-{
-	GList *uids;
-	int i;
-
-	uids = NULL;
-
-	for (i = 0; i < seq->_length; i++)
-		uids = g_list_prepend (uids, g_strdup (seq->_buffer[i]));
-
-	return uids;
-}
-
-/**
- * cal_client_get_uids:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- *
- * Queries a calendar for a list of unique identifiers corresponding to calendar
- * objects whose type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.
- **/
-GList *
-cal_client_get_uids (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-	GList *uids;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_uids (priv->cal, t, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_uids(): could not get the list of UIDs");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Builds a GList of CalObjChange structures from the CORBA sequence */
-static GList *
-build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjChange *corba_coc;
-		CalObjChange *coc;
-
-		corba_coc = &seq->_buffer[i];
-		coc = g_new (CalObjChange, 1);
-
-		coc->uid = g_strdup (corba_coc->uid);
-		coc->type = corba_coc->type;
-
-		list = g_list_prepend (list, coc);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-
-/**
- * cal_client_get_changed_uids:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- *
- * Queries a calendar for a list of unique identifiers corresponding to calendar
- * objects whose type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.
- **/
-GList *
-cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-	int t;
-	GList *changes;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	t = corba_obj_type (type);
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_changed_uids (priv->cal, t, since, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_changed_uids(): could not get the list of changes");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	changes = build_change_list (seq);
-	CORBA_free (seq);
-
-	return changes;
-}
-
-/* FIXME: Not used? */
-#if 0
-/* Builds a GList of CalObjInstance structures from the CORBA sequence */
-static GList *
-build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjInstance *corba_icoi;
-		CalObjInstance *icoi;
-
-		corba_icoi = &seq->_buffer[i];
-		icoi = g_new (CalObjInstance, 1);
-
-		icoi->uid = g_strdup (corba_icoi->uid);
-		icoi->start = corba_icoi->start;
-		icoi->end = corba_icoi->end;
-
-		list = g_list_prepend (list, icoi);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-#endif
-
-/**
- * cal_client_get_objects_in_range:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the objects that occur or recur in the specified range
- * of time.
- *
- * Return value: A list of UID strings.  This should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-	int t;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	t = corba_obj_type (type);
-
-	seq = Evolution_Calendar_Cal_get_objects_in_range (priv->cal, t, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_objects_in_range(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Callback used when an object is updated and we must update the copy we have */
-static void
-generate_instances_obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *comp_uid;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		/* OK, so we don't care about new objects that may indeed be in
-		 * the requested time range.  We only care about the ones that
-		 * were returned by the first query to
-		 * cal_client_get_objects_in_range().
-		 */
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	status = cal_client_get_object (client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* The hash key comes from the component's internal data */
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* No longer in the server, too bad */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting "
-			   "object `%s'; ignoring...", uid);
-		break;
-		
-	}
-}
-
-/* Callback used when an object is removed and we must delete the copy we have */
-static void
-generate_instances_obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Adds a component to the list; called from g_hash_table_foreach() */
-static void
-add_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-	GList **list;
-
-	comp = CAL_COMPONENT (value);
-	list = data;
-
-	*list = g_list_prepend (*list, comp);
-}
-
-/* Gets a list of components that recur within the specified range of time.  It
- * ensures that the resulting list of CalComponent objects contains only objects
- * that are actually in the server at the time the initial
- * cal_client_get_objects_in_range() query ends.
- */
-static GList *
-get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	GList *uids;
-	GHashTable *uid_comp_hash;
-	GList *objects;
-	guint obj_updated_id;
-	guint obj_removed_id;
-	GList *l;
-
-	uids = cal_client_get_objects_in_range (client, type, start, end);
-
-	uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* While we are getting the actual object data, keep track of changes */
-
-	obj_updated_id = gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_updated_cb),
-					     uid_comp_hash);
-
-	obj_removed_id = gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_removed_cb),
-					     uid_comp_hash);
-
-	/* Get the objects */
-
-	for (l = uids; l; l = l->next) {
-		CalComponent *comp;
-		CalClientGetStatus status;
-		char *uid;
-		const char *comp_uid;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			/* The hash key comes from the component's internal data
-			 * instead of the duped UID from the list of UIDS.
-			 */
-			cal_component_get_uid (comp, &comp_uid);
-			g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Object disappeared from the server, so don't log it */
-			break;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("get_objects_atomically(): Syntax error when getting "
-				   "object `%s'; ignoring...", uid);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	/* Now our state is consistent with the server, so disconnect from the
-	 * notification signals and generate the final list of components.
-	 */
-
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_updated_id);
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_removed_id);
-
-	objects = NULL;
-	g_hash_table_foreach (uid_comp_hash, add_component, &objects);
-	g_hash_table_destroy (uid_comp_hash);
-
-	return objects;
-}
-
-struct comp_instance {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-};
-
-/* Called from cal_recur_generate_instances(); adds an instance to the list */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GList **list;
-	struct comp_instance *ci;
-
-	list = data;
-
-	ci = g_new (struct comp_instance, 1);
-
-	ci->comp = comp;
-	gtk_object_ref (GTK_OBJECT (ci->comp));
-	
-	ci->start = start;
-	ci->end = end;
-
-	*list = g_list_prepend (*list, ci);
-
-	return TRUE;
-}
-
-/* Used from g_list_sort(); compares two struct comp_instance structures */
-static gint
-compare_comp_instance (gconstpointer a, gconstpointer b)
-{
-	const struct comp_instance *cia, *cib;
-	time_t diff;
-
-	cia = a;
-	cib = b;
-
-	diff = cia->start - cib->start;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/**
- * cal_client_generate_instances:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * @cb: Callback for each generated instance.
- * @cb_data: Closure data for the callback.
- * 
- * Does a combination of cal_client_get_objects_in_range() and
- * cal_recur_generate_instances().  It fetches the list of objects in an atomic
- * way so that the generated instances are actually in the server at the time
- * the initial cal_client_get_objects_in_range() query ends.
- *
- * The callback function should do a gtk_object_ref() of the calendar component
- * it gets passed if it intends to keep it around.
- **/
-void
-cal_client_generate_instances (CalClient *client, CalObjType type,
-			       time_t start, time_t end,
-			       CalRecurInstanceFn cb, gpointer cb_data)
-{
-	CalClientPrivate *priv;
-	GList *objects;
-	GList *instances;
-	GList *l;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = client->priv;
-	g_return_if_fail (priv->load_state == LOAD_STATE_LOADED);
-
-	g_return_if_fail (start != -1 && end != -1);
-	g_return_if_fail (start <= end);
-	g_return_if_fail (cb != NULL);
-
-	/* Generate objects */
-
-	objects = get_objects_atomically (client, type, start, end);
-	instances = NULL;
-
-	for (l = objects; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = l->data;
-		cal_recur_generate_instances (comp, start, end, add_instance, &instances);
-	}
-
-	g_list_free (objects);
-
-	/* Generate instances and spew them out */
-
-	instances = g_list_sort (instances, compare_comp_instance);
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-		gboolean result;
-		
-		ci = l->data;
-		
-		result = (* cb) (ci->comp, ci->start, ci->end, cb_data);
-
-		if (!result)
-			break;
-	}
-
-	/* Clean up */
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-
-		ci = l->data;
-		gtk_object_unref (GTK_OBJECT (ci->comp));
-		g_free (ci);
-	}
-
-	g_list_free (instances);
-}
-
-
-#if 0
-/* Translates the CORBA representation of an AlarmType */
-static enum AlarmType
-uncorba_alarm_type (Evolution_Calendar_AlarmType corba_type)
-{
-	switch (corba_type) {
-	case Evolution_Calendar_MAIL:
-		return ALARM_MAIL;
-
-	case Evolution_Calendar_PROGRAM:
-		return ALARM_PROGRAM;
-
-	case Evolution_Calendar_DISPLAY:
-		return ALARM_DISPLAY;
-
-	case Evolution_Calendar_AUDIO:
-		return ALARM_AUDIO;
-
-	default:
-		g_assert_not_reached ();
-		return ALARM_DISPLAY;
-	}
-}
-#endif
-
-/* Builds a GList of CalAlarmInstance structures from the CORBA sequence */
-static GList *
-build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
-		CalAlarmInstance *ai;
-
-		corba_ai = &seq->_buffer[i];
-		ai = g_new (CalAlarmInstance, 1);
-
-		ai->uid = g_strdup (corba_ai->uid);
-#if 0
-		ai->type = uncorba_alarm_type (corba_ai->type);
-#endif
-		ai->trigger = corba_ai->trigger;
-		ai->occur = corba_ai->occur;
-
-		list = g_list_prepend (list, ai);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-
-/**
- * cal_client_get_alarms_in_range:
- * @client: A calendar client.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the alarms that trigger in the specified range of
- * time.
- *
- * Return value: A list of #CalAlarmInstance structures.
- **/
-GList *
-cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_alarms_in_range (priv->cal, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	alarms = build_alarm_instance_list (seq);
-	CORBA_free (seq);
-
-	return alarms;
-}
-
-/**
- * cal_client_get_alarms_for_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar object.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the list of alarm instances.
- *
- * Queries a calendar for the alarms of a particular object that trigger in the
- * specified range of time.
- *
- * Return value: TRUE on success, FALSE if the object was not found.
- **/
-gboolean
-cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-				  time_t start, time_t end,
-				  GList **alarms)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	gboolean retval;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	*alarms = NULL;
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, (char *) uid, start, end, &ev);
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
-		goto out;
-	}
-
-	retval = TRUE;
-	*alarms = build_alarm_instance_list (seq);
-	CORBA_free (seq);
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-
-}
-
-/**
- * cal_client_update_object:
- * @client: A calendar client.
- * @comp: A calendar component object.
- *
- * Asks a calendar to update a component.  Any existing component with the
- * specified component's UID will be replaced.  The client program should not
- * assume that the object is actually in the server's storage until it has
- * received the "obj_updated" notification signal.
- *
- * Return value: TRUE on success, FALSE on specifying an invalid component.
- **/
-gboolean
-cal_client_update_object (CalClient *client, CalComponent *comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-	char *obj_string;
-	const char *uid;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	retval = FALSE;
-
-	cal_component_commit_sequence (comp);
-	obj_string = cal_component_get_as_string (comp);
-
-	cal_component_get_uid (comp, &uid);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_update_object (priv->cal, (char *) uid, obj_string, &ev);
-	g_free (obj_string);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_InvalidObject) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_update_object(): could not update the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-gboolean
-cal_client_remove_object (CalClient *client, const char *uid)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_remove_object (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_remove_object(): could not remove the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
deleted file mode 100644
index fd40c424d9..0000000000
--- a/calendar/cal-client/cal-client.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_CLIENT_H
-#define CAL_CLIENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/cal-util.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-
-typedef struct _CalClient CalClient;
-typedef struct _CalClientClass CalClientClass;
-
-typedef struct _CalClientPrivate CalClientPrivate;
-
-/* Load status for the cal_loaded signal */
-typedef enum {
-	CAL_CLIENT_LOAD_SUCCESS,
-	CAL_CLIENT_LOAD_ERROR,
-	CAL_CLIENT_LOAD_IN_USE,
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED
-} CalClientLoadStatus;
-
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-
-
-struct _CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-
-struct _CalClientClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_loaded) (CalClient *client, CalClientLoadStatus status);
-
-	void (* obj_updated) (CalClient *client, const char *uid);
-	void (* obj_removed) (CalClient *client, const char *uid);
-};
-
-GtkType cal_client_get_type (void);
-
-CalClient *cal_client_construct (CalClient *client);
-
-CalClient *cal_client_new (void);
-
-gboolean cal_client_load_calendar (CalClient *client, const char *str_uri);
-gboolean cal_client_create_calendar (CalClient *client, const char *str_uri);
-
-gboolean cal_client_is_loaded (CalClient *client);
-
-int cal_client_get_n_objects (CalClient *client, CalObjType type);
-
-CalClientGetStatus cal_client_get_object (CalClient *client,
-					  const char *uid,
-					  CalComponent **comp);
-
-GList *cal_client_get_uids (CalClient *client, CalObjType type);
-GList *cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since);
-
-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,
-					time_t start, time_t end);
-
-void cal_client_generate_instances (CalClient *client, CalObjType type,
-				    time_t start, time_t end,
-				    CalRecurInstanceFn cb, gpointer cb_data);
-
-GList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);
-
-gboolean cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-					   time_t start, time_t end,
-					   GList **alarms);
-
-gboolean cal_client_update_object (CalClient *client, CalComponent *comp);
-
-gboolean cal_client_remove_object (CalClient *client, const char *uid);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
deleted file mode 100644
index c5626fee9d..0000000000
--- a/calendar/cal-client/cal-listener.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-listener.h"
-
-
-
-/* Private part of the CalListener structure */
-struct _CalListenerPrivate {
-	/* The calendar this listener refers to */
-	Evolution_Calendar_Cal cal;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_LOADED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_listener_class_init (CalListenerClass *class);
-static void cal_listener_init (CalListener *listener);
-static void cal_listener_destroy (GtkObject *object);
-
-static void marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);
-
-static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;
-
-static guint cal_listener_signals[LAST_SIGNAL];
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_listener_get_type:
- * @void:
- *
- * Registers the #CalListener class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalListener class.
- **/
-GtkType
-cal_listener_get_type (void)
-{
-	static GtkType cal_listener_type = 0;
-
-	if (!cal_listener_type) {
-		static const GtkTypeInfo cal_listener_info = {
-			"CalListener",
-			sizeof (CalListener),
-			sizeof (CalListenerClass),
-			(GtkClassInitFunc) cal_listener_class_init,
-			(GtkObjectInitFunc) cal_listener_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info);
-	}
-
-	return cal_listener_type;
-}
-
-/* CORBA class initialization function for the calendar listener */
-static void
-init_cal_listener_corba_class (void)
-{
-	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
-}
-
-/* Class initialization function for the calendar listener */
-static void
-cal_listener_class_init (CalListenerClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	cal_listener_signals[CAL_LOADED] =
-		gtk_signal_new ("cal_loaded",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, cal_loaded),
-				marshal_cal_loaded,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_ENUM,
-				GTK_TYPE_POINTER);
-	cal_listener_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, obj_updated),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	cal_listener_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, obj_removed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, cal_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_listener_destroy;
-
-	init_cal_listener_corba_class ();
-}
-
-/* Object initialization function for the calendar listener */
-static void
-cal_listener_init (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	priv = g_new0 (CalListenerPrivate, 1);
-	listener->priv = priv;
-
-	priv->cal = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar listener */
-static void
-cal_listener_destroy (GtkObject *object)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment ev;
-	gboolean result;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (object));
-
-	listener = CAL_LISTENER (object);
-	priv = listener->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_listener_destroy(): could not see if the calendar was NIL");
-	else if (!result) {
-		CORBA_exception_free (&ev);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->cal, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("cal_listener_destroy(): could not release the calendar");
-
-		priv->cal = CORBA_OBJECT_NIL;
-	}
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-	listener->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Marshalers */
-
-typedef void (* CalLoadedFunc) (GtkObject *object, gint status, gpointer cal, gpointer data);
-
-static void
-marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args)
-{
-	CalLoadedFunc rfunc;
-
-	rfunc = (CalLoadedFunc) func;
-	(* rfunc) (object, GTK_VALUE_ENUM (args[0]), GTK_VALUE_POINTER (args[1]), data);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Listener::cal_loaded method */
-static void
-Listener_cal_loaded (PortableServer_Servant servant,
-		     Evolution_Calendar_Listener_LoadStatus status,
-		     Evolution_Calendar_Cal cal,
-		     CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment aev;
-	Evolution_Calendar_Cal cal_copy;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (priv->cal != CORBA_OBJECT_NIL) {
-		g_message ("Listener_cal_loaded(): calendar was already loaded!");
-		return;
-	}
-
-	CORBA_exception_init (&aev);
-	cal_copy = CORBA_Object_duplicate (cal, &aev);
-
-	if (aev._major != CORBA_NO_EXCEPTION) {
-		g_message ("Listener_cal_loaded(): could not duplicate the calendar");
-		CORBA_exception_free (&aev);
-		return;
-	}
-	CORBA_exception_free (&aev);
-
-	priv->cal = cal_copy;
-
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[CAL_LOADED],
-			 status, cal);
-}
-
-/* Listener::obj_updated method */
-static void
-Listener_obj_updated (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
-		      CORBA_Environment *ev)
-{
-	CalListener *listener;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_UPDATED],
-			 uid);
-}
-
-/* Listener::obj_removed method */
-static void
-Listener_obj_removed (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
-		      CORBA_Environment *ev)
-{
-	CalListener *listener;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_REMOVED],
-			 uid);
-}
-
-/**
- * cal_listener_get_epv:
- * @void:
- *
- * Creates an EPV for the Listener CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_Listener__epv *
-cal_listener_get_epv (void)
-{
-	POA_Evolution_Calendar_Listener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
-	epv->cal_loaded = Listener_cal_loaded;
-	epv->obj_updated = Listener_obj_updated;
-	epv->obj_removed = Listener_obj_removed;
-	return epv;
-}
-
-
-
-/**
- * cal_listener_construct:
- * @listener: A calendar listener.
- * @corba_listener: CORBA object for the calendar listener.
- *
- * Constructs a calendar listener by binding the corresponding CORBA object to
- * it.
- *
- * Return value: the same object as the @listener argument.
- **/
-CalListener *
-cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
-{
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener);
-	return listener;
-}
-
-/**
- * cal_listener_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar listener @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_Listener
-cal_listener_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_Listener *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_listener_new:
- * @void:
- *
- * Creates a new #CalListener object.
- *
- * Return value: A newly-created #CalListener, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-CalListener *
-cal_listener_new (void)
-{
-	CalListener *listener;
-	CORBA_Environment ev;
-	Evolution_Calendar_Listener corba_listener;
-	gboolean result;
-
-	listener = gtk_type_new (CAL_LISTENER_TYPE);
-
-	corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (corba_listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION || result) {
-		g_message ("cal_listener_new(): could not create the CORBA listener");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_listener_construct (listener, corba_listener);
-}
-
-/**
- * cal_listener_get_calendar:
- * @listener: A calendar listener.
- * 
- * Queries the calendar that a listener is watching.
- * 
- * Return value: The calendar that the listener is watching.
- **/
-Evolution_Calendar_Cal
-cal_listener_get_calendar (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-	return priv->cal;
-}
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
deleted file mode 100644
index b4eda6c2d6..0000000000
--- a/calendar/cal-client/cal-listener.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_LISTENER_H
-#define CAL_LISTENER_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_LISTENER_TYPE            (cal_listener_get_type ())
-#define CAL_LISTENER(obj)            (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener))
-#define CAL_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE,	\
-				      CalListenerClass))
-#define IS_CAL_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE))
-#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE))
-
-typedef struct _CalListener CalListener;
-typedef struct _CalListenerClass CalListenerClass;
-
-typedef struct _CalListenerPrivate CalListenerPrivate;
-
-struct _CalListener {
-	BonoboObject object;
-
-	/* Private data */
-	CalListenerPrivate *priv;
-};
-
-struct _CalListenerClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_loaded) (CalListener *listener,
-			     Evolution_Calendar_Listener_LoadStatus status,
-			     Evolution_Calendar_Cal cal);
-	void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
-	void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
-};
-
-GtkType cal_listener_get_type (void);
-
-CalListener *cal_listener_construct (CalListener *listener,
-				     Evolution_Calendar_Listener corba_listener);
-
-Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
-
-CalListener *cal_listener_new (void);
-
-Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
-
-POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
deleted file mode 100644
index c28e3f5696..0000000000
--- a/calendar/cal-client/client-test.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Evolution calendar client - test program
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-static CalClient *client1;
-static CalClient *client2;
-
-/* Prints a message with a client identifier */
-static void
-cl_printf (CalClient *client, const char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	printf ("Client %s: ",
-		client == client1 ? "1" :
-		client == client2 ? "2" :
-		"UNKNOWN");
-	vprintf (format, args);
-	va_end (args);
-}
-
-/* Dumps some interesting data from a component */
-static void
-dump_component (CalComponent *comp)
-{
-	const char *uid;
-	CalComponentText summary;
-
-	cal_component_get_uid (comp, &uid);
-
-	printf ("UID %s\n", uid);
-
-	cal_component_get_summary (comp, &summary);
-	if (summary.value)
-		printf ("\tSummary: `%s', altrep `%s'\n",
-			summary.value,
-			summary.altrep ? summary.altrep : "NONE");
-	else
-		printf ("\tNo summary\n");
-}
-
-/* Lists the UIDs of objects in a calendar, called as an idle handler */
-static gboolean
-list_uids (gpointer data)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-
-	client = CAL_CLIENT (data);
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY);
-
-	cl_printf (client, "UIDs: ");
-
-	if (!uids)
-		printf ("none\n");
-	else {
-		for (l = uids; l; l = l->next) {
-			char *uid;
-
-			uid = l->data;
-			printf ("`%s' ", uid);
-		}
-
-		printf ("\n");
-
-		for (l = uids; l; l = l->next) {
-			char *uid;
-			CalComponent *comp;
-			CalClientGetStatus status;
-
-			uid = l->data;
-			status = cal_client_get_object (client, uid, &comp);
-
-			if (status == CAL_CLIENT_GET_SUCCESS) {
-				printf ("------------------------------\n");
-				dump_component (comp);
-				printf ("------------------------------\n");
-				gtk_object_unref (GTK_OBJECT (comp));
-			} else {
-				printf ("FAILED: %d\n", status);
-			}
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (client));
-
-	return FALSE;
-}
-
-/* Callback used when a calendar is loaded */
-static void
-cal_loaded (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	cl_printf (client, "Load/create %s\n",
-		   ((status == CAL_CLIENT_LOAD_SUCCESS) ? "success" :
-		    (status == CAL_CLIENT_LOAD_ERROR) ? "error" :
-		    (status == CAL_CLIENT_LOAD_IN_USE) ? "in use" :
-		    "unknown status value"));
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS)
-		g_idle_add (list_uids, client);
-	else
-		gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Callback used when an object is updated */
-static void
-obj_updated (CalClient *client, const char *uid, gpointer data)
-{
-	cl_printf (client, "Object updated: %s\n", uid);
-}
-
-/* Callback used when a client is destroyed */
-static void
-client_destroy_cb (GtkObject *object, gpointer data)
-{
-	if (CAL_CLIENT (object) == client1)
-		client1 = NULL;
-	else if (CAL_CLIENT (object) == client2)
-		client2 = NULL;
-	else
-		g_assert_not_reached ();
-
-	if (!client1 && !client2)
-		gtk_main_quit ();
-}
-
-/* Creates a calendar client and tries to load the specified URI into it */
-static void
-create_client (CalClient **client, const char *uri, gboolean load)
-{
-	gboolean result;
-
-	*client = cal_client_new ();
-	if (!*client) {
-		g_message ("create_client(): could not create the client");
-		exit (1);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (*client), "destroy",
-			    client_destroy_cb,
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (*client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded),
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT (*client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated),
-			    NULL);
-
-	printf ("Calendar loading `%s'...\n", uri);
-
-	if (load)
-		result = cal_client_load_calendar (*client, uri);
-	else
-		result = cal_client_create_calendar (*client, uri);
-
-	if (!result) {
-		g_message ("create_client(): failure when issuing calendar %s request `%s'",
-			   load ? "load" : "create",
-			   uri);
-		exit (1);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	textdomain (PACKAGE);
-
-	gnome_init ("tl-test", VERSION, argc, argv);
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): could not initialize Bonobo");
-		exit (1);
-	}
-
-	create_client (&client1, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);
-	create_client (&client2, "/cvs/evolution/calendar/cal-client/test.ics", FALSE);
-
-	bonobo_main ();
-	return 0;
-}
diff --git a/calendar/cal-client/test.ics b/calendar/cal-client/test.ics
deleted file mode 100644
index 128251ee11..0000000000
--- a/calendar/cal-client/test.ics
+++ /dev/null
@@ -1,318 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-
-BEGIN:VEVENT
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore
deleted file mode 100644
index 9f93120f8a..0000000000
--- a/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.libs
-Makefile.in
-Makefile
-.deps
-*.lo
-*.la
-test-recur
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
deleted file mode 100644
index 9a1b677e9b..0000000000
--- a/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-noinst_PROGRAMS = test-recur
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"cal-util\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/calendar			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-        $(GNOME_INCLUDEDIR)
-
-#
-# cal util library
-#
-
-lib_LTLIBRARIES = libcal-util.la
-
-libcal_util_la_SOURCES = 	\
-	cal-component.c		\
-	cal-recur.c		\
-	cal-util.c		\
-	timeutil.c
-
-libcal_utilincludedir = $(includedir)/evolution/cal-util
-
-libcal_utilinclude_HEADERS =	\
-	cal-component.h		\
-	cal-recur.h		\
-	cal-util.h		\
-	timeutil.h
-
-#
-# static library for use in conduits' shared libraries
-#
-noinst_LTLIBRARIES = libcal-util-static.la
-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
-libcal_util_static_la_LDFLAGS = --all-static
-
-test_recur_SOURCES = 	\
-	 test-recur.c
-
-test_recur_LDADD = 	\
-	 libcal-util.la	\
-	 $(top_builddir)/libversit/libversit.la		\
-	 $(top_builddir)/libical/src/libical/libical.a	\
-	 $(EXTRA_GNOME_LIBS)
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
deleted file mode 100644
index 4f813cbdee..0000000000
--- a/calendar/cal-util/cal-component.c
+++ /dev/null
@@ -1,3662 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "cal-component.h"
-#include "timeutil.h"
-
-
-
-/* Private part of the CalComponent structure */
-struct _CalComponentPrivate {
-	/* The icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *uid;
-
-	icalproperty *status;
-
-	struct categories {
-		icalproperty *prop;
-	};
-	GSList *categories_list; /* list of struct categories */
-
-	icalproperty *classification;
-
-	struct text {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	};
-
-	GSList *comment_list; /* list of struct text */
-
-	icalproperty *completed;
-	icalproperty *created;
-
-	GSList *description_list; /* list of struct text */
-
-	struct datetime {
-		icalproperty *prop;
-		icalparameter *tzid_param;
-	};
-
-	struct datetime dtstart;
-	struct datetime dtend;
-
-	icalproperty *dtstamp;
-
-	struct datetime due;
-
-	GSList *exdate_list; /* list of icalproperty objects */
-	GSList *exrule_list; /* list of icalproperty objects */
-
-	icalproperty *geo;
-	icalproperty *last_modified;
-	icalproperty *percent;
-	icalproperty *priority;
-
-	struct period {
-		icalproperty *prop;
-		icalparameter *value_param;
-	};
-
-	GSList *rdate_list; /* list of struct period */
-
-	GSList *rrule_list; /* list of icalproperty objects */
-
-	icalproperty *sequence;
-
-	struct {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	} summary;
-
-	icalproperty *transparency;
-	icalproperty *url;
-
-	/* Whether we should increment the sequence number when piping the
-	 * object over the wire.
-	 */
-	guint need_sequence_inc : 1;
-};
-
-/* Private structure for alarms */
-struct _CalComponentAlarm {
-	/* Our parent component */
-	CalComponent *parent;
-
-	/* Alarm icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *action;
-	icalproperty *trigger;
-};
-
-
-
-static void cal_component_class_init (CalComponentClass *class);
-static void cal_component_init (CalComponent *comp);
-static void cal_component_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_component_get_type:
- *
- * Registers the #CalComponent class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalComponent class.
- **/
-GtkType
-cal_component_get_type (void)
-{
-	static GtkType cal_component_type = 0;
-
-	if (!cal_component_type) {
-		static const GtkTypeInfo cal_component_info = {
-			"CalComponent",
-			sizeof (CalComponent),
-			sizeof (CalComponentClass),
-			(GtkClassInitFunc) cal_component_class_init,
-			(GtkObjectInitFunc) cal_component_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_component_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_component_info);
-	}
-
-	return cal_component_type;
-}
-
-/* Class initialization function for the calendar component object */
-static void
-cal_component_class_init (CalComponentClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_component_destroy;
-}
-
-/* Object initialization function for the calendar component object */
-static void
-cal_component_init (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = g_new0 (CalComponentPrivate, 1);
-	comp->priv = priv;
-}
-
-/* Does a simple g_free() of the elements of a GSList and then frees the list
- * itself.  Returns NULL.
- */
-static GSList *
-free_slist (GSList *slist)
-{
-	GSList *l;
-
-	for (l = slist; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (slist);
-	return NULL;
-}
-
-/* Frees the internal icalcomponent only if it does not have a parent.  If it
- * does, it means we don't own it and we shouldn't free it.
- */
-static void
-free_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!priv->icalcomp)
-		return;
-
-	/* Free the icalcomponent */
-
-	if (icalcomponent_get_parent (priv->icalcomp) != NULL)
-		icalcomponent_free (priv->icalcomp);
-
-	priv->icalcomp = NULL;
-
-	/* Free the mappings */
-
-	priv->uid = NULL;
-
-	priv->status = NULL;
-
-	priv->categories_list = free_slist (priv->categories_list);
-
-	priv->classification = NULL;
-	priv->comment_list = NULL;
-	priv->completed = NULL;
-	priv->created = NULL;
-
-	priv->description_list = free_slist (priv->description_list);
-
-	priv->dtend.prop = NULL;
-	priv->dtend.tzid_param = NULL;
-
-	priv->dtstamp = NULL;
-
-	priv->dtstart.prop = NULL;
-	priv->dtstart.tzid_param = NULL;
-
-	priv->due.prop = NULL;
-	priv->due.tzid_param = NULL;
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	g_slist_free (priv->exrule_list);
-	priv->exrule_list = NULL;
-
-	priv->geo = NULL;
-	priv->last_modified = NULL;
-	priv->percent = NULL;
-	priv->priority = NULL;
-
-	priv->rdate_list = free_slist (priv->rdate_list);
-
-	g_slist_free (priv->rrule_list);
-	priv->rrule_list = NULL;
-
-	priv->sequence = NULL;
-
-	priv->summary.prop = NULL;
-	priv->summary.altrep_param = NULL;
-
-	priv->transparency = NULL;
-	priv->url = NULL;
-
-	/* Clean up */
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/* Destroy handler for the calendar component object */
-static void
-cal_component_destroy (GtkObject *object)
-{
-	CalComponent *comp;
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (object));
-
-	comp = CAL_COMPONENT (object);
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-
-	g_free (priv);
-	comp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/**
- * cal_component_gen_uid:
- *
- * Generates a unique identifier suitable for calendar components.
- *
- * Return value: A unique identifier string.  Every time this function is called
- * a different string is returned.
- **/
-char *
-cal_component_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname) {
-		static char buffer [512];
-
-		if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = buffer;
-		else
-			hostname = "localhost";
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-/**
- * cal_component_new:
- *
- * Creates a new empty calendar component object.  You should set it from an
- * #icalcomponent structure by using cal_component_set_icalcomponent() or with a
- * new empty component type by using cal_component_set_new_vtype().
- *
- * Return value: A newly-created calendar component object.
- **/
-CalComponent *
-cal_component_new (void)
-{
-	return CAL_COMPONENT (gtk_type_new (CAL_COMPONENT_TYPE));
-}
-
-/**
- * cal_component_clone:
- * @comp: A calendar component object.
- * 
- * Creates a new calendar component object by copying the information from
- * another one.
- * 
- * Return value: A newly-created calendar component with the same values as the
- * original one.
- **/
-CalComponent *
-cal_component_clone (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	CalComponent *new_comp;
-	icalcomponent *new_icalcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	new_comp = cal_component_new ();
-
-	if (priv->icalcomp) {
-		new_icalcomp = icalcomponent_new_clone (priv->icalcomp);
-		cal_component_set_icalcomponent (new_comp, new_icalcomp);
-	}
-
-	return new_comp;
-}
-
-/* Scans the categories property */
-static void
-scan_categories (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	struct categories *categ;
-
-	priv = comp->priv;
-
-	categ = g_new (struct categories, 1);
-	categ->prop = prop;
-
-	priv->categories_list = g_slist_append (priv->categories_list, categ);
-}
-
-/* Scans a date/time and timezone pair property */
-static void
-scan_datetime (CalComponent *comp, struct datetime *datetime, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	datetime->prop = prop;
-	datetime->tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-}
-
-/* Scans an exception date property */
-static void
-scan_exdate (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-	priv->exdate_list = g_slist_append (priv->exdate_list, prop);
-}
-
-/* Scans an icalperiodtype property */
-static void
-scan_period (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	struct period *period;
-
-	period = g_new (struct period, 1);
-	period->prop = prop;
-	period->value_param = icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER);
-
-	*list = g_slist_append (*list, period);
-}
-
-/* Scans an icalrecurtype property */
-static void
-scan_recur (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	*list = g_slist_append (*list, prop);
-}
-
-/* Scans the summary property */
-static void
-scan_summary (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	priv->summary.prop = prop;
-	priv->summary.altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-}
-
-/* Scans a text (i.e. text + altrep) property */
-static void
-scan_text (CalComponent *comp, GSList **text_list, icalproperty *prop)
-{
-	struct text *text;
-
-	text = g_new (struct text, 1);
-	text->prop = prop;
-	text->altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-
-	*text_list = g_slist_append (*text_list, text);
-}
-
-/* Scans an icalproperty and adds its mapping to the component */
-static void
-scan_property (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	icalproperty_kind kind;
-
-	priv = comp->priv;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_STATUS_PROPERTY:
-		priv->status = prop;
-		break;
-
-	case ICAL_CATEGORIES_PROPERTY:
-		scan_categories (comp, prop);
-		break;
-
-	case ICAL_CLASS_PROPERTY:
-		priv->classification = prop;
-		break;
-
-	case ICAL_COMMENT_PROPERTY:
-		scan_text (comp, &priv->comment_list, prop);
-		break;
-
-	case ICAL_COMPLETED_PROPERTY:
-		priv->completed = prop;
-		break;
-
-	case ICAL_CREATED_PROPERTY:
-		priv->created = prop;
-		break;
-
-	case ICAL_DESCRIPTION_PROPERTY:
-		scan_text (comp, &priv->description_list, prop);
-		break;
-
-	case ICAL_DTEND_PROPERTY:
-		scan_datetime (comp, &priv->dtend, prop);
-		break;
-
-	case ICAL_DTSTAMP_PROPERTY:
-		priv->dtstamp = prop;
-		break;
-
-	case ICAL_DTSTART_PROPERTY:
-		scan_datetime (comp, &priv->dtstart, prop);
-		break;
-
-	case ICAL_DUE_PROPERTY:
-		scan_datetime (comp, &priv->due, prop);
-		break;
-
-	case ICAL_EXDATE_PROPERTY:
-		scan_exdate (comp, prop);
-		break;
-
-	case ICAL_EXRULE_PROPERTY:
-		scan_recur (comp, &priv->exrule_list, prop);
-		break;
-
-	case ICAL_GEO_PROPERTY:
-		priv->geo = prop;
-		break;
-
-	case ICAL_LASTMODIFIED_PROPERTY:
-		priv->last_modified = prop;
-		break;
-
-	case ICAL_PERCENTCOMPLETE_PROPERTY:
-		priv->percent = prop;
-		break;
-
-	case ICAL_PRIORITY_PROPERTY:
-		priv->priority = prop;
-		break;
-
-	case ICAL_RDATE_PROPERTY:
-		scan_period (comp, &priv->rdate_list, prop);
-		break;
-
-	case ICAL_RRULE_PROPERTY:
-		scan_recur (comp, &priv->rrule_list, prop);
-		break;
-
-	case ICAL_SEQUENCE_PROPERTY:
-		priv->sequence = prop;
-		break;
-
-	case ICAL_SUMMARY_PROPERTY:
-		scan_summary (comp, prop);
-		break;
-
-	case ICAL_TRANSP_PROPERTY:
-		priv->transparency = prop;
-		break;
-
-	case ICAL_UID_PROPERTY:
-		priv->uid = prop;
-		break;
-
-	case ICAL_URL_PROPERTY:
-		priv->url = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Scans an icalcomponent for its properties so that we can provide
- * random-access to them.
- */
-static void
-scan_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-
-	priv = comp->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (priv->icalcomp, ICAL_ANY_PROPERTY))
-		scan_property (comp, prop);
-
-	/* We don't scan for alarm subcomponents since they can be iterated
-	 * through using cal_component_get_{first,next}_alarm().
-	 */
-}
-
-/* Ensures that the mandatory calendar component properties (uid, dtstamp) do
- * exist.  If they don't exist, it creates them automatically.
- */
-static void
-ensure_mandatory_properties (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-	g_assert (priv->icalcomp != NULL);
-
-	if (!priv->uid) {
-		char *uid;
-
-		uid = cal_component_gen_uid ();
-		priv->uid = icalproperty_new_uid (uid);
-		g_free (uid);
-
-		icalcomponent_add_property (priv->icalcomp, priv->uid);
-	}
-
-	if (!priv->dtstamp) {
-		time_t tim;
-		struct icaltimetype t;
-
-		tim = time (NULL);
-		t = icaltime_from_timet (tim, FALSE, FALSE);
-
-		priv->dtstamp = icalproperty_new_dtstamp (t);
-		icalcomponent_add_property (priv->icalcomp, priv->dtstamp);
-	}
-}
-
-/**
- * cal_component_set_new_vtype:
- * @comp: A calendar component object.
- * @type: Type of calendar component to create.
- *
- * Clears any existing component data from a calendar component object and
- * creates a new #icalcomponent of the specified type for it.  The only property
- * that will be set in the new component will be its unique identifier.
- **/
-void
-cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-
-	if (type == CAL_COMPONENT_NO_TYPE)
-		return;
-
-	/* Figure out the kind and create the icalcomponent */
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		kind = ICAL_VEVENT_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		kind = ICAL_VTODO_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		kind = ICAL_VJOURNAL_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_FREEBUSY:
-		kind = ICAL_VFREEBUSY_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TIMEZONE:
-		kind = ICAL_VTIMEZONE_COMPONENT;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		kind = ICAL_NO_COMPONENT;
-	}
-
-	icalcomp = icalcomponent_new (kind);
-	if (!icalcomp) {
-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");
-		return;
-	}
-
-	/* Scan the component to build our mapping table */
-
-	priv->icalcomp = icalcomp;
-	scan_icalcomponent (comp);
-
-	/* Add missing stuff */
-
-	ensure_mandatory_properties (comp);
-}
-
-/**
- * cal_component_set_icalcomponent:
- * @comp: A calendar component object.
- * @icalcomp: An #icalcomponent.
- *
- * Sets the contents of a calendar component object from an #icalcomponent
- * structure.  If the @comp already had an #icalcomponent set into it, it will
- * will be freed automatically if the #icalcomponent does not have a parent
- * component itself.
- *
- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.
- *
- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component
- * type.
- **/
-gboolean
-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-
-	if (priv->icalcomp == icalcomp)
-		return TRUE;
-
-	free_icalcomponent (comp);
-
-	if (!icalcomp) {
-		priv->icalcomp = NULL;
-		return TRUE;
-	}
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT
-	      || kind == ICAL_VFREEBUSY_COMPONENT
-	      || kind == ICAL_VTIMEZONE_COMPONENT))
-		return FALSE;
-
-	priv->icalcomp = icalcomp;
-
-	scan_icalcomponent (comp);
-	ensure_mandatory_properties (comp);
-
-	return TRUE;
-}
-
-/**
- * cal_component_get_icalcomponent:
- * @comp: A calendar component object.
- *
- * Queries the #icalcomponent structure that a calendar component object is
- * wrapping.
- *
- * Return value: An #icalcomponent structure, or NULL if the @comp has no
- * #icalcomponent set to it.
- **/
-icalcomponent *
-cal_component_get_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	return priv->icalcomp;
-}
-
-/**
- * cal_component_get_vtype:
- * @comp: A calendar component object.
- *
- * Queries the type of a calendar component object.
- *
- * Return value: The type of the component, as defined by RFC 2445.
- **/
-CalComponentVType
-cal_component_get_vtype (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, CAL_COMPONENT_NO_TYPE);
-
-	kind = icalcomponent_isa (priv->icalcomp);
-	switch (kind) {
-	case ICAL_VEVENT_COMPONENT:
-		return CAL_COMPONENT_EVENT;
-
-	case ICAL_VTODO_COMPONENT:
-		return CAL_COMPONENT_TODO;
-
-	case ICAL_VJOURNAL_COMPONENT:
-		return CAL_COMPONENT_JOURNAL;
-
-	case ICAL_VFREEBUSY_COMPONENT:
-		return CAL_COMPONENT_FREEBUSY;
-
-	case ICAL_VTIMEZONE_COMPONENT:
-		return CAL_COMPONENT_TIMEZONE;
-
-	default:
-		/* We should have been loaded with a supported type! */
-		g_assert_not_reached ();
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/**
- * cal_component_get_as_string:
- * @comp: A calendar component.
- *
- * Gets the iCalendar string representation of a calendar component.  You should
- * call cal_component_commit_sequence() before this function to ensure that the
- * component's sequence number is consistent with the state of the object.
- *
- * Return value: String representation of the calendar component according to
- * RFC 2445.
- **/
-char *
-cal_component_get_as_string (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	char *str, *buf;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	/* Ensure that the user has committed the new SEQUENCE */
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	/* We dup the string; libical owns that memory */
-
-	str = icalcomponent_as_ical_string (priv->icalcomp);
-
-	if (str)
-		buf = g_strdup (str);
-	else
-		buf = NULL;
-
-	return buf;
-}
-
-/**
- * cal_component_commit_sequence:
- * @comp: 
- * 
- * Increments the sequence number property in a calendar component object if it
- * needs it.  This needs to be done when any of a number of properties listed in
- * RFC 2445 change values, such as the start and end dates of a component.
- *
- * This function must be called before calling cal_component_get_as_string() to
- * ensure that the component is fully consistent.
- **/
-void
-cal_component_commit_sequence (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->need_sequence_inc)
-		return;
-
-	if (priv->sequence) {
-		int seq;
-
-		seq = icalproperty_get_sequence (priv->sequence);
-		icalproperty_set_sequence (priv->sequence, seq + 1);
-	} else {
-		/* The component had no SEQUENCE property, so assume that the
-		 * default would have been zero.  Since it needed incrementing
-		 * anyways, we use a value of 1 here.
-		 */
-		priv->sequence = icalproperty_new_sequence (1);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/**
- * cal_component_get_uid:
- * @comp: A calendar component object.
- * @uid: Return value for the UID string.
- *
- * Queries the unique identifier of a calendar component object.
- **/
-void
-cal_component_get_uid (CalComponent *comp, const char **uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	*uid = icalproperty_get_uid (priv->uid);
-}
-
-/**
- * cal_component_set_uid:
- * @comp: A calendar component object.
- * @uid: Unique identifier.
- *
- * Sets the unique identifier string of a calendar component object.
- **/
-void
-cal_component_set_uid (CalComponent *comp, const char *uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	icalproperty_set_uid (priv->uid, (char *) uid);
-}
-
-/**
- * cal_component_get_status:
- * @comp: A calendar component object.
- * @status: Return value for the status string.
- *
- * Queries the status property of a calendar component object.
- **/
-void
-cal_component_get_status (CalComponent *comp, const char **status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (status != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->status) {
-		*status = NULL;
-		return;
-	}
-
-	*status = icalproperty_get_status (priv->status);
-}
-
-/**
- * cal_component_set_status:
- * @comp: A calendar component object.
- * @status: a status string, e.g. "IN-PROCESS", "NEEDS-ACTION". See the RFC.
- *
- * Sets the status string property of a calendar component object.
- **/
-void
-cal_component_set_status (CalComponent *comp, const char *status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (status != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = TRUE;
-
-	if (status == NULL) {
-		if (priv->status) {
-			icalcomponent_remove_property (priv->icalcomp, priv->status);
-			icalproperty_free (priv->status);
-			priv->status = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->status) {
-		icalproperty_set_status (priv->status, (char *) status);
-	} else {
-		priv->status = icalproperty_new_status ((char *) status);
-		icalcomponent_add_property (priv->icalcomp,
-					    priv->status);
-	}
-}
-
-/**
- * cal_component_get_categories_list:
- * @comp: A calendar component object.
- * @categ_list: Return value for the list of strings, where each string is a
- * category.  This should be freed using cal_component_free_categories_list().
- *
- * Queries the list of categories of a calendar component object.  Each element
- * in the returned categ_list is a string with the corresponding category.
- **/
-void
-cal_component_get_categories_list (CalComponent *comp, GSList **categ_list)
-{
-	CalComponentPrivate *priv;
-	const char *categories;
-	const char *p;
-	const char *cat_start;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (categ_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->categories_list) {
-		*categ_list = NULL;
-		return;
-	}
-
-	categories = icalproperty_get_categories (priv->categories_list);
-	g_assert (categories != NULL);
-
-	cat_start = categories;
-
-	*categ_list = NULL;
-
-	for (p = categories; *p; p++)
-		if (*p == ',') {
-			str = g_strndup (cat_start, p - cat_start);
-			*categ_list = g_slist_prepend (*categ_list, str);
-
-			cat_start = p + 1;
-		}
-
-	str = g_strndup (cat_start, p - cat_start);
-	*categ_list = g_slist_prepend (*categ_list, str);
-
-	*categ_list = g_slist_reverse (*categ_list);
-}
-
-/* Creates a comma-delimited string of categories */
-static char *
-stringify_categories (GSList *categ_list)
-{
-	GString *s;
-	GSList *l;
-	char *str;
-
-	s = g_string_new (NULL);
-
-	for (l = categ_list; l; l = l->next) {
-		g_string_append (s, l->data);
-
-		if (l->next != NULL)
-			g_string_append (s, ",");
-	}
-
-	str = s->str;
-	g_string_free (s, FALSE);
-
-	return str;
-}
-
-/**
- * cal_component_set_categories_list:
- * @comp: A calendar component object.
- * @categ_list: List of strings, one for each category.
- *
- * Sets the list of categories of a calendar component object.
- **/
-void
-cal_component_set_categories_list (CalComponent *comp, GSList *categ_list)
-{
-	CalComponentPrivate *priv;
-	struct categories *cat;
-	char *categories_str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* Free the old list */
-
-	if (!categ_list) {
-		if (priv->categories_list) {
-			GSList *l;
-
-			for (l = priv->categories_list; l; l = l->next) {
-				struct categories *c;
-
-				c = l->data;
-				icalcomponent_remove_property (priv->icalcomp, c->prop);
-				icalproperty_free (c->prop);
-
-				g_free (c);
-			}
-
-			g_slist_free (priv->categories_list);
-			priv->categories_list = NULL;
-		}
-
-		return;
-	}
-
-	/* Create a single string of categories */
-
-	categories_str = stringify_categories (categ_list);
-
-	/* Set the categories */
-
-	cat = g_new (struct categories, 1);
-	cat->prop = icalproperty_new_categories (categories_str);
-	g_free (categories_str);
-
-	icalcomponent_add_property (priv->icalcomp, cat->prop);
-}
-
-/**
- * cal_component_get_classification:
- * @comp: A calendar component object.
- * @classif: Return value for the classification.
- *
- * Queries the classification of a calendar component object.  If the
- * classification property is not set on this component, this function returns
- * #CAL_COMPONENT_CLASS_NONE.
- **/
-void
-cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif)
-{
-	CalComponentPrivate *priv;
-	const char *class;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->classification) {
-		*classif = CAL_COMPONENT_CLASS_NONE;
-		return;
-	}
-
-	class = icalproperty_get_class (priv->classification);
-
-	if (strcasecmp (class, "PUBLIC") == 0)
-		*classif = CAL_COMPONENT_CLASS_PUBLIC;
-	else if (strcasecmp (class, "PRIVATE") == 0)
-		*classif = CAL_COMPONENT_CLASS_PRIVATE;
-	else if (strcasecmp (class, "CONFIDENTIAL") == 0)
-		*classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;
-	else
-		*classif = CAL_COMPONENT_CLASS_UNKNOWN;
-}
-
-/**
- * cal_component_set_classification:
- * @comp: A calendar component object.
- * @classif: Classification to use.
- *
- * Sets the classification property of a calendar component object.  To unset
- * the property, specify CAL_COMPONENT_CLASS_NONE for @classif.
- **/
-void
-cal_component_set_classification (CalComponent *comp, CalComponentClassification classif)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != CAL_COMPONENT_CLASS_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (classif == CAL_COMPONENT_CLASS_NONE) {
-		if (priv->classification) {
-			icalcomponent_remove_property (priv->icalcomp, priv->classification);
-			icalproperty_free (priv->classification);
-			priv->classification = NULL;
-		}
-
-		return;
-	}
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		str = "PUBLIC";
-		break;
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		str = "PRIVATE";
-		break;
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		str = "CONFIDENTIAL";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->classification)
-		icalproperty_set_class (priv->classification, str);
-	else {
-		priv->classification = icalproperty_new_class (str);
-		icalcomponent_add_property (priv->icalcomp, priv->classification);
-	}
-}
-
-/* Gets a text list value */
-static void
-get_text_list (GSList *text_list,
-	       char *(* get_prop_func) (icalproperty *prop),
-	       GSList **tl)
-{
-	GSList *l;
-
-	*tl = NULL;
-
-	if (!text_list)
-		return;
-
-	for (l = text_list; l; l = l->next) {
-		struct text *text;
-		CalComponentText *t;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		t = g_new (CalComponentText, 1);
-		t->value = (* get_prop_func) (text->prop);
-
-		if (text->altrep_param)
-			t->altrep = icalparameter_get_altrep (text->altrep_param);
-		else
-			t->altrep = NULL;
-
-		*tl = g_slist_prepend (*tl, t);
-	}
-
-	*tl = g_slist_reverse (*tl);
-}
-
-/* Sets a text list value */
-static void
-set_text_list (CalComponent *comp,
-	       icalproperty *(* new_prop_func) (char *value),
-	       GSList **text_list,
-	       GSList *tl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old texts */
-
-	for (l = *text_list; l; l = l->next) {
-		struct text *text;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, text->prop);
-		icalproperty_free (text->prop);
-		g_free (text);
-	}
-
-	g_slist_free (*text_list);
-	*text_list = NULL;
-
-	/* Add in new texts */
-
-	for (l = tl; l; l = l->next) {
-		CalComponentText *t;
-		struct text *text;
-
-		t = l->data;
-		g_return_if_fail (t->value != NULL);
-
-		text = g_new (struct text, 1);
-
-		text->prop = (* new_prop_func) ((char *) t->value);
-		icalcomponent_add_property (priv->icalcomp, text->prop);
-
-		if (t->altrep) {
-			text->altrep_param = icalparameter_new_altrep ((char *) t->altrep);
-			icalproperty_add_parameter (text->prop, text->altrep_param);
-		} else
-			text->altrep_param = NULL;
-
-		*text_list = g_slist_prepend (*text_list, text);
-	}
-
-	*text_list = g_slist_reverse (*text_list);
-}
-
-/**
- * cal_component_get_comment_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the comment properties and their parameters, as
- * a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText is returned.
- **/
-void
-cal_component_get_comment_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->comment_list, icalproperty_get_comment, text_list);
-}
-
-/**
- * cal_component_set_comment_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentText structures.
- *
- * Sets the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText structures is used.
- **/
-void
-cal_component_set_comment_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_comment, &priv->comment_list, text_list);
-}
-
-/* Gets a struct icaltimetype value */
-static void
-get_icaltimetype (icalproperty *prop,
-		  struct icaltimetype (* get_prop_func) (icalproperty *prop),
-		  struct icaltimetype **t)
-{
-	if (!prop) {
-		*t = NULL;
-		return;
-	}
-
-	*t = g_new (struct icaltimetype, 1);
-	**t = (* get_prop_func) (prop);
-}
-
-/* Sets a struct icaltimetype value */
-static void
-set_icaltimetype (CalComponent *comp, icalproperty **prop,
-		  icalproperty *(* prop_new_func) (struct icaltimetype v),
-		  void (* prop_set_func) (icalproperty *prop, struct icaltimetype v),
-		  struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!t) {
-		if (*prop) {
-			icalcomponent_remove_property (priv->icalcomp, *prop);
-			icalproperty_free (*prop);
-			*prop = NULL;
-		}
-
-		return;
-	}
-
-	if (*prop)
-		(* prop_set_func) (*prop, *t);
-	else {
-		*prop = (* prop_new_func) (*t);
-		icalcomponent_add_property (priv->icalcomp, *prop);
-	}
-}
-
-/**
- * cal_component_get_completed:
- * @comp: A calendar component object.
- * @t: Return value for the completion date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date at which a calendar compoment object was completed.
- **/
-void
-cal_component_get_completed (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->completed, icalproperty_get_completed, t);
-}
-
-/**
- * cal_component_set_completed:
- * @comp: A calendar component object.
- * @t: Value for the completion date.
- *
- * Sets the date at which a calendar component object was completed.
- **/
-void
-cal_component_set_completed (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->completed,
-			  icalproperty_new_completed,
-			  icalproperty_set_completed,
-			  t);
-}
-
-
-/**
- * cal_component_get_created:
- * @comp: A calendar component object.
- * @t: Return value for the creation date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date in which a calendar component object was created in the
- * calendar store.
- **/
-void
-cal_component_get_created (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->created, icalproperty_get_created, t);
-}
-
-/**
- * cal_component_set_created:
- * @comp: A calendar component object.
- * @t: Value for the creation date.
- *
- * Sets the date in which a calendar component object is created in the calendar
- * store.  This should only be used inside a calendar store application, i.e.
- * not by calendar user agents.
- **/
-void
-cal_component_set_created (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->created,
-			  icalproperty_new_created,
-			  icalproperty_set_created,
-			  t);
-}
-
-/**
- * cal_component_get_description_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the description properties and their parameters,
- * as a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the description of a calendar component object.  Journal components
- * may have more than one description, and as such this function returns a list
- * of #CalComponentText structures.  All other types of components can have at
- * most one description.
- **/
-void
-cal_component_get_description_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->description_list, icalproperty_get_description, text_list);
-}
-
-/**
- * cal_component_set_description_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentSummary structures.
- *
- * Sets the description of a calendar component object.  Journal components may
- * have more than one description, and as such this function takes in a list of
- * #CalComponentDescription structures.  All other types of components can have
- * at most one description.
- **/
-void
-cal_component_set_description_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_description, &priv->description_list, text_list);
-}
-
-/* Gets a date/time and timezone pair */
-static void
-get_datetime (struct datetime *datetime,
-	      struct icaltimetype (* get_prop_func) (icalproperty *prop),
-	      CalComponentDateTime *dt)
-{
-	if (datetime->prop) {
-		dt->value = g_new (struct icaltimetype, 1);
-		*dt->value = (* get_prop_func) (datetime->prop);
-	} else
-		dt->value = NULL;
-
-	if (datetime->tzid_param)
-		dt->tzid = icalparameter_get_tzid (datetime->tzid_param);
-	else
-		dt->tzid = NULL;
-}
-
-/* Sets a date/time and timezone pair */
-static void
-set_datetime (CalComponent *comp, struct datetime *datetime,
-	      icalproperty *(* prop_new_func) (struct icaltimetype v),
-	      void (* prop_set_func) (icalproperty * prop, struct icaltimetype v),
-	      CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!dt) {
-		if (datetime->prop) {
-			icalcomponent_remove_property (priv->icalcomp, datetime->prop);
-			icalproperty_free (datetime->prop);
-
-			datetime->prop = NULL;
-			datetime->tzid_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (dt->value != NULL);
-
-	if (datetime->prop)
-		(* prop_set_func) (datetime->prop, *dt->value);
-	else {
-		datetime->prop = (* prop_new_func) (*dt->value);
-		icalcomponent_add_property (priv->icalcomp, datetime->prop);
-	}
-
-	if (dt->tzid) {
-		g_assert (datetime->prop != NULL);
-
-		if (datetime->tzid_param)
-			icalparameter_set_tzid (datetime->tzid_param, (char *) dt->tzid);
-		else {
-			datetime->tzid_param = icalparameter_new_tzid ((char *) dt->tzid);
-			icalproperty_add_parameter (datetime->prop, datetime->tzid_param);
-		}
-	} else if (datetime->tzid_param) {
-		icalproperty_remove_parameter (datetime->prop, ICAL_TZID_PARAMETER);
-		icalparameter_free (datetime->tzid_param);
-		datetime->tzid_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_dtend:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time end.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time end of a calendar component object.
- **/
-void
-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtend, icalproperty_get_dtend, dt);
-}
-
-/**
- * cal_component_set_dtend:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the date/time end property of a calendar component object.
- **/
-void
-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtend,
-		      icalproperty_new_dtend,
-		      icalproperty_set_dtend,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_dtstamp:
- * @comp: A calendar component object.
- * @t: Return value for the date/timestamp.
- *
- * Queries the date/timestamp property of a calendar component object, which is
- * the last time at which the object was modified by a calendar user agent.
- **/
-void
-cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	*t = icalproperty_get_dtstamp (priv->dtstamp);
-}
-
-/**
- * cal_component_set_dtstamp:
- * @comp: A calendar component object.
- * @t: Date/timestamp value.
- *
- * Sets the date/timestamp of a calendar component object.  This should be
- * called whenever a calendar user agent makes a change to a component's
- * properties.
- **/
-void
-cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	icalproperty_set_dtstamp (priv->dtstamp, *t);
-}
-
-/**
- * cal_component_get_dtstart:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time start.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time start of a calendar component object.
- **/
-void
-cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtstart, icalproperty_get_dtstart, dt);
-}
-
-/**
- * cal_component_set_dtstart:
- * @comp: A calendar component object.
- * @dt: Start date/time.
- *
- * Sets the date/time start property of a calendar component object.
- **/
-void
-cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtstart,
-		      icalproperty_new_dtstart,
-		      icalproperty_set_dtstart,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_due:
- * @comp: A calendar component object.
- * @dt: Return value for the due date/time.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the due date/time of a calendar component object.
- **/
-void
-cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->due, icalproperty_get_due, dt);
-}
-
-/**
- * cal_component_set_due:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the due date/time property of a calendar component object.
- **/
-void
-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->due,
-		      icalproperty_new_due,
-		      icalproperty_set_due,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */
-static void
-get_period_list (GSList *period_list,
-		 struct icalperiodtype (* get_prop_func) (icalproperty *prop),
-		 GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	if (!period_list)
-		return;
-
-	for (l = period_list; l; l = l->next) {
-		struct period *period;
-		CalComponentPeriod *p;
-		struct icalperiodtype ip;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		p = g_new (CalComponentPeriod, 1);
-
-		/* Get value parameter */
-
-		if (period->value_param) {
-			icalparameter_value value_type;
-
-			value_type = icalparameter_get_value (period->value_param);
-
-			if (value_type == ICAL_VALUE_DATE || value_type == ICAL_VALUE_DATETIME)
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			else if (value_type == ICAL_VALUE_DURATION)
-				p->type = CAL_COMPONENT_PERIOD_DURATION;
-			else {
-				g_message ("get_period_list(): Unknown value for period %d; "
-					   "using DATETIME", value_type);
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			}
-		} else
-			p->type = CAL_COMPONENT_PERIOD_DATETIME;
-
-		/* Get start and end/duration */
-
-		ip = (* get_prop_func) (period->prop);
-
-		p->start = ip.start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME)
-			p->u.end = ip.end;
-		else if (p->type == CAL_COMPONENT_PERIOD_DURATION)
-			p->u.duration = ip.duration;
-		else
-			g_assert_not_reached ();
-
-		/* Put in list */
-
-		*list = g_slist_prepend (*list, p);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a period list value */
-static void
-set_period_list (CalComponent *comp,
-		 icalproperty *(* new_prop_func) (struct icalperiodtype period),
-		 GSList **period_list,
-		 GSList *pl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old periods */
-
-	for (l = *period_list; l; l = l->next) {
-		struct period *period;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, period->prop);
-		icalproperty_free (period->prop);
-		g_free (period);
-	}
-
-	g_slist_free (*period_list);
-	*period_list = NULL;
-
-	/* Add in new periods */
-
-	for (l = pl; l; l = l->next) {
-		CalComponentPeriod *p;
-		struct period *period;
-		struct icalperiodtype ip;
-		icalparameter_value value_type;
-
-		g_assert (l->data != NULL);
-		p = l->data;
-
-		/* Create libical value */
-
-		ip.start = p->start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-			value_type = ICAL_VALUE_DATETIME;
-			ip.end = p->u.end;
-		} else if (p->type == CAL_COMPONENT_PERIOD_DURATION) {
-			value_type = ICAL_VALUE_DURATION;
-			ip.duration = p->u.duration;
-		} else {
-			g_assert_not_reached ();
-			return;
-		}
-
-		/* Create property */
-
-		period = g_new (struct period, 1);
-
-		period->prop = (* new_prop_func) (ip);
-		period->value_param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (period->prop, period->value_param);
-
-		/* Add to list */
-
-		*period_list = g_slist_prepend (*period_list, period);
-	}
-
-	*period_list = g_slist_reverse (*period_list);
-}
-
-/**
- * cal_component_get_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: Return value for the list of exception dates, as a list of
- * struct #icaltimetype structures.  This should be freed using the
- * cal_component_free_exdate_list() function.
- * 
- * Queries the list of exception date properties in a calendar component object.
- **/
-void
-cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (exdate_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*exdate_list = NULL;
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icaltimetype *t;
-
-		prop = l->data;
-
-		t = g_new (struct icaltimetype, 1);
-		*t = icalproperty_get_exdate (prop);
-
-		*exdate_list = g_slist_prepend (*exdate_list, t);
-	}
-
-	*exdate_list = g_slist_reverse (*exdate_list);
-}
-
-/**
- * cal_component_set_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: List of struct #icaltimetype structures.
- * 
- * Sets the list of exception dates in a calendar component object.
- **/
-void
-cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* Remove old exception dates */
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		icalproperty *prop;
-
-		prop = l->data;
-		icalcomponent_remove_property (priv->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	/* Add in new exception dates */
-
-	for (l = exdate_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icaltimetype *t;
-
-		g_assert (l->data != NULL);
-		t = l->data;
-
-		prop = icalproperty_new_exdate (*t);
-		icalcomponent_add_property (priv->icalcomp, prop);
-
-		priv->exdate_list = g_slist_prepend (priv->exdate_list, prop);
-	}
-
-	priv->exdate_list = g_slist_reverse (priv->exdate_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exdates:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any exception dates defined
- * for it.
- * 
- * Return value: TRUE if the component has exception dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exdate_list != NULL);
-}
-
-/* Gets a list of recurrence rules */
-static void
-get_recur_list (GSList *recur_list,
-		struct icalrecurrencetype (* get_prop_func) (icalproperty *prop),
-		GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	for (l = recur_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *r;
-
-		prop = l->data;
-
-		r = g_new (struct icalrecurrencetype, 1);
-		*r = (* get_prop_func) (prop);
-
-		*list = g_slist_prepend (*list, r);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a list of recurrence rules */
-static void
-set_recur_list (CalComponent *comp,
-		icalproperty *(* new_prop_func) (struct icalrecurrencetype recur),
-		GSList **recur_list,
-		GSList *rl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old recurrences */
-
-	for (l = *recur_list; l; l = l->next) {
-		icalproperty *prop;
-
-		prop = l->data;
-		icalcomponent_remove_property (priv->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (*recur_list);
-	*recur_list = NULL;
-
-	/* Add in new recurrences */
-
-	for (l = rl; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *recur;
-
-		g_assert (l->data != NULL);
-		recur = l->data;
-
-		prop = (* new_prop_func) (*recur);
-		icalcomponent_add_property (priv->icalcomp, prop);
-
-		*recur_list = g_slist_prepend (*recur_list, prop);
-	}
-
-	*recur_list = g_slist_reverse (*recur_list);
-}
-
-/**
- * cal_component_get_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of exception rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- * 
- * Queries the list of exception rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->exrule_list, icalproperty_get_exrule, recur_list);
-}
-
-/**
- * cal_component_get_exrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of exception rule properties.
- * 
- * Returns a list of exception rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->exrule_list;
-}
-
-/**
- * cal_component_set_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Sets the list of exception rules in a calendar component object.
- **/
-void
-cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_exrule, &priv->exrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exrules:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any exception rules defined
- * for it.
- * 
- * Return value: TRUE if the component has exception rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exrule_list != NULL);
-}
-
-/**
- * cal_component_has_exceptions:
- * @comp: A calendar component object
- * 
- * Queries whether a calendar component object has any exception dates
- * or exception rules.
- * 
- * Return value: TRUE if the component has exceptions, FALSE otherwise.
- **/
-gboolean 
-cal_component_has_exceptions (CalComponent *comp)
-{
-	return cal_component_has_exdates (comp) || cal_component_has_exrules (comp);
-}
-
-/**
- * cal_component_get_geo:
- * @comp: A calendar component object.
- * @geo: Return value for the geographic position property.  This should be
- * freed using the cal_component_free_geo() function.
- * 
- * Sets the geographic position property of a calendar component object.
- **/
-void
-cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (geo != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->geo) {
-		*geo = g_new (struct icalgeotype, 1);
-		**geo = icalproperty_get_geo (priv->geo);
-	} else
-		*geo = NULL;
-}
-
-/**
- * cal_component_set_geo:
- * @comp: A calendar component object.
- * @geo: Value for the geographic position property.
- * 
- * Sets the geographic position property on a calendar component object.
- **/
-void
-cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!geo) {
-		if (priv->geo) {
-			icalcomponent_remove_property (priv->icalcomp, priv->geo);
-			icalproperty_free (priv->geo);
-			priv->geo = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->geo)
-		icalproperty_set_geo (priv->geo, *geo);
-	else {
-		priv->geo = icalproperty_new_geo (*geo);
-		icalcomponent_add_property (priv->icalcomp, priv->geo);
-	}
-}
-
-/**
- * cal_component_get_last_modified:
- * @comp: A calendar component object.
- * @t: Return value for the last modified time value.
- *
- * Queries the time at which a calendar component object was last modified in
- * the calendar store.
- **/
-void
-cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->last_modified, icalproperty_get_lastmodified, t);
-}
-
-/**
- * cal_component_set_last_modified:
- * @comp: A calendar component object.
- * @t: Value for the last time modified.
- *
- * Sets the time at which a calendar component object was last stored in the
- * calendar store.  This should not be called by plain calendar user agents.
- **/
-void
-cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->last_modified,
-			  icalproperty_new_lastmodified,
-			  icalproperty_set_lastmodified,
-			  t);
-}
-
-/**
- * cal_component_get_percent:
- * @comp: A calendar component object.
- * @percent: Return value for the percent-complete property.  This should be
- * freed using the cal_component_free_percent() function.
- * 
- * Queries the percent-complete property of a calendar component object.
- **/
-void
-cal_component_get_percent (CalComponent *comp, int **percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (percent != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->percent) {
-		*percent = g_new (int, 1);
-		**percent = icalproperty_get_percentcomplete (priv->percent);
-	} else
-		*percent = NULL;
-}
-
-/**
- * cal_component_set_percent:
- * @comp: A calendar component object.
- * @percent: Value for the percent-complete property.
- * 
- * Sets the percent-complete property of a calendar component object.
- **/
-void
-cal_component_set_percent (CalComponent *comp, int *percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!percent) {
-		if (priv->percent) {
-			icalcomponent_remove_property (priv->icalcomp, priv->percent);
-			icalproperty_free (priv->percent);
-			priv->percent = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*percent >= 0 && *percent <= 100);
-
-	if (priv->percent)
-		icalproperty_set_percentcomplete (priv->percent, *percent);
-	else {
-		priv->percent = icalproperty_new_percentcomplete (*percent);
-		icalcomponent_add_property (priv->icalcomp, priv->percent);
-	}
-}
-
-/**
- * cal_component_get_priority:
- * @comp: A calendar component object.
- * @priority: Return value for the priority property.  This should be freed using
- * the cal_component_free_priority() function.
- * 
- * Queries the priority property of a calendar component object.
- **/
-void
-cal_component_get_priority (CalComponent *comp, int **priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (priority != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->priority) {
-		*priority = g_new (int, 1);
-		**priority = icalproperty_get_priority (priv->priority);
-	} else
-		*priority = NULL;
-}
-
-/**
- * cal_component_set_priority:
- * @comp: A calendar component object.
- * @priority: Value for the priority property.
- * 
- * Sets the priority property of a calendar component object.
- **/
-void
-cal_component_set_priority (CalComponent *comp, int *priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priority) {
-		if (priv->priority) {
-			icalcomponent_remove_property (priv->icalcomp, priv->priority);
-			icalproperty_free (priv->priority);
-			priv->priority = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*priority >= 0 && *priority <= 9);
-
-	if (priv->priority)
-		icalproperty_set_priority (priv->priority, *priority);
-	else {
-		priv->priority = icalproperty_new_priority (*priority);
-		icalcomponent_add_property (priv->icalcomp, priv->priority);
-	}
-}
-
-/**
- * cal_component_get_rdate_list:
- * @comp: A calendar component object.
- * @period_list: Return value for the list of recurrence dates, as a list of
- * #CalComponentPeriod structures.  This should be freed using the
- * cal_component_free_period_list() function.
- * 
- * Queries the list of recurrence date properties in a calendar component
- * object.
- **/
-void
-cal_component_get_rdate_list (CalComponent *comp, GSList **period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (period_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_period_list (priv->rdate_list, icalproperty_get_rdate, period_list);
-}
-
-/**
- * cal_component_set_rdate_list:
- * @comp: A calendar component object.
- * @period_list: List of #CalComponentPeriod structures.
- * 
- * Sets the list of recurrence dates in a calendar component object.
- **/
-void
-cal_component_set_rdate_list (CalComponent *comp, GSList *period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_period_list (comp, icalproperty_new_rdate, &priv->rdate_list, period_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rdates:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any recurrence dates defined
- * for it.
- * 
- * Return value: TRUE if the component has recurrence dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rdate_list != NULL);
-}
-
-/**
- * cal_component_get_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of recurrence rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- * 
- * Queries the list of recurrence rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->rrule_list, icalproperty_get_rrule, recur_list);
-}
-
-/**
- * cal_component_get_rrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of recurrence rule properties.
- * 
- * Returns a list of recurrence rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->rrule_list;
-}
-
-/**
- * cal_component_set_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Sets the list of recurrence rules in a calendar component object.
- **/
-void
-cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_rrule, &priv->rrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rrules:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any recurrence rules defined
- * for it.
- * 
- * Return value: TRUE if the component has recurrence rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rrule_list != NULL);
-}
-
-/**
- * cal_component_has_recurrences:
- * @comp: A calendar component object
- * 
- * Queries whether a calendar component object has any recurrence dates or
- * recurrence rules.
- * 
- * Return value: TRUE if the component has recurrences, FALSE otherwise.
- **/
-gboolean 
-cal_component_has_recurrences (CalComponent *comp)
-{
-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);
-}
-
-/**
- * cal_component_get_sequence:
- * @comp: A calendar component object.
- * @sequence: Return value for the sequence number.  This should be freed using
- * cal_component_free_sequence().
- *
- * Queries the sequence number of a calendar component object.
- **/
-void
-cal_component_get_sequence (CalComponent *comp, int **sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (sequence != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->sequence) {
-		*sequence = NULL;
-		return;
-	}
-
-	*sequence = g_new (int, 1);
-	**sequence = icalproperty_get_sequence (priv->sequence);
-}
-
-/**
- * cal_component_set_sequence:
- * @comp: A calendar component object.
- * @sequence: Sequence number value.
- *
- * Sets the sequence number of a calendar component object.  Normally this
- * function should not be called, since the sequence number is incremented
- * automatically at the proper times.
- **/
-void
-cal_component_set_sequence (CalComponent *comp, int *sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = FALSE;
-
-	if (!sequence) {
-		if (priv->sequence) {
-			icalcomponent_remove_property (priv->icalcomp, priv->sequence);
-			icalproperty_free (priv->sequence);
-			priv->sequence = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->sequence)
-		icalproperty_set_sequence (priv->sequence, *sequence);
-	else {
-		priv->sequence = icalproperty_new_sequence (*sequence);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-}
-
-/**
- * cal_component_get_summary:
- * @comp: A calendar component object.
- * @summary: Return value for the summary property and its parameters.
- *
- * Queries the summary of a calendar component object.
- **/
-void
-cal_component_get_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (summary != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->summary.prop)
-		summary->value = icalproperty_get_summary (priv->summary.prop);
-	else
-		summary->value = NULL;
-
-	if (priv->summary.altrep_param)
-		summary->altrep = icalparameter_get_altrep (priv->summary.altrep_param);
-	else
-		summary->altrep = NULL;
-}
-
-/**
- * cal_component_set_summary:
- * @comp: A calendar component object.
- * @summary: Summary property and its parameters.
- *
- * Sets the summary of a calendar component object.
- **/
-void
-cal_component_set_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!summary) {
-		if (priv->summary.prop) {
-			icalcomponent_remove_property (priv->icalcomp, priv->summary.prop);
-			icalproperty_free (priv->summary.prop);
-
-			priv->summary.prop = NULL;
-			priv->summary.altrep_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (summary->value != NULL);
-
-	if (priv->summary.prop)
-		icalproperty_set_summary (priv->summary.prop, (char *) summary->value);
-	else {
-		priv->summary.prop = icalproperty_new_summary ((char *) summary->value);
-		icalcomponent_add_property (priv->icalcomp, priv->summary.prop);
-	}
-
-	if (summary->altrep) {
-		g_assert (priv->summary.prop != NULL);
-
-		if (priv->summary.altrep_param)
-			icalparameter_set_altrep (priv->summary.altrep_param,
-						  (char *) summary->altrep);
-		else {
-			priv->summary.altrep_param = icalparameter_new_altrep (
-				(char *) summary->altrep);
-			icalproperty_add_parameter (priv->summary.prop,
-						    priv->summary.altrep_param);
-		}
-	} else if (priv->summary.altrep_param) {
-		icalproperty_remove_parameter (priv->summary.prop, ICAL_ALTREP_PARAMETER);
-		icalparameter_free (priv->summary.altrep_param);
-		priv->summary.altrep_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_transparency:
- * @comp: A calendar component object.
- * @transp: Return value for the time transparency.
- *
- * Queries the time transparency of a calendar component object.
- **/
-void
-cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp)
-{
-	CalComponentPrivate *priv;
-	const char *val;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->transparency) {
-		*transp = CAL_COMPONENT_TRANSP_NONE;
-		return;
-	}
-
-	val = icalproperty_get_transp (priv->transparency);
-
-	if (strcasecmp (val, "TRANSPARENT"))
-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else if (strcasecmp (val, "OPAQUE"))
-		*transp = CAL_COMPONENT_TRANSP_OPAQUE;
-	else
-		*transp = CAL_COMPONENT_TRANSP_UNKNOWN;
-}
-
-/**
- * cal_component_set_transparency:
- * @comp: A calendar component object.
- * @transp: Time transparency value.
- *
- * Sets the time transparency of a calendar component object.
- **/
-void
-cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != CAL_COMPONENT_TRANSP_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-
-	if (transp == CAL_COMPONENT_TRANSP_NONE) {
-		if (priv->transparency) {
-			icalcomponent_remove_property (priv->icalcomp, priv->transparency);
-			icalproperty_free (priv->transparency);
-			priv->transparency = NULL;
-		}
-
-		return;
-	}
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		str = "TRANSPARENT";
-		break;
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		str = "OPAQUE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->transparency)
-		icalproperty_set_transp (priv->transparency, str);
-	else {
-		priv->transparency = icalproperty_new_transp (str);
-		icalcomponent_add_property (priv->icalcomp, priv->transparency);
-	}
-}
-
-/**
- * cal_component_get_url:
- * @comp: A calendar component object.
- * @url: Return value for the URL.
- *
- * Queries the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_get_url (CalComponent *comp, const char **url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (url != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->url)
-		*url = icalproperty_get_url (priv->url);
-	else
-		*url = NULL;
-}
-
-/**
- * cal_component_set_url:
- * @comp: A calendar component object.
- * @url: URL value.
- *
- * Sets the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_set_url (CalComponent *comp, const char *url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!url) {
-		if (priv->url) {
-			icalcomponent_remove_property (priv->icalcomp, priv->url);
-			icalproperty_free (priv->url);
-			priv->url = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->url)
-		icalproperty_set_url (priv->url, (char *) url);
-	else {
-		priv->url = icalproperty_new_url ((char *) url);
-		icalcomponent_add_property (priv->icalcomp, priv->url);
-	}
-}
-
-
-
-/**
- * cal_component_free_categories_list:
- * @categ_list: List of category strings.
- *
- * Frees a list of category strings.
- **/
-void
-cal_component_free_categories_list (GSList *categ_list)
-{
-	GSList *l;
-
-	for (l = categ_list; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (categ_list);
-}
-
-/**
- * cal_component_free_datetime:
- * @dt: A date/time structure.
- *
- * Frees a date/time structure.
- **/
-void
-cal_component_free_datetime (CalComponentDateTime *dt)
-{
-	g_return_if_fail (dt != NULL);
-
-	if (dt->value)
-		g_free (dt->value);
-}
-
-/**
- * cal_component_free_exdate_list:
- * @exdate_list: List of struct #icaltimetype structures.
- * 
- * Frees a list of struct #icaltimetype structures.
- **/
-void
-cal_component_free_exdate_list (GSList *exdate_list)
-{
-	GSList *l;
-
-	for (l = exdate_list; l; l = l->next) {
-		struct icaltimetype *t;
-
-		g_assert (l->data != NULL);
-		t = l->data;
-
-		g_free (t);
-	}
-
-	g_slist_free (exdate_list);
-}
-
-/**
- * cal_component_free_geo:
- * @geo: An #icalgeotype structure.
- * 
- * Frees a struct #icalgeotype structure as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_geo (struct icalgeotype *geo)
-{
-	g_return_if_fail (geo != NULL);
-
-	g_free (geo);
-}
-
-/**
- * cal_component_free_icaltimetype:
- * @t: An #icaltimetype structure.
- *
- * Frees a struct #icaltimetype value as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_icaltimetype (struct icaltimetype *t)
-{
-	g_return_if_fail (t != NULL);
-
-	g_free (t);
-}
-
-/**
- * cal_component_free_percent:
- * @percent: Percent value.
- * 
- * Frees a percent value as returned by the cal_component_get_percent()
- * function.
- **/
-void
-cal_component_free_percent (int *percent)
-{
-	g_return_if_fail (percent != NULL);
-
-	g_free (percent);
-}
-
-/**
- * cal_component_free_priority:
- * @priority: Priority value.
- * 
- * Frees a priority value as returned by the cal_component_get_priority()
- * function.
- **/
-void
-cal_component_free_priority (int *priority)
-{
-	g_return_if_fail (priority != NULL);
-
-	g_free (priority);
-}
-
-/**
- * cal_component_free_period_list:
- * @period_list: List of #CalComponentPeriod structures.
- *
- * Frees a list of #CalComponentPeriod structures.
- **/
-void
-cal_component_free_period_list (GSList *period_list)
-{
-	GSList *l;
-
-	for (l = period_list; l; l = l->next) {
-		CalComponentPeriod *period;
-
-		g_assert (l->data != NULL);
-
-		period = l->data;
-		g_free (period);
-	}
-
-	g_slist_free (period_list);
-}
-
-/**
- * cal_component_free_recur_list:
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Frees a list of struct #icalrecurrencetype structures.
- **/
-void
-cal_component_free_recur_list (GSList *recur_list)
-{
-	GSList *l;
-
-	for (l = recur_list; l; l = l->next) {
-		struct icalrecurrencetype *r;
-
-		g_assert (l->data != NULL);
-		r = l->data;
-
-		g_free (r);
-	}
-
-	g_slist_free (recur_list);
-}
-
-/**
- * cal_component_free_sequence:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_sequence (int *sequence)
-{
-	g_return_if_fail (sequence != NULL);
-
-	g_free (sequence);
-}
-
-/**
- * cal_component_free_pilot_id:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_pilot_id (unsigned long *pilot_id)
-{
-	g_return_if_fail (pilot_id != NULL);
-
-	g_free (pilot_id);
-}
-
-/**
- * cal_component_free_pilot_status:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_pilot_status (unsigned long *pilot_status)
-{
-	g_return_if_fail (pilot_status != NULL);
-
-	g_free (pilot_status);
-}
-
-/**
- * cal_component_free_text_list:
- * @text_list: List of #CalComponentText structures.
- *
- * Frees a list of #CalComponentText structures.  This function should only be
- * used to free lists of text values as returned by the other getter functions
- * of #CalComponent.
- **/
-void
-cal_component_free_text_list (GSList *text_list)
-{
-	GSList *l;
-
-	for (l = text_list; l; l = l->next) {
-		CalComponentText *text;
-
-		g_assert (l->data != NULL);
-
-		text = l->data;
-		g_return_if_fail (text != NULL);
-		g_free (text);
-	}
-
-	g_slist_free (text_list);
-}
-
-
-
-/**
- * cal_component_has_alarms:
- * @comp: A calendar component object.
- *
- * Checks whether the component has any alarms.
- *
- * Return value: TRUE if the component has any alarms.
- **/
-gboolean
-cal_component_has_alarms (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *subcomp;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	subcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-
-	return subcomp != NULL ? TRUE : FALSE;
-}
-
-/* Scans an icalproperty from a calendar component and adds its mapping to our
- * own alarm structure.
- */
-static void
-scan_alarm_property (CalComponentAlarm *alarm, icalproperty *prop)
-{
-	icalproperty_kind kind;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_ACTION_PROPERTY:
-		alarm->action = prop;
-		break;
-
-	case ICAL_TRIGGER_PROPERTY:
-		alarm->trigger = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Creates a CalComponentAlarm from a libical alarm subcomponent */
-static CalComponentAlarm *
-make_alarm (CalComponent *comp, icalcomponent *subcomp)
-{
-	CalComponentAlarm *alarm;
-	icalproperty *prop;
-
-	alarm = g_new (CalComponentAlarm, 1);
-
-	alarm->parent = comp;
-	alarm->icalcomp = subcomp;
-
-	for (prop = icalcomponent_get_first_property (subcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (subcomp, ICAL_ANY_PROPERTY))
-		scan_alarm_property (alarm, prop);
-
-	return alarm;
-}
-
-/**
- * cal_component_get_first_alarm:
- * @comp: A calendar component object.
- *
- * Starts an iterator for the alarms in a calendar component object.  Subsequent
- * alarms can be obtained with the cal_component_get_next_alarm() function.
- *
- * Return value: The first alarm in the component, or NULL if the component has
- * no alarms.  This should be freed using the cal_component_alarm_free()
- * function.
- **/
-CalComponentAlarm *
-cal_component_get_first_alarm (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *subcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	subcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	if (!subcomp)
-		return NULL;
-
-	return make_alarm (comp, subcomp);
-}
-
-/**
- * cal_component_get_next_alarm:
- * @comp: A calendar component object.
- * 
- * Gets the next alarm on a calendar component object.  This should be used as
- * an iterator function after calling cal_component_get_first_alarm().
- * 
- * Return value: The next alarm in the component, or NULL if the component has
- * no more alarms.  This should be freed using the cal_component_alarm_free()
- * function.
- **/
-CalComponentAlarm *
-cal_component_get_next_alarm (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *subcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	subcomp = icalcomponent_get_next_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	if (!subcomp)
-		return NULL;
-
-	return make_alarm (comp, subcomp);
-}
-
-/**
- * cal_component_alarm_free:
- * @alarm: A calendar alarm.
- *
- * Frees an alarm structure.
- **/
-void
-cal_component_alarm_free (CalComponentAlarm *alarm)
-{
-	g_return_if_fail (alarm != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (icalcomponent_get_parent (alarm->icalcomp) != NULL)
-		icalcomponent_free (alarm->icalcomp);
-
-	alarm->icalcomp = NULL;
-
-	alarm->parent = NULL;
-	alarm->action = NULL;
-
-	g_free (alarm);
-}
-
-/**
- * cal_component_alarm_get_action:
- * @alarm: An alarm.
- * @action: Return value for the alarm's action type.
- *
- * Queries the action type of an alarm.
- **/
-void
-cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action)
-{
-	const char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->action) {
-		*action = CAL_COMPONENT_ALARM_NONE;
-		return;
-	}
-
-	str = icalproperty_get_action (alarm->action);
-
-	if (strcasecmp (str, "AUDIO") == 0)
-		*action = CAL_COMPONENT_ALARM_AUDIO;
-	else if (strcasecmp (str, "DISPLAY") == 0)
-		*action = CAL_COMPONENT_ALARM_DISPLAY;
-	else if (strcasecmp (str, "EMAIL") == 0)
-		*action = CAL_COMPONENT_ALARM_EMAIL;
-	else if (strcasecmp (str, "PROCEDURE") == 0)
-		*action = CAL_COMPONENT_ALARM_PROCEDURE;
-	else
-		*action = CAL_COMPONENT_ALARM_UNKNOWN;
-}
-
-/**
- * cal_component_alarm_set_action:
- * @alarm: An alarm.
- * @action: Action type.
- *
- * Sets the action type for an alarm.
- **/
-void
-cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action)
-{
-	char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != CAL_COMPONENT_ALARM_NONE);
-	g_return_if_fail (action != CAL_COMPONENT_ALARM_UNKNOWN);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	switch (action) {
-	case CAL_COMPONENT_ALARM_AUDIO:
-		str = "AUDIO";
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-		str = "DISPLAY";
-		break;
-
-	case CAL_COMPONENT_ALARM_EMAIL:
-		str = "EMAIL";
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-		str = "PROCEDURE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (alarm->action)
-		icalproperty_set_action (alarm->action, str);
-	else {
-		alarm->action = icalproperty_new_action (str);
-		icalcomponent_add_property (alarm->icalcomp, alarm->action);
-	}
-}
-
-/**
- * cal_component_alarm_get_trigger:
- * @alarm: An alarm.
- * @trigger: Return value for the trigger time.  This should be freed using the
- * cal_component_alarm_free_trigger() function.
- *
- * Queries the trigger time for an alarm.
- **/
-void
-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger)
-{
-	icalparameter *param;
-	union icaltriggertype t;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->trigger) {
-		*trigger = NULL;
-		return;
-	}
-
-	*trigger = g_new (CalComponentAlarmTrigger, 1);
-
-	/* Get trigger type */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-
-	if (param) {
-		icalparameter_value value;
-
-		value = icalparameter_get_value (param);
-
-		switch (value) {
-		case ICAL_VALUE_DURATION:
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-			break;
-
-		case ICAL_VALUE_DATETIME:
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE;
-			break;
-
-		default:
-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "
-				   "value %d; using RELATIVE", value);
-
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-			break;
-		}
-	} else
-		(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-
-	/* Get trigger value and the RELATED parameter */
-
-	t = icalproperty_get_trigger (alarm->trigger);
-
-	switch ((*trigger)->type) {
-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-		(*trigger)->u.relative.duration = t.duration;
-
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-		if (param) {
-			icalparameter_related rel;
-
-			rel = icalparameter_get_related (param);
-
-			switch (rel) {
-			case ICAL_RELATED_START:
-				(*trigger)->u.relative.related =
-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;
-				break;
-
-			case ICAL_RELATED_END:
-				(*trigger)->u.relative.related =
-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_END;
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		} else
-			(*trigger)->u.relative.related = CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;
-
-		break;
-
-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
-		(*trigger)->u.absolute = t.time;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/**
- * cal_component_alarm_set_trigger:
- * @alarm: An alarm.
- * @trigger: Trigger time structure.
- *
- * Sets the trigger time of an alarm.
- **/
-void
-cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger)
-{
-	union icaltriggertype t;
-	icalparameter *param;
-	icalparameter_value value_type;
-	icalparameter_related related;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	/* Delete old trigger */
-
-	if (alarm->trigger) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->trigger);
-		icalproperty_free (alarm->trigger);
-		alarm->trigger = NULL;
-	}
-
-	/* Set the value */
-
-	value_type = ICAL_DURATION_VALUE; /* Keep GCC happy */
-	related = ICAL_RELATED_START; /* Ditto */
-
-	switch (trigger->type) {
-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-		t.duration = trigger->u.relative.duration;
-		value_type = ICAL_DURATION_VALUE;
-
-		switch (trigger->u.relative.related) {
-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
-			related = ICAL_RELATED_START;
-			break;
-
-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-			related = ICAL_RELATED_END;
-			break;
-
-		default:
-			g_assert_not_reached ();
-			return;
-		}
-
-		break;
-
-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
-		t.time = trigger->u.absolute;
-		value_type = ICAL_DATETIME_VALUE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	alarm->trigger = icalproperty_new_trigger (t);
-	icalcomponent_add_property (alarm->icalcomp, alarm->trigger);
-
-	/* Value parameters */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-	if (param)
-		icalparameter_set_value (param, value_type);
-	else {
-		param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (alarm->trigger, param);
-	}
-
-	/* Related parameter */
-
-	if (trigger->type == CAL_COMPONENT_ALARM_TRIGGER_RELATIVE) {
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-
-		if (param)
-			icalparameter_set_related (param, related);
-		else {
-			param = icalparameter_new_related (related);
-			icalproperty_add_parameter (alarm->trigger, param);
-		}
-	}
-}
-
-/**
- * cal_component_alarm_free_trigger:
- * @trigger: A #CalComponentAlarmTrigger structure.
- *
- * Frees a #CalComponentAlarmTrigger structure.
- **/
-void
-cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger)
-{
-	g_return_if_fail (trigger != NULL);
-
-	g_free (trigger);
-}
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
deleted file mode 100644
index 32c3449b55..0000000000
--- a/calendar/cal-util/cal-component.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMPONENT_H
-#define CAL_COMPONENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <ical.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-
-/* Types of calendar components to be stored by a CalComponent, as per RFC 2445.
- * We don't put the alarm component type here since we store alarms as separate
- * structures inside the other "real" components.
- */
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-
-/* Field identifiers for a calendar component */
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-
-/* Structures to return properties and their parameters */
-
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-
-typedef struct _CalComponentAlarm CalComponentAlarm;
-
-typedef struct _CalComponent CalComponent;
-typedef struct _CalComponentClass CalComponentClass;
-
-typedef struct _CalComponentPrivate CalComponentPrivate;
-
-struct _CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-
-struct _CalComponentClass {
-	GtkObjectClass parent_class;
-};
-
-/* Calendar component */
-
-GtkType cal_component_get_type (void);
-
-char *cal_component_gen_uid (void);
-
-CalComponent *cal_component_new (void);
-
-CalComponent *cal_component_clone (CalComponent *comp);
-
-void cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type);
-
-gboolean cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp);
-icalcomponent *cal_component_get_icalcomponent (CalComponent *comp);
-
-CalComponentVType cal_component_get_vtype (CalComponent *comp);
-
-char *cal_component_get_as_string (CalComponent *comp);
-
-void cal_component_commit_sequence (CalComponent *comp);
-
-void cal_component_get_uid (CalComponent *comp, const char **uid);
-void cal_component_set_uid (CalComponent *comp, const char *uid);
-
-void cal_component_get_status (CalComponent *comp, const char **status);
-void cal_component_set_status (CalComponent *comp, const char *status);
-
-void cal_component_get_categories_list (CalComponent *comp, GSList **categ_list);
-void cal_component_set_categories_list (CalComponent *comp, GSList *categ_list);
-
-void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif);
-void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif);
-
-void cal_component_get_comment_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_comment_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_completed (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_completed (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_created (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_created (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_description_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_description_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t);
-void cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list);
-void cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list);
-gboolean cal_component_has_exdates (CalComponent *comp);
-
-void cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_exrules (CalComponent *comp);
-
-gboolean cal_component_has_exceptions (CalComponent *comp);
-
-void cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo);
-void cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo);
-
-void cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_percent (CalComponent *comp, int **percent);
-void cal_component_set_percent (CalComponent *comp, int *percent);
-
-void cal_component_get_priority (CalComponent *comp, int **priority);
-void cal_component_set_priority (CalComponent *comp, int *priority);
-
-void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);
-void cal_component_set_rdate_list (CalComponent *comp, GSList *period_list);
-gboolean cal_component_has_rdates (CalComponent *comp);
-
-void cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_rrules (CalComponent *comp);
-
-gboolean cal_component_has_recurrences (CalComponent *comp);
-
-void cal_component_get_sequence (CalComponent *comp, int **sequence);
-void cal_component_set_sequence (CalComponent *comp, int *sequence);
-
-void cal_component_get_summary (CalComponent *comp, CalComponentText *summary);
-void cal_component_set_summary (CalComponent *comp, CalComponentText *summary);
-
-void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp);
-void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp);
-
-void cal_component_get_url (CalComponent *comp, const char **url);
-void cal_component_set_url (CalComponent *comp, const char *url);
-
-/* Functions to free returned values */
-
-void cal_component_free_categories_list (GSList *categ_list);
-void cal_component_free_datetime (CalComponentDateTime *dt);
-void cal_component_free_exdate_list (GSList *exdate_list);
-void cal_component_free_geo (struct icalgeotype *geo);
-void cal_component_free_icaltimetype (struct icaltimetype *t);
-void cal_component_free_percent (int *percent);
-void cal_component_free_priority (int *priority);
-void cal_component_free_period_list (GSList *period_list);
-void cal_component_free_recur_list (GSList *recur_list);
-void cal_component_free_sequence (int *sequence);
-void cal_component_free_pilot_id (unsigned long *pilot_status);
-void cal_component_free_pilot_status (unsigned long *pilot_status);
-void cal_component_free_text_list (GSList *text_list);
-
-/* Alarms */
-
-typedef enum {
-	CAL_COMPONENT_ALARM_NONE,
-	CAL_COMPONENT_ALARM_AUDIO,
-	CAL_COMPONENT_ALARM_DISPLAY,
-	CAL_COMPONENT_ALARM_EMAIL,
-	CAL_COMPONENT_ALARM_PROCEDURE,
-	CAL_COMPONENT_ALARM_UNKNOWN
-} CalComponentAlarmAction;
-
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,
-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE
-} CalComponentAlarmTriggerType;
-
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END
-} CalComponentAlarmTriggerRelated;
-
-typedef struct {
-	CalComponentAlarmTriggerType type;
-
-	union {
-		struct {
-			struct icaldurationtype duration;
-			CalComponentAlarmTriggerRelated related;
-		} relative;
-
-		struct icaltimetype absolute;
-	} u;
-} CalComponentAlarmTrigger;
-
-gboolean cal_component_has_alarms (CalComponent *comp);
-CalComponentAlarm *cal_component_get_first_alarm (CalComponent *comp);
-CalComponentAlarm *cal_component_get_next_alarm (CalComponent *comp);
-
-void cal_component_alarm_free (CalComponentAlarm *alarm);
-
-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action);
-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action);
-
-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger);
-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger);
-void cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
deleted file mode 100644
index 057bde1368..0000000000
--- a/calendar/cal-util/cal-recur.c
+++ /dev/null
@@ -1,3662 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/timeutil.h>
-
-
-/*
- * Introduction to The Recurrence Generation Functions:
- *
- * Note: This is pretty complicated. See the iCalendar spec (RFC 2445) for
- *       the specification of the recurrence rules and lots of examples
- *	 (sections 4.3.10 & 4.8.5). We also want to support the older
- *	 vCalendar spec, though this should be easy since it is basically a
- *	 subset of iCalendar.
- *
- * o An iCalendar event can have any number of recurrence rules specifying
- *   occurrences of the event, as well as dates & times of specific
- *   occurrences. It can also have any number of recurrence rules and
- *   specific dates & times specifying exceptions to the occurrences.
- *   So we first merge all the occurrences generated, eliminating any
- *   duplicates, then we generate all the exceptions and remove these to
- *   form the final set of occurrences.
- *
- * o There are 7 frequencies of occurrences: YEARLY, MONTHLY, WEEKLY, DAILY,
- *   HOURLY, MINUTELY & SECONDLY. The 'interval' property specifies the
- *   multiples of the frequency which we step by. We generate a 'set' of
- *   occurrences for each period defined by the frequency & interval.
- *   So for a YEARLY frequency with an interval of 3, we generate a set of
- *   occurrences for every 3rd year. We use complete years here -  any
- *   generated occurrences that occur before the event's start (or after its
- *   end) are just discarded.
- *
- * o There are 8 frequency modifiers: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY,
- *   BYDAY, BYHOUR, BYMINUTE & BYSECOND. These can either add extra occurrences
- *   or filter out occurrences. For example 'FREQ=YEARLY;BYMONTH=1,2' produces
- *   2 occurrences for each year rather than the default 1. And
- *   'FREQ=DAILY;BYMONTH=1' filters out all occurrences except those in Jan.
- *   If the modifier works on periods which are less than the recurrence
- *   frequency, then extra occurrences are added, otherwise occurrences are
- *   filtered. So we have 2 functions for each modifier - one to expand events
- *   and the other to filter. We use a table of functions for each frequency
- *   which points to the appropriate function to use for each modifier.
- *
- * o Any number of frequency modifiers can be used in a recurrence rule.
- *   (Though the iCalendar spec says that BYWEEKNO can only be used in a YEARLY
- *   rule, and some modifiers aren't appropriate for some frequencies - e.g.
- *   BYMONTHDAY is not really useful in a WEEKLY frequency, and BYYEARDAY is
- *   not useful in a MONTHLY or WEEKLY frequency).
- *   The frequency modifiers are applied in the order given above. The first 5
- *   modifier rules (BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY & BYDAY) all
- *   produce the days on which the occurrences take place, and so we have to
- *   compute some of these in parallel rather than sequentially, or we may end
- *   up with too many days.
- *
- * o Note that some expansion functions may produce days which are invalid,
- *   e.g. 31st September, 30th Feb. These invalid days are removed before the
- *   BYHOUR, BYMINUTE & BYSECOND modifier functions are applied.
- *
- * o After the set of occurrences for the frequency interval are generated,
- *   the BYSETPOS property is used to select which of the occurrences are
- *   finally output. If BYSETPOS is not specified then all the occurrences are
- *   output.
- */
-
-/* Define this for some debugging output. */
-#if 0
-#define CAL_OBJ_DEBUG	1
-#endif
-
-/* We will use icalrecurrencetype instead of this eventually. */
-typedef struct {
-	icalrecurrencetype_frequency freq;
-
-	int            interval;
-
-	/* Specifies the end of the recurrence. No occurrences are generated
-	   after this date. If it is 0, the event recurs forever. */
-	time_t         enddate;
-
-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
-	gint	       week_start_day;
-
-
-	/* NOTE: I've used GList's here, but it doesn't matter if we use
-	   other data structures like arrays. The code should be easy to
-	   change. So long as it is easy to see if the modifier is set. */
-
-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */
-	GList	      *bymonth;
-
-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */
-	GList	      *byweekno;
-
-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */
-	GList	      *byyearday;
-
-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */
-	GList	      *bymonthday;
-
-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
-	   The second of each pair is the week number [+-]0-53. */
-	GList	      *byday;
-
-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
-	GList	      *byhour;
-
-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */
-	GList	      *byminute;
-
-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */
-	GList	      *bysecond;
-
-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */
-	GList	      *bysetpos;
-} CalRecurrence;
-
-/* This is what we use to pass to all the filter functions. */
-typedef struct _RecurData RecurData;
-struct _RecurData {
-	CalRecurrence *recur;
-
-	/* This is used for the WEEKLY frequency. */
-	gint weekday;
-
-	/* This is used for fast lookup in BYMONTH filtering. */
-	guint8 months[12];
-
-	/* This is used for fast lookup in BYYEARDAY filtering. */
-	guint8 yeardays[367], neg_yeardays[367]; /* Days are 1 - 366. */
-
-	/* This is used for fast lookup in BYMONTHDAY filtering. */
-	guint8 monthdays[32], neg_monthdays[32]; /* Days are 1 to 31. */
-
-	/* This is used for fast lookup in BYDAY filtering. */
-	guint8 weekdays[7];
-
-	/* This is used for fast lookup in BYHOUR filtering. */
-	guint8 hours[24];
-
-	/* This is used for fast lookup in BYMINUTE filtering. */
-	guint8 minutes[60];
-
-	/* This is used for fast lookup in BYSECOND filtering. */
-	guint8 seconds[62];
-};
-
-/* This is what we use to represent a date & time. */
-typedef struct _CalObjTime CalObjTime;
-struct _CalObjTime {
-	guint16 year;
-	guint8 month;		/* 0 - 11 */
-	guint8 day;		/* 1 - 31 */
-	guint8 hour;		/* 0 - 23 */
-	guint8 minute;		/* 0 - 59 */
-	guint8 second;		/* 0 - 59 (maybe up to 61 for leap seconds) */
-	guint8 is_rdate;	/* TRUE if this is an RDATE, which may have an
-				   end or duration set. */
-};
-
-/* This is what we use to represent specific recurrence dates.
-   Note that we assume it starts with a CalObjTime when sorting. */
-typedef struct _CalObjRecurrenceDate CalObjRecurrenceDate;
-struct _CalObjRecurrenceDate {
-	CalObjTime start;
-	CalComponentPeriod *period;
-};
-
-/* The paramter we use to store the enddate in RRULE and EXRULE properties. */
-#define EVOLUTION_END_DATE_PARAMETER	"X-EVOLUTION-ENDDATE"
-
-typedef gboolean (*CalObjFindStartFn) (CalObjTime *event_start,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_start,
-				       CalObjTime *interval_end,
-				       CalObjTime *cotime);
-typedef gboolean (*CalObjFindNextFn)  (CalObjTime *cotime,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_end);
-typedef GArray*	 (*CalObjFilterFn)    (RecurData  *recur_data,
-				       GArray     *occs);
-
-typedef struct _CalRecurVTable CalRecurVTable;
-struct _CalRecurVTable {
-	CalObjFindStartFn find_start_position;
-	CalObjFindNextFn find_next_position;
-
-	CalObjFilterFn bymonth_filter;
-	CalObjFilterFn byweekno_filter;
-	CalObjFilterFn byyearday_filter;
-	CalObjFilterFn bymonthday_filter;
-	CalObjFilterFn byday_filter;
-	CalObjFilterFn byhour_filter;
-	CalObjFilterFn byminute_filter;
-	CalObjFilterFn bysecond_filter;
-};
-
-
-/* This is used to specify which parts of the CalObjTime to compare in
-   cal_obj_time_compare(). */
-typedef enum {
-	CALOBJ_YEAR,
-	CALOBJ_MONTH,
-	CALOBJ_DAY,
-	CALOBJ_HOUR,
-	CALOBJ_MINUTE,
-	CALOBJ_SECOND
-} CalObjTimeComparison;
-
-static void cal_recur_generate_instances_of_rule (CalComponent	*comp,
-						  icalproperty	*prop,
-						  time_t	 start,
-						  time_t	 end,
-						  CalRecurInstanceFn cb,
-						  gpointer       cb_data);
-
-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,
-						    gboolean exception);
-static gint cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);
-static void	cal_recur_free			(CalRecurrence	*r);
-
-
-static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,
-						 GArray		*rdate_periods);
-static void	cal_object_compute_duration	(CalObjTime	*start,
-						 CalObjTime	*end,
-						 gint		*days,
-						 gint		*seconds);
-
-static gboolean generate_instances_for_chunk	(CalComponent		*comp,
-						 time_t			 comp_dtstart,
-						 GSList			*rrules,
-						 GSList			*rdates,
-						 GSList			*exrules,
-						 GSList			*exdates,
-						 CalObjTime		*event_start,
-						 CalObjTime		*chunk_start,
-						 CalObjTime		*chunk_end,
-						 time_t			 interval_start_time,
-						 time_t			 interval_end_time,
-						 gint			 duration_days,
-						 gint			 duration_seconds,
-						 CalRecurInstanceFn	 cb,
-						 gpointer		 cb_data);
-
-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,
-						 CalRecurrence	  *recur,
-						 CalObjTime	  *interval_start,
-						 CalObjTime	  *interval_end,
-						 gboolean	  *finished);
-
-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_monthly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-
-
-static CalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);
-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,
-						 CalRecurrence	*recur,
-						 CalObjTime	*event_start);
-static void	cal_obj_sort_occurrences	(GArray		*occs);
-static gint	cal_obj_time_compare_func	(const void	*arg1,
-						 const void	*arg2);
-static void	cal_obj_remove_duplicates_and_invalid_dates (GArray	*occs);
-static void	cal_obj_remove_exceptions	(GArray		*occs,
-						 GArray		*ex_occs);
-static GArray*	cal_obj_bysetpos_filter		(CalRecurrence	*recur,
-						 GArray		*occs);
-
-
-static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_yearly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_monthly_find_start_position (CalObjTime *event_start,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_start,
-						     CalObjTime *interval_end,
-						     CalObjTime *cotime);
-static gboolean cal_obj_monthly_find_next_position  (CalObjTime *cotime,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_end);
-
-static gboolean cal_obj_weekly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_weekly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_daily_find_start_position  (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_daily_find_next_position   (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_hourly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_hourly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_minutely_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_minutely_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static gboolean cal_obj_secondly_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_secondly_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static GArray* cal_obj_bymonth_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonth_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byweekno_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-#if 0
-/* This isn't used at present. */
-static GArray* cal_obj_byweekno_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-#endif
-static GArray* cal_obj_byyearday_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byyearday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_expand	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_filter	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-
-static void cal_obj_time_add_months		(CalObjTime *cotime,
-						 gint	     months);
-static void cal_obj_time_add_days		(CalObjTime *cotime,
-						 gint	     days);
-static void cal_obj_time_add_hours		(CalObjTime *cotime,
-						 gint	     hours);
-static void cal_obj_time_add_minutes		(CalObjTime *cotime,
-						 gint	     minutes);
-static void cal_obj_time_add_seconds		(CalObjTime *cotime,
-						 gint	     seconds);
-static gint cal_obj_time_compare		(CalObjTime *cotime1,
-						 CalObjTime *cotime2,
-						 CalObjTimeComparison type);
-static gint cal_obj_time_weekday		(CalObjTime *cotime,
-						 CalRecurrence *recur);
-static gint cal_obj_time_day_of_year		(CalObjTime *cotime);
-static void cal_obj_time_find_first_week	(CalObjTime *cotime,
-						 RecurData  *recur_data);
-static void cal_object_time_from_time		(CalObjTime *cotime,
-						 time_t      t);
-static gint cal_obj_date_only_compare_func (const void *arg1,
-					    const void *arg2);
-
-
-
-static gboolean cal_recur_ensure_end_dates	(CalComponent	*comp,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,
-						 icalproperty	*prop,
-						 gboolean	 exception,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-							 time_t		 instance_start,
-							 time_t		 instance_end,
-							 gpointer	 data);
-static time_t cal_recur_get_rule_end_date	(icalproperty	*prop);
-static void cal_recur_set_rule_end_date		(icalproperty	*prop,
-						 time_t		 end_date);
-
-
-#ifdef CAL_OBJ_DEBUG
-static char* cal_obj_time_to_string	(CalObjTime *cotime);
-#endif
-
-
-CalRecurVTable cal_obj_yearly_vtable = {
-	cal_obj_yearly_find_start_position,
-	cal_obj_yearly_find_next_position,
-
-	cal_obj_bymonth_expand,
-	cal_obj_byweekno_expand,
-	cal_obj_byyearday_expand,
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_yearly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_monthly_vtable = {
-	cal_obj_monthly_find_start_position,
-	cal_obj_monthly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a MONTHLY frequency. */
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_monthly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_weekly_vtable = {
-	cal_obj_weekly_find_start_position,
-	cal_obj_weekly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a WEEKLY frequency. */
-	NULL, /* BYMONTHDAY is not useful in a WEEKLY frequency. */
-	cal_obj_byday_expand_weekly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_daily_vtable = {
-	cal_obj_daily_find_start_position,
-	cal_obj_daily_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_hourly_vtable = {
-	cal_obj_hourly_find_start_position,
-	cal_obj_hourly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_minutely_vtable = {
-	cal_obj_minutely_find_start_position,
-	cal_obj_minutely_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_secondly_vtable = {
-	cal_obj_secondly_find_start_position,
-	cal_obj_secondly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_filter
-};
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void
-cal_recur_generate_instances (CalComponent		*comp,
-			      time_t			 start,
-			      time_t			 end,
-			      CalRecurInstanceFn	 cb,
-			      gpointer                   cb_data)
-{
-#if 0
-	g_print ("In cal_recur_generate_instances comp: %p\n", comp);
-	g_print ("  start: %li - %s", start, ctime (&start));
-	g_print ("  end  : %li - %s", end, ctime (&end));
-#endif
-	cal_recur_generate_instances_of_rule (comp, NULL, start, end,
-					      cb, cb_data);
-}
-
-
-/*
- * Calls the given callback function for each occurrence of the given
- * recurrence rule between the given start and end times. If the rule is NULL
- * it uses all the rules from the component.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * The use of the specific rule is for determining the end of a rule when
- * COUNT is set. The callback will count instances and store the enddata
- * when COUNT is reached.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-static void
-cal_recur_generate_instances_of_rule (CalComponent	 *comp,
-				      icalproperty	 *prop,
-				      time_t		  start,
-				      time_t		  end,
-				      CalRecurInstanceFn  cb,
-				      gpointer            cb_data)
-{
-	CalComponentDateTime dtstart, dtend;
-	time_t dtstart_time, dtend_time;
-	GSList *rrules = NULL, *rdates = NULL, elem;
-	GSList *exrules = NULL, *exdates = NULL;
-	CalObjTime interval_start, interval_end, event_start, event_end;
-	CalObjTime chunk_start, chunk_end;
-	gint days, seconds, year;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (cb != NULL);
-
-	/* Get dtstart, dtend, recurrences, and exceptions */
-
-	cal_component_get_dtstart (comp, &dtstart);
-	cal_component_get_dtend (comp, &dtend);
-
-	if (!dtstart.value) {
-		g_message ("cal_recur_generate_instances_of_rule(): bogus "
-			   "component, does not have DTSTART.  Skipping...");
-		goto out;
-	}
-
-	dtstart_time = icaltime_as_timet (*dtstart.value);
-	if (start == -1)
-		start = dtstart_time;
-
-	/* FIXME: DURATION could be used instead, couldn't it? - Damon */
-	if (dtend.value)
-		dtend_time = icaltime_as_timet (*dtend.value);
-	else
-		dtend_time = time_day_end (dtstart_time);
-
-	/* If there is no recurrence, just call the callback if the event
-	   intersects the given interval. */
-	if (!(cal_component_has_recurrences (comp)
-	      || cal_component_has_exceptions (comp))) {
-		if ((end == -1 || dtstart_time < end) && dtend_time > start) {
-			(* cb) (comp, dtstart_time, dtend_time, cb_data);
-		}
-
-		goto out;
-	}
-
-	/* If a specific recurrence rule is being used, set up a simple list,
-	   else get the recurrence rules from the component. */
-	if (prop) {
-		elem.data = prop;
-		elem.next = NULL;
-		rrules = &elem;
-	} else {
-		/* Make sure all the enddates for the rules are set. */
-		cal_recur_ensure_end_dates (comp, FALSE);
-
-		cal_component_get_rrule_property_list (comp, &rrules);
-		cal_component_get_rdate_list (comp, &rdates);
-		cal_component_get_exrule_property_list (comp, &exrules);
-		cal_component_get_exdate_list (comp, &exdates);
-	}
-
-	/* Convert the interval start & end to CalObjTime. Note that if end
-	   is -1 interval_end won't be set, so don't use it!
-	   Also note that we use end - 1 since we want the interval to be
-	   inclusive as it makes the code simpler. */
-	cal_object_time_from_time (&interval_start, start);
-	if (end != -1)
-		cal_object_time_from_time (&interval_end, end - 1);
-
-	cal_object_time_from_time (&event_start, dtstart_time);
-	cal_object_time_from_time (&event_end, dtend_time);
-	
-	/* Calculate the duration of the event, which we use for all
-	   occurrences. We can't just subtract start from end since that may
-	   be affected by daylight-saving time. So we want a value of days
-	   + seconds. */
-	cal_object_compute_duration (&event_start, &event_end,
-				     &days, &seconds);
-
-	/* Take off the duration from interval_start, so we get occurrences
-	   that start just before the start time but overlap it. But only do
-	   that if the interval is after the event's start time. */
-	if (start > dtstart_time) {
-		cal_obj_time_add_days (&interval_start, -days);
-		cal_obj_time_add_seconds (&interval_start, -seconds);
-	}
-
-	/* Expand the recurrence for each year between start & end, or until
-	   the callback returns 0 if end is 0. We do a year at a time to
-	   give the callback function a chance to break out of the loop, and
-	   so we don't get into problems with infinite recurrences. Since we
-	   have to work on complete sets of occurrences, if there is a yearly
-	   frequency it wouldn't make sense to break it into smaller chunks,
-	   since we would then be calculating the same sets several times.
-	   Though this does mean that we sometimes do a lot more work than
-	   is necessary, e.g. if COUNT is set to something quite low. */
-	for (year = interval_start.year;
-	     end == -1 || year <= interval_end.year;
-	     year++) {
-		chunk_start = interval_start;
-		chunk_start.year = year;
-		if (end != -1)
-			chunk_end = interval_end;
-		chunk_end.year = year;
-
-		if (year != interval_start.year) {
-			chunk_start.month  = 0;
-			chunk_start.day    = 1;
-			chunk_start.hour   = 0;
-			chunk_start.minute = 0;
-			chunk_start.second = 0;
-		}
-		if (end == -1 || year != interval_end.year) {
-			chunk_end.month  = 11;
-			chunk_end.day    = 31;
-			chunk_end.hour   = 23;
-			chunk_end.minute = 59;
-			chunk_end.second = 61;
-			chunk_end.is_rdate = FALSE;
-		}
-
-		if (!generate_instances_for_chunk (comp, dtstart_time,
-						   rrules, rdates,
-						   exrules, exdates,
-						   &event_start,
-						   &chunk_start, &chunk_end,
-						   start, end,
-						   days, seconds,
-						   cb, cb_data))
-			break;
-	}
-
-	if (!prop) {
-		cal_component_free_period_list (rdates);
-		cal_component_free_exdate_list (exdates);
-	}
-
- out:
-	cal_component_free_datetime (&dtstart);
-	cal_component_free_datetime (&dtend);
-}
-
-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a
- * struct icalrecurrencetype.
- */
-static GList *
-array_to_list (short *array, int max_elements)
-{
-	GList *l;
-	int i;
-
-	l = NULL;
-
-	for (i = 0; i < max_elements && array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)
-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));
-	return g_list_reverse (l);
-}
-
-/**
- * cal_recur_from_icalproperty:
- * @ir: An RRULE or EXRULE #icalproperty.
- * 
- * Converts an #icalproperty to a #CalRecurrence.  This should be
- * freed using the cal_recur_free() function.
- * 
- * Return value: #CalRecurrence structure.
- **/
-static CalRecurrence *
-cal_recur_from_icalproperty (icalproperty *prop, gboolean exception)
-{
-	struct icalrecurrencetype ir;
-	CalRecurrence *r;
-	gint max_elements, i;
-
-	g_return_val_if_fail (prop != NULL, NULL);
-
-	r = g_new (CalRecurrence, 1);
-
-	if (exception)
-		ir = icalproperty_get_exrule (prop);
-	else
-		ir = icalproperty_get_rrule (prop);
-
-	r->freq = ir.freq;
-	r->interval = ir.interval;
-
-	if (ir.count != 0) {
-		r->enddate = cal_recur_get_rule_end_date (prop);
-	} else {
-		/* FIXME: icaltime_as_timet() seems to return -1 if UNTIL isn't
-		   set, but a simpler test would be better. */
-		r->enddate = icaltime_as_timet (ir.until);
-		if (r->enddate == -1)
-			r->enddate = 0;
-	}
-
-	r->week_start_day = cal_recur_ical_weekday_to_weekday (ir.week_start);
-
-	r->bymonth = array_to_list (ir.by_month,
-				    sizeof (ir.by_month) / sizeof (ir.by_month[0]));
-
-	r->byweekno = array_to_list (ir.by_week_no,
-				     sizeof (ir.by_week_no) / sizeof (ir.by_week_no[0]));
-
-	r->byyearday = array_to_list (ir.by_year_day,
-				      sizeof (ir.by_year_day) / sizeof (ir.by_year_day[0]));
-
-	r->bymonthday = array_to_list (ir.by_month_day,
-				       sizeof (ir.by_month_day) / sizeof (ir.by_month_day[0]));
-
-	/* FIXME: libical only supports 8 values, out of possible 107 * 7. */
-	r->byday = NULL;
-	max_elements = sizeof (ir.by_day) / sizeof (ir.by_day[0]);
-	for (i = 0; i < max_elements && ir.by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-		enum icalrecurrencetype_weekday day;
-		gint weeknum, weekday;
-
-		day = icalrecurrencetype_day_day_of_week (ir.by_day[i]);
-		weeknum = icalrecurrencetype_day_position (ir.by_day[i]);
-
-		weekday = cal_recur_ical_weekday_to_weekday (day);
-
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weeknum));
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weekday));
-	}
-
-	r->byhour = array_to_list (ir.by_hour,
-				   sizeof (ir.by_hour) / sizeof (ir.by_hour[0]));
-
-	r->byminute = array_to_list (ir.by_minute,
-				     sizeof (ir.by_minute) / sizeof (ir.by_minute[0]));
-
-	r->bysecond = array_to_list (ir.by_second,
-				     sizeof (ir.by_second) / sizeof (ir.by_second[0]));
-
-	r->bysetpos = array_to_list (ir.by_set_pos,
-				     sizeof (ir.by_set_pos) / sizeof (ir.by_set_pos[0]));
-
-	return r;
-}
-
-
-static gint
-cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)
-{
-	gint weekday;
-
-	switch (day) {
-	case ICAL_NO_WEEKDAY:		/* Monday is the default in RFC2445. */
-	case ICAL_MONDAY_WEEKDAY:
-		weekday = 0;
-		break;
-	case ICAL_TUESDAY_WEEKDAY:
-		weekday = 1;
-		break;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		weekday = 2;
-		break;
-	case ICAL_THURSDAY_WEEKDAY:
-		weekday = 3;
-		break;
-	case ICAL_FRIDAY_WEEKDAY:
-		weekday = 4;
-		break;
-	case ICAL_SATURDAY_WEEKDAY:
-		weekday = 5;
-		break;
-	case ICAL_SUNDAY_WEEKDAY:
-		weekday = 6;
-		break;
-	default:
-		g_warning ("cal_recur_ical_weekday_to_weekday(): Unknown week day %d",
-			   day);
-		weekday = 0;
-	}
-
-	return weekday;
-}
-
-
-/**
- * cal_recur_free:
- * @r: A #CalRecurrence structure.
- * 
- * Frees a #CalRecurrence structure.
- **/
-static void
-cal_recur_free (CalRecurrence *r)
-{
-	g_return_if_fail (r != NULL);
-
-	g_list_free (r->bymonth);
-	g_list_free (r->byweekno);
-	g_list_free (r->byyearday);
-	g_list_free (r->bymonthday);
-	g_list_free (r->byday);
-	g_list_free (r->byhour);
-	g_list_free (r->byminute);
-	g_list_free (r->bysecond);
-	g_list_free (r->bysetpos);
-
-	g_free (r);
-}
-
-/* Generates one year's worth of recurrence instances.  Returns TRUE if all the
- * callback invocations returned TRUE, or FALSE when any one of them returns
- * FALSE, i.e. meaning that the instance generation should be stopped.
- */
-static gboolean
-generate_instances_for_chunk (CalComponent	*comp,
-			      time_t             comp_dtstart,
-			      GSList		*rrules,
-			      GSList		*rdates,
-			      GSList		*exrules,
-			      GSList		*exdates,
-			      CalObjTime	*event_start,
-			      CalObjTime	*chunk_start,
-			      CalObjTime	*chunk_end,
-			      time_t		 interval_start_time,
-			      time_t		 interval_end_time,
-			      gint		 duration_days,
-			      gint		 duration_seconds,
-			      CalRecurInstanceFn cb,
-			      gpointer           cb_data)
-{
-	GArray *occs, *ex_occs, *tmp_occs, *rdate_periods;
-	CalObjTime cotime, *occ;
-	GSList *elem;
-	gint i;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	gboolean cb_status = TRUE, rule_finished, finished = TRUE;
-
-#if 0
-	g_print ("In generate_instances_for_chunk rrules: %p\n"
-		 "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",
-		 rrules,
-		 chunk_start->day, chunk_start->month + 1,
-		 chunk_start->year, chunk_start->hour,
-		 chunk_start->minute, chunk_start->second,
-		 chunk_end->day, chunk_end->month + 1,
-		 chunk_end->year, chunk_end->hour,
-		 chunk_end->minute, chunk_end->second);
-#endif
-
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	rdate_periods = g_array_new (FALSE, FALSE,
-				     sizeof (CalObjRecurrenceDate));
-
-	/* The original DTSTART property is included in the occurrence set.
-	   So we add it if it is in this chunk. If it is after this chunk
-	   we set finished to FALSE. */
-	if (cal_obj_time_compare_func (event_start, chunk_end) >= 0)
-		finished = FALSE;
-	else if (cal_obj_time_compare_func (event_start, chunk_start) >= 0)
-		g_array_append_vals (occs, event_start, 1);
-	
-	/* Expand each of the recurrence rules. */
-	for (elem = rrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		/* If any of the rules return FALSE for finished, we know we
-		   have to carry on so we set finished to FALSE. */
-		if (!rule_finished)
-			finished = FALSE;
-
-		g_array_append_vals (occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific occurrence dates, flag them as RDATEs, and store
-	   a pointer to the period in the rdate_periods array. */
-	for (elem = rdates; elem; elem = elem->next) {
-		CalComponentPeriod *p;
-		CalObjRecurrenceDate rdate;
-		time_t t;
-
-		p = elem->data;
-		t = icaltime_as_timet (p->start);
-		cal_object_time_from_time (&cotime, t);
-
-		/* If the rdate is after the current chunk we set finished
-		   to FALSE, and we skip it. */
-		if (cal_obj_time_compare_func (&cotime, chunk_end) >= 0) {
-			finished = FALSE;
-			continue;
-		}
-
-		/* Check if the end date or duration is set. If it is we need
-		   to store it so we can get it later. (libical seems to set
-		   second to -1 to denote an unset time. See icalvalue.c) */
-		if (p->type != CAL_COMPONENT_PERIOD_DATETIME
-		    || p->u.end.second != -1) {
-			cotime.is_rdate = TRUE;
-
-			rdate.start = cotime;
-			rdate.period = p;
-			g_array_append_val (rdate_periods, rdate);
-		}
-
-		g_array_append_val (occs, cotime);
-	}
-
-	/* Expand each of the exception rules. */
-	for (elem = exrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		g_array_append_vals (ex_occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific exception dates. */
-	for (elem = exdates; elem; elem = elem->next) {
-		struct icaltimetype *it;
-		time_t t;
-
-		/* FIXME we should only be dealing with dates, not times too.
-
-		   No, I think it is supposed to be dates & times - Damon.
-		   I'm not sure what the semantics of just a date would be,
-		   since the event could recur several times each day. */
-		it = elem->data;
-		t = icaltime_as_timet (*it);
-		cal_object_time_from_time (&cotime, t);
-
-		g_array_append_val (ex_occs, cotime);
-	}
-
-
-	/* Sort all the arrays. */
-	cal_obj_sort_occurrences (occs);
-	cal_obj_sort_occurrences (ex_occs);
-
-	qsort (rdate_periods->data, rdate_periods->len,
-	       sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);
-
-	/* Create the final array, by removing the exceptions from the
-	   occurrences, and removing any duplicates. */
-	cal_obj_remove_exceptions (occs, ex_occs);
-
-	/* Call the callback for each occurrence. If it returns 0 we break
-	   out of the loop. */
-	for (i = 0; i < occs->len; i++) {
-		/* Convert each CalObjTime into a start & end time_t, and
-		   check it is within the bounds of the event & interval. */
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		start_tm.tm_year  = occ->year - 1900;
-		start_tm.tm_mon   = occ->month;
-		start_tm.tm_mday  = occ->day;
-		start_tm.tm_hour  = occ->hour;
-		start_tm.tm_min   = occ->minute;
-		start_tm.tm_sec   = occ->second;
-		start_tm.tm_isdst = -1;
-		start_time = mktime (&start_tm);
-
-		if (start_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		if (start_time < comp_dtstart
-		    || (interval_end_time != -1
-			&& start_time >= interval_end_time))
-			continue;
-
-		if (occ->is_rdate) {
-			if (!cal_object_get_rdate_end (occ, rdate_periods)) {
-				cal_obj_time_add_days (occ, duration_days);
-				cal_obj_time_add_seconds (occ,
-							  duration_seconds);
-			}
-		} else {
-			cal_obj_time_add_days (occ, duration_days);
-			cal_obj_time_add_seconds (occ, duration_seconds);
-		}
-
-		end_tm.tm_year  = occ->year - 1900;
-		end_tm.tm_mon   = occ->month;
-		end_tm.tm_mday  = occ->day;
-		end_tm.tm_hour  = occ->hour;
-		end_tm.tm_min   = occ->minute;
-		end_tm.tm_sec   = occ->second;
-		end_tm.tm_isdst = -1;
-		end_time = mktime (&end_tm);
-
-		if (end_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		if (end_time <= interval_start_time)
-			continue;
-
-		cb_status = (*cb) (comp, start_time, end_time, cb_data);
-		if (!cb_status)
-			break;
-	}
-
-	g_array_free (occs, TRUE);
-	g_array_free (ex_occs, TRUE);
-	g_array_free (rdate_periods, TRUE);
-
-	/* We return TRUE (i.e. carry on) only if the callback has always
-	   returned TRUE and we know that we have more occurrences to generate
-	   (i.e. finished is FALSE). */
-	return cb_status && !finished;
-}
-
-
-/* This looks up the occurrence time in the sorted rdate_periods array, and
-   tries to compute the end time of the occurrence. If no end time or duration
-   is set it returns FALSE and the default duration will be used. */
-static gboolean
-cal_object_get_rdate_end	(CalObjTime	*occ,
-				 GArray		*rdate_periods)
-{
-	CalObjRecurrenceDate *rdate;
-	CalComponentPeriod *p;
-	gint lower, upper, middle, cmp = 0;
-	time_t t;
-
-	lower = 0;
-	upper = rdate_periods->len;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		rdate = &g_array_index (rdate_periods, CalObjRecurrenceDate,
-					middle);
-
-		cmp = cal_obj_time_compare_func (occ, &rdate->start);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* This should never happen. */
-	if (cmp == 0) {
-		g_warning ("Recurrence date not found");
-		return FALSE;
-	}
-
-	p = rdate->period;
-	if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-		t = icaltime_as_timet (p->u.end);
-		cal_object_time_from_time (occ, t);
-	} else {
-		cal_obj_time_add_days (occ, p->u.duration.weeks * 7
-				       + p->u.duration.days);
-		cal_obj_time_add_hours (occ, p->u.duration.hours);
-		cal_obj_time_add_minutes (occ, p->u.duration.minutes);
-		cal_obj_time_add_seconds (occ, p->u.duration.seconds);
-	}
-
-	return TRUE;
-}
-
-
-static void
-cal_object_compute_duration (CalObjTime *start,
-			     CalObjTime *end,
-			     gint	*days,
-			     gint	*seconds)
-{
-	GDate start_date, end_date;
-	gint start_seconds, end_seconds;
-
-	g_date_clear (&start_date, 1);
-	g_date_clear (&end_date, 1);
-	g_date_set_dmy (&start_date, start->day, start->month + 1,
-			start->year);
-	g_date_set_dmy (&end_date, end->day, end->month + 1,
-			end->year);
-
-	*days = g_date_julian (&end_date) - g_date_julian (&start_date);
-	start_seconds = start->hour * 3600 + start->minute * 60
-		+ start->second;
-	end_seconds = end->hour * 3600 + end->minute * 60 + end->second;
-
-	*seconds = end_seconds - start_seconds;
-	if (*seconds < 0) {
-		*days = *days - 1;
-		*seconds += 24 * 60 * 60;
-	}
-}
-
-
-/* Returns an unsorted GArray of CalObjTime's resulting from expanding the
-   given recurrence rule within the given interval. Note that it doesn't
-   clip the generated occurrences to the interval, i.e. if the interval
-   starts part way through the year this function still returns all the
-   occurrences for the year. Clipping is done later.
-   The finished flag is set to FALSE if there are more occurrences to generate
-   after the given interval.*/
-static GArray*
-cal_obj_expand_recurrence		(CalObjTime	  *event_start,
-					 CalRecurrence	  *recur,
-					 CalObjTime	  *interval_start,
-					 CalObjTime	  *interval_end,
-					 gboolean	  *finished)
-{
-	CalRecurVTable *vtable;
-	CalObjTime *event_end = NULL, event_end_cotime;
-	RecurData recur_data;
-	CalObjTime occ, *cotime;
-	GArray *all_occs, *occs;
-	gint len;
-
-	/* This is the resulting array of CalObjTime elements. */
-	all_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	*finished = TRUE;
-
-	vtable = cal_obj_get_vtable (recur->freq);
-	if (!vtable)
-		return all_occs;
-
-	/* Calculate some useful data such as some fast lookup tables. */
-	cal_obj_initialize_recur_data (&recur_data, recur, event_start);
-
-	/* Compute the event_end, if the recur's enddate is set. */
-	if (recur->enddate > 0) {
-		cal_object_time_from_time (&event_end_cotime,
-					   recur->enddate);
-		event_end = &event_end_cotime;
-
-		/* If the enddate is before the requested interval return. */
-		if (cal_obj_time_compare_func (event_end, interval_start) < 0)
-			return all_occs;
-	}
-
-	/* Set finished to FALSE if we know there will be more occurrences to
-	   do after this interval. */
-	if (!interval_end || !event_end
-	    || cal_obj_time_compare_func (event_end, interval_end) > 0)
-		*finished = FALSE;
-
-	/* Get the first period based on the frequency and the interval that
-	   intersects the interval between start and end. */
-	if ((*vtable->find_start_position) (event_start, event_end,
-					    &recur_data,
-					    interval_start, interval_end,
-					    &occ))
-		return all_occs;
-
-	/* Loop until the event ends or we go past the end of the required
-	   interval. */
-	for (;;) {
-		/* Generate the set of occurrences for this period. */
-		switch (recur->freq) {
-		case ICAL_YEARLY_RECURRENCE:
-			occs = cal_obj_generate_set_yearly (&recur_data,
-							    vtable, &occ);
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			occs = cal_obj_generate_set_monthly (&recur_data,
-							     vtable, &occ);
-			break;
-		default:
-			occs = cal_obj_generate_set_default (&recur_data,
-							     vtable, &occ);
-			break;
-		}
-
-		/* Sort the occurrences and remove duplicates. */
-		cal_obj_sort_occurrences (occs);
-		cal_obj_remove_duplicates_and_invalid_dates (occs);
-
-		/* Apply the BYSETPOS property. */
-		occs = cal_obj_bysetpos_filter (recur, occs);
-
-		/* Remove any occs after event_end. */
-		len = occs->len - 1;
-		if (event_end) {
-			while (len >= 0) {
-				cotime = &g_array_index (occs, CalObjTime,
-							 len);
-				if (cal_obj_time_compare_func (cotime,
-							       event_end) <= 0)
-					break;
-				len--;
-			}
-		}
-
-		/* Add the occurrences onto the main array. */
-		if (len >= 0)
-			g_array_append_vals (all_occs, occs->data, len + 1);
-
- 		g_array_free (occs, TRUE);
-
-		/* Skip to the next period, or exit the loop if finished. */
-		if ((*vtable->find_next_position) (&occ, event_end,
-						   &recur_data, interval_end))
-			break;
-	}
-
-	return all_occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_yearly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	CalRecurrence *recur = recur_data->recur;
-	GArray *occs_arrays[4], *occs, *occs2;
-	gint num_occs_arrays = 0, i;
-
-	/* This is a bit complicated, since the iCalendar spec says that
-	   several BYxxx modifiers can be used simultaneously. So we have to
-	   be quite careful when determining the days of the occurrences.
-	   The BYHOUR, BYMINUTE & BYSECOND modifiers are no problem at all.
-
-	   The modifiers we have to worry about are: BYMONTH, BYWEEKNO,
-	   BYYEARDAY, BYMONTHDAY & BYDAY. We can't do these sequentially
-	   since each filter will mess up the results of the previous one.
-	   But they aren't all completely independant, e.g. BYMONTHDAY and
-	   BYDAY are related to BYMONTH, and BYDAY is related to BYWEEKNO.
-
-	   BYDAY & BYMONTHDAY can also be applied independently, which makes
-	   it worse. So we assume that if BYMONTH or BYWEEKNO is used, then
-	   the BYDAY modifier applies to those, else it is applied
-	   independantly.
-
-	   We expand the occurrences in parallel into the occs_arrays[] array,
-	   and then merge them all into one GArray before expanding BYHOUR,
-	   BYMINUTE & BYSECOND. */
-
-	if (recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-		/* If BYMONTHDAY & BYDAY are both set we need to expand them
-		   in parallel and add the results. */
-		if (recur->bymonthday && recur->byday) {
-			/* Copy the occs array. */
-			occs2 = g_array_new (FALSE, FALSE,
-					     sizeof (CalObjTime));
-			g_array_append_vals (occs2, occs->data, occs->len);
-
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs2 = cal_obj_byday_expand_monthly (recur_data,
-							      occs2);
-
-			/* Add the 2 resulting arrays together. */
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		} else {
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs = cal_obj_byday_expand_monthly (recur_data, occs);
-		}
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-		/* Note that we explicitly call the weekly version of the
-		   BYDAY expansion filter. */
-		occs = cal_obj_byday_expand_weekly (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byyearday) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYMONTHDAY is set, and BYMONTH is not set, we need to
-	   expand BYMONTHDAY independantly. */
-	if (recur->bymonthday && !recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYDAY is set, and BYMONTH and BYWEEKNO are not set, we need to
-	   expand BYDAY independantly. */
-	if (recur->byday && !recur->bymonth && !recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* Add all the arrays together. If no filters were used we just
-	   create an array with one element. */
-	if (num_occs_arrays > 0) {
-		occs = occs_arrays[0];
-		for (i = 1; i < num_occs_arrays; i++) {
-			occs2 = occs_arrays[i];
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		}
-	} else {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-	}
-
-	/* Now expand BYHOUR, BYMINUTE & BYSECOND. */
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_monthly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs, *occs2;
-
-	/* We start with just the one time in each set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-	/* We need to combine the output of BYMONTHDAY & BYDAY, by doing them
-	   in parallel rather than sequentially. If we did them sequentially
-	   then we would lose the occurrences generated by BYMONTHDAY, and
-	   instead have repetitions of the occurrences from BYDAY. */
-	if (recur_data->recur->bymonthday && recur_data->recur->byday) {
-		occs2 = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs2, occs->data, occs->len);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs2 = (*vtable->byday_filter) (recur_data, occs2);
-
-		g_array_append_vals (occs, occs2->data, occs2->len);
-		g_array_free (occs2, TRUE);
-	} else {
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs = (*vtable->byday_filter) (recur_data, occs);
-	}
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_default	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs;
-
-#if 0
-	g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",
-		 occ->day, occ->month + 1, occ->year, occ->hour, occ->minute,
-		 occ->second);
-#endif
-
-	/* We start with just the one time in the set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-	if (vtable->byweekno_filter)
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-	if (vtable->byyearday_filter)
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-	if (vtable->bymonthday_filter)
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-	occs = (*vtable->byday_filter) (recur_data, occs);
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-
-/* Returns the function table corresponding to the recurrence frequency. */
-static CalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)
-{
-	CalRecurVTable* vtable;
-
-	switch (recur_type) {
-	case ICAL_YEARLY_RECURRENCE:
-		vtable = &cal_obj_yearly_vtable;
-		break;
-	case ICAL_MONTHLY_RECURRENCE:
-		vtable = &cal_obj_monthly_vtable;
-		break;
-	case ICAL_WEEKLY_RECURRENCE:
-		vtable = &cal_obj_weekly_vtable;
-		break;
-	case ICAL_DAILY_RECURRENCE:
-		vtable = &cal_obj_daily_vtable;
-		break;
-	case ICAL_HOURLY_RECURRENCE:
-		vtable = &cal_obj_hourly_vtable;
-		break;
-	case ICAL_MINUTELY_RECURRENCE:
-		vtable = &cal_obj_minutely_vtable;
-		break;
-	case ICAL_SECONDLY_RECURRENCE:
-		vtable = &cal_obj_secondly_vtable;
-		break;
-	default:
-		g_warning ("Unknown recurrence frequenct");
-		vtable = NULL;
-	}
-
-	return vtable;
-}
-
-
-/* This creates a number of fast lookup tables used when filtering with the
-   modifier properties BYMONTH, BYYEARDAY etc. */
-static void
-cal_obj_initialize_recur_data (RecurData  *recur_data,
-			       CalRecurrence *recur,
-			       CalObjTime *event_start)
-{
-	GList *elem;
-	gint month, yearday, monthday, weekday, week_num, hour, minute, second;
-
-	/* Clear the entire RecurData. */
-	memset (recur_data, 0, sizeof (RecurData));
-
-	recur_data->recur = recur;
-
-	/* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO
-	   modifier. */
-	recur_data->weekday = cal_obj_time_weekday (event_start, recur);
-
-	/* Create an array of months from bymonths for fast lookup. */
-	elem = recur->bymonth;
-	while (elem) {
-		month = GPOINTER_TO_INT (elem->data);
-		recur_data->months[month] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of yeardays from byyearday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the year. */
-	elem = recur->byyearday;
-	while (elem) {
-		yearday = GPOINTER_TO_INT (elem->data);
-		if (yearday >= 0)
-			recur_data->yeardays[yearday] = 1;
-		else
-			recur_data->neg_yeardays[-yearday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of monthdays from bymonthday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the month. */
-	elem = recur->bymonthday;
-	while (elem) {
-		monthday = GPOINTER_TO_INT (elem->data);
-		if (monthday >= 0)
-			recur_data->monthdays[monthday] = 1;
-		else
-			recur_data->neg_monthdays[-monthday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of weekdays from byday for fast lookup. */
-	elem = recur->byday;
-	while (elem) {
-		weekday = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-		/* The week number is not used when filtering. */
-		week_num = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-
-		recur_data->weekdays[weekday] = 1;
-	}
-
-	/* Create an array of hours from byhour for fast lookup. */
-	elem = recur->byhour;
-	while (elem) {
-		hour = GPOINTER_TO_INT (elem->data);
-		recur_data->hours[hour] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of minutes from byminutes for fast lookup. */
-	elem = recur->byminute;
-	while (elem) {
-		minute = GPOINTER_TO_INT (elem->data);
-		recur_data->minutes[minute] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of seconds from byseconds for fast lookup. */
-	elem = recur->bysecond;
-	while (elem) {
-		second = GPOINTER_TO_INT (elem->data);
-		recur_data->seconds[second] = 1;
-		elem = elem->next;
-	}
-}
-
-
-static void
-cal_obj_sort_occurrences (GArray *occs)
-{
-	qsort (occs->data, occs->len, sizeof (CalObjTime),
-	       cal_obj_time_compare_func);
-}
-
-
-static void
-cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
-{
-	static const int days_in_month[12] = {
-		31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-	};
-
-	CalObjTime *occ, *prev_occ = NULL;
-	gint len, i, j = 0, year, month, days;
-	gboolean keep_occ;
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		if (prev_occ && cal_obj_time_compare_func (occ,
-							   prev_occ) == 0)
-			keep_occ = FALSE;
-
-		year = occ->year;
-		month = occ->month;
-		days = days_in_month[occ->month];
-		/* If it is february and a leap year, add a day. */
-		if (month == 1 && (year % 4 == 0
-				   && (year % 100 != 0
-				       || year % 400 == 0)))
-			days++;
-		if (occ->day > days)
-			keep_occ = FALSE;
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-/* Removes the exceptions from the ex_occs array from the occurrences in the
-   occs array, and removes any duplicates. Both arrays are sorted. */
-static void
-cal_obj_remove_exceptions (GArray *occs,
-			   GArray *ex_occs)
-{
-	CalObjTime *occ, *prev_occ = NULL, *ex_occ = NULL, *last_occ_kept;
-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;
-	gboolean keep_occ, current_time_is_exception = FALSE;
-
-	if (occs->len == 0)
-		return;
-
-	ex_index = 0;
-	occs_len = occs->len;
-	ex_occs_len = ex_occs->len;
-
-	if (ex_occs_len > 0)
-		ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-
-	for (i = 0; i < occs_len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		/* If the occurrence is a duplicate of the previous one, skip
-		   it. */
-		if (prev_occ
-		    && cal_obj_time_compare_func (occ, prev_occ) == 0) {
-			keep_occ = FALSE;
-
-			/* If this occurrence is an RDATE, and the previous
-			   occurrence in the array was kept, set the RDATE flag
-			   of the last one, so we still use the end date
-			   or duration. */
-			if (occ->is_rdate && !current_time_is_exception) {
-				last_occ_kept = &g_array_index (occs,
-								CalObjTime,
-								j - 1);
-				last_occ_kept->is_rdate = TRUE;
-			}
-		} else {
-			/* We've found a new occurrence time. Reset the flag
-			   to indicate that it hasn't been found in the
-			   exceptions array (yet). */
-			current_time_is_exception = FALSE;
-
-			if (ex_occ) {
-				/* Step through the exceptions until we come
-				   to one that matches or follows this
-				   occurrence. */
-				while (ex_occ) {
-					cmp = cal_obj_time_compare_func (ex_occ, occ);
-					/* I'm pretty sure this is wrong. */
-					/*cmp = cal_obj_date_only_compare_func (ex_occ, occ);*/
-					if (cmp > 0)
-						break;
-
-					/* Move to the next exception, or set
-					   ex_occ to NULL when we reach the
-					   end of array. */
-					ex_index++;
-					if (ex_index < ex_occs_len)
-						ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-					else
-						ex_occ = NULL;
-
-					/* If the exception did match this
-					   occurrence we remove it, and set the
-					   flag to indicate that the current
-					   time is an exception. */
-					if (cmp == 0) {
-						current_time_is_exception = TRUE;
-						keep_occ = FALSE;
-						break;
-					}
-				}
-			}
-		}
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-
-static GArray*
-cal_obj_bysetpos_filter (CalRecurrence *recur,
-			 GArray	    *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, pos;
-
-	/* If BYSETPOS has not been specified, or the array is empty, just
-	   return the array. */
-	elem = recur->bysetpos;
-	if (!elem || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	/* Iterate over the indices given in bysetpos, adding the corresponding
-	   element from occs to new_occs. */
-	len = occs->len;
-	while (elem) {
-		pos = GPOINTER_TO_INT (elem->data);
-
-		/* Negative values count back from the end of the array. */
-		if (pos < 0)
-			pos += len;
-
-		if (pos >= 0 && pos < len) {
-			occ = &g_array_index (occs, CalObjTime, pos);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-		elem = elem->next;
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-/* Finds the first year from the event_start, counting in multiples of the
-   recurrence interval, that intersects the given interval. It returns TRUE
-   if there is no intersection. */
-static gboolean
-cal_obj_yearly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cotime->year < interval_start->year) {
-		gint years = interval_start->year - cotime->year
-			+ recur_data->recur->interval - 1;
-		years -= years % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-		cotime->year += years;
-	}
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_yearly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-	cotime->year += recur_data->recur->interval;
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_monthly_find_start_position (CalObjTime *event_start,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_start,
-				     CalObjTime *interval_end,
-				     CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cal_obj_time_compare (cotime, interval_start, CALOBJ_MONTH) < 0) {
-		gint months = (interval_start->year - cotime->year) * 12
-			+ interval_start->month - cotime->month
-			+ recur_data->recur->interval - 1;
-		months -= months % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-		cal_obj_time_add_months (cotime, months);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_monthly_find_next_position (CalObjTime *cotime,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-	cal_obj_time_add_months (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_weekly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian;
-	gint interval_start_weekday;
-	CalObjTime week_start;
-
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	/* Calculate the start of the weeks corresponding to the event start
-	   and interval start. */
-	event_start_julian = g_date_julian (&event_start_date);
-	event_start_julian -= recur_data->weekday;
-
-	interval_start_julian = g_date_julian (&interval_start_date);
-	interval_start_weekday = cal_obj_time_weekday (interval_start,
-						       recur_data->recur);
-	interval_start_julian -= interval_start_weekday;
-
-	/* We want to find the first full week using the recurrence interval
-	   that intersects the given interval dates. */
-	if (event_start_julian < interval_start_julian) {
-		gint weeks = (interval_start_julian - event_start_julian) / 7;
-		weeks += recur_data->recur->interval - 1;
-		weeks -= weeks % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, weeks * 7);
-	}
-
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday);
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_weekly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	CalObjTime week_start;
-
-	cal_obj_time_add_days (cotime, recur_data->recur->interval * 7);
-
-	/* Return TRUE if the start of this week is after the event finishes
-	   or is after the end of the required interval. */
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday);
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_start_position  (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, days;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	event_start_julian = g_date_julian (&event_start_date);
-	interval_start_julian = g_date_julian (&interval_start_date);
-
-	if (event_start_julian < interval_start_julian) {
-		days = interval_start_julian - event_start_julian
-			+ recur_data->recur->interval - 1;
-		days -= days % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, days);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_next_position  (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_days (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, hours;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_HOUR) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_HOUR) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		hours = (interval_start_julian - event_start_julian) * 24;
-		hours += interval_start->hour - event_start->hour;
-		hours += recur_data->recur->interval - 1;
-		hours -= hours % recur_data->recur->interval;
-		cal_obj_time_add_hours (cotime, hours);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_hours (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, minutes;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_MINUTE) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_MINUTE) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		minutes = (interval_start_julian - event_start_julian)
-			* 24 * 60;
-		minutes += (interval_start->hour - event_start->hour) * 24;
-		minutes += interval_start->minute - event_start->minute;
-		minutes += recur_data->recur->interval - 1;
-		minutes -= minutes % recur_data->recur->interval;
-		cal_obj_time_add_minutes (cotime, minutes);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_minutes (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, seconds;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_SECOND) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_SECOND) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_SECOND) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		seconds = (interval_start_julian - event_start_julian)
-			* 24 * 60 * 60;
-		seconds += (interval_start->hour - event_start->hour)
-			* 24 * 60;
-		seconds += (interval_start->minute - event_start->minute) * 60;
-		seconds += interval_start->second - event_start->second;
-		seconds += recur_data->recur->interval - 1;
-		seconds -= seconds % recur_data->recur->interval;
-		cal_obj_time_add_seconds (cotime, seconds);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_seconds (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-
-
-/* If the BYMONTH rule is specified it expands each occurrence in occs, by
-   using each of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bymonth;
-		while (elem) {
-			/* NOTE: The day may now be invalid, e.g. 31st Feb. */
-			occ->month = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMONTH rule is specified it filters out all occurrences in occs
-   which do not match one of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->months[occ->month])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byweekno_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, weekno;
-
-	/* If BYWEEKNO has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byweekno || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to week 1 (note that
-		   week 1 is the first week starting from the specified week
-		   start day that has 4 days in the new year). */
-		year_start_cotime = *occ;
-		cal_obj_time_find_first_week (&year_start_cotime,
-					      recur_data);
-
-		/* Find the day that would correspond to week 1 of the next
-		   year, which we use for -ve week numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		cal_obj_time_find_first_week (&year_end_cotime,
-					      recur_data);
-
-		/* Now iterate over the week numbers in byweekno, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byweekno;
-		while (elem) {
-			weekno = GPOINTER_TO_INT (elem->data);
-			if (weekno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime,
-						       (weekno - 1) * 7);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, weekno * 7);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-#if 0
-/* This isn't used at present. */
-static GArray*
-cal_obj_byweekno_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-
-	return occs;
-}
-#endif
-
-
-static GArray*
-cal_obj_byyearday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		year_start_cotime = *occ;
-		year_start_cotime.month = 0;
-		year_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   year, which we use for -ve day numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		year_end_cotime.month = 0;
-		year_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in byyearday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byyearday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byyearday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint yearday, len, i, days_in_year;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		yearday = cal_obj_time_day_of_year (occ);
-		if (recur_data->yeardays[yearday]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_year = g_date_is_leap_year (occ->year)
-				? 366 : 365;
-			if (recur_data->neg_yeardays[days_in_year + 1
-						    - yearday])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_bymonthday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, month_start_cotime, month_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		month_start_cotime = *occ;
-		month_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   month, which we use for -ve day numbers. */
-		month_end_cotime = *occ;
-		month_end_cotime.month++;
-		month_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in bymonthday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->bymonthday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = month_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = month_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the month. */
-			if (cotime.month == occ->month)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_bymonthday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, days_in_month;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->monthdays[occ->day]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_month = time_days_in_month (occ->year,
-							    occ->month);
-			if (recur_data->neg_monthdays[days_in_month + 1
-						     - occ->day])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			if (week_num == 0) {
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				occ->month = 11;
-				occ->day = 31;
-				last_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year, as we may have gone past the end. */
-			occ->year = year;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-	guint8 month;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			month = occ->month;
-			if (week_num == 0) {
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year
-				       && occ->month == month) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				occ->day = time_days_in_month (occ->year,
-							       occ->month);
-				last_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year & month, as we may have gone past
-			   the end. */
-			occ->year = year;
-			occ->month = month;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint current_weekday;
-	gint day_of_week, new_day_of_week, days_to_add;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			current_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-			day_of_week = (current_weekday + 7
-				       - recur_data->recur->week_start_day) % 7;
-			new_day_of_week = (weekday + 7
-					   - recur_data->recur->week_start_day) % 7;
-			days_to_add = new_day_of_week - day_of_week;
-			cal_obj_time_add_days (occ, days_to_add);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, weekday;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		weekday = cal_obj_time_weekday (occ, recur_data->recur);
-
-		/* See if the weekday on its own is set. */
-		if (recur_data->weekdays[weekday])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYHOUR rule is specified it expands each occurrence in occs, by
-   using each of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byhour;
-		while (elem) {
-			occ->hour = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYHOUR rule is specified it filters out all occurrences in occs
-   which do not match one of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->hours[occ->hour])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYMINUTE rule is specified it expands each occurrence in occs, by
-   using each of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byminute;
-		while (elem) {
-			occ->minute = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMINUTE rule is specified it filters out all occurrences in occs
-   which do not match one of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->minutes[occ->minute])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYSECOND rule is specified it expands each occurrence in occs, by
-   using each of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bysecond;
-		while (elem) {
-			occ->second = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYSECOND rule is specified it filters out all occurrences in occs
-   which do not match one of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->seconds[occ->second])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-
-/* Adds a positive number of months to the given CalObjTime, updating the year
-   appropriately so we end up with a valid month. Note that the day may be
-   invalid. */
-static void
-cal_obj_time_add_months		(CalObjTime *cotime,
-				 gint	     months)
-{
-	guint month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	month = cotime->month + months;
-	cotime->year += month / 12;
-	cotime->month = month % 12;
-}
-
-
-/* Adds a positive number of days to the given CalObjTime, updating the month
-   and year appropriately so we end up with a valid day. */
-static void
-cal_obj_time_add_days		(CalObjTime *cotime,
-				 gint	     days)
-{
-	guint day, days_in_month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	day = (guint) cotime->day;
-	day += days;
-
-	if (days >= 0) {
-		for (;;) {
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-			if (day <= days_in_month)
-				break;
-
-			cotime->month++;
-			if (cotime->month >= 12) {
-				cotime->year++;
-				cotime->month = 0;
-			}
-
-			day -= days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	} else {
-		while (day <= 0) {
-			if (cotime->month == 0) {
-				cotime->year--;
-				cotime->month = 11;
-			} else {
-				cotime->month--;
-			}
-
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-
-			day += days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	}
-}
-
-
-/* Adds a positive number of hours to the given CalObjTime, updating the day,
-   month & year appropriately so we end up with a valid time. */
-static void
-cal_obj_time_add_hours		(CalObjTime *cotime,
-				 gint	     hours)
-{
-	gint hour, days;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	hour = cotime->hour + hours;
-	cotime->hour = hour % 24;
-	if (hour >= 0) {
-		if (hour >= 24)
-			cal_obj_time_add_days (cotime, hour / 24);
-	} else {
-		days = hour / 24;
-		if (cotime->hour != 0) {
-			cotime->hour += 24;
-			days -= 1;
-		}
-		cal_obj_time_add_days (cotime, days);
-	}
-}
-
-
-/* Adds a positive number of minutes to the given CalObjTime, updating the
-   rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_minutes	(CalObjTime *cotime,
-				 gint	     minutes)
-{
-	gint minute, hours;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	minute = cotime->minute + minutes;
-	cotime->minute = minute % 60;
-	if (minute >= 0) {
-		if (minute >= 60)
-			cal_obj_time_add_hours (cotime, minute / 60);
-	} else {
-		hours = minute / 60;
-		if (cotime->minute != 0) {
-			cotime->minute += 60;
-			hours -= 1;
-		}
-		cal_obj_time_add_hours (cotime, hours);
-	}
-}
-
-
-/* Adds a positive number of seconds to the given CalObjTime, updating the
-   rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_seconds	(CalObjTime *cotime,
-				 gint	     seconds)
-{
-	gint second, minutes;
-
-	/* We use a gint to avoid overflow on the guint8. */
-	second = cotime->second + seconds;
-	cotime->second = second % 60;
-	if (second >= 0) {
-		if (second >= 60)
-			cal_obj_time_add_minutes (cotime, second / 60);
-	} else {
-		minutes = second / 60;
-		if (cotime->second != 0) {
-			cotime->second += 60;
-			minutes -= 1;
-		}
-		cal_obj_time_add_minutes (cotime, minutes);
-	}
-}
-
-
-/* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if
-   they are the same, or 1 if cotime1 is after cotime2. The comparison type
-   specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY
-   is used we only want to know if the days are different. */
-static gint
-cal_obj_time_compare		(CalObjTime *cotime1,
-				 CalObjTime *cotime2,
-				 CalObjTimeComparison type)
-{
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (type == CALOBJ_YEAR)
-		return 0;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (type == CALOBJ_MONTH)
-		return 0;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	if (type == CALOBJ_DAY)
-		return 0;
-
-	if (cotime1->hour < cotime2->hour)
-		return -1;
-	if (cotime1->hour > cotime2->hour)
-		return 1;
-
-	if (type == CALOBJ_HOUR)
-		return 0;
-
-	if (cotime1->minute < cotime2->minute)
-		return -1;
-	if (cotime1->minute > cotime2->minute)
-		return 1;
-
-	if (type == CALOBJ_MINUTE)
-		return 0;
-
-	if (cotime1->second < cotime2->second)
-		return -1;
-	if (cotime1->second > cotime2->second)
-		return 1;
-
-	return 0;
-}
-
-
-/* This is the same as the above function, but without the comparison type.
-   It is used for qsort(). */
-static gint
-cal_obj_time_compare_func (const void *arg1,
-			   const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-	gint retval;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		retval = -1;
-	else if (cotime1->year > cotime2->year)
-		retval = 1;
-
-	else if (cotime1->month < cotime2->month)
-		retval = -1;
-	else if (cotime1->month > cotime2->month)
-		retval = 1;
-
-	else if (cotime1->day < cotime2->day)
-		retval = -1;
-	else if (cotime1->day > cotime2->day)
-		retval = 1;
-
-	else if (cotime1->hour < cotime2->hour)
-		retval = -1;
-	else if (cotime1->hour > cotime2->hour)
-		retval = 1;
-
-	else if (cotime1->minute < cotime2->minute)
-		retval = -1;
-	else if (cotime1->minute > cotime2->minute)
-		retval = 1;
-
-	else if (cotime1->second < cotime2->second)
-		retval = -1;
-	else if (cotime1->second > cotime2->second)
-		retval = 1;
-
-	else
-		retval = 0;
-
-#if 0
-	g_print ("%s - ", cal_obj_time_to_string (cotime1));
-	g_print ("%s : %i\n", cal_obj_time_to_string (cotime2), retval);
-#endif
-
-	return retval;
-}
-
-static gint
-cal_obj_date_only_compare_func (const void *arg1,
-				const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	return 0;
-}
-
-/* Returns the weekday of the given CalObjTime, from 0 - 6. The week start
-   day is Monday by default, but can be set in the recurrence rule. */
-static gint
-cal_obj_time_weekday		(CalObjTime *cotime,
-				 CalRecurrence *recur)
-{
-	GDate date;
-	gint weekday;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	/* This calculates the offset of our day from the start of the week.
-	   We just add on a week (to avoid any possible negative values) and
-	   then subtract the specified week start day, then convert it into a
-	   value from 0-6. */
-	weekday = (weekday + 7 - recur->week_start_day) % 7;
-
-	return weekday;
-}
-
-
-/* Returns the day of the year of the given CalObjTime, from 1 - 366. */
-static gint
-cal_obj_time_day_of_year		(CalObjTime *cotime)
-{
-	GDate date;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	return g_date_day_of_year (&date);
-}
-
-
-/* Finds the first week in the given CalObjTime's year, using the same weekday
-   as the event start day (i.e. from the RecurData).
-   The first week of the year is the first week starting from the specified
-   week start day that has 4 days in the new year. It may be in the previous
-   year. */
-static void
-cal_obj_time_find_first_week	(CalObjTime *cotime,
-				 RecurData  *recur_data)
-{
-	GDate date;
-	gint weekday, week_start_day, offset;
-
-	/* Find out the weekday of the 1st of the year. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 1, 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	/* Calculate the first day of the year that starts a new week. */
-	week_start_day = recur_data->recur->week_start_day;
-	offset = (week_start_day + 7 - weekday) % 7;
-
-	/* Now see if we have to move backwards 1 week, i.e. if the week
-	   starts on or after Jan 5th (since the previous week has 4 days in
-	   this year and so will be the first week of the year). */
-	if (offset >= 4)
-		offset -= 7;
-
-	/* Now move to the required day. */
-	offset += (recur_data->weekday + 7 - week_start_day) % 7;
-
-	/* Now move the cotime to the appropriate day. */
-	cotime->month = 0;
-	cotime->day = 1;
-	cal_obj_time_add_days (cotime, offset);
-}
-
-
-static void
-cal_object_time_from_time (CalObjTime *cotime,
-			   time_t      t)
-{
-	struct tm *tmp_tm;
-	time_t tmp_time_t;
-
-	tmp_time_t = t;
-	tmp_tm = localtime (&tmp_time_t);
-
-	cotime->year     = tmp_tm->tm_year + 1900;
-	cotime->month    = tmp_tm->tm_mon;
-	cotime->day      = tmp_tm->tm_mday;
-	cotime->hour     = tmp_tm->tm_hour;
-	cotime->minute   = tmp_tm->tm_min;
-	cotime->second   = tmp_tm->tm_sec;
-	cotime->is_rdate = FALSE;
-}
-
-
-/* Debugging function to convert a CalObjTime to a string. It uses a static
-   buffer so beware. */
-#ifdef CAL_OBJ_DEBUG
-static char*
-cal_obj_time_to_string	(CalObjTime *cotime)
-{
-	static char buffer[20];
-
-	sprintf (buffer, "%02i/%02i/%04i %02i:%02i:%02i",
-		 cotime->day, cotime->month + 1, cotime->year,
-		 cotime->hour, cotime->minute, cotime->second);
-	return buffer;
-}
-#endif
-
-
-/* This recalculates the end dates for recurrence & exception rules which use
-   the COUNT property. If refresh is TRUE it will recalculate all enddates
-   for rules which use COUNT. If refresh is FALSE, it will only calculate
-   the enddate if it hasn't already been set. It returns TRUE if the component
-   was changed, i.e. if the component should be saved at some point.
-   We store the enddate in the "X-EVOLUTION-ENDDATE" parameter of the RRULE
-   or EXRULE. */
-static gboolean
-cal_recur_ensure_end_dates (CalComponent	*comp,
-			    gboolean		 refresh)
-{
-	GSList *rrules, *exrules, *elem;
-	gboolean changed = FALSE;
-
-	/* Do the RRULEs. */
-	cal_component_get_rrule_property_list (comp, &rrules);
-	for (elem = rrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   FALSE, refresh);
-	}
-
-	/* Do the EXRULEs. */
-	cal_component_get_exrule_property_list (comp, &exrules);
-	for (elem = exrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   TRUE, refresh);
-	}
-
-	return changed;
-}
-
-
-typedef struct _CalRecurEnsureEndDateData CalRecurEnsureEndDateData;
-struct _CalRecurEnsureEndDateData {
-	gint count;
-	gint instances;
-	time_t end_date;
-};
-
-
-static gboolean
-cal_recur_ensure_rule_end_date (CalComponent			*comp,
-				icalproperty			*prop,
-				gboolean			 exception,
-				gboolean			 refresh)
-{
-	struct icalrecurrencetype rule;
-	CalRecurEnsureEndDateData cb_data;
-
-	if (exception)
-		rule = icalproperty_get_exrule (prop);
-	else
-		rule = icalproperty_get_rrule (prop);
-
-	/* If the rule doesn't use COUNT just return. */
-	if (rule.count == 0)
-		return FALSE;
-
-	/* If refresh is FALSE, we check if the enddate is already set, and
-	   if it is we just return. */
-	if (!refresh) {
-		if (cal_recur_get_rule_end_date (prop) != -1)
-			return FALSE;
-	}
-
-	/* Calculate the end date. */
-	cb_data.count = rule.count;
-	cb_data.instances = 0;
-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-					      cal_recur_ensure_rule_end_date_cb,
-					      &cb_data);
-
-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the
-	   rule. */
-	cal_recur_set_rule_end_date (prop, cb_data.end_date);
-		
-	return TRUE;
-}
-
-
-static gboolean
-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data)
-{
-	CalRecurEnsureEndDateData *cb_data;
-
-	cb_data = (CalRecurEnsureEndDateData*) data;
-
-	cb_data->instances++;
-
-	if (cb_data->instances == cb_data->count) {
-		cb_data->end_date = instance_start;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static time_t
-cal_recur_get_rule_end_date	(icalproperty	*prop)
-{
-	icalparameter *param;
-	char *xname, *xvalue;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			xvalue = icalparameter_get_x (param);
-			value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,
-							   xvalue);
-			if (value) {
-				icaltime = icalvalue_get_datetime (value);
-				icalvalue_free (value);
-
-				return icaltime_as_timet (icaltime);
-			}
-		}
-
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_X_PARAMETER);
-	}
-
-	return -1;
-}
-
-
-static void
-cal_recur_set_rule_end_date	(icalproperty	*prop,
-				 time_t		 end_date)
-{
-	icalparameter *param;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-	char *end_date_string, *xname;
-
-	icaltime = icaltime_from_timet (end_date, FALSE, FALSE);
-	value = icalvalue_new_datetime (icaltime);
-	end_date_string = icalvalue_as_ical_string (value);
-	icalvalue_free (value);
-
-	/* If we already have an X-EVOLUTION-ENDDATE parameter, set the value
-	   to the new date-time. */
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			icalparameter_set_x (param, end_date_string);
-			return;
-		}
-		param = icalproperty_get_next_parameter (prop, ICAL_X_PARAMETER);
-	}
-
-	/* Create a new X-EVOLUTION-ENDDATE and add it to the property. */
-	param = icalparameter_new_x (end_date_string);
-	icalparameter_set_xname (param, EVOLUTION_END_DATE_PARAMETER);
-	icalproperty_add_parameter (prop, param);
-}
-
diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h
deleted file mode 100644
index de5a139f78..0000000000
--- a/calendar/cal-util/cal-recur.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_RECUR_H
-#define CAL_RECUR_H
-
-#include <libgnome/gnome-defs.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-BEGIN_GNOME_DECLS
-
-typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instance_end,
-					 gpointer      data);
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void	cal_recur_generate_instances	(CalComponent		*comp,
-					 time_t			 start,
-					 time_t			 end,
-					 CalRecurInstanceFn	 cb,
-					 gpointer                cb_data);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
deleted file mode 100644
index bfb9c88fff..0000000000
--- a/calendar/cal-util/cal-util.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-util.h"
-
-
-
-/**
- * cal_obj_instance_list_free:
- * @list: List of #CalObjInstance structures.
- * 
- * Frees a list of #CalObjInstance structures.
- **/
-void
-cal_obj_instance_list_free (GList *list)
-{
-	CalObjInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_change_list_free:
- * @list: List of #CalObjChange structures.
- * 
- * Frees a list of #CalObjChange structures.
- **/
-void
-cal_obj_change_list_free (GList *list)
-{
-	CalObjChange *c;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		c = l->data;
-
-		g_assert (c != NULL);
-		g_assert (c->uid != NULL);
-
-		g_free (c->uid);
-		g_free (c);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_alarm_instance_list_free:
- * @list: List of #CalAlarmInstance structures.
- * 
- * Frees a list of #CalAlarmInstance structures.
- **/
-void
-cal_alarm_instance_list_free (GList *list)
-{
-	CalAlarmInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_uid_list_free:
- * @list: List of strings with unique identifiers.
- *
- * Frees a list of unique identifiers for calendar objects.
- **/
-void
-cal_obj_uid_list_free (GList *list)
-{
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		char *uid;
-
-		uid = l->data;
-
-		g_assert (uid != NULL);
-		g_free (uid);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
deleted file mode 100644
index 243cc34105..0000000000
--- a/calendar/cal-util/cal-util.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_UTIL_H
-#define CAL_UTIL_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-/* Instance of a calendar object.  This can be an actual occurrence, a
- * recurrence, or an alarm trigger of a `real' calendar object.
- */
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-
-void cal_obj_instance_list_free (GList *list);
-
-typedef enum {
-	CALOBJ_UPDATED = 1 << 0,
-	CALOBJ_REMOVED = 1 << 1
-} CalObjChangeType;
-
-typedef struct 
-{
-	char *uid;
-	CalObjChangeType type;
-} CalObjChange;
-
-void cal_obj_change_list_free (GList *list);
-
-/* Instance of an alarm trigger */
-typedef struct {
-	char *uid;			/* UID of object */
-#if 0
-	enum AlarmType type;		/* Type of alarm */
-#endif
-	time_t trigger;			/* Alarm trigger time */
-	time_t occur;			/* Occurrence time */
-} CalAlarmInstance;
-
-void cal_alarm_instance_list_free (GList *list);
-
-/* Used for multiple UID queries */
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-
-void cal_obj_uid_list_free (GList *list);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
deleted file mode 100644
index bcb1b9bb88..0000000000
--- a/calendar/cal-util/calobj.c
+++ /dev/null
@@ -1,2008 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Calendar objects implementations.
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Federico Mena (quartic@gimp.org)
- */
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <time.h>
-#include "calobj.h"
-#include "timeutil.h"
-#include "libversit/vcc.h"
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-
-/* VCalendar product ID */
-#define PRODID "-//Helix Code//NONSGML Evolution Calendar//EN"
-
-static gint compare_exdates (gconstpointer a, gconstpointer b);
-static void ical_object_normalize_summary (iCalObject *ico);
-static void list_free (GList *list);
-
-
-
-char *
-ical_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname){
-		char buffer [128];
-
-		if ((gethostname (buffer, sizeof (buffer)-1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = g_strdup (buffer);
-		else
-			hostname = g_strdup ("localhost");
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-iCalObject *
-ical_object_new (void)
-{
-	iCalObject *ico;
-
-	ico = g_new0 (iCalObject, 1);
-
-	ico->seq = -1;
-	ico->dtstamp = time (NULL);
-	ico->uid = ical_gen_uid ();
-
-	ico->pilot_id = 0;
-	ico->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	ico->ref_count = 1;
-
-	return ico;
-}
-
-iCalObject *
-ical_new (char *comment, char *organizer, char *summary)
-{
-	iCalObject *ico;
-
-	ico = ical_object_new ();
-
-	ico->comment   = g_strdup (comment);
-	ico->organizer = g_new0 (iCalPerson, 1);
-	ico->organizer->addr = g_strdup (organizer);
-	ico->summary   = g_strdup (summary);
-	ico->class     = g_strdup ("PUBLIC");
-	ico->status    = g_strdup ("NEEDS ACTION");
-
-	ico->dalarm.type = ALARM_DISPLAY;
-	ico->palarm.type = ALARM_PROGRAM;
-	ico->malarm.type = ALARM_MAIL;
-	ico->aalarm.type = ALARM_AUDIO;
-
-	ical_object_normalize_summary (ico);
-
-	return ico;
-}
-
-
-void
-ical_object_ref (iCalObject *ico)
-{
-	ico->ref_count++;
-}
-
-
-#define free_if_defined(x) if (x){ g_free (x); x = 0; }
-#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }
-static void
-ical_object_destroy (iCalObject *ico)
-{
-	/* Regular strings */
-	free_if_defined  (ico->comment);
-	free_if_defined  (ico->organizer);
-	free_if_defined  (ico->summary);
-	free_if_defined  (ico->uid);
-	free_if_defined  (ico->status);
-	free_if_defined  (ico->class);
-	free_if_defined  (ico->url);
-	free_if_defined  (ico->recur);
-
-	/* Lists */
-	lfree_if_defined (ico->exdate);
-	lfree_if_defined (ico->categories);
-	lfree_if_defined (ico->resources);
-	lfree_if_defined (ico->related);
-	lfree_if_defined (ico->attach);
-
-	/* Alarms */
-	g_free (ico->dalarm.data);
-	g_free (ico->palarm.data);
-	g_free (ico->malarm.data);
-	g_free (ico->aalarm.data);
-
-	g_free (ico);
-}
-
-void
-ical_object_unref (iCalObject *ico)
-{
-	ico->ref_count--;
-	if (ico->ref_count == 0)
-		ical_object_destroy (ico);
-}
-
-
-static void
-my_free (gpointer data, gpointer user_dat_ignored)
-{
-	g_free (data);
-}
-
-static void
-list_free (GList *list)
-{
-	g_list_foreach (list, my_free, 0);
-	g_list_free (list);
-}
-
-/* This resets any recurrence rules of the iCalObject. */
-void
-ical_object_reset_recurrence (iCalObject *ico)
-{
-	free_if_defined  (ico->recur);
-	lfree_if_defined (ico->exdate);
-}
-
-static GList *
-set_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";"); s; s = strtok (NULL, ";"))
-		list = g_list_prepend (list, g_strdup (s));
-
-	return list;
-}
-
-static GList *
-set_date_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";,"); s; s = strtok (NULL, ";,")){
-		time_t *t = g_new (time_t, 1);
-
-		while (*s && isspace (*s))
-			s++;
-		*t = time_from_isodate (s);
-		list = g_list_prepend (list, t);
-	}
-	return list;
-}
-
-void
-ical_object_add_exdate (iCalObject *o, time_t t)
-{
-	time_t *pt = g_new (time_t, 1);
-
-	*pt = t;
-	o->exdate = g_list_prepend (o->exdate, pt);
-}
-
-static void
-ignore_space(char **str)
-{
-	while (**str && isspace (**str))
-		(*str)++;
-}
-
-static void
-skip_numbers (char **str)
-{
-	while (**str){
-		ignore_space (str);
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str))
-			(*str)++;
-	}
-}
-
-static void
-weekdaylist (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday |= 1 << i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-
-	if (o->recur->weekday == 0){
-		struct tm tm = *localtime (&o->dtstart);
-
-		o->recur->weekday = 1 << tm.tm_wday;
-	}
-}
-
-static void
-weekdaynum (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday = i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha ((unsigned char) **str));
-}
-
-static void
-ocurrencelist (iCalObject *o, char **str)
-{
-	char *p;
-
-	ignore_space (str);
-	p = *str;
-	if (!isdigit (*p))
-		return;
-
-	if (!(*p >= '1' && *p <= '5'))
-		return;
-
-	if (!(*(p+1) == '+' || *(p+1) == '-'))
-		return;
-
-	o->recur->u.month_pos = (*p-'0') * (*(p+1) == '+' ? 1 : -1);
-	*str += 2;
-}
-
-#if 0
-
-static void
-daynumber (iCalObject *o, char **str)
-{
-	int val = 0;
-	char *p = *str;
-
-	ignore_space (str);
-	if (strcmp (p, "LD")){
-		o->recur->u.month_day = DAY_LASTDAY;
-		*str += 2;
-		return;
-	}
-
-	if (!(isdigit (*p)))
-		return;
-
-	while (**str && isdigit (**str)){
-		val = val * 10 + (**str - '0');
-		(*str)++;
-	}
-
-	if (**str == '+')
-		(*str)++;
-
-	if (**str == '-')
-		val *= -1;
-	o->recur->u.month_day = val;
-}
-
-#endif
-
-static void
-daynumberlist (iCalObject *o, char **str)
-{
-	int first = 0;
-	int val = 0;
-
-	ignore_space (str);
-
-	while (**str){
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str)){
-			val = 10 * val + (**str - '0');
-			(*str)++;
-		}
-		if (!first){
-			/*
-			 * Some broken applications set this to zero
-			 */
-			if (val == 0){
-				struct tm day = *localtime (&o->dtstart);
-
-				val = day.tm_mday;
-			}
-			o->recur->u.month_day = val;
-			first = 1;
-			val = 0;
-		}
-	}
-}
-
-static void
-load_recur_weekly (iCalObject *o, char **str)
-{
-	weekdaylist (o, str);
-}
-
-static void
-load_recur_monthly_pos (iCalObject *o, char **str)
-{
-	ocurrencelist (o, str);
-	weekdaynum (o, str);
-}
-
-static void
-load_recur_monthly_day (iCalObject *o, char **str)
-{
-	daynumberlist (o, str);
-}
-
-static void
-load_recur_yearly_month (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple months and we do expect
-	 * the dtstart to agree with the value on this field
-	 */
-	skip_numbers (str);
-}
-
-static void
-load_recur_yearly_day (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple days and we do expect
-	 * the dtstart to agree with the value on this field
-	 *
-	 * FIXME: we should support every-n-years
-	 */
-	skip_numbers (str);
-}
-
-static void
-duration (iCalObject *o, char **str)
-{
-	unsigned int duration = 0;
-
-	ignore_space (str);
-	if (**str != '#')
-		return;
-	(*str)++;
-	while (**str && isdigit (**str)){
-		duration = duration * 10 + (**str - '0');
-		(*str)++;
-	}
-	o->recur->duration = duration;
-}
-
-static void
-enddate (iCalObject *o, char **str)
-{
-	ignore_space (str);
-	if (isdigit (**str)){
-		o->recur->_enddate = time_from_isodate (*str);
-		*str += 16;
-	}
-}
-
-static int
-load_recurrence (iCalObject *o, char *str)
-{
-	enum RecurType type;
-	int  interval = 0;
-
-	type = -1;
-	switch (*str++){
-	case 'D':
-		type = RECUR_DAILY;
-		break;
-
-	case 'W':
-		type = RECUR_WEEKLY;
-		break;
-
-	case 'M':
-		if (*str == 'P')
-			type = RECUR_MONTHLY_BY_POS;
-	        else if (*str == 'D')
-			type = RECUR_MONTHLY_BY_DAY;
-		str++;
-		break;
-
-	case 'Y':
-		if (*str == 'M')
-			type = RECUR_YEARLY_BY_MONTH;
-		else if (*str == 'D')
-			type = RECUR_YEARLY_BY_DAY;
-		str++;
-		break;
-	}
-	if (type == -1)
-		return 0;
-
-	o->recur = g_new0 (Recurrence, 1);
-	o->recur->type = type;
-	ignore_space (&str);
-
-	/* Get the interval */
-	for (;*str && isdigit (*str);str++)
-		interval = interval * 10 + (*str-'0');
-
-	if (interval == 0)
-		interval = 1;
-
-	o->recur->interval = interval;
-
-	/* this is the default per the spec */
-	o->recur->duration = 2;
-
-	ignore_space (&str);
-
-	switch (type){
-	case RECUR_DAILY:
-		break;
-	case RECUR_WEEKLY:
-		load_recur_weekly (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_POS:
-		load_recur_monthly_pos (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		load_recur_monthly_day (o, &str);
-		break;
-	case RECUR_YEARLY_BY_MONTH:
-		load_recur_yearly_month (o, &str);
-		break;
-	case RECUR_YEARLY_BY_DAY:
-		load_recur_yearly_day (o, &str);
-		break;
-	default:
-		g_warning ("Unimplemented recurrence type %d", (int) type);
-		break;
-	}
-	duration (o, &str);
-	enddate (o, &str);
-
-	/* Compute the enddate */
-	if (o->recur->_enddate == 0){
-		if (o->recur->duration != 0){
-			ical_object_compute_end (o);
-		} else
-			o->recur->enddate = 0;
-	} else {
-		o->recur->enddate = o->recur->_enddate;
-	}
-	return 1;
-}
-
-#define is_a_prop_of(obj,prop) isAPropertyOf (obj,prop)
-#define str_val(obj) the_str = fakeCString (vObjectUStringZValue (obj))
-#define has(obj,prop) (vo = isAPropertyOf (obj, prop))
-
-/*
- * FIXME: This is loosing precission.  Enhanec the thresholds
- */
-#define HOURS(n) (n*(60*60))
-
-static void
-setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *vo)
-{
-	time_t alarm_time = time_from_isodate (iso_time);
-	time_t base = ico->dtstart;
-	int d = difftime (base, alarm_time);
-	VObject *a;
-	char *the_str;
-
-	alarm->enabled = 1;
-	if (d > HOURS (2)){
-		if (d > HOURS (48)){
-			alarm->count = d / HOURS (24);
-			alarm->units = ALARM_DAYS;
-		} else {
-			alarm->count = d / (60*60);
-			alarm->units = ALARM_HOURS;
-		}
-	} else {
-		alarm->count = d / 60;
-		alarm->units = ALARM_MINUTES;
-	}
-
-	if ((a = is_a_prop_of (vo, VCSnoozeTimeProp))){
-		alarm->snooze_secs = isodiff_to_secs (str_val (a));
-		free (the_str);
-	}
-
-	if ((a = is_a_prop_of (vo, VCRepeatCountProp))){
-		alarm->snooze_repeat = atoi (str_val (a));
-		free (the_str);
-	}
-}
-
-/*
- * Duplicates an iCalObject.  Implementation is a grand hack.
- * If you need the new ICalObject to have a new uid, free the current one,
- * and call ical_gen_uid() to generate a new one.
- */
-iCalObject *
-ical_object_duplicate (iCalObject *o)
-{
-	VObject *vo;
-	iCalObject *new;
-
-	vo = ical_object_to_vobject (o);
-	switch (o->type){
-	case ICAL_EVENT:
-		new = ical_object_create_from_vobject (vo, VCEventProp);
-		break;
-	case ICAL_TODO:
-		new = ical_object_create_from_vobject (vo, VCTodoProp);
-		break;
-	default:
-		new = NULL;
-	}
-
-	cleanVObject (vo);
-	return new;
-}
-
-/* FIXME: we need to load the recurrence properties */
-iCalObject *
-ical_object_create_from_vobject (VObject *o, const char *object_name)
-{
-	time_t  now = time (NULL);
-	iCalObject *ical;
-	VObject *vo, *a;
-	VObjectIterator i;
-	char *the_str;
-
-	ical = g_new0 (iCalObject, 1);
-
-	if (strcmp (object_name, VCEventProp) == 0)
-		ical->type = ICAL_EVENT;
-	else if (strcmp (object_name, VCTodoProp) == 0)
-		ical->type = ICAL_TODO;
-	else {
-		g_free (ical);
-		return 0;
-	}
-
-	ical->ref_count = 1;
-
-	/* uid */
-	if (has (o, VCUniqueStringProp)){
-		ical->uid = g_strdup (str_val (vo));
-		free (the_str);
-	} else {
-		ical->uid = ical_gen_uid ();
-	}
-
-	/* seq */
-	if (has (o, VCSequenceProp)){
-		ical->seq = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->seq = 0;
-
-	/* dtstart */
-	if (has (o, VCDTstartProp)){
-		ical->dtstart = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->dtstart = 0;
-
-	/* dtend */
-	ical->dtend = 0;	/* default value */
-	if (ical->type == ICAL_EVENT){
-		if (has (o, VCDTendProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	} else if (ical->type == ICAL_TODO){
-		if (has (o, VCDueProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	}
-
-	/* dcreated */
-	if (has (o, VCDCreatedProp)){
-		ical->created = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* completed */
-	if (has (o, VCCompletedProp)){
-		ical->completed = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* last_mod */
-	if (has (o, VCLastModifiedProp)){
-		ical->last_mod = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->last_mod = now;
-
-	/* exdate */
-	if (has (o, VCExpDateProp)){
-		ical->exdate = set_date_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* description/comment */
-	if (has (o, VCDescriptionProp)){
-		ical->comment = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* summary */
-	if (has (o, VCSummaryProp)){
-		ical->summary = g_strdup (str_val (vo));
-		free (the_str);
-
-		/* Convert any CR/LF/CRLF sequences in the summary field to
-		   spaces so we just have a one-line field. */
-		ical_object_normalize_summary (ical);
-	} else 
-		ical->summary = g_strdup ("");
-
-	/* status */
-	if (has (o, VCStatusProp)){
-		ical->status = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->status = g_strdup ("NEEDS ACTION");
-
-	if (has (o, VCClassProp)){
-		ical->class = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->class = g_strdup ("PUBLIC");
-
-	/* categories */
-	if (has (o, VCCategoriesProp)){
-		ical->categories = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* resources */
-	if (has (o, VCResourcesProp)){
-		ical->resources = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* priority */
-	if (has (o, VCPriorityProp)){
-		ical->priority = atoi (str_val (vo));
-		free (the_str);
-	}
-
-	/* tranparency */
-	if (has (o, VCTranspProp)){
-		ical->transp = atoi (str_val (vo)) ? ICAL_TRANSPARENT : ICAL_OPAQUE;
-		free (the_str);
-	}
-
-	/* Organizer */
-	if (has (o, VCOrgNameProp)){
-		ical->organizer = g_new0 (iCalPerson, 1);
-		ical->organizer->addr = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* related */
-	if (has (o, VCRelatedToProp)){
-		char *str;
-		char *s;
-		iCalRelation *rel;
-		str = str_val (vo);
-		for (s = strtok (str, ";"); s; s = strtok (NULL, ";")) {
-			rel = g_new0 (iCalRelation, 1);
-			rel->uid = g_strdup (s);
-			rel->reltype = g_strdup ("PARENT");
-			ical->related = g_list_prepend (ical->related, rel);
-		}
-		free (the_str);
-	}
-
-	/* attach */
-	initPropIterator (&i, o);
-	while (moreIteration (&i)){
-		vo = nextVObject (&i);
-		if (strcmp (vObjectName (vo), VCAttachProp) == 0){
-			ical->attach = g_list_prepend (ical->attach, g_strdup (str_val (vo)));
-			free (the_str);
-		}
-	}
-
-	/* url */
-	if (has (o, VCURLProp)){
-		/* There seems to be a problem with the URL property. For some
-		   reason an empty property gets saved, vObjectUStringZValue
-		   returns NULL and fakeCString crashes. So we check for NULL.
-		*/
-		const wchar_t *zval;
-
-		zval = vObjectUStringZValue (o);
-		if (zval) {
-			the_str = fakeCString (zval);
-			ical->url = g_strdup (the_str);
-			free (the_str);
-		}
-	}
-
-	/* dalarm */
-	ical->dalarm.type = ALARM_DISPLAY;
-	ical->dalarm.enabled = 0;
-	if (has (o, VCDAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->dalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* aalarm */
-	ical->aalarm.type = ALARM_AUDIO;
-	ical->aalarm.enabled = 0;
-	if (has (o, VCAAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->aalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* palarm */
-	ical->palarm.type = ALARM_PROGRAM;
-	ical->palarm.enabled = 0;
-	if (has (o, VCPAlarmProp)){
-		ical->palarm.type = ALARM_PROGRAM;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->palarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCProcedureNameProp))){
-				ical->palarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->palarm.data = g_strdup ("");
-		}
-	}
-
-	/* malarm */
-	ical->malarm.type = ALARM_MAIL;
-	ical->malarm.enabled = 0;
-	if (has (o, VCMAlarmProp)){
-		ical->malarm.type = ALARM_MAIL;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->malarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCEmailAddressProp))){
-				ical->malarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->malarm.data = g_strdup ("");
-		}
-	}
-
-	/* rrule */
-	if (has (o, VCRRuleProp)){
-		if (!load_recurrence (ical, str_val (vo))) {
-			ical_object_unref (ical);
-			return NULL;
-		}
-		free (the_str);
-	}
-
-	/*
-	 * Pilot
-	 */
-	if (has (o, XPilotIdProp)){
-		ical->pilot_id = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_id = 0;
-
-	if (has (o, XPilotStatusProp)){
-		ical->pilot_status = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	return ical;
-}
-
-static char *
-to_str (int num)
-{
-	static char buf [40];
-
-	sprintf (buf, "%d", num);
-	return buf;
-}
-
-/*
- * stores a GList in the property.
- */
-static void
-store_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (l->data) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (l->data);
-
-		strcpy (p, l->data);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_rel_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-	
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (((iCalRelation*)(l->data))->uid) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (((iCalRelation*)(l->data))->uid);
-		
-		strcpy (p, ((iCalRelation*)(l->data))->uid);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_date_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int   size, len;
-	char  *s, *p;
-
-	size = g_list_length (values);
-	s = p = g_malloc ((size * 17 + 1) * sizeof (char));
-
-	for (l = values; l; l = l->next){
-		strcpy (s, isodate_from_time_t (*(time_t *)l->data));
-		len = strlen (s);
-		s [len] = ',';
-		s += len + 1;
-	}
-	s--;
-	*s = 0;
-	addPropValue (o, prop, p);
-	g_free (p);
-}
-
-static char *recur_type_name [] = { "D", "W", "MP", "MD", "YM", "YD" };
-static char *recur_day_list  [] = { "SU", "MO", "TU","WE", "TH", "FR", "SA" };
-static char *alarm_names [] = { VCMAlarmProp, VCPAlarmProp, VCDAlarmProp, VCAAlarmProp };
-
-static VObject *
-save_alarm (VObject *o, CalendarAlarm *alarm, iCalObject *ical)
-{
-	VObject *alarm_object;
-	struct tm tm;
-	time_t alarm_time;
-
-	if (!alarm->enabled)
-		return NULL;
-	tm = *localtime (&ical->dtstart);
-	switch (alarm->units){
-	case ALARM_MINUTES:
-		tm.tm_min -= alarm->count;
-		break;
-
-	case ALARM_HOURS:
-		tm.tm_hour -= alarm->count;
-		break;
-
-	case ALARM_DAYS:
-		tm.tm_mday -= alarm->count;
-		break;
-	}
-
-	alarm_time = mktime (&tm);
-	alarm_object = addProp (o, alarm_names [alarm->type]);
-	addPropValue (alarm_object, VCRunTimeProp, isodate_from_time_t (alarm_time));
-
-	if (alarm->snooze_secs)
-		addPropValue (alarm_object, VCSnoozeTimeProp, isodiff_from_secs (alarm->snooze_secs));
-	else
-		addPropValue (alarm_object, VCSnoozeTimeProp, "");
-
-	if (alarm->snooze_repeat){
-		char buf [20];
-
-		sprintf (buf, "%d", alarm->snooze_repeat);
-		addPropValue (alarm_object, VCRepeatCountProp, buf);
-	} else
-		addPropValue (alarm_object, VCRepeatCountProp, "");
-	return alarm_object;
-}
-
-VObject *
-ical_object_to_vobject (iCalObject *ical)
-{
-	VObject *o, *alarm, *s;
-	GList *l;
-
-	if (ical->type == ICAL_EVENT)
-		o = newVObject (VCEventProp);
-	else
-		o = newVObject (VCTodoProp);
-
-	/* uid */
-	if (ical->uid)
-		addPropValue (o, VCUniqueStringProp, ical->uid);
-
-	/* seq */
-	addPropValue (o, VCSequenceProp, to_str (ical->seq));
-
-	/* dtstart */
-	addPropValue (o, VCDTstartProp, isodate_from_time_t (ical->dtstart));
-
-	/* dtend */
-	if (ical->type == ICAL_EVENT){
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->dtend));
-	} else if (ical->type == ICAL_TODO){
-		addPropValue (o, VCDueProp, isodate_from_time_t (ical->dtend));
-	}
-
-	/* dcreated */
-	addPropValue (o, VCDCreatedProp, isodate_from_time_t (ical->created));
-
-	/* completed */
-	if (ical->completed)
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->completed));
-
-	/* last_mod */
-	addPropValue (o, VCLastModifiedProp, isodate_from_time_t (ical->last_mod));
-
-	/* exdate */
-	if (ical->exdate)
-		store_date_list (o, VCExpDateProp, ical->exdate);
-
-	/* description/comment */
-	if (ical->comment && strlen (ical->comment)){
-		s = addPropValue (o, VCDescriptionProp, ical->comment);
-		if (strchr (ical->comment, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-
-	/* summary */
-	if (ical->summary && strlen (ical->summary)) {
-		s = addPropValue (o, VCSummaryProp, ical->summary);
-		if (strchr (ical->summary, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-		
-	/* status */
-	addPropValue (o, VCStatusProp, ical->status);
-
-	/* class */
-	addPropValue (o, VCClassProp, ical->class);
-
-	/* categories */
-	if (ical->categories)
-		store_list (o, VCCategoriesProp, ical->categories);
-
-	/* resources */
-	if (ical->resources)
-		store_list (o, VCCategoriesProp, ical->resources);
-
-	/* priority */
-	addPropValue (o, VCPriorityProp, to_str (ical->priority));
-
-	/* transparency */
-	addPropValue (o, VCTranspProp, to_str (ical->transp));
-
-	/* Owner/organizer */
-	if (ical->organizer && ical->organizer->addr)
-		addPropValue (o, VCOrgNameProp, ical->organizer->addr);
-
-	/* related */
-	if (ical->related)
-		store_rel_list (o, VCRelatedToProp, ical->related);
-
-	/* attach */
-	for (l = ical->attach; l; l = l->next)
-		addPropValue (o, VCAttachProp, l->data);
-
-	/* url */
-	if (ical->url)
-		addPropValue (o, VCURLProp, ical->url);
-
-	if (ical->recur){
-		char result [256];
-		char buffer [80];
-		int i;
-
-		sprintf (result, "%s%d ", recur_type_name [ical->recur->type], ical->recur->interval);
-		switch (ical->recur->type){
-		case RECUR_DAILY:
-			break;
-
-		case RECUR_WEEKLY:
-			for (i = 0; i < 7; i++){
-				if (ical->recur->weekday & (1 << i)){
-					sprintf (buffer, "%s ", recur_day_list [i]);
-					strcat (result, buffer);
-				}
-			}
-			break;
-
-		case RECUR_MONTHLY_BY_POS: {
-			int nega = ical->recur->u.month_pos < 0;
-
-			sprintf (buffer, "%d%s ", nega ? -ical->recur->u.month_pos : ical->recur->u.month_pos,
-				 nega ? "-" : "+");
-			strcat (result, buffer);
-			/* the gui is set up for a single day, not a set here in this case */
-			sprintf (buffer, "%s ", recur_day_list [ical->recur->weekday]);
-			strcat (result, buffer);
-		}
-		break;
-
-		case RECUR_MONTHLY_BY_DAY:
-			sprintf (buffer, "%d ", ical->recur->u.month_pos);
-			strcat (result, buffer);
-			break;
-
-		case RECUR_YEARLY_BY_MONTH:
-			break;
-
-		case RECUR_YEARLY_BY_DAY:
-			break;
-		}
-		if (ical->recur->_enddate == 0)
-			sprintf (buffer, "#%d ",ical->recur->duration);
-		else
-			sprintf (buffer, "%s ", isodate_from_time_t (ical->recur->_enddate));
-		strcat (result, buffer);
-		addPropValue (o, VCRRuleProp, result);
-	}
-
-	save_alarm (o, &ical->aalarm, ical);
-	save_alarm (o, &ical->dalarm, ical);
-
-	if ((alarm = save_alarm (o, &ical->palarm, ical)))
-		addPropValue (alarm, VCProcedureNameProp, ical->palarm.data);
-	if ((alarm = save_alarm (o, &ical->malarm, ical)))
-		addPropValue (alarm, VCEmailAddressProp, ical->malarm.data);
-
-	/* Pilot */
-	{
-		char buffer [20];
-
-		sprintf (buffer, "%d", ical->pilot_id);
-		addPropValue (o, XPilotIdProp, buffer);
-		sprintf (buffer, "%d", ical->pilot_status);
-		addPropValue (o, XPilotStatusProp, buffer);
-	}
-
-	return o;
-}
-
-void
-ical_foreach (GList *events, calendarfn fn, void *closure)
-{
-	for (; events; events = events->next){
-		iCalObject *ical = events->data;
-
-		(*fn) (ical, ical->dtstart, ical->dtend, closure);
-	}
-}
-
-static int
-is_date_in_list (GList *list, struct tm *date)
-{
-	struct tm tm;
-
-	for (; list; list = list->next){
-		time_t *timep = list->data;
-
-		tm = *localtime (timep);
-		if (date->tm_mday == tm.tm_mday &&
-		    date->tm_mon  == tm.tm_mon &&
-		    date->tm_year == tm.tm_year){
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Generates an event instance based on the reference time */
-static gboolean
-generate (iCalObject *ico, time_t reference, calendarfn cb, void *closure)
-{
-	time_t offset;
-	struct tm tm_start, ref;
-	time_t start, end;
-
-	offset = ico->dtend - ico->dtstart;
-
-	tm_start = *localtime (&ico->dtstart);
-	ref      = *localtime (&reference);
-
-	tm_start.tm_mday = ref.tm_mday;
-	tm_start.tm_mon  = ref.tm_mon;
-	tm_start.tm_year = ref.tm_year;
-
-	start = mktime (&tm_start);
-	if (start == -1) {
-		g_message ("generate(): Produced invalid start date!");
-		return FALSE;
-	}
-
-	end = start + offset;
-
-#if 0
-	/* FIXME: I think this is not needed, since we are offsetting by full day values,
-	 * and the times should remain the same --- if you have a daily appointment
-	 * at 18:00, it is always at 18:00 even during daylight savings.
-	 *
-	 * However, what should happen on the exact change-of-savings day with
-	 * appointments in the early morning hours?
-	 */
-
-	if (ref.tm_isdst > tm_start.tm_isdst) {
-		tm_start.tm_hour--;
-		tm_end.tm_hour--;
-	} else if (ref.tm_isdst < tm_start.tm_isdst) {
-		tm_start.tm_hour++;
-		tm_end.tm_hour++;
-	}
-#endif
-
-	if (ico->exdate && is_date_in_list (ico->exdate, &tm_start))
-		return TRUE;
-
-	return (*cb) (ico, start, end, closure);
-}
-
-int
-ical_object_get_first_weekday (int weekday_mask)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		if (weekday_mask & (1 << i))
-			return i;
-
-	return -1;
-}
-
-#define time_in_range(t, a, b) ((t >= a) && (b ? (t < b) : 1))
-#define recur_in_range(t, r) (r->enddate ? (t < r->enddate) : 1)
-
-/*
- * Generate every possible event.  Invokes the callback routine for
- * every occurrence of the event in the [START, END] time interval.
- *
- * If END is zero, the event is generated forever.
- * The callback routine is expected to return 0 when no further event
- * generation is requested.
- */
-void
-ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure)
-{
-	time_t current;
-	int first_week_day;
-
-	/* If there is no recurrence, just check ranges */
-
-	if (!ico->recur) {
-		if ((end && (ico->dtstart < end) && (ico->dtend > start))
-		    || ((end == 0) && (ico->dtend > start))) {
-			/* The new calendar views expect the times to not be
-			   clipped, so they can show that it continues past
-			   the end of the viewable area. */
-#if 0
-			time_t ev_s, ev_e;
-
-			/* Clip range */
-
-			ev_s = MAX (ico->dtstart, start);
-			ev_e = MIN (ico->dtend, end);
-
-			(* cb) (ico, ev_s, ev_e, closure);
-#else
-			(* cb) (ico, ico->dtstart, ico->dtend, closure);
-#endif
-		}
-		return;
-	}
-
-	/* The event has a recurrence rule -- check that we will generate at least one instance */
-
-	if (end != 0) {
-		if (ico->dtstart > end)
-			return;
-
-		if (!IS_INFINITE (ico->recur) && (ico->recur->enddate < start))
-			return;
-	}
-
-	/* Generate the instances */
-
-	current = ico->dtstart;
-
-	switch (ico->recur->type) {
-	case RECUR_DAILY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_day (current, ico->recur->interval);
-
-			if (current == -1) {
-				g_warning ("RECUR_DAILY: time_add_day() returned invalid time");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_WEEKLY:
-		do {
-			struct tm tm;
-
-			tm = *localtime (&current);
-
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur)) {
-				/* Weekdays to recur on are specified as a bitmask */
-			  if (ico->recur->weekday & (1 << tm.tm_wday)) {
-					if (!generate (ico, current, cb, closure))
-						return;
-			  }
-			}
-
-			/* Advance by day for scanning the week or by interval at week end */
-
-			if (tm.tm_wday == 6)
-				current = time_add_day (current, (ico->recur->interval - 1) * 7 + 1);
-			else
-				current = time_add_day (current, 1);
-
-			if (current == -1) {
-				g_warning ("RECUR_WEEKLY: time_add_day() returned invalid time\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_POS:
-		/* FIXME: We only deal with positives now */
-		if (ico->recur->u.month_pos < 0) {
-			g_warning ("RECUR_MONTHLY_BY_POS does not support negative positions yet");
-			return;
-		}
-
-		if (ico->recur->u.month_pos == 0)
-			return;
-
-		first_week_day = /* ical_object_get_first_weekday (ico->recur->weekday);  */
-			ico->recur->weekday; /* the i/f only lets you choose a single day of the week! */
-
-		/* This should not happen, but take it into account */
-		if (first_week_day == -1) {
-			g_warning ("ical_object_get_first_weekday() returned -1");
-			return;
-		}
-
-		do {
-			struct tm tm;
-			time_t t;
-			int    week_day_start;
-
-			tm = *localtime (&current);
-			tm.tm_mday = 1;
-			t = mktime (&tm);
-			tm = *localtime (&t);
-			week_day_start = tm.tm_wday;
-
-			tm.tm_mday = (7 * (ico->recur->u.month_pos - ((week_day_start <= first_week_day ) ? 1 : 0))
-				      - (week_day_start - first_week_day) + 1);
-			if( tm.tm_mday > 31 )
-			{
-				tm.tm_mday = 1;
-				tm.tm_mon += ico->recur->interval;
-				current = mktime (&tm);
-				continue;
-			}
-
-			switch( tm.tm_mon )
-			{
-			case 3:
-			case 5:
-			case 8:
-			case 10:
-				if( tm.tm_mday > 30 )
-				{
-					tm.tm_mday = 1;
-					tm.tm_mon += ico->recur->interval;
-					current = mktime (&tm);
-					continue;
-				}
-				break;
-			case 1:
-				if( ((tm.tm_year+1900)%4) == 0
-					&& ((tm.tm_year+1900)%400) != 100
-					&& ((tm.tm_year+1900)%400) != 200
-					&& ((tm.tm_year+1900)%400) != 300 )
-				{
-
-					if( tm.tm_mday > 29 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				else
-				{
-					if( tm.tm_mday > 28 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				break;
-			}
-
-			t = mktime (&tm);
-
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			current = mktime (&tm);
-
-			tm.tm_mday = 1;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_DAY:
-		do {
-			struct tm tm;
-			time_t t;
-			int    p;
-
-			tm = *localtime (&current);
-
-			p = tm.tm_mday;
-			tm.tm_mday = ico->recur->u.month_day;
-			t = mktime (&tm);
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			tm.tm_mday = p;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_YEARLY_BY_MONTH:
-	case RECUR_YEARLY_BY_DAY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_year (current, ico->recur->interval);
-		} while (current < end || (end == 0));
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static int
-duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
-{
-	int *count = closure;
-	struct tm tm;
-
-	tm = *localtime (&start);
-
-	(*count)++;
-	if (ico->recur->duration == *count) {
-		ico->recur->enddate = time_day_end (end);
-		return 0;
-	}
-	return 1;
-}
-
-/* Computes ico->recur->enddate from ico->recur->duration */
-void
-ical_object_compute_end (iCalObject *ico)
-{
-	int count = 0;
-
-	g_return_if_fail (ico->recur != NULL);
-
-	ico->recur->_enddate = 0;
-	ico->recur->enddate = 0;
-	ical_object_generate_events (ico, ico->dtstart, 0, duration_callback, &count);
-}
-
-int
-alarm_compute_offset (CalendarAlarm *a)
-{
-	if (!a->enabled)
-		return -1;
-	switch (a->units){
-	case ALARM_MINUTES:
-		a->offset = a->count * 60;
-		break;
-	case ALARM_HOURS:
-		a->offset = a->count * 3600;
-		break;
-	case ALARM_DAYS:
-		a->offset = a->count * 24 * 3600;
-	}
-	return a->offset;
-}
-
-
-/**
- * ical_object_find_in_string:
- * @uid: Unique identifier of the sought object.
- * @vcalobj: String representation of a complete calendar object.
- * @ico: The resulting #iCalObject is stored here.
- *
- * Parses a complete vCalendar object string and tries to find the calendar
- * object that matches the specified @uid.  If found, it stores the resulting
- * #iCalObject in the @ico parameter.
- *
- * Return value: A result code depending on whether the parse and search were
- * successful.
- **/
-CalObjFindStatus
-ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico)
-{
-#if 0
-	icalcomponent* comp = NULL;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_NOT_FOUND);
-
-	comp = icalparser_parse_string (vcalobj);
-
-	if (!comp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #1\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	if (!subcomp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #2\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			if (strcasecmp (ical->uid, uid) == 0) {
-				(*ico) = ical;
-				(*ico)->ref_count = 1;
-				printf ("CAL_OBJ_FIND_SUCCESS\n");
-
-	printf ("ical_object_find_in_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (*ico);
-	printf ("-----------------------------------------------------\n");
-
-
-				return CAL_OBJ_FIND_SUCCESS;
-			}
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	printf ("CAL_OBJ_FIND_NOT_FOUND\n");
-	return CAL_OBJ_FIND_NOT_FOUND;
-
-#else /* 1 */
-	VObject *vcal;
-	VObjectIterator i;
-	CalObjFindStatus status;
-
-	g_return_val_if_fail (uid != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (ico != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-
-	*ico = NULL;
-	status = CAL_OBJ_FIND_NOT_FOUND;
-
-	vcal = Parse_MIME (vcalobj, strlen (vcalobj));
-
-	if (!vcal)
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-
-	initPropIterator (&i, vcal);
-
-	while (moreIteration (&i)) {
-		VObject *vobj;
-		VObject *uid_prop;
-		char *the_str;
-
-		vobj = nextVObject (&i);
-
-		uid_prop = isAPropertyOf (vobj, VCUniqueStringProp);
-		if (!uid_prop)
-			continue;
-
-		/* str_val() sets the_str to the string representation of the
-		 * property.
-		 */
-		str_val (uid_prop);
-
-		if (strcmp (the_str, uid) == 0) {
-			const char *object_name;
-
-			object_name = vObjectName (vobj);
-			*ico = ical_object_create_from_vobject (vobj, object_name);
-
-			if (*ico)
-				status = CAL_OBJ_FIND_SUCCESS;
-		}
-
-		free (the_str);
-
-		if (status == CAL_OBJ_FIND_SUCCESS)
-			break;
-	}
-
-	cleanVObject (vcal);
-	cleanStrTbl ();
-
-	return status;
-#endif /* 1 */
-}
-
-
-#if 1
-/* Creates a VObject with the base information of a calendar */
-static VObject *
-get_calendar_base_vobject (void)
-{
-	VObject *vobj;
-	time_t now;
-	struct tm tm;
-
-	/* We call localtime for the side effect of setting tzname */
-
-	now = time (NULL);
-	tm = *localtime (&now);
-
-	vobj = newVObject (VCCalProp);
-
-	addPropValue (vobj, VCProdIdProp, PRODID);
-
-#if defined (HAVE_TM_ZONE)
-	addPropValue (vobj, VCTimeZoneProp, tm.tm_zone);
-#elif defined (HAVE_TZNAME)
-	addPropValue (vobj, VCTimeZoneProp, tzname[0]);
-#endif
-
-	/* Per the vCalendar spec, this must be "1.0" */
-	addPropValue (vobj, VCVersionProp, "1.0");
-
-	return vobj;
-}
-#endif /* 0 */
-
-/**
- * ical_object_to_string:
- * @ico: A calendar object.
- * 
- * Converts a vCalendar object to its string representation.  It is wrapped
- * inside a complete VCALENDAR object because other auxiliary information such
- * as timezones may appear there.
- * 
- * Return value: String representation of the object.
- **/
-char *
-ical_object_to_string (iCalObject *ico)
-{
-#if 0
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-	icalcomponent *comp;
-
-	printf ("ical_object_to_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (ico);
-	printf ("-----------------------------------------------------\n");
-
-	comp = icalcomponent_create_from_ical_object (ico);
-	icalcomponent_add_component (top, comp);
-	out_cal_string = icalcomponent_as_ical_string (top);
-	return g_strdup (out_cal_string);
-
-#else /* 1 */
-	VObject *vcalobj, *vobj;
-	char *buf, *gbuf;
-
-	vcalobj = get_calendar_base_vobject ();
-	vobj = ical_object_to_vobject (ico);
-	addVObjectProp (vcalobj, vobj);
-
-	buf = writeMemVObject (NULL, NULL, vcalobj);
-
-	cleanVObject (vcalobj);
-	cleanStrTbl ();
-
-	/* We have to g_strdup() it because libversit uses malloc()/realloc(),
-	 * and we want clients to be able to use g_free().  Sigh.
-	 */
-	gbuf = g_strdup (buf);
-	free (buf);
-
-	return gbuf;
-#endif /* 1 */
-}
-
-
-/**
- * ical_object_compare_dates:
- * @ico1: A calendar event.
- * @ico2: A calendar event to compare with @ico1.
- * 
- * Returns TRUE if the dates of both objects match, including any recurrence
- * rules. Both calendar objects must have a type of ICAL_EVENT.
- * 
- * Return value: TRUE if both calendar objects have the same dates.
- **/
-gboolean
-ical_object_compare_dates (iCalObject *ico1,
-			   iCalObject *ico2)
-{
-	Recurrence *recur1, *recur2;
-	gint num_exdates;
-	GList *elem1, *elem2;
-	time_t *time1, *time2;
-
-	g_return_val_if_fail (ico1 != NULL, FALSE);
-	g_return_val_if_fail (ico2 != NULL, FALSE);
-	g_return_val_if_fail (ico1->type == ICAL_EVENT, FALSE);
-	g_return_val_if_fail (ico2->type == ICAL_EVENT, FALSE);
-
-	/* First check the base dates. */
-	if (ico1->dtstart != ico2->dtstart
-	    || ico1->dtend != ico2->dtend)
-		return FALSE;
-
-	recur1 = ico1->recur;
-	recur2 = ico2->recur;
-
-	/* If the event doesn't recur, we already know it matches. */
-	if (!recur1 && !recur2)
-		return TRUE;
-
-	/* Check that both recur. */
-	if (!(recur1 && recur2))
-		return FALSE;
-
-	/* Now we need to see if the recurrence rules are the same. */
-	if (recur1->type != recur2->type
-	    || recur1->interval != recur2->interval
-	    || recur1->enddate != recur2->enddate
-	    || recur1->weekday != recur2->weekday
-	    || recur1->duration != recur2->duration
-	    || recur1->_enddate != recur2->_enddate
-	    || recur1->__count != recur2->__count)
-		return FALSE;
-
-	switch (recur1->type) {
-	case RECUR_MONTHLY_BY_POS:
-		if (recur1->u.month_pos != recur2->u.month_pos)
-			return FALSE;
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		if (recur1->u.month_day != recur2->u.month_day)
-			return FALSE;
-		break;
-	default:
-		break;
-	}
-
-	/* Now check if the excluded dates match. */
-	num_exdates = g_list_length (ico1->exdate);
-	if (g_list_length (ico2->exdate) != num_exdates)
-		return FALSE;
-	if (num_exdates == 0)
-		return TRUE;
-
-	ico1->exdate = g_list_sort (ico1->exdate, compare_exdates);
-	ico2->exdate = g_list_sort (ico2->exdate, compare_exdates);
-
-	elem1 = ico1->exdate;
-	elem2 = ico2->exdate;
-	while (elem1) {
-		time1 = (time_t*) elem1->data;
-		time2 = (time_t*) elem2->data;
-
-		if (*time1 != *time2)
-			return FALSE;
-
-		elem1 = elem1->next;
-		elem2 = elem2->next;
-	}
-
-	return TRUE;
-}
-
-
-static gint
-compare_exdates (gconstpointer a, gconstpointer b)
-{
-	const time_t *ca = a, *cb = b;
-	time_t diff = *ca - *cb;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-
-/* Converts any CR/LF sequences in the summary field to spaces so we just
-   have a one-line field. The iCalObjects summary field is changed. */
-static void
-ical_object_normalize_summary (iCalObject *ico)
-{
-	gchar *src, *dest, ch;
-	gboolean just_output_space = FALSE;
-
-	src = dest = ico->summary;
-	while ((ch = *src++)) {
-		if (ch == '\n' || ch == '\r') {
-			/* We only output 1 space for each sequence of CR & LF
-			   characters. */
-			if (!just_output_space) {
-				*dest++ = ' ';
-				just_output_space = TRUE;
-			}
-		} else {
-			*dest++ = ch;
-			just_output_space = FALSE;
-		}
-	}
-	*dest = '\0';
-}
-
-
-void dump_icalobject (iCalObject *ico)
-{
-	if (!ico) {
-		printf ("<<NULL>>\n");
-		return;
-	}
-
-	printf ("type ");
-	switch (ico->type) {
-	case ICAL_EVENT: printf ("event"); break;
-	case ICAL_TODO: printf ("todo"); break;
-	case ICAL_JOURNAL: printf ("journal"); break;
-	case ICAL_FBREQUEST: printf ("fbrequest"); break;
-	case ICAL_FBREPLY: printf ("fbreply"); break;
-	case ICAL_BUSYTIME: printf ("busytime"); break;
-	case ICAL_TIMEZONE: printf ("timezone"); break;
-	}
-	printf ("\n");
-
-	printf ("attach-length %d\n", g_list_length (ico->attach));
-
-	printf ("attendee-length %d\n", g_list_length (ico->attendee));
-
-	printf ("catagories-length %d\n", g_list_length (ico->categories));
-
-	printf ("class '%s'\n", ico->class ? ico->class : "NULL");
-
-	printf ("comment '%s'\n", ico->comment ? ico->comment : "NULL");
-
-	printf ("completed %ld=%s",
-		ico->completed, ctime (&ico->completed));
-
-	printf ("created %ld=%s", ico->created, ctime (&ico->created));
-
-	printf ("contact-length %d\n", g_list_length (ico->contact));
-
-	printf ("desc '%s'\n", ico->desc ? ico->desc : "NULL");
-
-	printf ("dtstamp %ld=%s", ico->dtstamp, ctime (&ico->dtstamp));
-
-	printf ("dtstart %ld=%s", ico->dtstart, ctime (&ico->dtstart));
-
-	printf ("dtend %ld=%s", ico->dtend, ctime (&ico->dtend));
-
-	printf ("date_only %d\n", ico->date_only);
-
-	printf ("exdate-length %d\n", g_list_length (ico->exdate));
-
-	printf ("exrule-length %d\n", g_list_length (ico->exrule));
-
-	printf ("iCalGeo %d %f %f\n",
-		ico->geo.valid, ico->geo.latitude, ico->geo.longitude);
-
-	printf ("last_mod %ld=%s", ico->last_mod, ctime (&ico->last_mod));
-
-	printf ("location '%s'\n", ico->location ? ico->location : "NULL");
-
-	printf ("organizer %p\n", ico->organizer);
-
-	printf ("percent %d\n", ico->percent);
-
-	printf ("priority %d\n", ico->priority);
-
-	printf ("rstatus '%s'\n", ico->rstatus ? ico->rstatus : "NULL");
-
-	printf ("related-length %d\n", g_list_length (ico->related));
-
-	printf ("resources-length %d\n", g_list_length (ico->resources));
-
-	printf ("rdate-length %d\n", g_list_length (ico->rdate));
-
-	printf ("rrule-length %d\n", g_list_length (ico->rrule));
-
-	printf ("seq %d\n", ico->seq);
-
-	printf ("status '%s'\n", ico->status ? ico->status : "NULL");
-
-	printf ("summary '%s'\n", ico->summary ? ico->summary : "NULL");
-
-	printf ("transp ");
-	switch (ico->transp) {
-	case ICAL_OPAQUE: printf ("opaque"); break;
-	case ICAL_TRANSPARENT: printf ("transparent"); break;
-	}
-	printf ("\n");
-
-	printf ("uid '%s'\n", ico->uid ? ico->uid : "NULL");
-
-	printf ("url '%s'\n", ico->url ? ico->url : "NULL");
-
-	printf ("recurid %ld=%s", ico->recurid, ctime (&ico->recurid));
-
-	printf ("dalarm %d\n", ico->dalarm.enabled);
-
-	printf ("aalarm %d\n", ico->aalarm.enabled);
-
-	printf ("palarm %d\n", ico->palarm.enabled);
-
-	printf ("malarm %d\n", ico->malarm.enabled);
-
-	printf ("alarms-length %d\n", g_list_length (ico->alarms));
-
-	printf ("recur %p\n", ico->recur);
-
-	printf ("new %d\n", ico->new);
-
-	printf ("user_data %p\n", ico->user_data);
-
-	printf ("ref_count %d\n", ico->ref_count);
-}
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
deleted file mode 100644
index 3caef945e2..0000000000
--- a/calendar/cal-util/calobj.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Internal representation of a Calendar object.  This is modeled after the
- * iCalendar/vCalendar specificiation
- *
- * Authors: Miguel de Icaza (miguel@gnu.org)
- *          Federico Mena (quartic@gimp.org).
- */
-#ifndef CALOBJ_H
-#define CALOBJ_H
-
-#include <libgnome/libgnome.h>
-#include "libversit/vcc.h"
-
-BEGIN_GNOME_DECLS
-
-/* Alarm types */
-enum AlarmType {
-	ALARM_MAIL,
-	ALARM_PROGRAM,
-	ALARM_DISPLAY,
-	ALARM_AUDIO
-};
-
-/* Whether the alarm should trigger N mins/hours/days before its due time */
-enum AlarmUnit {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS
-};
-
-/* Field identifiers for the iCalObject structure. These are also used to
-   identify columns in ECalendarTable, so be careful when reordering them. */
-typedef enum {
-	ICAL_OBJECT_FIELD_COMMENT,
-	ICAL_OBJECT_FIELD_COMPLETED,
-	ICAL_OBJECT_FIELD_CREATED,
-	ICAL_OBJECT_FIELD_DESCRIPTION,
-	ICAL_OBJECT_FIELD_DTSTAMP,
-	ICAL_OBJECT_FIELD_DTSTART,
-	ICAL_OBJECT_FIELD_DTEND,
-	ICAL_OBJECT_FIELD_GEO,
-	ICAL_OBJECT_FIELD_LAST_MOD,
-	ICAL_OBJECT_FIELD_LOCATION,
-	ICAL_OBJECT_FIELD_ORGANIZER,
-	ICAL_OBJECT_FIELD_PERCENT,
-	ICAL_OBJECT_FIELD_PRIORITY,
-	ICAL_OBJECT_FIELD_SUMMARY,
-	ICAL_OBJECT_FIELD_URL,
-	ICAL_OBJECT_FIELD_HAS_ALARMS, /* not a real field */
-	ICAL_OBJECT_FIELD_ICON,	      /* not a real field */
-	ICAL_OBJECT_FIELD_COMPLETE,   /* not a real field */
-	ICAL_OBJECT_FIELD_RECURRING,  /* not a real field */
-	ICAL_OBJECT_FIELD_OVERDUE,    /* not a real field */
-	ICAL_OBJECT_FIELD_COLOR,      /* not a real field */
-	ICAL_OBJECT_FIELD_NUM_FIELDS
-} iCalObjectField;
-
-typedef struct {
-	enum AlarmType type;
-	int            enabled;
-	int            count;
-	enum AlarmUnit units;
-	char           *data;	/* not used for iCalendar alarms */
-
-	/* the following pointers are used for iCalendar alarms */
-
-	char           *attach;	           /* AUDIO, EMAIL, PROC */
-	char           *desc;	           /* DISPLAY, EMAIL, PROC */
-	char           *summary;           /* EMAIL */
-	char           *attendee;          /* EMAIL */
-
-	/* Does not get saved, internally used */
-	time_t         offset;
-	time_t         trigger;
-
-	int            snooze_secs;
-	int	       snooze_repeat;
-	
-	/* Widgets */
-	void           *w_count;      /* A GtkEntry */
-	void           *w_enabled;    /* A GtkChecButton */
-	void           *w_timesel;    /* A GtkMenu */
-	void           *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
-	void           *w_label;
-} CalendarAlarm;
-
-/* Calendar object type */
-typedef enum {
-	ICAL_EVENT,
-	ICAL_TODO,
-	ICAL_JOURNAL,
-	ICAL_FBREQUEST,
-	ICAL_FBREPLY,
-	ICAL_BUSYTIME,
-	ICAL_TIMEZONE
-} iCalType;
-
-/* For keys that might contain binary or text/binary */
-typedef struct {
-	char *data;
-	int  len;
-} iCalValue;
-
-typedef enum {
-	ICAL_PILOT_SYNC_NONE = 0,
-	ICAL_PILOT_SYNC_MOD  = 1,
-	ICAL_PILOT_SYNC_DEL  = 3
-} iCalPilotState;
-
-typedef struct {
-	int     valid;		/* true if the Geography was specified */
-	double  latitude;
-	double  longitude;
-} iCalGeo;
-
-typedef enum {
-	ICAL_OPAQUE,
-	ICAL_TRANSPARENT
-} iCalTransp;
-
-typedef struct {
-	char   *uid;
-	char   *reltype;
-} iCalRelation;
-
-typedef char NotYet;
-
-enum RecurType {
-	RECUR_DAILY,
-	RECUR_WEEKLY,
-	RECUR_MONTHLY_BY_POS,
-	RECUR_MONTHLY_BY_DAY,
-	RECUR_YEARLY_BY_MONTH,
-	RECUR_YEARLY_BY_DAY,
-};
-
-#define DAY_LASTDAY 10000
-
-typedef struct {
-	enum RecurType type;
-
-	int            interval;
-
-	/* Used for recur computation */
-	time_t         enddate;	/* If the value is zero, it is an infinite event
-				 * otherwise, it is either the _enddate value (if
-				 * this is what got specified)  or it is our computed
-				 * ending date (computed from the duration item).
-				 */
-
-	int            weekday;
-
-	union {
-		int    month_pos;
-		int    month_day;
-	} u;
-
-	int            duration;
-	time_t         _enddate; /* As found on the vCalendar file */
-	int            __count;
-} Recurrence;
-
-/* 
-   NOTE: iCalPerson is used for various property values which specify
-   people (e.g. ATTENDEE, ORGANIZER, etc.  Not all fields are valid
-   under RFC 2445 for all property values, but iCalPerson can store
-   them anyway.  Enforcing the RFC is a job for the parser.
-*/
-
-typedef struct {
-	char          *addr;
-	char          *name;
-	char          *role;
-	char          *partstat;
-	gboolean      rsvp;
-	char          *cutype;	/* calendar user type */
-	GList         *member;	/* group memberships */
-	GList         *deleg_to;
-	GList         *deleg_from;
-	char          *sent_by;
-	char          *directory;
-	GList         *altrep;	/* list of char* URI's */
-} iCalPerson;
-
-#define IS_INFINITE(r) (r->duration == 0)
-
-/* Flags to indicate what has changed in an object */
-typedef enum {
-	CHANGE_NEW     = 1 << 0,	/* new object */
-	CHANGE_SUMMARY = 1 << 1,	/* summary */
-	CHANGE_DATES   = 1 << 2,	/* dtstart / dtend */
-	CHANGE_ALL     = CHANGE_SUMMARY | CHANGE_DATES
-} CalObjectChange;
-
-/*
- * This describes an iCalendar object, note that we never store durations, instead we
- * always compute the end time computed from the start + duration.
- */
-typedef struct {
-	iCalType      type;
-
-	GList         *attach;		/* type: one or more URIs or binary data */
-        GList         *attendee; 	/* type: CAL-ADDRESS (list of iCalPerson) */
-	GList         *categories; 	/* type: one or more TEXT */
-	char          *class;
-
-	char          *comment;		/* we collapse one or more TEXTs into one */
-	time_t        completed;
-	time_t        created;
-	GList         *contact;		/* type: one or more TEXT */
-	char          *desc;
-	time_t        dtstamp;
-	time_t        dtstart;
-	time_t        dtend;            /* also duedate for todo's */
-        gboolean      date_only;        /* set if the start/end times were
-   specified using dates, not times (internal use, not stored to disk) */
-	GList         *exdate;		/* type: one or more time_t's */
-	GList         *exrule;		/* type: one or more RECUR */
-	iCalGeo       geo;
-	time_t        last_mod;
-	char          *location;
-	iCalPerson    *organizer;
-	int           percent;
-	int           priority;
-	char          *rstatus;	        /* request status for freebusy */
-	GList         *related;		/* type: one or more TEXT */
-	GList         *resources;	/* type: one or more TEXT */
-	GList         *rdate;		/* type: one or more recurrence date */
-	GList         *rrule;		/* type: one or more recurrence rules */
-	int           seq;
-	char          *status;
-	char          *summary;
-	iCalTransp    transp;
-	char          *uid;
-	char          *url;
-	time_t        recurid;
-
-	CalendarAlarm dalarm;
-	CalendarAlarm aalarm;
-	CalendarAlarm palarm;
-	CalendarAlarm malarm;
-
-	GList         *alarms;
-
-	Recurrence    *recur;
-	
-	int new;
-	void *user_data;		/* Generic data pointer */
-
-	/* Pilot */
-	iCalPilotState pilot_status;    /* Status information */
-	guint32            pilot_id;        /* Pilot ID */
-
-	guint	       ref_count;
-} iCalObject;
-
-/* The callback for the recurrence generator */
-typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *);
-
-iCalObject *ical_new                        (char *comment, char *organizer, char *summary);
-iCalObject *ical_object_new                 (void);
-
-void        ical_object_ref                 (iCalObject *ico);
-void        ical_object_unref               (iCalObject *ico);
-
-iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);
-VObject    *ical_object_to_vobject          (iCalObject *ical);
-iCalObject *ical_object_duplicate           (iCalObject *o);
-void        ical_foreach                    (GList *events, calendarfn fn, void *closure);
-void        ical_object_generate_events     (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure);
-void        ical_object_add_exdate          (iCalObject *o, time_t t);
-
-/* Computes the enddate field of the recurrence based on the duration */
-void        ical_object_compute_end         (iCalObject *ico);
-
-typedef enum {
-	CAL_OBJ_FIND_SUCCESS,
-	CAL_OBJ_FIND_SYNTAX_ERROR,
-	CAL_OBJ_FIND_NOT_FOUND
-} CalObjFindStatus;
-
-CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);
-
-char       *ical_object_to_string (iCalObject *ico);
-
-
-/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple
- * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.
- */
-int	    ical_object_get_first_weekday (int weekday_mask);
-
-/* Returns the number of seconds configured to trigger the alarm in advance to an event */
-int         alarm_compute_offset (CalendarAlarm *a);
-
-
-/* Returns TRUE if the dates of both objects match, including any recurrence
-   rules. */
-gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
-
-/* Generates a new uid for a calendar object. Should be g_free'd eventually. */
-char	   *ical_gen_uid (void);
-
-/* This resets any recurrence rules of the iCalObject. */
-void	    ical_object_reset_recurrence (iCalObject *ico);
-
-
-void dump_icalobject (iCalObject *ico);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/icalendar-save.c b/calendar/cal-util/icalendar-save.c
deleted file mode 100644
index 8f2335763f..0000000000
--- a/calendar/cal-util/icalendar-save.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "icalendar-save.h"
-
-
-static void unparse_person (iCalPerson *person, icalproperty *person_prop);
-static struct icaltimetype timet_to_icaltime (time_t tt);
-static icalproperty *unparse_related (iCalRelation *rel);
-static icalcomponent *unparse_alarm (CalendarAlarm *alarm);
-
-
-icalcomponent*
-icalcomponent_create_from_ical_object (iCalObject *ical)
-{
-	icalcomponent_kind kind;
-	icalcomponent *comp;
-	icalproperty *prop;
-
-	switch (ical->type) {
-	case ICAL_EVENT: kind = ICAL_VEVENT_COMPONENT; break;
-	case ICAL_TODO: kind = ICAL_VTODO_COMPONENT; break;
-	case ICAL_JOURNAL: kind = ICAL_VJOURNAL_COMPONENT; break;
-	case ICAL_FBREQUEST: kind = ICAL_VFREEBUSY_COMPONENT; break;
-	case ICAL_TIMEZONE: kind = ICAL_VTIMEZONE_COMPONENT; break;
-	default:
-		kind = ICAL_NO_COMPONENT; break;
-	}
-
-	comp = icalcomponent_new (kind);
-
-	/*** calscale ***/
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (comp, prop);
-
-	/*** catagories ***/
-	if (ical->categories) {		
-		/* ical->categories is a GList of (char *) */
-		GList *cur;
-		for (cur = ical->categories; cur; cur = cur->next) {
-			prop = icalproperty_new_categories ((char *) cur);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** class ***/
-	if (ical->class) {
-		prop = icalproperty_new_class (ical->class);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** comment ***/
-	if (ical->comment) {
-		prop = icalproperty_new_comment (ical->comment);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** description ***/
-	if (ical->desc) {
-		prop = icalproperty_new_description (ical->desc);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** geo ***/
-	if (ical->geo.valid) {
-		struct icalgeotype v;
-		v.lat = ical->geo.latitude;
-		v.lon = ical->geo.longitude;
-		prop = icalproperty_new_geo (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** location ***/
-	if (ical->location) {
-		prop = icalproperty_new_location (ical->location);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** percentcomplete ***/
-	prop = icalproperty_new_percentcomplete (ical->percent);
-	icalcomponent_add_property (comp, prop);
-
-	/*** priority ***/
-	if (ical->priority) {
-		prop = icalproperty_new_priority (ical->priority);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** resources ***/
-	if (ical->resources) {
-		/* ical->resources is a GList of (char *) */
-		GList *cur;
-		for (cur = ical->resources; cur; cur = cur->next) {
-			prop = icalproperty_new_resources ((char *) cur);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** status ***/
-	if (ical->status) {
-		prop = icalproperty_new_status (ical->status);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** summary ***/
-	if (ical->summary) {
-		prop = icalproperty_new_summary (ical->summary);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** completed ***/
-	if (ical->completed) {
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->completed);
-		prop = icalproperty_new_completed (ictime);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtend ***/  /*** due ***/
-	if (ical->dtend) {
-		/* FIXME: We should handle timezone specifiers */
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->dtend);
-		if (ical->type == ICAL_TODO)
-			prop = icalproperty_new_due (ictime);
-		else
-			prop = icalproperty_new_dtend (ictime);
-		if (ical->date_only) {
-			icalparameter *param;
-			param = icalparameter_new (ICAL_VALUE_PARAMETER);
-			icalparameter_set_value (param, ICAL_VALUE_DATE);
-			icalproperty_add_parameter (prop, param);
-		}
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtstart ***/
-	if (ical->dtstart) {
-		/* FIXME: We should handle timezone specifiers */
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->dtstart);
-		prop = icalproperty_new_dtstart (ictime);
-		if (ical->date_only) {
-			icalparameter *param;
-			param = icalparameter_new (ICAL_VALUE_PARAMETER);
-			icalparameter_set_value (param, ICAL_VALUE_DATE);
-			icalproperty_add_parameter (prop, param);
-		}
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** duration ***/
-	{
-		/* FIX ME */
-	}
-
-	/*** freebusy ***/
-	{
-		/* FIX ME */
-	}
-
-	/*** transp ***/
-	{
-		if (ical->transp == ICAL_TRANSP_PROPERTY)
-			prop = icalproperty_new_transp ("TRANSPARENT");
-		else
-			prop = icalproperty_new_transp ("OPAQUE");
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*
-	  ICAL_TZID_PROPERTY:
-	  ICAL_TZNAME_PROPERTY:
-	  ICAL_TZOFFSETFROM_PROPERTY:
-	  ICAL_TZOFFSETTO_PROPERTY:
-	  ICAL_TZURL_PROPERTY:
-	*/
-
-	/*** attendee ***/
-	if (ical->attendee) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->attendee; cur; cur = cur->next) {
-			iCalPerson *person = (iCalPerson *) cur->data;
-			prop = icalproperty_new_attendee (person->addr);
-			unparse_person (person, prop);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** contact ***/
-	if (ical->contact) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->contact; cur; cur = cur->next) {
-			iCalPerson *person = (iCalPerson *) cur->data;
-			prop = icalproperty_new_contact (person->addr);
-			unparse_person (person, prop);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** organizer ***/
-	if (ical->organizer) {
-		prop = icalproperty_new_organizer (ical->organizer->addr);
-		unparse_person (ical->organizer, prop);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** recurrenceid ***/
-	if (ical->recurid) {
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->recurid);
-		prop = icalproperty_new_recurrenceid (ictime);
-	}
-
-	/*** relatedto ***/
-
-	if (ical->related) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->related; cur; cur = cur->next) {
-			iCalRelation *related = (iCalRelation *) cur->data;
-			prop = unparse_related (related);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-
-	/*** url ***/
-	if (ical->url) {
-		prop = icalproperty_new_url (ical->url);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** uid ***/
-	if (ical->uid) {
-		prop = icalproperty_new_uid (ical->uid);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** exdate ***/
-	if (ical->exdate) {
-		struct icaltimetype v;
-		GList *cur;
-		for (cur = ical->exdate; cur; cur = cur->next) {
-			time_t t = (time_t) cur->data;
-			v = timet_to_icaltime (t);
-			prop = icalproperty_new_exdate (v);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** created ***/
-	if (ical->created) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->created);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtstamp ***/
-	if (ical->dtstamp) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->dtstamp);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** lastmodified ***/
-	if (ical->last_mod) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->last_mod);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** sequence ***/
-	if (ical->seq) {
-		prop = icalproperty_new_sequence (ical->seq);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** requeststatus ***/
-	if (ical->rstatus) {
-		prop = icalproperty_new_requeststatus (ical->rstatus);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/* if there is a VALARM subcomponent, add it here */
-
-	if (ical->alarms) {
-		GList *cur;
-		for (cur = ical->alarms; cur; cur = cur->next) {
-			CalendarAlarm *alarm = (CalendarAlarm *) cur->data;
-			icalcomponent *subcomp = unparse_alarm (alarm);
-			icalcomponent_add_component (comp, subcomp);
-		}
-	}
-
-	return comp;
-}
-
-
-/* FIX ME -- same as icaltimetype_from_timet in icaltypes.c */
-static
-struct icaltimetype timet_to_icaltime (time_t tt)
-{
-	struct tm *t;
-	struct icaltimetype i;
-
-	//t = gmtime (&tt);
-	t = localtime (&tt);
-
-	/*return tt - (i->is_utc ? timezone : 0); */
-	i.is_utc = 0;
-
-	i.year = t->tm_year + 1900;
-	i.month = t->tm_mon + 1;
-	i.day = t->tm_mday;
-
-	if (t->tm_hour == 0 && t->tm_min == 0 && t->tm_sec == 0) {
-		i.is_date = 1;
-		i.hour = 0;
-		i.minute = 0;
-		i.second = 0;
-	} else {
-		i.is_date = 0;
-		i.hour = t->tm_hour;
-		i.minute = t->tm_min;
-		i.second = t->tm_sec;
-	}
-
-	return i;
-}
-
-
-/* fills in "person_prop" with information from "person" */
-
-static
-void unparse_person (iCalPerson *person, icalproperty *person_prop)
-{
-	icalparameter *param;
-	GList *cur;
-
-	/* convert iCalPerson to an icalproperty */
-
-	if (person->name) {
-		param = icalparameter_new_cn (person->name);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->role) {
-		if (g_strcasecmp (person->role, "CHAIR") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_CHAIR);
-		else if (g_strcasecmp (person->role, "REQPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		else if (g_strcasecmp (person->role, "OPTPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);
-		else if (g_strcasecmp (person->role, "NONPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_NONPARTICIPANT);
-		else
-			param = icalparameter_new_role (ICAL_ROLE_XNAME);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->partstat) {
-		if (g_strcasecmp (person->partstat, "NEEDSACTION") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-		else if (g_strcasecmp (person->partstat, "ACCEPTED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_ACCEPTED);
-		else if (g_strcasecmp (person->partstat, "DECLINED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DECLINED);
-		else if (g_strcasecmp (person->partstat, "TENTATIVE") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_TENTATIVE);
-		else if (g_strcasecmp (person->partstat, "DELEGATED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DELEGATED);
-		else if (g_strcasecmp (person->partstat, "COMPLETED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_COMPLETED);
-		else if (g_strcasecmp (person->partstat, "INPROCESS") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_INPROCESS);
-		else /* FIX ME, NEEDSACTION instead? */
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_XNAME);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->rsvp != FALSE) {
-		param = icalparameter_new_rsvp (TRUE);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->cutype) {
-		if (g_strcasecmp (person->cutype, "INDIVIDUAL") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_INDIVIDUAL);
-		else if (g_strcasecmp (person->cutype, "GROUP") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_GROUP);
-		else if (g_strcasecmp (person->cutype, "RESOURCE") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_RESOURCE);
-		else if (g_strcasecmp (person->cutype, "ROOM") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_ROOM);
-		else /* FIX ME, INDIVIDUAL instead? */
-			param = icalparameter_new_cutype (ICAL_CUTYPE_UNKNOWN);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* person->member is a list of ICAL_MEMBER_PARAMETER */
-	for (cur = person->member; cur; cur = cur->next) {
-		gchar *member = (gchar *) cur->data;
-		param = icalparameter_new_member (member);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* person->deleg_to is a list of ICAL_DELEGATEDTO_PARAMETER */
-	for (cur = person->deleg_to; cur; cur = cur->next) {
-		gchar *deleg_to = (gchar *) cur->data;
-		param = icalparameter_new_delegatedto (deleg_to);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* ret->deleg_from is a list of ICAL_DELEGATEDFROM_PARAMETER */
-	for (cur = person->deleg_from; cur; cur = cur->next) {
-		gchar *deleg_from = (gchar *) cur->data;
-		param = icalparameter_new_delegatedfrom (deleg_from);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->sent_by) {
-		param = icalparameter_new_sentby (person->sent_by);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* ret->deleg_to is a list of ICAL_DIR_PARAMETER */
-	/* FIX ME ... */
-}
-
-
-static
-icalproperty *unparse_related (iCalRelation *rel)
-{
-	icalproperty *prop;
-
-	prop = icalproperty_new_relatedto (rel->reltype);
-
-	icalproperty_set_relatedto (prop, rel->uid);
-
-	/* FIX ME  RELTYPE_XNAME ? */
-	
-	return prop;
-}
-
-
-static
-icalcomponent *unparse_alarm (CalendarAlarm *alarm)
-{
-	icalcomponent *comp = icalcomponent_new (ICAL_VALARM_COMPONENT);
-	icalproperty *prop;
-
-	prop = NULL;
-	switch (alarm->type){
-	case ALARM_AUDIO:
-		prop = icalproperty_new_action ("AUDIO");
-		break;
-	case ALARM_DISPLAY:
-		prop = icalproperty_new_action ("DISPLAY");
-		break;
-	case ALARM_MAIL:
-		prop = icalproperty_new_action ("EMAIL");
-		break;
-	case ALARM_PROGRAM:
-		prop = icalproperty_new_action ("PROCEDURE");
-		break;
-	default:
-		g_warning ("Unsupported alarm type!");
-		break;
-	}
-	if (prop)
-		icalcomponent_add_property (comp, prop);
-
-	if (alarm->snooze_repeat)
-		prop = icalproperty_new_repeat (alarm->snooze_repeat);
-
-	if (alarm->snooze_secs) {
-		struct icaldurationtype dur;
-		dur = icaldurationtype_from_timet (alarm->snooze_secs);
-		prop = icalproperty_new_duration (dur);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->attach) {
-		struct icalattachtype *attach;
-		attach = icalattachtype_new ();
-		icalattachtype_set_url (attach, alarm->attach);
-		prop = icalproperty_new_attach (*attach);
-		icalattachtype_free (attach);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->desc) {
-		prop = icalproperty_new_description (alarm->desc);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->summary) {
-		prop = icalproperty_new_summary (alarm->summary);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->attendee) {
-		icalproperty_new_attendee (alarm->attendee);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	return comp;
-}
diff --git a/calendar/cal-util/icalendar-save.h b/calendar/cal-util/icalendar-save.h
deleted file mode 100644
index 1e0ab59e70..0000000000
--- a/calendar/cal-util/icalendar-save.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ICALENDAR_SAVE_H
-#define ICALENDAR_SAVE_H
-
-#include <ical.h>
-#include <cal-util/calobj.h>
-
-
-
-icalcomponent *icalcomponent_create_from_ical_object (iCalObject *ical);
-
-
-
-#endif
diff --git a/calendar/cal-util/icalendar-test.c b/calendar/cal-util/icalendar-test.c
deleted file mode 100644
index 921e109a2c..0000000000
--- a/calendar/cal-util/icalendar-test.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <cal-util/calobj.h>
-#include "libversit/vcc.h"
-
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-static icalcomponent* 
-icalendar_parse_file (char* fname)
-{
-	FILE* fp;
-	icalcomponent* comp = NULL;
-	gchar* str;
-	struct stat st;
-	int n;
-
-	fp = fopen (fname, "r");
-	if (!fp) {
-		g_warning ("Cannot open open calendar file.");
-		return NULL;
-	}
-	
-	stat (fname, &st);
-	
-	str = g_malloc (st.st_size + 2);
-	
-	n = fread ((gchar*) str, 1, st.st_size, fp);
-	if (n != st.st_size) {
-		g_warning ("Read error.");
-	}
-	str[n] = '\0';
-
-	fclose (fp);
-	
-	comp = icalparser_parse_string (str);
-	g_free (str);
-
-	return comp;
-}
-
-
-static GList *
-icalendar_calendar_load (GList *icals, char *fname)
-{
-	icalcomponent *comp;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	comp = icalendar_parse_file (fname);
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			printf ("prepending %p\n", ical);
-			icals = g_list_prepend (icals, ical);
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	return icals;
-}
-
-
-
-
-static void
-icalendar_calendar_save (GList *icals, char *fname)
-{
-	GList *cur;
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-
-	for (cur=icals; cur; cur=cur->next) {
-		iCalObject *ical = (iCalObject *) cur->data;
-		icalcomponent *comp;
-		comp = icalcomponent_create_from_ical_object (ical);
-		icalcomponent_add_component (top, comp);
-	}
-
-	out_cal_string = icalcomponent_as_ical_string (top);
-
-	printf ("---------------------------------------------------------\n");
-	printf ("%s", out_cal_string);
-}
-
-
-
-int main (int argc, char *argv[])
-{
-	GList *icals = NULL;
-	int i;
-	long int n0, n1;
-        struct icaldurationtype dt;
-
-
-	/* test icaldurationtype_from_timet */
-	srandom (time (0));
-
-	for (i=0; i<10; i++) {
-		n0 = random () % ((60 * 60 * 24 * 7) * 4);
-		dt = icaldurationtype_from_timet (n0);
-		n1 = icaldurationtype_as_timet (dt);
-
-		printf ("%ld -> (%d %d %d %d %d) -> %ld\n",
-			n0,
-			dt.weeks, dt.days, dt.hours, dt.minutes, dt.seconds,
-			n1);
-		if (n0 != n1) abort ();
-	}
-
-	/*****************/
-	/* test conversion of icalcomponents to and from iCalObjects */
-	/*****************/
-
-	/* load an ical file */
-
-	if (argc < 2) {
-		printf ("give ical file as argument.\n");
-		return 1;
-	}
-
-	icals = icalendar_calendar_load (icals, argv[ 1 ]);
-
-	printf ("loaded %d ical components\n", g_list_length (icals));
-
-
-	/* save it back out */
-
-	icalendar_calendar_save (icals, "out.ical");
-
-	return 0;
-}
diff --git a/calendar/cal-util/icalendar.c b/calendar/cal-util/icalendar.c
deleted file mode 100644
index c43d0fba77..0000000000
--- a/calendar/cal-util/icalendar.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * icalendar server for gnomecal
- * 
- * This module interfaces between libical and the gnomecal internal
- * representation
- *
- * Copyright (C) 1999 The Free Software Foundation
- * Authors:
- *   Russell Steinthal (rms39@columbia.edu)
- * 
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "icalendar.h"
-
-static time_t icaltime_to_timet (struct icaltimetype* i);
-static CalendarAlarm* parse_alarm (icalproperty *prop);
-static iCalPerson* parse_person (icalproperty *prop, gchar *value);
-static iCalRelation* parse_related (icalproperty *prop);
-
-/* Duplicate a string without memory leaks */
-static gchar* copy_str (gchar** store, gchar* src)
-{
-	if (*store)
-		g_free (*store);
-	return (*store = g_strdup (src));
-}
-
-static GList* 
-copy_to_list (GList** store, gchar* src)
-{
-	*store = g_list_prepend (*store, g_strdup (src));
-	return *store;
-}
-
-	
-iCalObject *
-ical_object_create_from_icalcomponent (icalcomponent* comp)
-{
-	iCalObject    *ical = NULL;
-	iCalPerson    *person;
-	icalcomponent *subcomp;
-	icalproperty  *prop;
-	icalparameter *param;
-	struct icaltimetype ictime;
-	time_t *pt;	
-	CalendarAlarm *alarm = NULL;
-	icalcomponent_kind compType;
-	struct icalgeotype geo;
-	struct icalperiodtype period; 
-
-	gboolean root = FALSE;
-	gboolean attachment = FALSE;
-
-	char *tmpStr;		/* this is a library-owned string */
-
-	ical  = g_new0 (iCalObject, 1);
-
-	compType = icalcomponent_isa (comp);
-	
-	switch (compType) {
-	case ICAL_XROOT_COMPONENT:
-	     root = TRUE;
-	     break;
-	case ICAL_XATTACH_COMPONENT:
-	     attachment = TRUE;
-	     break;
-	case ICAL_VEVENT_COMPONENT:
-	     ical->type = ICAL_EVENT;
-	     break;
-	case ICAL_VTODO_COMPONENT:
-	     ical->type = ICAL_TODO;
-	     break;
-	case ICAL_VJOURNAL_COMPONENT:
-	     ical->type = ICAL_JOURNAL;
-	     break;
-	case ICAL_VCALENDAR_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_VFREEBUSY_COMPONENT:
-	     ical->type = ICAL_FBREQUEST;
-	     /* NOTE: This is not conclusive- you need to analyze
-		properties to determine whether this is an
-		FBREQUEST or an FBREPLY */
-	     break;
-	case ICAL_VTIMEZONE_COMPONENT:
-	     ical->type = ICAL_TIMEZONE;
-	     break;
-	case ICAL_VALARM_COMPONENT:
-	case ICAL_XAUDIOALARM_COMPONENT:
-	case ICAL_XDISPLAYALARM_COMPONENT:
-	case ICAL_XEMAILALARM_COMPONENT:
-	case ICAL_XPROCEDUREALARM_COMPONENT:
-	     /* this should not be reached, since this loop should
-		only be processing first level components */
-	     break;
-	case ICAL_XSTANDARD_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_XDAYLIGHT_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_X_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_VSCHEDULE_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_XLICINVALID_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_NO_COMPONENT:
-	case ICAL_ANY_COMPONENT:
-	     /* should not occur */
-	     break;
-	case ICAL_VQUERY_COMPONENT:
-	case ICAL_VCAR_COMPONENT:
-	case ICAL_VCOMMAND_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	}
-	
-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-	while (prop) {
-		switch (icalproperty_isa (prop)) {
-		case ICAL_CALSCALE_PROPERTY:
-			if (g_strcasecmp (icalproperty_get_calscale (prop),
-					  "GREGORIAN"))
-				g_warning ("Unknown calendar format.");
-			break;
-		case ICAL_METHOD_PROPERTY:
-			/* FIXME: implement something here */
-			break;
-		case ICAL_ATTACH_PROPERTY:
-			/* FIXME: not yet implemented */
-			break;
-		case ICAL_CATEGORIES_PROPERTY:
-			copy_to_list (&ical->categories,
-				      icalproperty_get_categories (prop));
-			break;
-		case ICAL_CLASS_PROPERTY:
-			copy_str (&ical->class, icalproperty_get_class (prop));
-			break;
-		case ICAL_COMMENT_PROPERTY:
-			/*tmpStr = icalproperty_get_comment (prop);*/
-			tmpStr = g_strconcat (icalproperty_get_comment (prop),
-					      ical->comment,
-					      NULL);
-			if (ical->comment)
-				g_free (ical->comment);
-			ical->comment = tmpStr;
-			break;
-		case ICAL_DESCRIPTION_PROPERTY:
-			copy_str (&ical->desc, 
-				  icalproperty_get_description (prop));
-			break;
-		case ICAL_GEO_PROPERTY:
-			geo = icalproperty_get_geo (prop);
-			ical->geo.latitude = geo.lat;
-			ical->geo.longitude = geo.lon;
-			ical->geo.valid = TRUE;
-			break;
-		case ICAL_LOCATION_PROPERTY:
-			copy_str (&ical->location,
-				  icalproperty_get_location (prop));
-			break;
-		case ICAL_PERCENTCOMPLETE_PROPERTY:
-			ical->percent = icalproperty_get_percentcomplete (prop);
-			break;
-		case ICAL_PRIORITY_PROPERTY:
-			ical->priority = icalproperty_get_priority (prop);
-			if (ical->priority < 0 || ical->priority > 9)
-				g_warning ("Priority out-of-range (see RFC2445)");
-			break;
-		case ICAL_RESOURCES_PROPERTY:
-			copy_to_list (&ical->resources,
-				      icalproperty_get_resources (prop));
-			break;
-		case ICAL_STATUS_PROPERTY:
-			copy_str (&ical->status,
-				  icalproperty_get_status (prop));
-			break;
-		case ICAL_SUMMARY_PROPERTY:
-			copy_str (&ical->summary,
-				  icalproperty_get_summary (prop));
-			break;
-		case ICAL_COMPLETED_PROPERTY:
-			ictime = icalproperty_get_completed (prop);
-			ical->completed = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_DTEND_PROPERTY:
-			ictime = icalproperty_get_dtend (prop);
-			ical->dtend = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			if (param)
-				ical->date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DUE_PROPERTY:
-			ictime = icalproperty_get_due (prop);
-			ical->dtend = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			ical->date_only = (icalparameter_get_value (param) == 
-					   ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DTSTART_PROPERTY:
-			ictime = icalproperty_get_dtstart (prop);
-			ical->dtstart = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			if (param)
-				ical->date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DURATION_PROPERTY:
-			/* FIXME: I don't see the necessary libical function */
-			break;
-		case ICAL_FREEBUSY_PROPERTY:
-			period = icalproperty_get_freebusy (prop);
-			ical->dtstart = icaltime_to_timet (&(period.start));
-			/* FIXME: period.end is specified as being relative
-			   to start, so this may not be correct */
-			ical->dtend   = icaltime_to_timet (&(period.end));
-			break;
-		case ICAL_TRANSP_PROPERTY:
-			tmpStr = icalproperty_get_transp (prop);
-			/* do not i18n the following string constant! */
-			if (!g_strcasecmp (tmpStr, "TRANSPARENT"))
-				ical->transp = ICAL_TRANSPARENT;
-			else
-				ical->transp = ICAL_OPAQUE;
-			break;
-		case ICAL_TZID_PROPERTY:
-		case ICAL_TZNAME_PROPERTY:
-		case ICAL_TZOFFSETFROM_PROPERTY:
-		case ICAL_TZOFFSETTO_PROPERTY:
-		case ICAL_TZURL_PROPERTY:
-			/* no implementation for now */
-			break;
-		case ICAL_ATTENDEE_PROPERTY:
-			tmpStr = icalproperty_get_attendee (prop);
-			person  = parse_person (prop, tmpStr);
-			ical->attendee = g_list_prepend (ical->attendee, 
-							 person);
-			break;
-		case ICAL_CONTACT_PROPERTY:
-			tmpStr = icalproperty_get_contact (prop);
-			person  = parse_person (prop, tmpStr);
-			ical->contact = g_list_prepend (ical->contact, person);
-			break;
-		case ICAL_ORGANIZER_PROPERTY:
-			tmpStr = icalproperty_get_organizer (prop);
-			person  = parse_person (prop, tmpStr);
-			if (ical->organizer)
-				g_free (ical->organizer);
-			ical->organizer = person;
-			break;
-		case ICAL_RECURRENCEID_PROPERTY:
-			ictime = icalproperty_get_recurrenceid (prop);
-			ical->recurid = icaltime_to_timet (&ictime);
-			/* FIXME: Range parameter not implemented */
-			break;
-		case ICAL_RELATEDTO_PROPERTY:
-			ical->related = g_list_prepend (ical->related,
-							parse_related (prop));
-			break;
-		case ICAL_URL_PROPERTY:
-			copy_str (&ical->url, 
-				  icalproperty_get_url (prop));
-			break;
-		case ICAL_UID_PROPERTY:
-			copy_str (&ical->uid,
-				  icalproperty_get_uid (prop));
-			break;
-		case ICAL_EXDATE_PROPERTY:
-			/* FIXME: This does not appear to parse
-                           multiple exdate values in one property, as
-                           allowed by the RFC; needs a libical fix */
-			ictime = icalproperty_get_exdate (prop);
-			pt = g_new0 (time_t, 1);
-			*pt = icaltime_to_timet (&ictime);
-			ical->exdate = g_list_prepend (ical->exdate, pt);
-			break;
-		case ICAL_EXRULE_PROPERTY:
-		case ICAL_RDATE_PROPERTY:
-		case ICAL_RRULE_PROPERTY:
-			/* FIXME: need recursion processing */
-			break;
-		case ICAL_ACTION_PROPERTY:
-		case ICAL_REPEAT_PROPERTY:
-		case ICAL_TRIGGER_PROPERTY:
-			/* should only occur in VALARM's, handled below */
-			g_assert_not_reached();
-			break;
-		case ICAL_CREATED_PROPERTY:
-			ictime = icalproperty_get_created (prop);
-			ical->created = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_DTSTAMP_PROPERTY:
-			ictime = icalproperty_get_dtstamp (prop);
-			ical->dtstamp = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_LASTMODIFIED_PROPERTY:
-			ictime = icalproperty_get_lastmodified (prop);
-			ical->last_mod = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_SEQUENCE_PROPERTY:
-			ical->seq = icalproperty_get_sequence (prop);
-			break;
-		case ICAL_REQUESTSTATUS_PROPERTY:
-			copy_str (&ical->rstatus,
-				  icalproperty_get_requeststatus (prop));
-			break;
-		case ICAL_X_PROPERTY:
-			g_warning ("Unsupported X-property: %s",
-				   icalproperty_as_ical_string (prop));
-			break;
-		case ICAL_XLICERROR_PROPERTY:
-			g_warning ("Unsupported property: %s",
-				   icalproperty_get_xlicerror (prop));
-			break;
-		case ICAL_PRODID_PROPERTY:
-		case ICAL_VERSION_PROPERTY:
-			/* nothing to do for this property */
-			break;
-		default:
-			g_warning ("Unsupported property: %s", icalproperty_as_ical_string (prop));
-			break;
-			
-		}
-		
-		prop = icalcomponent_get_next_property (comp,
-							ICAL_ANY_PROPERTY);
-	}
-	
-	/* now parse subcomponents --- should only be VALARM's */
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		compType = icalcomponent_isa (subcomp);
-		switch (compType) {
-		case ICAL_VALARM_COMPONENT:
-			alarm = parse_alarm (subcomp);
-			if (alarm)
-				ical->alarms = g_list_prepend (ical->alarms,
-							       alarm);
-			break;
-		default:
-			g_warning ("Only nested VALARM components are supported.");
-		}
-
-		subcomp = icalcomponent_get_next_component (comp,
-							    ICAL_ANY_COMPONENT);
-	}
-
-	return ical;
-}
-
-
-static time_t icaltime_to_timet (struct icaltimetype* i)
-{
-	struct tm t;
-	time_t ret;
-
-	t.tm_year = i->year - 1900;
-	t.tm_mon  = i->month - 1;
-	t.tm_mday = i->day;
-	if (!i->is_date) {
-		t.tm_hour = i->hour;
-		t.tm_min  = i->minute;
-		t.tm_sec  = i->second;
-	} else {
-		t.tm_hour = 0;
-		t.tm_min  = 0;
-		t.tm_sec  = 0;
-	}
-
-	ret = mktime(&t);
-
-	if (i->is_utc) {
-#ifdef HAVE_TIMEZONE
-	  	extern long timezone;
-		ret -= timezone;
-#else
-		struct tm *tmp;
-		time_t tod = time(NULL);
-		tmp = localtime (&tod);
-		ret += tmp->tm_gmtoff;
-#endif
-	} 
-
-	return ret;
-}
-	
-static iCalPerson*
-parse_person (icalproperty* prop, gchar* value)
-{
-	icalparameter* param;
-	icalparameter_role role;
-	icalparameter_partstat partstat;
-	icalparameter_cutype cutype;
-
-	iCalPerson* ret;
-	
-	ret = g_new0 (iCalPerson, 1);
-
-	ret->addr = g_strdup (value);
-
-	param = icalproperty_get_first_parameter (prop,
-						  ICAL_CN_PARAMETER);
-	if (param)
-		ret->name = g_strdup (icalparameter_get_cn (param));
-	else
-		ret->name = NULL;
-	
-	
-	param = icalproperty_get_first_parameter (prop,
-						  ICAL_ROLE_PARAMETER);
-	if (param) {
-		role  = icalparameter_get_role (param);
-		switch (role) {
-		case ICAL_ROLE_CHAIR:
-			ret->role = g_strdup ("CHAIR");
-			break;
-		case ICAL_ROLE_REQPARTICIPANT:
-			ret->role = g_strdup ("REQPARTICIPANT");
-			break;
-		case ICAL_ROLE_OPTPARTICIPANT:
-			ret->role = g_strdup ("OPTPARTICIPANT");
-			break;
-		case ICAL_ROLE_NONPARTICIPANT:
-			ret->role = g_strdup ("NONPARTICIPANT");
-			break;
-		case ICAL_ROLE_XNAME:
-		default:
-			ret->role = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		ret->role = g_strdup ("REQPARTICIPANT");
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-	if (param) {
-		partstat = icalparameter_get_partstat (param);
-		switch (partstat) {
-		case ICAL_PARTSTAT_NEEDSACTION:
-			ret->partstat = g_strdup ("NEEDSACTION");
-			break;
-		case ICAL_PARTSTAT_ACCEPTED:
-			ret->partstat = g_strdup ("ACCEPTED");
-			break;
-		case ICAL_PARTSTAT_DECLINED:
-			ret->partstat = g_strdup ("DECLINED");
-			break;
-		case ICAL_PARTSTAT_TENTATIVE:
-			ret->partstat = g_strdup ("TENTATIVE");
-			break;
-		case ICAL_PARTSTAT_DELEGATED:
-			ret->partstat = g_strdup ("DELEGATED");
-			break;
-		case ICAL_PARTSTAT_COMPLETED:
-			ret->partstat = g_strdup ("COMPLETED");
-			break;
-		case ICAL_PARTSTAT_INPROCESS:
-			ret->partstat = g_strdup ("INPROCESS");
-			break;
-		case ICAL_PARTSTAT_XNAME:
-			ret->partstat = g_strdup (icalparameter_get_xvalue (param));
-			break;
-		default:
-			ret->partstat = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		ret->partstat = g_strdup ("NEEDSACTION");
-
-	param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);
-	if (param)
-		ret->rsvp = icalparameter_get_rsvp (param);
-	else
-		ret->rsvp = FALSE;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_CUTYPE_PARAMETER
-);
-	if (param) {
-		cutype = icalparameter_get_cutype (param);
-		switch (cutype) {
-		case ICAL_CUTYPE_INDIVIDUAL:
-			ret->cutype = g_strdup ("INDIVIDUAL");
-			break;
-		case ICAL_CUTYPE_GROUP:
-			ret->cutype = g_strdup ("GROUP");
-			break;
-		case ICAL_CUTYPE_RESOURCE:
-			ret->cutype = g_strdup ("RESOURCE");
-			break;
-		case ICAL_CUTYPE_ROOM:
-			ret->cutype = g_strdup ("ROOM");
-			break;
-		case ICAL_CUTYPE_UNKNOWN:
-		case ICAL_CUTYPE_XNAME:
-		default:
-			ret->cutype = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else 
-		ret->cutype = g_strdup ("INDIVIDUAL");
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_MEMBER_PARAMETER
-);
-	while (param) {
-		copy_to_list (&ret->member, icalparameter_get_member (param));
-		param = icalproperty_get_next_parameter (prop, 
-							 ICAL_MEMBER_PARAMETER);
-	}
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_to, 
-			      icalparameter_get_delegatedto (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DELEGATEDTO_PARAMETER);
-	}
-
-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_from, 
-			      icalparameter_get_delegatedfrom (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DELEGATEDFROM_PARAMETER);
-	}
-
-	param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
-	if (param)
-		copy_str (&ret->sent_by, icalparameter_get_sentby (param));
-	else
-		ret->sent_by = NULL;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_DIR_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_to, 
-			      icalparameter_get_delegatedto (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DIR_PARAMETER);
-	}
-
-	return ret;
-}
-
-static iCalRelation* 
-parse_related (icalproperty* prop)
-{
-	iCalRelation* rel;
-	icalparameter* param;
-	icalparameter_reltype type;
-
-	rel = g_new0 (iCalRelation, 1);
-	rel->uid = g_strdup (icalproperty_get_relatedto (prop));
-	
-	param = icalproperty_get_first_parameter (prop, 
-						  ICAL_RELTYPE_PARAMETER);
-	if (param) {
-		type = icalparameter_get_reltype (param);
-		switch (type) {
-		case ICAL_RELTYPE_PARENT:
-			rel->reltype = g_strdup ("PARENT");
-			break;
-		case ICAL_RELTYPE_CHILD:
-			rel->reltype = g_strdup ("CHILD");
-			break;
-		case ICAL_RELTYPE_SIBLING:
-			rel->reltype = g_strdup ("SIBLING");
-			break;
-		case ICAL_RELTYPE_XNAME:
-			rel->reltype = g_strdup (icalparameter_get_xvalue (param));
-			break;
-		default:
-			rel->reltype = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		rel->reltype = g_strdup ("PARENT");
-
-	return rel;
-}
-	
-#ifdef TEST
-
-int main(int argc, char* argv[])
-{
-	icalcomponent* comp;
-	comp = icalendar_parse_file (argv[1]);
-	printf ("%s\n", icalcomponent_as_ical_string (comp));
-	return 0;
-}
-
-#endif
-	
-	
-static CalendarAlarm*
-parse_alarm (icalcomponent* comp)
-{
-	CalendarAlarm *alarm;
-	icalproperty  *prop;
-	char          *tmpStr;
-	struct icaldurationtype dur;
-	struct icalattachtype attach;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	
-	alarm = g_new0 (CalendarAlarm, 1);
-	
-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-	while (prop) {
-		switch (icalproperty_isa (prop)) {
-		case ICAL_ACTION_PROPERTY:
-			tmpStr = icalproperty_get_action (prop);
-			if (!g_strcasecmp (tmpStr, "AUDIO"))
-				alarm->type = ALARM_AUDIO;
-			else if (!g_strcasecmp (tmpStr, "DISPLAY"))
-				alarm->type = ALARM_DISPLAY;
-			else if (!g_strcasecmp (tmpStr, "EMAIL"))
-				alarm->type = ALARM_MAIL;
-			else if (!g_strcasecmp (tmpStr, "PROCEDURE"))
-				alarm->type = ALARM_PROGRAM;
-			else
-				g_warning ("Unsupported alarm type!");
-			break;
-		case ICAL_TRIGGER_PROPERTY:
-			/* FIXME: waiting on proper libical support */
-			break;
-		case ICAL_REPEAT_PROPERTY:
-			alarm->snooze_repeat = icalproperty_get_repeat (prop);
-			break;
-		case ICAL_DURATION_PROPERTY:
-			dur = icalproperty_get_duration (prop);
-			alarm->snooze_secs = icaldurationtype_as_timet (dur);
-			break;
-		case ICAL_ATTACH_PROPERTY:
-			attach = icalproperty_get_attach (prop);
-			copy_str (&alarm->attach,
-				  icalattachtype_get_url (&attach));
-			break;
-		case ICAL_DESCRIPTION_PROPERTY:
-			copy_str (&alarm->desc,
-				  icalproperty_get_description (prop));
-			break;
-		case ICAL_SUMMARY_PROPERTY:
-			copy_str (&alarm->summary,
-				  icalproperty_get_summary (prop));
-			break;
-		case ICAL_ATTENDEE_PROPERTY:
-			copy_str (&alarm->attendee,
-				  icalproperty_get_attendee (prop));
-			break;
-		default:
-			g_warning ("Unsupported alarm property: %s",
-				   icalproperty_as_ical_string (prop));
-			break;
-		}
-		
-		prop = icalcomponent_get_next_property (comp, 
-							ICAL_ANY_PROPERTY);
-	}
-
-	return alarm;
-}
diff --git a/calendar/cal-util/icalendar.h b/calendar/cal-util/icalendar.h
deleted file mode 100644
index 2a22fbab71..0000000000
--- a/calendar/cal-util/icalendar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ICALENDAR_H
-#define ICALENDAR_H
-
-#include <ical.h>
-#include <cal-util/calobj.h>
-
-
-
-iCalObject *ical_object_create_from_icalcomponent (icalcomponent* comp);
-
-
-
-#endif
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
deleted file mode 100644
index 6ec214b18b..0000000000
--- a/calendar/cal-util/test-recur.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * This tests the recurrence rule expansion functions.
- * FIXME: Needs to be updated to just use the public interface.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include <cal-util/cal-recur.h>
-
-
-/* Since events can recur infinitely, we set a limit to the number of
-   occurrences we output. */
-#define MAX_OCCURRENCES	1000
-
-static void usage			(void);
-static icalcomponent* scan_ics_file	(char		*filename);
-static char* get_line			(char		*s,
-					 size_t		 size,
-					 void		*data);
-static void generate_occurrences	(icalcomponent	*comp);
-static gboolean occurrence_cb		(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data);
-
-
-int
-main			(int		 argc,
-			 char		*argv[])
-{
-	gchar *filename;
-	icalcomponent *icalcomp;
-
-	gtk_init (&argc, &argv);
-
-	if (argc != 2)
-		usage ();
-
-	filename = argv[1];
-
-	icalcomp = scan_ics_file (filename);
-	if (icalcomp)
-		generate_occurrences	(icalcomp);
-
-	return 0;
-}
-
-
-static void
-usage			(void)
-{
-	g_print ("Usage: test-recur <filename>\n");
-	exit (1);
-}
-
-
-static icalcomponent*
-scan_ics_file		(char		*filename)
-{
-	FILE *fp;
-	icalcomponent *icalcomp;
-	icalparser *parser;
-
-	g_print ("Opening file: %s\n", filename);
-	fp = fopen (filename, "r");
-
-	if (!fp) {
-		g_print ("Can't open file: %s\n", filename);
-		return NULL;
-	}
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fp);
-
-	icalcomp = icalparser_parse (parser, get_line);
-	icalparser_free (parser);
-
-	return icalcomp;
-}
-
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line		(char		*s,
-			 size_t		 size,
-			 void		*data)
-{
-	return fgets (s, size, (FILE*) data);
-}
-
-
-static void
-generate_occurrences	(icalcomponent	*icalcomp)
-{
-	icalcomponent *tmp_icalcomp;
-	CalComponent *comp;
-	gint occurrences;
-
-	for (tmp_icalcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	     tmp_icalcomp;
-	     tmp_icalcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT)) {
-		icalcomponent_kind kind;
-
-		kind = icalcomponent_isa (tmp_icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, tmp_icalcomp))
-			continue;
-
-		g_print ("#############################################################################\n");
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-
-		occurrences = 0;
-		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, &occurrences);
-
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-	}
-}
-
-
-static gboolean
-occurrence_cb		(CalComponent	*comp,
-			 time_t		 instance_start,
-			 time_t		 instance_end,
-			 gpointer	 data)
-{
-	char start[32], finish[32];
-	gint *occurrences;
-
-	occurrences = (gint*) data;
-
-	strcpy (start, ctime (&instance_start));
-	start[24] = '\0';
-	strcpy (finish, ctime (&instance_end));
-	finish[24] = '\0';
-
-	g_print ("%s - %s\n", start, finish);
-
-	(*occurrences)++;
-	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;
-}
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
deleted file mode 100644
index a509bd3cba..0000000000
--- a/calendar/cal-util/timeutil.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Authors: Federico Mena <federico@nuclecu.unam.mx>
- *          Miguel de Icaza <miguel@nuclecu.unam.mx>
- */
-
-#include <libgnome/libgnome.h>
-#include <string.h>
-#include "timeutil.h"
-
-
-
-#define digit_at(x,y) (x [y] - '0')
-	
-time_t
-time_from_isodate (char *str)
-{
-	struct tm my_tm;
-	time_t t;
-
-	if (strlen (str) < 14)
-		return -1;
-	
-	my_tm.tm_year = (digit_at (str, 0) * 1000 + digit_at (str, 1) * 100 +
-		digit_at (str, 2) * 10 + digit_at (str, 3)) - 1900;
-
-	my_tm.tm_mon  = digit_at (str, 4) * 10 + digit_at (str, 5) - 1;
-	my_tm.tm_mday = digit_at (str, 6) * 10 + digit_at (str, 7);
-	my_tm.tm_hour = digit_at (str, 9) * 10 + digit_at (str, 10);
-	my_tm.tm_min  = digit_at (str, 11) * 10 + digit_at (str, 12);
-	my_tm.tm_sec  = digit_at (str, 13) * 10 + digit_at (str, 14);
-	my_tm.tm_isdst = -1;
-	
-	t = mktime (&my_tm);
-
-	if (str [15] == 'Z')
-#if defined(HAVE_TM_GMTOFF)
-		t -= my_tm.tm_gmtoff
-#elsif defined(HAVE_TIMEZONE)
-		t -= timezone
-#endif
-		;
-	    
-	return t;
-}
-
-void
-print_time_t (time_t t)
-{
-	struct tm *tm = localtime (&t);
-	
-	printf ("TIEMPO: %d/%d/%d %d:%d:%d\n",
-		tm->tm_mon+1, tm->tm_mday, tm->tm_year,
-		tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-int
-get_time_t_hour (time_t t)
-{
-	struct tm *tm;
-
-	tm = localtime (&t);
-	return tm->tm_hour;
-}
-
-char *
-isodate_from_time_t (time_t t)
-{
-	struct tm *tm;
-	static char isotime [40];
-
-	tm = localtime (&t);
-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%S", tm);
-	return isotime;
-}
-
-time_t
-time_from_start_duration (time_t start, char *duration)
-{
-	printf ("Not yet implemented\n");
-	return 0;
-}
-
-char *
-format_simple_hour (int hour, int use_am_pm)
-{
-	static char buf[256];
-
-	/* I don't know whether this is the best way to internationalize it.
-	 * Does any language use different conventions? - Federico
-	 */
-
-	if (use_am_pm)
-		g_snprintf (buf, sizeof(buf), "%d%s",
-			 (hour == 0) ? 12 : (hour > 12) ? (hour - 12) : hour,
-			 (hour < 12) ? _("am") : _("pm"));
-	else
-		g_snprintf (buf, sizeof(buf), "%02d%s", hour, _("h"));
-
-	return buf;
-
-}
-
-time_t
-time_add_minutes (time_t time, int minutes)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-
-	tm->tm_min += minutes;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_minutes(): mktime() could not handle "
-			   "adding %d minutes with\n", minutes);
-		print_time_t (time);
-		return time;
-	}
-	return new_time;
-}
-
-/* Adds a day onto the time, using local time.
-   Note that if clocks go forward due to daylight savings time, there are
-   some non-existent local times, so the hour may be changed to make it a
-   valid time. This also means that it may not be wise to keep calling
-   time_add_day() to step through a certain period - if the hour gets changed
-   to make it valid time, any further calls to time_add_day() will also return
-   this hour, which may not be what you want. */
-time_t
-time_add_day (time_t time, int days)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-#if 0
-	int dst_flag = tm->tm_isdst;
-#endif
-
-	tm->tm_mday += days;
-	tm->tm_isdst = -1;
-
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_day(): mktime() could not handling adding %d days with\n",
-			   days);
-		print_time_t (time);
-		return time;
-	}
-
-#if 0
-	/* I don't know what this is for. See also time_day_begin() and
-	   time_day_end(). - Damon. */
-	if (dst_flag > tm->tm_isdst){
-		tm->tm_hour++;
-		new_time += 3600;
-	} else if (dst_flag < tm->tm_isdst){
-		tm->tm_hour--;
-		new_time -= 3600;
-	}
-#endif
-
-	return new_time;
-}
-
-time_t
-time_add_week (time_t time, int weeks)
-{
-	return time_add_day (time, weeks * 7);
-}
-
-time_t
-time_add_month (time_t time, int months)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	int mday;
-
-	mday = tm->tm_mday;
-	
-	tm->tm_mon += months;
-	tm->tm_isdst = -1;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_month(): mktime() could not handling adding %d months with\n",
-			   months);
-		print_time_t (time);
-		return time;
-	}
-	tm = localtime (&new_time);
-	if (tm->tm_mday < mday){
-		tm->tm_mon--;
-		tm->tm_mday = time_days_in_month (tm->tm_year+1900, tm->tm_mon);
-		return new_time = mktime (tm);
-	}
-	else
-		return new_time;
-}
-
-time_t
-time_add_year (time_t time, int years)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	
-	tm->tm_year += years;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_year(): mktime() could not handling adding %d years with\n",
-			   years);
-		print_time_t (time);
-		return time;
-	}
-	return new_time;
-}
-
-time_t
-time_day_hour (time_t t, int hour)
-{
-	struct tm tm;
-	
-	tm = *localtime (&t);
-	tm.tm_hour = hour;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-
-	return mktime (&tm);
-}
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-int
-time_days_in_month (int year, int month)
-{
-	g_return_val_if_fail (year >= 1900, 0);
-	g_return_val_if_fail ((month >= 0) && (month < 12), 0);
-
-	return days_in_month [is_leap_year (year)][month];
-}
-
-time_t
-time_from_day (int year, int month, int day)
-{
-	struct tm tm;
-
-	memset (&tm, 0, sizeof (tm));
-	tm.tm_year = year - 1900;
-	tm.tm_mon = month;
-	tm.tm_mday = day;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_year++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_mon++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_begin (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday -= tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_end (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday += 7 - tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the start of the day, according to the local time. */
-time_t
-time_day_begin (time_t t)
-{
-#if 1
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-
-#else
-	/* This is the original code which sometimes produces a time of 1:00.
-	   I don't understand why it looked at the tm_isdst flags at all.
-	   - Damon. */
-
-	struct tm tm;
-	time_t temp = t - 43200;
-	int dstflag, dstflag2;
-	
-	tm = *localtime(&temp); /* one day */
-	dstflag = tm.tm_isdst;
-
-	tm = *localtime (&t);
-	dstflag2 = tm.tm_isdst;
-
-	if (dstflag < dstflag2)
-		tm.tm_hour = 1;
-	else
-		tm.tm_hour = 0;
-
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	
-	temp = mktime(&tm);
-	if (dstflag > dstflag2){
-		temp += 3600; 
-	}
-
-	return temp;
-#endif
-}
-
-/* Returns the end of the day, according to the local time. */
-time_t
-time_day_end (time_t t)
-{
-#if 1
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_mday++;
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-
-#else
-	/* This is the original code which has more problems than
-	   time_day_begin(). - Damon. */
-
-	struct tm tm;
-	time_t temp;
-	int dstflag, dstflag2;
-
-	t += 10800;
-	temp = t - 86400;
-
-	tm = *localtime(&temp); /* one day */
-	dstflag = tm.tm_isdst;
-
-	tm = *localtime (&t);
-	dstflag2 = tm.tm_isdst;
-
-	if (dstflag < dstflag2)
-		tm.tm_hour = 23;
-	else {
-		tm.tm_mday++;
-		tm.tm_hour = 0;
-	}
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	
-	temp = mktime(&tm);
-	if(dstflag > dstflag2) {
-	}
-	return temp;
-#endif
-}
-
-static char *
-pcat (char *dest, int num, char key)
-{
-	int c;
-
-	c = sprintf (dest, "%d%c", num, key);
-	return dest + c;
-}
-
-/* Converts secs into the ISO difftime representation */
-char *
-isodiff_from_secs (int secs)
-{
-	static char buffer [60], *p;
-	int years, months, weeks, days, hours, minutes;
-	
-	years = months = weeks = days = hours = minutes = 0;
-	
-	years    = secs / (365 * 86400);
-	secs    %= (365 * 86400);
-	months   = secs / (30 * 86400);
-	secs    %= (30 * 86400);
-	weeks    = secs / (7 * 86400);
-	secs    %= (7 * 86400);
-	days     = secs / 86400;
-	secs    %= 86400;
-	hours    = secs / 3600;
-	secs    %= 3600;
-	minutes  = secs / 60;
-	secs    %= 60;
-
-	strcpy (buffer, "P");
-	p = buffer + 1;
-	if (years)
-		p = pcat (p, years, 'Y');
-	if (months)
-		p = pcat (p, months, 'M');
-	if (weeks)
-		p = pcat (p, weeks, 'W');
-	if (days)
-		p = pcat (p, days, 'D');
-	if (hours || minutes || secs){
-		*p++ = 'T';
-		if (hours)
-			p = pcat (p, hours, 'H');
-		if (minutes)
-			p = pcat (p, minutes, 'M');
-		if (secs)
-			p = pcat (p, secs, 'S');
-	}
-	
-	return buffer;
-}
-
-int
-isodiff_to_secs (char *str)
-{
-	int value, time;
-	int years, months, weeks, days, hours, minutes, seconds;
-
-	value = years = months = weeks = days = hours = minutes = time = seconds = 0;
-	if (*str != 'P')
-		return 0;
-
-	str++;
-	while (*str){
-		switch (*str){
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			value = value * 10 + (*str - '0');
-			break;
-		case 'Y':
-			years = value; value = 0;
-			break;
-		case 'M':
-			if (time)
-				minutes = value;
-			else
-				months = value;
-			value = 0;
-			break;
-		case 'W':
-			weeks = value; value = 0;
-			break;
-		case 'D':
-			days = value; value = 0;
-			break;
-		case 'T':
-			value = 0; time = 1;
-			break;
-		case 'H':
-			hours = value; value = 0;
-			break;
-		case 'S':
-			seconds = value; value = 0;
-			break;
-		}
-		str++;
-	}
-	return seconds + (minutes * 60) + (hours * 3600) +
-	       (days * 86400) + (weeks * 7 * 86400) +
-	       (months * 30 * 86400) + (years * 365 * 86400);
-}
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
deleted file mode 100644
index b8fa6400d2..0000000000
--- a/calendar/cal-util/timeutil.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Authors: Federico Mena <federico@nuclecu.unam.mx>
- *          Miguel de Icaza <miguel@nuclecu.unam.mx>
- */
-
-#ifndef TIMEUTIL_H
-#define TIMEUTIL_H
-
-
-#include <time.h>
-#include <icaltypes.h>
-
-
-time_t time_from_isodate        (char *str);
-time_t time_from_start_duration (time_t start, char *duration);
-char   *isodate_from_time_t     (time_t t);
-int    get_time_t_hour          (time_t t);
-int    isodiff_to_secs          (char *str);
-char   *isodiff_from_secs       (int secs);
-
-time_t time_add_minutes (time_t time, int minutes);
-time_t time_add_day (time_t time, int days);
-time_t time_add_week (time_t time, int weeks);
-time_t time_add_month (time_t time, int months);
-time_t time_add_year (time_t time, int years);
-
-
-/* Returns pointer to a statically-allocated buffer with a string of the form
- * 3am, 4am, 12pm, 08h, 17h, etc.
- * The string is internationalized, hopefully correctly.
- */
-char *format_simple_hour (int hour, int use_am_pm);
-
-/* Returns the number of days in the specified month.  Years are full years (starting from year 1).
- * Months are in [0, 11].
- */
-int time_days_in_month (int year, int month);
-
-/* Converts the specified date to a time_t at the start of the specified day.  Years are full years
- * (starting from year 1).  Months are in [0, 11].  Days are 1-based.
- */
-time_t time_from_day (int year, int month, int day);
-
-time_t time_day_hour     (time_t t, int hour);
-
-/* For the functions below, time ranges are considered to contain the start time, but not the end
- * time.
- */
-
-/* These two functions take a time value and return the beginning or end of the corresponding year,
- * respectively.
- */
-time_t time_year_begin (time_t t);
-time_t time_year_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding month,
- * respectively.
- */
-time_t time_month_begin (time_t t);
-time_t time_month_end (time_t t);
-
-/* These functions take a time value and return the beginning or end of the corresponding week,
- * respectively.  This takes into account the global week_starts_on_monday flag.
- */
-time_t time_week_begin (time_t t);
-time_t time_week_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding day,
- * respectively.
- */
-time_t time_day_begin (time_t t);
-time_t time_day_end (time_t t);
-
-time_t parse_date (char *str);
-void print_time_t (time_t t);
-
-
-#endif
diff --git a/calendar/conduits/.cvsignore b/calendar/conduits/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/conduits/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am
deleted file mode 100644
index 906ea61971..0000000000
--- a/calendar/conduits/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = calendar todo
diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore
deleted file mode 100644
index 83c86fa189..0000000000
--- a/calendar/conduits/calendar/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-e-calendar.conduit
-*.lo
-.libs
-libecalendar_conduit.la
-e-calendar-conduit-control-applet
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
deleted file mode 100644
index d421a710b0..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
-	$(GNOME_PILOT_CFLAGS)
-
-# Calendar Capplet
-bin_PROGRAMS = e-calendar-conduit-control-applet
-
-e_calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
-
-e_calendar_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-                $(INTLLIBS)
-
-# Calendar Conduit
-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = 	\
-	calendar-conduit.c		\
-	calendar-conduit.h		\
-	calendar-conduit-config.h
-
-libecalendar_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-calendar.conduit: e-calendar.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
-	&& mv e-calendar.conduit.tmp e-calendar.conduit
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-calendar-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
-
-EXTRA_DIST = \
-	e-calendar.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h
deleted file mode 100644
index d0ba28dbb1..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAL_CONDUIT_CONFIG_H__
-#define __CAL_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _ECalConduitCfg ECalConduitCfg;
-struct _ECalConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef CAL_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (ECalConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef CAL_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef CAL_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef CAL_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-calconduit_destroy_configuration (ECalConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __CAL_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c
deleted file mode 100644
index ecd8d84e65..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-control-applet.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_SAVE 1
-#define CAL_CONFIG_DUPE 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_SAVE
-#undef CAL_CONFIG_DUPE
-#undef CAL_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-ECalConduitCfg *origState = NULL;
-ECalConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, ECalConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, ECalConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	calconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution Calendar Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution calendar conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, ECalConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution Calendar conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	calconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = calconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	calconduit_destroy_configuration (&origState);
-	calconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/calendar-conduit-control-applet.desktop
deleted file mode 100644
index b15e8f940c..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Name=Calendar conduit
-Name[pt_BR]=Conduit calendário
-Name[da]=Gnome kalender
-Name[es]=Enlace de calendario
-Name[fr]=Conduit Calendrier
-Name[no]=GNOME kalender
-Name[sv]=Kalenderkanal
-Name[tr]=Takvim parçasý
-Comment=Configure the GnomeCal conduit
-Comment[pt_BR]=Configurar o conduit GnomeCal
-Comment[da]=Konfigurér GnomeCal-komponent
-Comment[es]=Configurar el enlace de calendario
-Comment[fr]=Configuration du conduit calendrier
-Comment[no]=Konfigurér GnomeCal-komponent
-Comment[sv]=Konfigurera GnomeCal-kanalen
-Comment[tr]=GnomeCal takvim parçasý ayarlarý
-Exec=calendar-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index 90bcb5e685..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <pi-version.h>
-#include <libical/src/libical/icaltypes.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_DESTROY
-
-#include <calendar-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.0"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "ecalconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* debug spew DELETE ME */
-static char *
-print_local (ECalLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->appt && local->appt->description) {
-		sprintf (buff, "[%ld %ld '%s' '%s']",
-			 mktime (&local->appt->begin),
-			 mktime (&local->appt->end),
-			 local->appt->description,
-			 local->appt->note);
-		return buff;
-	}
-
-	return "";
-	
-	return cal_component_get_as_string (local->comp);
-}
-
-
-/* debug spew DELETE ME */
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Appointment appt;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	sprintf (buff, "[%ld %ld '%s' '%s']",
-		 mktime (&appt.begin),
-		 mktime (&appt.end),
-		 appt.description,
-		 appt.note);
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_calendar_context_new (ECalConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (ECalConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	calconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->client != NULL)
-		gtk_object_unref (GTK_OBJECT ((*ctxt)->client));
-
-	if ((*ctxt)->cfg != NULL)
-		calconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (GtkWidget *cal_client,
-			  CalClientLoadStatus status,
-			  ECalConduitContext *ctxt)
-{
-	CalClient *client = CAL_CLIENT (cal_client);
-
-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",
-		ctxt->calendar_load_tried);
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		ctxt->calendar_load_success = TRUE;
-		LOG ("    success\n");
-		gtk_main_quit (); /* end the sub event loop */
-	} else {
-		if (ctxt->calendar_load_tried) {
-			LOG ("    load and create of calendar failed\n");
-			gtk_main_quit (); /* end the sub event loop */
-			return;
-		}
-
-		cal_client_create_calendar (client, ctxt->calendar_file);
-		ctxt->calendar_load_tried = TRUE;
-	}
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_loaded",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_load_calendar\n");
-	cal_client_load_calendar (ctxt->client, ctxt->calendar_file);
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static icalrecurrencetype_weekday
-get_ical_day (int day) 
-{
-	switch (day) {
-	case 0:
-		return ICAL_MONDAY_WEEKDAY;
-	case 1:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 2:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 3:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 4:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 5:
-		return ICAL_SATURDAY_WEEKDAY;
-	case 6:
-		return ICAL_SUNDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static GList *
-next_changed_item (ECalConduitContext *ctxt, GList *changes) 
-{
-	CalObjChange *coc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		coc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, coc->uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
-{
-	CalObjChange *coc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	coc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (coc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (coc->type) {
-	case CALOBJ_UPDATED:
-		if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0)
-			local->local.attr = GnomePilotRecordModified;
-		else
-			local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case CALOBJ_REMOVED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord *
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord *p = NULL;
-	
-	g_return_val_if_fail (local != NULL, NULL);
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	LOG ("local_record_to_remote_record\n");
-
-	p = g_new0 (GnomePilotRecord, 1);
-
-	p->ID = local->local.ID;
-	p->category = 0;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p->record = g_new0 (char,0xffff);
-	p->length = pack_Appointment (local->appt, p->record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime dt;
-	time_t dt_time;
-	CalComponentClassification classif;
-	int i;
-	
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment,1);
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = strdup ((char *) summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->appt->note = strdup (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	cal_component_get_dtstart (comp, &dt);	
-	if (dt.value) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->begin = *localtime (&dt_time);
-	}
-
-	cal_component_get_dtend (comp, &dt);	
-	if (dt.value && time_add_day (dt_time, 1) != icaltime_as_timet (*dt.value)) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->end = *localtime (&dt_time);
-		local->appt->event = 0;
-	} else {
-		local->appt->event = 1;
-	}
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-
-	if (cal_component_has_rrules (comp)) {
-		GSList *list;
-		struct icalrecurrencetype *recur;
-		
-		cal_component_get_rrule_list (comp, &list);
-		recur = list->data;
-		
-		switch (recur->freq) {
-		case ICAL_DAILY_RECURRENCE:
-			local->appt->repeatType = repeatDaily;
-			break;
-		case ICAL_WEEKLY_RECURRENCE:
-			local->appt->repeatType = repeatWeekly;
-			for (i = 0; i<= 7 && recur->by_day[i] != SHRT_MAX; i++)
-				local->appt->repeatDays[0] = 0;
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			if (recur->by_month_day[0] != SHRT_MAX) {
-				local->appt->repeatType = repeatMonthlyByDate;
-			}
-			break;
-		case ICAL_YEARLY_RECURRENCE:
-			local->appt->repeatType = repeatYearly;
-			break;
-		default:
-			break;
-		}
-
-		if (local->appt->repeatType != repeatNone) {
-			local->appt->repeatFrequency = recur->interval;
-		}
-		
-		cal_component_free_recur_list (list);
-	}
-
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;  
-}
-
-static void 
-local_record_from_uid (ECalLocalRecord *local,
-		       const char *uid,
-		       ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE), it;
-	struct icalrecurrencetype recur;
-	int pos, i;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentText description = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
- 	GSList *d_list;
-
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
- 	LOG ("        comp_from_remote_record: "
- 	     "creating from remote %s and comp %s\n", 
-  	     print_remote (remote), cal_component_get_as_string (comp));
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = appt.description;
-	cal_component_set_summary (comp, &summary);
-
-	description.value = appt.note;
-	d_list = g_slist_append (NULL, &description);
-	cal_component_set_comment_list (comp, d_list);
-	g_slist_free (d_list);
-
-
-	/* FIX ME This is a bit hackish, how else can we tell if there is
-	 * no due date set?
-	 */
-	if (appt.begin.tm_sec || appt.begin.tm_min || appt.begin.tm_hour 
-	    || appt.begin.tm_mday || appt.begin.tm_mon || appt.begin.tm_year) {
-		it = icaltime_from_timet (mktime (&appt.begin), FALSE, FALSE);
-		dt.value = &it;
-		cal_component_set_dtstart (comp, &dt);
-	}
-
-	if (appt.event) {
-		time_t t = mktime (&appt.begin);
-		
-		t = time_day_end (t);
-		it = icaltime_from_timet (t, FALSE, FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	} else if (appt.end.tm_sec || appt.end.tm_min || appt.end.tm_hour 
-	    || appt.end.tm_mday || appt.end.tm_mon || appt.end.tm_year) {
-		it = icaltime_from_timet (mktime (&appt.end), FALSE, FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	}
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-
-	switch (appt.repeatType) {
-	case repeatNone:
-		recur.freq = ICAL_NO_RECURRENCE;
-		/* nothing */
-		break;
-
-	case repeatDaily:
-		recur.freq = ICAL_DAILY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-
-	case repeatWeekly:
-		recur.freq = ICAL_WEEKLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-
-		pos = 0;
-		for (i = 0; i < 7; i++) {
-			if (appt.repeatDays[i])
-				recur.by_day[pos++] = get_ical_day (i);
-		}
-		
-		break;
-
-	case repeatMonthlyByDay:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_month_day[0] = appt.begin.tm_mday;
-		break;
-		
-	case repeatMonthlyByDate:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		/* Not handled! */
-		break;
-
-	case repeatYearly:
-		recur.freq = ICAL_YEARLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-		
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (recur.freq != ICAL_NO_RECURRENCE) {
-		GSList *list = NULL;
-		
-		/* recurrence start of week */
-		recur.week_start = get_ical_day (appt.repeatWeekstart);
-
-		if (appt.repeatEnd.tm_sec || appt.repeatEnd.tm_min || appt.repeatEnd.tm_hour 
-		    || appt.repeatEnd.tm_mday || appt.repeatEnd.tm_mon || appt.repeatEnd.tm_year) {
-			time_t t = mktime (&appt.repeatEnd);
-			t = time_add_day (t, 1);
-			recur.until = icaltime_from_timet (t, FALSE, FALSE);
-		}
-
-		list = g_slist_append (list, &recur);
-		cal_component_set_rrule_list (comp, list);
-		g_slist_free (list);
-	} else {
-		cal_component_set_rrule_list (comp, NULL);		
-	}
-	
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     ECalConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	LOG ("update_comp: saving to desktop\n%s\n", 
-	     cal_component_get_as_string (comp));
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	g_message ("Calendar Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_EVENT);
-	
-	/* Load the uid <--> pilot id mapping */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Find the added, modified and deleted items */
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->changed = cal_client_get_changed_uids (ctxt->client, 
-						     CALOBJ_TYPE_EVENT,
-						     ctxt->map->since + 1);
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalObjChange *coc = l->data;
-
-		if (!e_pilot_map_uid_is_archived (ctxt->map, coc->uid)) {
-			
-			g_hash_table_insert (ctxt->changed_hash, coc->uid, coc);
-			
-			switch (coc->type) {
-			case CALOBJ_UPDATED:
-				if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0)
-					mod_records++;
-				else
-					add_records++;
-				break;
-				
-			case CALOBJ_REMOVED:
-				del_records++;
-				break;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	gchar *filename;
-	
-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    ECalLocalRecord *local,
-		    ECalConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("set_status_cleared: clearing status\n");
-	
-	cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  ECalLocalRecord **local,
-	  ECalConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalObjChange *coc = NULL;
-			
-			coc = iterator->data;
-		
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		if ((iterator = next_changed_item (ctxt, iterator))) {
-			CalObjChange *coc = NULL;
-
-			coc = iterator->data;
-			
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("for_each_modified ending");
-
-			/* Signal the iteration is over */
-			*local = NULL;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord *local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-		print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-	if (!local_pilot) 
-		return -1;
-
-	if (remote->length != local_pilot->length
-	    || memcmp (local_pilot->record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	g_free (local_pilot);
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       ECalLocalRecord *local,
-	       ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	cal_client_remove_object (ctxt->client, uid);
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		gboolean archive,
-		ECalConduitContext *ctxt)
-{
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("archive_record: %s\n", archive ? "yes" : "no");
-
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, local->local.ID, uid, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       ECalLocalRecord **local,
-       ECalConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (ECalLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    ECalLocalRecord *local,
-	    ECalConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord **remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	if (!*remote)
-		return -1;
-	
-	return 0;
-}
-
-static gint
-free_prepare (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      GnomePilotRecord **remote,
-	      ECalConduitContext *ctxt)
-{
-	LOG ("free_prepare: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	g_free (*remote);
-	*remote = NULL;
-
-        return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG ("in calendar's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_calendar_conduit");
-
-	e_calendar_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	ECalConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "calconduit_context");
-
-	e_calendar_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
deleted file mode 100644
index d78fae3553..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CALENDAR_CONDUIT_H__
-#define __CALENDAR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution Calendar conduit. */
-typedef struct _ECalLocalRecord ECalLocalRecord;
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct Appointment *appt;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _ECalConduitContext ECalConduitContext;
-struct _ECalConduitContext {
-	ECalConduitCfg *cfg;
-
-	struct AppointmentAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_load_tried;
-	gboolean calendar_load_success;
-
-	time_t since;
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __CALENDAR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop
deleted file mode 100644
index 51ee34d2bd..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=Evolution Calendar conduit
-Name[da]=Gnome kalender
-Name[es]=Enlace con el calendario de Evolution
-Name[fr]=Conduit Calendrier
-Name[no]=GNOME kalender
-Name[sv]=Kalenderkanal
-Name[tr]=Takvim parçasý
-Comment=Configure the GnomeCal conduit
-Comment[da]=Konfigurér GnomeCal-komponent
-Comment[es]=Configurar el enlace con GnomeCal
-Comment[fr]=Configuration du conduit calendrier
-Comment[no]=Konfigurér GnomeCal-komponent
-Comment[sv]=Konfigurera GnomeCal-kanalen
-Comment[tr]=GnomeCal takvim parçasý ayarlarý
-Exec=e-calendar-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 6143978e8b..0000000000
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
-<name value="ECalendar"/>
-<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 6b94f92c38..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index 765c9a3742..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	-I$(top_builddir)/e-util		\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
-	$(GNOME_PILOT_CFLAGS)
-
-# ToDo Capplet
-bin_PROGRAMS = e-todo-conduit-control-applet
-
-e_todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
-
-e_todo_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-                $(INTLLIBS)
-
-# ToDo Conduit
-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = \
-	todo-conduit.c 		\
-	todo-conduit.h		\
-	todo-conduit-config.h 
-
-libetodo_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(UNICODE_LIBS)							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-todo.conduit: e-todo.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
-	&& mv e-todo.conduit.tmp e-todo.conduit
-
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-todo-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
-
-EXTRA_DIST = \
-	e-todo.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
-
-
-
-
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
deleted file mode 100644
index 2d392f322b..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Evolution ToDo conduit 
-Name[da]=Udstående
-Name[es]=Enlace con el componente `Por Hacer' de Evolution
-Name[fr]=Conduit Evolution `A Faire'
-Name[no]=Oppgaver
-Name[sv]=Att göra-lista
-Name[tr]=Yapýlacaklar parçasý
-Comment=Configure the todo conduit
-Comment[da]=Konfigurér Udstående
-Comment[es]=Configurar el enlace con el componente `Por Hacer'
-Comment[fr]=Configuration du conduit `A Faire'
-Comment[no]=Konfigurér oppgavelisten
-Comment[sv]=Konfigurerar att göra-listan
-Comment[tr]=Yapýlacaklar parçasý ayarlarý
-Exec=e-todo-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 40e6fd620c..0000000000
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
-<name value="EToDo"/>
-<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h
deleted file mode 100644
index fe7b1dbafa..0000000000
--- a/calendar/conduits/todo/todo-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_CONFIG_H__
-#define __TODO_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-struct _EToDoConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef TODO_CONFIG_LOAD
-/* Load the configuration data */
-static void 
-todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EToDoConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef TODO_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef TODO_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef TODO_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __TODO_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c
deleted file mode 100644
index 7140522b55..0000000000
--- a/calendar/conduits/todo/todo-conduit-control-applet.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_SAVE 1
-#define TODO_CONFIG_DUPE 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_SAVE
-#undef TODO_CONFIG_DUPE
-#undef TODO_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-EToDoConduitCfg *origState = NULL;
-EToDoConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, EToDoConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, EToDoConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	todoconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution ToDo Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution todo conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, EToDoConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution ToDo conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	todoconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = todoconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	todoconduit_destroy_configuration (&origState);
-	todoconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index 12b04ad78c..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <pi-version.h>
-#include <libical/src/libical/icaltypes.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_DESTROY
-
-#include <todo-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.0"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "etodoconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* debug spew DELETE ME */
-static char *
-print_local (EToDoLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->todo && local->todo->description) {
-		sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-			 local->todo->indefinite,
-			 mktime (& local->todo->due),
-			 local->todo->priority,
-			 local->todo->complete,
-			 local->todo->description,
-			 local->todo->note);
-		return buff;
-	}
-
-	return "";
-}
-
-
-/* debug spew DELETE ME */
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct ToDo todo;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-		 todo.indefinite,
-		 mktime (& todo.due),
-		 todo.priority,
-		 todo.complete,
-		 todo.description,
-		 todo.note);
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_todo_context_new (EToDoConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (EToDoConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	todoconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->client != NULL)
-		gtk_object_unref (GTK_OBJECT ((*ctxt)->client));
-
-	if ((*ctxt)->cfg != NULL)
-		todoconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (GtkWidget *cal_client,
-			  CalClientLoadStatus status,
-			  EToDoConduitContext *ctxt)
-{
-	CalClient *client = CAL_CLIENT (cal_client);
-
-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",
-		ctxt->calendar_load_tried);
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		ctxt->calendar_load_success = TRUE;
-		LOG ("    success\n");
-		gtk_main_quit (); /* end the sub event loop */
-	} else {
-		if (ctxt->calendar_load_tried) {
-			LOG ("    load and create of calendar failed\n");
-			gtk_main_quit (); /* end the sub event loop */
-			return;
-		}
-
-		cal_client_create_calendar (client, ctxt->calendar_file);
-		ctxt->calendar_load_tried = TRUE;
-	}
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_loaded",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_load_calendar\n");
-	cal_client_load_calendar (ctxt->client, ctxt->calendar_file);
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static GList *
-next_changed_item (EToDoConduitContext *ctxt, GList *changes) 
-{
-	CalObjChange *coc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		coc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, coc->uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
-{
-	CalObjChange *coc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	coc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (coc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (coc->type) {
-	case CALOBJ_UPDATED:
-		if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0)
-			local->local.attr = GnomePilotRecordModified;
-		else
-			local->local.attr = GnomePilotRecordNew;
-		break;
-		
-	case CALOBJ_REMOVED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord *
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord *p = NULL;
-	
-	g_return_val_if_fail (local != NULL, NULL);
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG ("local_record_to_remote_record\n");
-
-	p = g_new0 (GnomePilotRecord, 1);
-
-	p->ID = local->local.ID;
-	p->category = 0;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p->record = g_new0 (char,0xffff);
-	p->length = pack_ToDo (local->todo, p->record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	struct icaltimetype *completed;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime due;
-	time_t due_time;
-	CalComponentClassification classif;
-
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-
-	cal_component_get_uid (local->comp, &uid);
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid);
-
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = strdup ((char *) summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->todo->note = strdup (description->value);
-		else
-			local->todo->note = NULL;
-	} else {
-		local->todo->note = NULL;
-	}
-
-	cal_component_get_due (comp, &due);	
-	if (due.value) {
-		due_time = icaltime_as_timet (*due.value);
-		
-		local->todo->due = *localtime (&due_time);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-
-	cal_component_get_completed (comp, &completed);
-	if (completed) {
-		local->todo->complete = 1;
-		cal_component_free_icaltimetype (completed);
-	}	
-
-	cal_component_get_priority (comp, &priority);
-	if (priority) {
-		local->todo->priority = *priority;
-		cal_component_free_priority (priority);
-	}
-	
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EToDoLocalRecord *local,
-		       const char *uid,
-		       EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct ToDo todo;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
-	CalComponentText summary = {NULL, NULL};
-	CalComponentText description = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	struct icaltimetype due;
- 	GSList *d_list;
-
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
- 	LOG ("        comp_from_remote_record: "
- 	     "creating from remote %s and comp %s\n", 
-  	     print_remote (remote), cal_component_get_as_string (comp));
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = todo.description;
-	cal_component_set_summary (comp, &summary);
-
-	description.value = todo.note;
-	d_list = g_slist_append (NULL, &description);
-	cal_component_set_comment_list (comp, d_list);
-	g_slist_free (d_list);
-
-	if (todo.complete) {
-		int percent = 100;
-		cal_component_set_completed (comp, &now);
-		cal_component_set_percent (comp, &percent);
-	}
-
-	/* FIX ME This is a bit hackish, how else can we tell if there is
-	 * no due date set?
-	 */
-	if (todo.due.tm_sec || todo.due.tm_min || todo.due.tm_hour 
-	    || todo.due.tm_mday || todo.due.tm_mon || todo.due.tm_year) {
-		due = icaltime_from_timet (mktime (&todo.due), FALSE, FALSE);
-		dt.value = &due;
-		cal_component_set_due (comp, &dt);
-	}
-	
-	cal_component_set_priority (comp, &todo.priority);
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     EToDoConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	LOG ("update_comp: saving to desktop\n%s\n", 
-	     cal_component_get_as_string (comp));
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if (map_count == 0) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
-	
-	/* Load the uid <--> pilot id map */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Count and hash the changes */
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->changed = cal_client_get_changed_uids (ctxt->client, 
-						     CALOBJ_TYPE_TODO,
-						     ctxt->map->since + 1);
-
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalObjChange *coc = l->data;
-
-		if (!e_pilot_map_uid_is_archived (ctxt->map, coc->uid)) {
-			
-			g_hash_table_insert (ctxt->changed_hash, coc->uid, coc);
-			
-			switch (coc->type) {
-			case CALOBJ_UPDATED:
-				if (e_pilot_map_lookup_pid (ctxt->map, coc->uid) > 0)
-					mod_records++;
-				else
-					add_records++;
-				break;
-				
-			case CALOBJ_REMOVED:
-				del_records++;
-				break;
-			}
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	gchar *filename;
-	
-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	e_pilot_map_destroy (ctxt->map);
-	g_free (filename);
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EToDoLocalRecord *local,
-		    EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("set_status_cleared: clearing status\n");
-	
-	cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EToDoLocalRecord **local,
-	  EToDoConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EToDoLocalRecord **local,
-		   EToDoConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CalObjChange *coc = NULL;
-			
-			coc = iterator->data;
-		
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		if ((iterator = next_changed_item (ctxt, iterator))) {
-			CalObjChange *coc = NULL;
-
-			coc = iterator->data;
-			
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("for_each_modified ending");
-
-			/* Signal the iteration is over */
-			*local = NULL;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord *local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-	if (!local_pilot) 
-		return -1;
-
-	if (remote->length != local_pilot->length
-	    || memcmp (local_pilot->record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	g_free (local_pilot);
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	cal_component_get_uid (comp, &uid);
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EToDoLocalRecord *local,
-	       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->comp != NULL, -1);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	cal_client_remove_object (ctxt->client, uid);
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		gboolean archive,
-		EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("archive_record: %s\n", archive ? "yes" : "no");
-
-	cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, local->local.ID, uid, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EToDoLocalRecord **local,
-       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EToDoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EToDoLocalRecord *local,
-	    EToDoConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord **remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	if (!*remote)
-		return -1;
-	
-	return 0;
-}
-
-static gint
-free_prepare (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      GnomePilotRecord **remote,
-	      EToDoConduitContext *ctxt)
-{
-	LOG ("free_prepare: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	g_free (*remote);
-	*remote = NULL;
-
-        return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG ("in todo's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_todo_conduit");
-
-	e_todo_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EToDoConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "todoconduit_context");
-
-	e_todo_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
deleted file mode 100644
index 624c6271e7..0000000000
--- a/calendar/conduits/todo/todo-conduit.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_H__
-#define __TODO_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-todo.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct ToDo *todo;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EToDoConduitContext EToDoConduitContext;
-struct _EToDoConduitContext {
-	EToDoConduitCfg *cfg;
-
-	struct ToDoAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_load_tried;
-	gboolean calendar_load_success;
-
-	GList *uids;
-	GList *changed;
-	GHashTable *changed_hash;
-	
-	EPilotMap *map;
-};
-
-#endif __TODO_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index 1396e98066..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-.pure
-evolution-calendar
-evolution-calendar.pure
-getdate.c
-*.lo
-Evolution-Composer-common.c
-Evolution-Composer-skels.c
-Evolution-Composer-stubs.c
-Evolution-Composer.h
\ No newline at end of file
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
deleted file mode 100644
index f8e0795590..0000000000
--- a/calendar/gui/Evolution-Composer.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * This file was generated by orbit-idl - DO NOT EDIT!
- */
-
-#include <glib.h>
-#define ORBIT_IDL_SERIAL 9
-#include <orb/orbit.h>
-
-#ifndef Evolution_Composer_H
-#define Evolution_Composer_H 1
-#ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
-
-/** typedefs **/
-#include <bonobo/Bonobo.h>
-#if !defined(ORBIT_DECL_Evolution_Composer) && !defined(_Evolution_Composer_defined)
-#define ORBIT_DECL_Evolution_Composer 1
-#define _Evolution_Composer_defined 1
-#define Evolution_Composer__free CORBA_Object__free
-   typedef CORBA_Object Evolution_Composer;
-   extern CORBA_unsigned_long Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_Evolution_Composer_0)
-#define TC_IMPL_TC_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_5 't'
-#define TC_IMPL_TC_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_15 's'
-#define TC_IMPL_TC_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_17 'r'
-   extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;
-#define TC_Evolution_Composer ((CORBA_TypeCode)&TC_Evolution_Composer_struct)
-#endif
-#endif
-#if !defined(_Evolution_Composer_Recipient_defined)
-#define _Evolution_Composer_Recipient_defined 1
-   typedef struct
-   {
-      CORBA_char *name;
-      CORBA_char *address;
-   }
-   Evolution_Composer_Recipient;
-
-#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_Recipient_struct;
-#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_Evolution_Composer_Recipient_struct)
-#endif
-   extern Evolution_Composer_Recipient
-      *Evolution_Composer_Recipient__alloc(void);
-   extern gpointer Evolution_Composer_Recipient__free(gpointer mem,
-						      gpointer dat,
-						      CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
-   typedef struct
-   {
-      CORBA_unsigned_long _maximum,
-       _length;
-      Evolution_Composer_Recipient *_buffer;
-      CORBA_boolean _release;
-   }
-   CORBA_sequence_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_CORBA_sequence_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_Evolution_Composer_Recipient_struct)
-#endif
-   extern CORBA_sequence_Evolution_Composer_Recipient
-      *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer
-								     mem,
-								     gpointer
-								     dat,
-								     CORBA_boolean free_strings);	/* ORBit internal use */
-   Evolution_Composer_Recipient
-      *CORBA_sequence_Evolution_Composer_Recipient_allocbuf
-      (CORBA_unsigned_long len);
-#endif
-#if !defined(_Evolution_Composer_RecipientList_defined)
-#define _Evolution_Composer_RecipientList_defined 1
-   typedef CORBA_sequence_Evolution_Composer_Recipient
-      Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_RecipientList_struct;
-#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_Evolution_Composer_RecipientList_struct)
-#endif
-   extern Evolution_Composer_RecipientList
-      *Evolution_Composer_RecipientList__alloc(void);
-   extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,
-							  gpointer dat,
-							  CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"
-   void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
-							  _ORBIT_recv_buffer,
-							  CORBA_Environment *
-							  ev);
-   void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
-							_ORBIT_send_buffer,
-							CORBA_Environment *
-							ev);
-#if !defined(_Evolution_Composer_CouldNotParse_defined)
-#define _Evolution_Composer_CouldNotParse_defined 1
-   typedef struct
-   {
-      int dummy;
-   }
-   Evolution_Composer_CouldNotParse;
-
-#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_Evolution_Composer_CouldNotParse_struct;
-#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_Evolution_Composer_CouldNotParse_struct)
-#endif
-#define Evolution_Composer_CouldNotParse__alloc() NULL
-   extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,
-							  gpointer dat,
-							  CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-
-/** POA structures **/
-   typedef struct
-   {
-      void *_private;
-      void (*set_headers) (PortableServer_Servant _servant,
-			   const Evolution_Composer_RecipientList * to,
-			   const Evolution_Composer_RecipientList * cc,
-			   const Evolution_Composer_RecipientList * bcc,
-			   const CORBA_char * subject,
-			   CORBA_Environment * ev);
-      void (*set_body_text) (PortableServer_Servant _servant,
-			     const CORBA_char * body, CORBA_Environment * ev);
-      void (*attach_MIME) (PortableServer_Servant _servant,
-			   const CORBA_char * data, CORBA_Environment * ev);
-      void (*attach_data) (PortableServer_Servant _servant,
-			   const CORBA_char * content_type,
-			   const CORBA_char * filename,
-			   const CORBA_char * description,
-			   const CORBA_boolean show_inline,
-			   const CORBA_char * data, CORBA_Environment * ev);
-      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
-   }
-   POA_Evolution_Composer__epv;
-   typedef struct
-   {
-      PortableServer_ServantBase__epv *_base_epv;
-      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
-      POA_Evolution_Composer__epv *Evolution_Composer_epv;
-   }
-   POA_Evolution_Composer__vepv;
-   typedef struct
-   {
-      void *_private;
-      POA_Evolution_Composer__vepv *vepv;
-   }
-   POA_Evolution_Composer;
-   extern void POA_Evolution_Composer__init(PortableServer_Servant servant,
-					    CORBA_Environment * ev);
-   extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,
-					    CORBA_Environment * ev);
-
-/** prototypes **/
-#define Evolution_Composer_ref Bonobo_Unknown_ref
-#define Evolution_Composer_unref Bonobo_Unknown_unref
-#define Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
-   void Evolution_Composer_set_headers(Evolution_Composer _obj,
-				       const Evolution_Composer_RecipientList
-				       * to,
-				       const Evolution_Composer_RecipientList
-				       * cc,
-				       const Evolution_Composer_RecipientList
-				       * bcc, const CORBA_char * subject,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_set_body_text(Evolution_Composer _obj,
-					 const CORBA_char * body,
-					 CORBA_Environment * ev);
-   void Evolution_Composer_attach_MIME(Evolution_Composer _obj,
-				       const CORBA_char * data,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_attach_data(Evolution_Composer _obj,
-				       const CORBA_char * content_type,
-				       const CORBA_char * filename,
-				       const CORBA_char * description,
-				       const CORBA_boolean show_inline,
-				       const CORBA_char * data,
-				       CORBA_Environment * ev);
-   void Evolution_Composer_show(Evolution_Composer _obj,
-				CORBA_Environment * ev);
-
-   void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_set_headers)
-						   (PortableServer_Servant
-						    _servant,
-						    const
-						    Evolution_Composer_RecipientList
-						    * to,
-						    const
-						    Evolution_Composer_RecipientList
-						    * cc,
-						    const
-						    Evolution_Composer_RecipientList
-						    * bcc,
-						    const CORBA_char *
-						    subject,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
-						     _ORBIT_servant,
-						     GIOPRecvBuffer *
-						     _ORBIT_recv_buffer,
-						     CORBA_Environment * ev,
-						     void
-						     (*_impl_set_body_text)
-						     (PortableServer_Servant
-						      _servant,
-						      const CORBA_char * body,
-						      CORBA_Environment *
-						      ev));
-   void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_attach_MIME)
-						   (PortableServer_Servant
-						    _servant,
-						    const CORBA_char * data,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
-						   _ORBIT_servant,
-						   GIOPRecvBuffer *
-						   _ORBIT_recv_buffer,
-						   CORBA_Environment * ev,
-						   void (*_impl_attach_data)
-						   (PortableServer_Servant
-						    _servant,
-						    const CORBA_char *
-						    content_type,
-						    const CORBA_char *
-						    filename,
-						    const CORBA_char *
-						    description,
-						    const CORBA_boolean
-						    show_inline,
-						    const CORBA_char * data,
-						    CORBA_Environment * ev));
-   void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *
-					    _ORBIT_servant,
-					    GIOPRecvBuffer *
-					    _ORBIT_recv_buffer,
-					    CORBA_Environment * ev,
-					    void (*_impl_show)
-					    (PortableServer_Servant _servant,
-					     CORBA_Environment * ev));
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif
-#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index ebe73826a6..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,164 +0,0 @@
-## CORBA stuff
-
-IDLS =                          \
-        $(srcdir)/../../composer/Evolution-Composer.idl
-
-IDL_GENERATED =                 \
-        Evolution-Composer.h              \
-        Evolution-Composer-common.c       \
-        Evolution-Composer-skels.c        \
-        Evolution-Composer-stubs.c
-
-$(IDL_GENERATED): $(IDLS) 
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \
-                -I . $(srcdir)/../../composer/Evolution-Composer.idl
-
-SUBDIRS = dialogs
-
-help_base = $(datadir)/gnome/help/cal
-
-bin_PROGRAMS = evolution-calendar
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/widgets				\
-	-I$(includedir)					\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-
-LINK_FLAGS =							\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(INTLLIBS)						\
-	dialogs/libcal-dialogs.a				\
-	$(top_builddir)/calendar/cal-client/libcal-client.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a		\
-	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 					\
-	event-editor-dialog.glade		\
-	e-meeting-dialog.glade			\
-	e-itip-control.glade
-
-glade_messages = event-editor-dialog.glade.h
-
-evolution_calendar_SOURCES =			\
-	$(IDL_GENERATED)			\
-	alarm.c					\
-	alarm.h					\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-model.c			\
-	calendar-model.h			\
-	control-factory.c			\
-	control-factory.h			\
-	component-factory.c			\
-	component-factory.h			\
-	e-calendar-table.h			\
-	e-calendar-table.c			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	e-meeting-edit.h			\
-	e-meeting-edit.c			\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	event-editor.c				\
-	event-editor.h				\
-	getdate.y				\
-	gncal-todo.c				\
-	gncal-todo.h				\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	gnome-month-item.c			\
-	gnome-month-item.h			\
-	goto.c					\
-	main.c					\
-	mark.c					\
-	mark.h					\
-	popup-menu.c				\
-	popup-menu.h				\
-	print.c					\
-	print.h					\
-	prop.c					\
-	weekday-picker.c			\
-	weekday-picker.h
-
-evolution_calendar_LDADD =					\
-	$(top_builddir)/shell/libeshell.a			\
-	$(EXTRA_GNOME_LIBS)					\
-	$(BONOBO_HTML_GNOME_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(LINK_FLAGS)
-
-evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-
-oafdir = $(datadir)/oaf
-oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo 
-
-EXTRA_DIST =	 			\
-	$(glade_DATA)			\
-	$(glade_messages)		\
-	bell.xpm			\
-	check-filled.xpm		\
-	dayview.xpm			\
-	jump.xpm			\
-	monthview.xpm			\
-	recur.xpm			\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	task.xpm			\
-	weekview.xpm			\
-	workweekview.xpm		\
-	yearview.xpm			\
-	calendar-control.oafinfo	\
-	evolution-calendar.oafinfo
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
-	$(mkinstalldirs) $(Conduitsdir)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-calendar.pure
-
-evolution-calendar.pure: evolution-calendar
-	@rm -f evolution-calendar.pure
-	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
-
-endif
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
deleted file mode 100644
index 7d8357599c..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
deleted file mode 100644
index 1e56f1c586..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 32d7e03f8b..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index 085111498b..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gnome.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include "alarm.h"
-
-
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else {
-		struct itimerval itimer;
-		int v;
-
-		itimer.it_interval.tv_sec = 0;
-		itimer.it_interval.tv_usec = 0;
-		itimer.it_value.tv_sec = 0;
-		itimer.it_value.tv_usec = 0;
-
-		v = setitimer (ITIMER_REAL, &itimer, NULL);
-		if (v != 0)
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-	}
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar->data);
-
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- * @void:
- *
- * Initializes the alarm notification system.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index 2394d28024..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer data);
-
-void     alarm_init   (void);
-gpointer alarm_add    (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		       AlarmDestroyNotify destroy_notify_fn);
-void     alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
deleted file mode 100644
index 085111498b..0000000000
--- a/calendar/gui/alarm.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gnome.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include "alarm.h"
-
-
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else {
-		struct itimerval itimer;
-		int v;
-
-		itimer.it_interval.tv_sec = 0;
-		itimer.it_interval.tv_usec = 0;
-		itimer.it_value.tv_sec = 0;
-		itimer.it_value.tv_usec = 0;
-
-		v = setitimer (ITIMER_REAL, &itimer, NULL);
-		if (v != 0)
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-	}
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar->data);
-
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- * @void:
- *
- * Initializes the alarm notification system.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-}
diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h
deleted file mode 100644
index 2394d28024..0000000000
--- a/calendar/gui/alarm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer data);
-
-void     alarm_init   (void);
-gpointer alarm_add    (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		       AlarmDestroyNotify destroy_notify_fn);
-void     alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/bell.xpm b/calendar/gui/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/calendar/gui/bell.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * bell_xpm[] = {
-"16 16 64 1",
-" 	c None",
-".	c #000000",
-"+	c #E3BB43",
-"@	c #E6C049",
-"#	c #EED275",
-"$	c #F4E193",
-"%	c #F4DF8C",
-"&	c #EAC95C",
-"*	c #EFD57A",
-"=	c #FAEFBB",
-"-	c #FDF6D3",
-";	c #FDF5C6",
-">	c #F4E18F",
-",	c #E4BD43",
-"'	c #F6E295",
-")	c #FEF9D8",
-"!	c #FFFFFF",
-"~	c #FFFADA",
-"{	c #FCEEAA",
-"]	c #EBCA5A",
-"^	c #E9C550",
-"/	c #FAEA9C",
-"(	c #FEF7CB",
-"_	c #FFF8CC",
-":	c #FDF1A8",
-"<	c #EED060",
-"[	c #D39D12",
-"}	c #F2D55D",
-"|	c #FCEC91",
-"1	c #FFF4AE",
-"2	c #FFF5B6",
-"3	c #FEEF97",
-"4	c #F3D65E",
-"5	c #D5A216",
-"6	c #FAE05C",
-"7	c #FFED7C",
-"8	c #FFEF8C",
-"9	c #FFF092",
-"0	c #FDEB7A",
-"a	c #F4D750",
-"b	c #D8A717",
-"c	c #EAC01D",
-"d	c #F6D83E",
-"e	c #FAE255",
-"f	c #FAE362",
-"g	c #F9E161",
-"h	c #F6DE5B",
-"i	c #F1D145",
-"j	c #E6BE28",
-"k	c #D09B09",
-"l	c #B67E00",
-"m	c #CE9100",
-"n	c #D69F04",
-"o	c #E0B011",
-"p	c #E6BA1D",
-"q	c #E3B721",
-"r	c #E0B21E",
-"s	c #DCAB16",
-"t	c #D7A20D",
-"u	c #CC9303",
-"v	c #BE8400",
-"w	c #AC7500",
-"x	c #A06B00",
-"y	c #FFDD00",
-"                ",
-"       ..       ",
-"      .+@.      ",
-"     .#$%&.     ",
-"    .*=-;>,.    ",
-"    .')!~{].    ",
-"   .^/(~_:<[.   ",
-"   .}|121345.   ",
-"   .678980ab.   ",
-"  .cdefghijkl.  ",
-" .mnopqrstuvwx. ",
-" .............. ",
-"      .8y.      ",
-"       ..       ",
-"                ",
-"                "};
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index c26144e307..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,688 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Main file for the GNOME Calendar program
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *          Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena (federico@helixcode.com)
- */
-
-#include <config.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "calendar-commands.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-
-#include "dayview.xpm"
-#include "workweekview.xpm"
-#include "weekview.xpm"
-#include "monthview.xpm"
-#if 0
-#include "yearview.xpm"
-#endif
-
-
-/* The username, used to set the `owner' field of the event */
-char *user_name;
-
-/* The full user name from the Gecos field */
-char *full_name;
-
-/* a gnome-config string prefix that can be used to access the calendar config info */
-char *calendar_settings;
-
-/* Day begin, day end parameters */
-int day_begin, day_end;
-
-/* Whether weeks starts on Sunday or Monday */
-int week_starts_on_monday;
-
-/* If AM/PM indicators should be used. This may not be supported by the new
-   views. */
-int am_pm_flag = 0;
-
-/* The array of color properties -- keep in sync with the enumeration defined in main.h.  The color
- * values specified here are the defaults for the program.
- */
-struct color_prop color_props[] = {
-	{ 0x3e72, 0x35ec, 0x8ba2, N_("Outline:"),              "/calendar/Colors/outline" },
-	{ 0xffff, 0xffff, 0xffff, N_("Headings:"),             "/calendar/Colors/headings" },
-	{ 0xf26c, 0xecec, 0xbbe7, N_("Empty days:"),           "/calendar/Colors/empty_bg" },
-	{ 0xfc1e, 0xf87f, 0x5f80, N_("Appointments:"),         "/calendar/Colors/mark_bg" },
-	{ 0xd364, 0xc6b7, 0x7969, N_("Highlighted day:"),      "/calendar/Colors/prelight_bg" },
-	{ 0x01f0, 0x01f0, 0x01f0, N_("Day numbers:"),          "/calendar/Colors/day_fg" },
-	{ 0x0000, 0x0000, 0xffff, N_("Current day's number:"), "/calendar/Colors/current_fg" },
-	{ 0xbbbb, 0xbbbb, 0x0000, N_("To-Do item that is not yet due:"), "/calendar/Colors/todo_not_yet" },
-	{ 0xdddd, 0xbbbb, 0x0000, N_("To-Do item that is due today:"),   "/calendar/Colors/todo_today" },
-	{ 0xbbbb, 0xdddd, 0x0000, N_("To-Do item that is overdue:"),     "/calendar/Colors/todo_overdue" }
-};
-
-/* A list of all of the calendars started */
-static GList *all_calendars = NULL;
-
-/* If set, beep on display alarms */
-gboolean beep_on_display = 0;
-
-/* If true, timeout the beeper on audio alarms */
-
-gboolean enable_aalarm_timeout = 0;
-guint audio_alarm_timeout = 0;
-const guint MAX_AALARM_TIMEOUT = 3600;
-const guint MAX_SNOOZE_SECS = 3600;
-gboolean enable_snooze = 0;
-guint snooze_secs = 60;
-
-#if 0
-CalendarAlarm alarm_defaults[4] = {
-        { ALARM_MAIL, 0, 15, ALARM_MINUTES },
-        { ALARM_PROGRAM, 0, 15, ALARM_MINUTES },
-        { ALARM_DISPLAY, 0, 15, ALARM_MINUTES },
-        { ALARM_AUDIO, 0, 15, ALARM_MINUTES }
-};
-#endif
-
-/* We have one global preferences dialog. */
-static CalPrefsDialog *preferences_dialog = NULL;
-
-
-static void update_pixmaps	(BonoboUIComponent *uic);
-static void set_pixmap		(BonoboUIComponent *uic,
-				 const char        *xml_path,
-				 char		  **xpm_data);
-
-
-
-static void
-init_username (void)
-{
-        user_name = g_strdup(g_get_user_name());
-        full_name = g_strdup(g_get_real_name());
-}
-
-static int
-range_check_hour (int hour)
-{
-	if (hour < 0)
-		hour = 0;
-	else if (hour >= 24)
-		hour = 23;
-
-	return hour;
-}
-
-#if 0
-static void
-init_default_alarms (void)
-{
-	int i;
-	gboolean def;
-
-	alarm_defaults [ALARM_DISPLAY].type = ALARM_DISPLAY;
-	alarm_defaults [ALARM_AUDIO].type   = ALARM_AUDIO;
-	alarm_defaults [ALARM_PROGRAM].type = ALARM_PROGRAM;
-	alarm_defaults [ALARM_MAIL].type    = ALARM_MAIL;
-
-	for (i = 0; i < 4; i++) {
-		switch (alarm_defaults [i].type) {
-		case ALARM_DISPLAY:
-			gnome_config_push_prefix ("/calendar/alarms/def_disp_");
-			break;
-		case ALARM_AUDIO:
-			gnome_config_push_prefix ("/calendar/alarms/def_audio_");
-			break;
-		case ALARM_PROGRAM:
-			gnome_config_push_prefix ("/calendar/alarms/def_prog_");
-			break;
-		case ALARM_MAIL:
-			gnome_config_push_prefix ("/calendar/alarms/def_mail_");
-			break;
-		}
-
-		alarm_defaults[i].enabled = gnome_config_get_int ("enabled=0");
-		if (alarm_defaults[i].type != ALARM_MAIL) {
-			alarm_defaults[i].count   = gnome_config_get_int ("count=15");
-			alarm_defaults[i].units   = gnome_config_get_int ("units=0");
-		} else {
-			alarm_defaults[i].count   = gnome_config_get_int ("count=1");
-			alarm_defaults[i].count   = gnome_config_get_int ("count=2");
-		}
-
-		alarm_defaults[i].data = gnome_config_get_string_with_default ("data=",
-									       &def);
-		if (def)
-			alarm_defaults[i].data = NULL;
-
-		gnome_config_pop_prefix ();
-	}
-}
-#endif
-
-/* Callback for the new appointment command */
-static void
-new_appointment_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (user_data);
-	gnome_calendar_new_appointment (gcal);
-}
-
-/* Prints the calendar at its current view and time range */
-static void
-print (GnomeCalendar *gcal, gboolean preview)
-{
-	time_t start;
-	const char *view;
-	PrintView print_view;
-
-	gnome_calendar_get_current_time_range (gcal, &start, NULL);
-	view = gnome_calendar_get_current_view_name (gcal);
-
-	if (strcmp (view, "dayview") == 0)
-		print_view = PRINT_VIEW_DAY;
-	else if (strcmp (view, "workweekview") == 0 || strcmp (view, "weekview") == 0)
-		print_view = PRINT_VIEW_WEEK;
-	else if (strcmp (view, "monthview") == 0)
-		print_view = PRINT_VIEW_MONTH;
-	else {
-		g_assert_not_reached ();
-		print_view = PRINT_VIEW_DAY;
-	}
-
-	print_calendar (gcal, preview, start, print_view);
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, FALSE);
-}
-
-
-/* This iterates over each calendar telling them to update their config
-   settings. */
-void
-update_all_config_settings (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_update_config_settings (GNOME_CALENDAR (l->data), FALSE);
-}
-
-
-/* These are all for the old config code and will eventually be removed. */
-void
-time_format_changed (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_time_format_changed (GNOME_CALENDAR (l->data));
-}
-
-void
-colors_changed (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_colors_changed (GNOME_CALENDAR (l->data));
-}
-
-void
-todo_properties_changed(void)
-{
-        GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_todo_properties_changed (GNOME_CALENDAR (l->data));
-}
-
-/* Sets a clock cursor for the specified calendar window */
-static void
-set_clock_cursor (GnomeCalendar *gcal)
-{
-	GdkCursor *cursor;
-
-	cursor = gdk_cursor_new (GDK_WATCH);
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_destroy (cursor);
-	gdk_flush ();
-}
-
-/* Resets the normal cursor for the specified calendar window */
-static void
-set_normal_cursor (GnomeCalendar *gcal)
-{
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, NULL);
-	gdk_flush ();
-}
-
-static void
-previous_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_previous (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-next_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_next (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-today_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-goto_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	goto_dialog (gcal);
-}
-
-static void
-show_day_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "workweekview", FALSE, TRUE);
-}
-
-static void
-show_week_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "weekview", FALSE, TRUE);
-}
-
-static void
-show_month_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "monthview", FALSE, TRUE);
-}
-
-
-static void
-new_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	new_calendar (full_name);
-}
-
-static void
-close_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	all_calendars = g_list_remove (all_calendars, gcal);
-
-	gtk_widget_destroy (GTK_WIDGET (gcal));
-
-	if (all_calendars == NULL)
-		gtk_main_quit ();
-}
-
-
-void
-quit_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	while (all_calendars){
-		GnomeCalendar *cal = GNOME_CALENDAR (all_calendars->data);
-
-		close_cmd (uih, cal, path);
-	}
-}
-
-
-static void
-open_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GtkWidget *error_dialog;
-	int ret;
-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {
-		error_dialog = gnome_message_box_new (
-			_("File not found"),
-			GNOME_MESSAGE_BOX_ERROR,
-			GNOME_STOCK_BUTTON_OK,
-			NULL);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog), GTK_WINDOW (fs));
-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));
-	} else {
-		/* FIXME: find out who owns this calendar and use that name */
-#ifndef NO_WARNINGS
-#warning "FIXME: find out who owns this calendar and use that name"
-#endif
-		/*
-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs));
-		*/
-		gtk_widget_destroy (GTK_WIDGET (fs));
-	}
-}
-
-static void
-open_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open calendar")));
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) open_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) gtk_widget_destroy,
-				   GTK_OBJECT (fs));
-
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me */
-}
-
-static void
-save_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GnomeCalendar *gcal;
-	gchar *fname;
-
-	gcal = GNOME_CALENDAR (gtk_object_get_user_data (GTK_OBJECT (fs)));
-	gtk_window_set_wmclass (GTK_WINDOW (gcal), "gnomecal", "gnomecal");
-
-	fname = g_strdup (gtk_file_selection_get_filename (fs));
-	g_free(fname);
-	gtk_main_quit ();
-}
-
-static gint
-close_save (GtkWidget *w)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-save_as_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar")));
-	gtk_object_set_user_data (GTK_OBJECT (fs), user_data);
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) save_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) close_save,
-				   GTK_OBJECT (fs));
-	gtk_signal_connect_object (GTK_OBJECT (fs), "delete_event",
-				   GTK_SIGNAL_FUNC (close_save),
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me even more */
-	gtk_main ();
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-properties_cmd (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	if (!preferences_dialog)
-		preferences_dialog = cal_prefs_dialog_new ();
-	else
-		cal_prefs_dialog_show (preferences_dialog);
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb),
-	BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd),
-
-	BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked),
-
-	BONOBO_UI_UNSAFE_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowMonthView", show_month_view_clicked),
-
-	BONOBO_UI_VERB_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *cal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-#if 0
-	/* FIXME: Need to update this to use new Bonobo ui stuff somehow.
-	   Also need radio buttons really. */
-
-	/* Note that these indices should correspond with the button indices
-	   in the gnome_toolbar_view_buttons UIINFO struct. */
-	gnome_calendar_set_view_buttons (cal,
-					 gnome_toolbar_view_buttons[0].widget,
-					 gnome_toolbar_view_buttons[1].widget,
-					 gnome_toolbar_view_buttons[2].widget,
-					 gnome_toolbar_view_buttons[3].widget);
-
-	/* This makes the appropriate radio button in the toolbar active. */
-	gnome_calendar_update_view_buttons (cal);
-#endif
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, cal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-calendar.xml",
-			       "evolution-calendar");
-
-	update_pixmaps (uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-	set_pixmap (uic, "/Toolbar/DayView",	  dayview_xpm);
-	set_pixmap (uic, "/Toolbar/WorkWeekView", workweekview_xpm);
-	set_pixmap (uic, "/Toolbar/WeekView",	  weekview_xpm);
-	set_pixmap (uic, "/Toolbar/MonthView",	  monthview_xpm);
-}
-
-
-static void
-set_pixmap (BonoboUIComponent *uic,
-	    const char        *xml_path,
-	    char	     **xpm_data)
-{
-	GdkPixbuf *pixbuf;
-
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) xpm_data);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-}
-
-
-void
-calendar_control_deactivate (BonoboControl *control)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-GnomeCalendar *
-new_calendar (char *full_name)
-{
-	GtkWidget *gcal;
-
-	gcal = gnome_calendar_new ();
-
-	all_calendars = g_list_prepend (all_calendars, gcal);
-
-	gtk_widget_show (gcal);
-	return GNOME_CALENDAR (gcal);
-}
-
-
-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file)
-{
-	gboolean    success;
-
-	g_return_if_fail (gcal);
-	g_return_if_fail (calendar_file);
-
-	printf ("calendar_set_uri: calendar_file is '%s'\n", calendar_file);
-
-	success = gnome_calendar_open (gcal,
-				       calendar_file,
-				       CALENDAR_OPEN_OR_CREATE);
-
-	printf ("    load or create returned %d\n", success);
-}
-
-
-
-
-
-/*
- * Initializes the calendar internal variables, loads defaults
- */
-void
-init_calendar (void)
-{
-	int i;
-	char *cspec, *color;
-	char *str;
-
-	init_username ();
-	/*user_calendar_file = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/user-cal.vcf");*/
-
-	gnome_config_push_prefix (calendar_settings);
-
-	/* Read calendar settings */
-
-	day_begin  = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day start=8"));
-	day_end    = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day end=17"));
-	am_pm_flag = gnome_config_get_bool ("/calendar/Calendar/AM PM flag=0");
-	week_starts_on_monday = gnome_config_get_bool ("/calendar/Calendar/Week starts on Monday=0");
-
-	if (day_end < day_begin) {
-		day_begin = 8;
-		day_end   = 17;
-	}
-
-	/* Read color settings */
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		str = g_strconcat (color_props[i].key, "=", cspec, NULL);
-
-		color = gnome_config_get_string (str);
-		parse_color_spec (color, &color_props[i].r, &color_props[i].g, &color_props[i].b);
-
-		g_free (str);
-		g_free (color);
-	}
-
-	/* read todolist settings */
-
-	todo_show_time_remaining = gnome_config_get_bool("/calendar/Todo/show_time_remain");
-	todo_show_due_date = gnome_config_get_bool("/calendar/Todo/show_due_date");
-
-	todo_item_dstatus_highlight_overdue = gnome_config_get_bool("/calendar/Todo/highlight_overdue");
-
-	todo_item_dstatus_highlight_due_today = gnome_config_get_bool("/calendar/Todo/highlight_due_today");
-
-	todo_item_dstatus_highlight_not_due_yet = gnome_config_get_bool("/calendar/Todo/highlight_not_due_yet");
-
-        todo_current_sort_column = gnome_config_get_int("/calendar/Todo/sort_column");
-
-	todo_current_sort_type = gnome_config_get_int("/calendar/Todo/sort_type");
-
-	todo_show_priority = gnome_config_get_bool("/calendar/Todo/show_priority");
-
-	/* read alarm settings */
-	beep_on_display = gnome_config_get_bool ("/calendar/alarms/beep_on_display=FALSE");
-	enable_aalarm_timeout = gnome_config_get_bool ("/calendar/alarms/enable_audio_timeout=FALSE");
-	audio_alarm_timeout = gnome_config_get_int ("/calendar/alarms/audio_alarm_timeout=60");
-	if (audio_alarm_timeout < 1)
-		audio_alarm_timeout = 1;
-	if (audio_alarm_timeout > MAX_AALARM_TIMEOUT)
-		audio_alarm_timeout = MAX_AALARM_TIMEOUT;
-	enable_snooze = gnome_config_get_bool ("/calendar/alarms/enable_snooze=FALSE");
-	snooze_secs = gnome_config_get_int ("/calendar/alarms/snooze_secs=300");
-	if (snooze_secs < 1)
-		snooze_secs = 1;
-	if (snooze_secs > MAX_SNOOZE_SECS)
-		snooze_secs = MAX_SNOOZE_SECS;
-
-#if 0
-	init_default_alarms ();
-#endif
-
-	/* Done */
-
-	gnome_config_pop_prefix ();
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index 19752c9cc8..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef CALENDAR_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include <bonobo/bonobo-control.h>
-#include "gnome-cal.h"
-
-/* This enum and the following array define the color preferences */
-
-typedef enum {
-	COLOR_PROP_OUTLINE_COLOR,	/* Color of calendar outline */
-	COLOR_PROP_HEADING_COLOR,	/* Color for headings */
-	COLOR_PROP_EMPTY_DAY_BG,	/* Background color for empty days */
-	COLOR_PROP_MARK_DAY_BG,		/* Background color for days with appointments */
-	COLOR_PROP_PRELIGHT_DAY_BG,	/* Background color for prelighted day */
-	COLOR_PROP_DAY_FG,		/* Color for day numbers */
-	COLOR_PROP_CURRENT_DAY_FG,	/* Color for current day's number */
-	COLOR_PROP_TODO_NOT_DUE_YET,    /* Color for Todo items not yet due */
-	COLOR_PROP_TODO_DUE_TODAY,      /* Color for Todo items due today */ 
-	COLOR_PROP_TODO_OVERDUE,        /* Color for Todo items that are overdue */
-	COLOR_PROP_LAST			/* Number of color properties */
-} ColorProp;
-
-struct color_prop {
-	int r;		/* Values are in [0, 65535] */
-	int g;
-	int b;
-	char *label;	/* Label for properties dialog */
-	char *key;	/* Key for gnome_config */
-};
-
-extern struct color_prop color_props[];
-
-
-#define COOKIE_USER_HOME_DIR ((char *) -1)
-
- 
-/* Calendar preferences */
-
-extern int day_begin, day_end;
-extern char *user_name;
-extern int am_pm_flag;
-extern int week_starts_on_monday;
-
-/* todo preferences */
-extern int todo_show_due_date;
-
-extern int todo_item_dstatus_highlight_overdue;
-extern int todo_item_dstatus_highlight_due_today;
-extern int todo_item_dstatus_highlight_not_due_yet;
-
-extern int todo_show_time_remaining;
-extern int todo_show_priority;
-extern char *todo_overdue_font_text;
-extern gint todo_current_sort_column;
-extern gint todo_current_sort_type;
-
-/* alarm stuff */
-#if 0
-extern CalendarAlarm alarm_defaults[4];
-#endif
-extern gboolean beep_on_display;
-extern gboolean enable_aalarm_timeout;
-extern guint audio_alarm_timeout;
-extern const guint MAX_AALARM_TIMEOUT;
-extern gboolean enable_snooze;
-extern guint snooze_secs;
-extern const guint MAX_SNOOZE_SECS;
-
-
-
-/* This tells all the calendars to reload the config settings. */
-void update_all_config_settings (void);
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* Creates and runs the preferences dialog box */
-void properties (GtkWidget *toplevel);
-
-/* Asks for all the time-related displays to be updated when the user changes the time format
- * preferences.
- */
-void time_format_changed (void);
-
-/* Asks for all the month items' colors to be reset */
-void colors_changed (void);
-
-/* Asks for all todo lists to reflect the accurate properties */
-void todo_properties_changed(void);
-
-
-
-
-/* Creates and runs the Go-to date dialog */
-void goto_dialog (GnomeCalendar *gcal);
-
-/* Returns a pointer to a statically-allocated string with a representation of the specified color.
- * Values must be in [0, 65535].
- */
-char *build_color_spec (int r, int g, int b);
-
-/* Parses a color specification of the form "#%04x%04x%04x" and returns the color components. */
-void parse_color_spec (char *spec, int *r, int *g, int *b);
-
-/* Calls build_color_spec() for the color in the specified property number */
-char *color_spec_from_prop (ColorProp propnum);
-
-GnomeCalendar *new_calendar (char *full_name);
-
-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file);
-
-
-/*----------------------------------------------------------------------*/
-/* FIXME -- where should this stuff go?                                 */
-/*----------------------------------------------------------------------*/
-
-void init_calendar (void);
-
-void calendar_control_activate (BonoboControl *control,
-				GnomeCalendar *cal);
-void calendar_control_deactivate (BonoboControl *control);
-
-void quit_cmd (BonoboUIComponent *uih, void *user_data, const char *path);
-
-/*extern char *user_calendar_file;*/
-extern char *user_name;
-extern char *full_name;
-extern int debug_alarms;
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index b30bae6a02..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#endif
-#include "component-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#if WANT_THE_EXECUTIVE_SUMMARY
-#include "calendar-summary.h"
-#endif
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "calendar") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = control_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	evolution_dir = g_strdup (evolution_homedir);
-	calendar_config_init ();
-	owner_count ++;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-static BonoboObject *
-summary_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-	ExecutiveSummaryComponent *summary_component;
-
-	summary_component = executive_summary_component_new (NULL,
-							     create_summary_view,
-							     NULL,
-							     evolution_dir);
-	return BONOBO_OBJECT (summary_component);
-}
-#endif
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
-#endif
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-#endif
-}
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index 8e5cd6605f..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
deleted file mode 100644
index 0245a05f2a..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.c - functions to load/save/get/set user settings.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "component-factory.h"
-#include "calendar-config.h"
-
-
-typedef struct
-{
-	CalWeekdays	working_days;
-	gboolean	use_24_hour_format;
-	gint		week_start_day;
-	gint		day_start_hour;
-	gint		day_start_minute;
-	gint		day_end_hour;
-	gint		day_end_minute;
-	gint		time_divisions;
-	gboolean	dnav_show_week_no;
-	gint		view;
-	gfloat		hpane_pos;
-	gfloat		vpane_pos;
-	gfloat		month_hpane_pos;
-	gfloat		month_vpane_pos;
-	gboolean	compress_weekend;
-	gboolean	show_event_end;
-} CalendarConfig;
-
-
-static CalendarConfig *config = NULL;
-
-static void config_read			(void);
-
-
-void
-calendar_config_init			(void)
-{
-	if (config)
-		return;
-	
-	config = g_new0 (CalendarConfig, 1);
-
-	config_read ();
-}
-
-
-static void
-config_read				(void)
-{
-	gchar *prefix;
-	gboolean is_default;
-
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->working_days = gnome_config_get_int_with_default ("WorkingDays", &is_default);
-	if (is_default) {
-		config->working_days = CAL_MONDAY | CAL_TUESDAY
-			| CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY;
-	}
-	config->use_24_hour_format = gnome_config_get_bool ("Use24HourFormat=0");
-	config->week_start_day = gnome_config_get_int ("WeekStartDay=1");
-	config->day_start_hour = gnome_config_get_int ("DayStartHour=9");
-	config->day_start_minute = gnome_config_get_int ("DayStartMinute=0");
-	config->day_end_hour = gnome_config_get_int ("DayEndHour=17");
-	config->day_end_minute = gnome_config_get_int ("DayEndMinute=0");
-	config->time_divisions = gnome_config_get_int ("TimeDivisions=30");
-	config->view = gnome_config_get_int ("View=0");
-	config->hpane_pos = gnome_config_get_float ("HPanePosition=1");
-	config->vpane_pos = gnome_config_get_float ("VPanePosition=1");
-	config->month_hpane_pos = gnome_config_get_float ("MonthHPanePosition=0");
-	config->month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=1");
-	config->compress_weekend = gnome_config_get_bool ("CompressWeekend=1");
-	config->show_event_end = gnome_config_get_bool ("ShowEventEndTime=1");
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->dnav_show_week_no = gnome_config_get_bool ("ShowWeekNumbers=0");
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write			(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("WorkingDays", config->working_days);
-	gnome_config_set_bool ("Use24HourFormat", config->use_24_hour_format);
-	gnome_config_set_int ("WeekStartDay", config->week_start_day);
-	gnome_config_set_int ("DayStartHour", config->day_start_hour);
-	gnome_config_set_int ("DayStartMinute", config->day_start_minute);
-	gnome_config_set_int ("DayEndHour", config->day_end_hour);
-	gnome_config_set_int ("DayEndMinute", config->day_end_minute);
-	gnome_config_set_bool ("CompressWeekend", config->compress_weekend);
-	gnome_config_set_bool ("ShowEventEndTime", config->show_event_end);
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_bool ("ShowWeekNumbers", config->dnav_show_week_no);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write_on_exit		(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("View", config->view);
-	gnome_config_set_int ("TimeDivisions", config->time_divisions);
-	gnome_config_set_float ("HPanePosition", config->hpane_pos);
-	gnome_config_set_float ("VPanePosition", config->vpane_pos);
-	gnome_config_set_float ("MonthHPanePosition", config->month_hpane_pos);
-	gnome_config_set_float ("MonthVPanePosition", config->month_vpane_pos);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-/*
- * Calendar Settings.
- */
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean
-calendar_config_get_24_hour_format	(void)
-{
-	return config->use_24_hour_format;
-}
-
-
-void
-calendar_config_set_24_hour_format	(gboolean     use_24_hour)
-{
-	config->use_24_hour_format = use_24_hour;
-}
-
-
-/* The start day of the week (0 = Sun to 6 = Mon). */
-gint
-calendar_config_get_week_start_day	(void)
-{
-	return config->week_start_day;
-}
-
-
-void
-calendar_config_set_week_start_day	(gint	      week_start_day)
-{
-	config->week_start_day = week_start_day;
-}
-
-
-/* The start and end times of the work-day. */
-gint
-calendar_config_get_day_start_hour	(void)
-{
-	return config->day_start_hour;
-}
-
-
-void
-calendar_config_set_day_start_hour	(gint	      day_start_hour)
-{
-	config->day_start_hour = day_start_hour;
-}
-
-
-gint
-calendar_config_get_day_start_minute	(void)
-{
-	return config->day_start_minute;
-}
-
-
-void
-calendar_config_set_day_start_minute	(gint	      day_start_min)
-{
-	config->day_start_minute = day_start_min;
-}
-
-
-gint
-calendar_config_get_day_end_hour	(void)
-{
-	return config->day_end_hour;
-}
-
-
-void
-calendar_config_set_day_end_hour	(gint	      day_end_hour)
-{
-	config->day_end_hour = day_end_hour;
-}
-
-
-gint
-calendar_config_get_day_end_minute	(void)
-{
-	return config->day_end_minute;
-}
-
-
-void
-calendar_config_set_day_end_minute	(gint	      day_end_min)
-{
-	config->day_end_minute = day_end_min;
-}
-
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint
-calendar_config_get_time_divisions	(void)
-{
-	return config->time_divisions;
-}
-
-
-void
-calendar_config_set_time_divisions	(gint	      divisions)
-{
-	config->time_divisions = divisions;
-}
-
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean
-calendar_config_get_dnav_show_week_no	(void)
-{
-	return config->dnav_show_week_no;
-}
-
-
-void
-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
-{
-	config->dnav_show_week_no = show_week_no;
-}
-
-
-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */
-gint
-calendar_config_get_default_view	(void)
-{
-	return config->view;
-}
-
-
-void
-calendar_config_set_default_view	(gint	      view)
-{
-	config->view = view;
-}
-
-
-/* The positions of the panes in the normal and month views. */
-gfloat
-calendar_config_get_hpane_pos		(void)
-{
-	return config->hpane_pos;
-}
-
-
-void
-calendar_config_set_hpane_pos		(gfloat	      hpane_pos)
-{
-	config->hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_vpane_pos		(void)
-{
-	return config->vpane_pos;
-}
-
-
-void
-calendar_config_set_vpane_pos		(gfloat	      vpane_pos)
-{
-	config->vpane_pos = vpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_hpane_pos	(void)
-{
-	return config->month_hpane_pos;
-}
-
-
-void
-calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos)
-{
-	config->month_hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_vpane_pos	(void)
-{
-	return config->month_vpane_pos;
-}
-
-
-void
-calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos)
-{
-	config->month_vpane_pos = vpane_pos;
-}
-
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean
-calendar_config_get_compress_weekend	(void)
-{
-	return config->compress_weekend;
-}
-
-
-void
-calendar_config_set_compress_weekend	(gboolean     compress)
-{
-	config->compress_weekend = compress;
-}
-
-
-/* Whether we show event end times. */
-gboolean
-calendar_config_get_show_event_end	(void)
-{
-	return config->show_event_end;
-}
-
-
-void
-calendar_config_set_show_event_end	(gboolean     show_end)
-{
-	config->show_event_end = show_end;
-}
-
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays
-calendar_config_get_working_days	(void)
-{
-	return config->working_days;
-}
-
-
-void
-calendar_config_set_working_days	(CalWeekdays  days)
-{
-	config->working_days = days;
-}
-
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index aa9bdefb80..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.h - functions to load/save/get/set user settings.
- */
-
-#ifndef _CALENDAR_CONFIG_H_
-#define _CALENDAR_CONFIG_H_
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	CAL_SUNDAY	= 1 << 0,
-	CAL_MONDAY	= 1 << 1,
-	CAL_TUESDAY	= 1 << 2,
-	CAL_WEDNESDAY	= 1 << 3,
-	CAL_THURSDAY	= 1 << 4,
-	CAL_FRIDAY	= 1 << 5,
-	CAL_SATURDAY	= 1 << 6
-} CalWeekdays;
-
-
-
-void	  calendar_config_init			(void);
-void	  calendar_config_write			(void);
-void	  calendar_config_write_on_exit		(void);
-
-
-/*
- * Calendar Settings.
- */
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays calendar_config_get_working_days	(void);
-void	  calendar_config_set_working_days	(CalWeekdays  days);
-
-/* The start day of the week (0 = Sun to 6 = Sat). */
-gint	  calendar_config_get_week_start_day	(void);
-void	  calendar_config_set_week_start_day	(gint	      week_start_day);
-
-/* The start and end times of the work-day. */
-gint	  calendar_config_get_day_start_hour	(void);
-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);
-
-gint	  calendar_config_get_day_start_minute	(void);
-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-
-gint	  calendar_config_get_day_end_hour	(void);
-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-
-gint	  calendar_config_get_day_end_minute	(void);
-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean  calendar_config_get_24_hour_format	(void);
-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint	  calendar_config_get_time_divisions	(void);
-void	  calendar_config_set_time_divisions	(gint	      divisions);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean  calendar_config_get_compress_weekend	(void);
-void	  calendar_config_set_compress_weekend	(gboolean     compress);
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean  calendar_config_get_dnav_show_week_no	(void);
-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
-
-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */
-gint	  calendar_config_get_default_view	(void);
-void	  calendar_config_set_default_view	(gint	      view);
-
-/* The positions of the panes in the normal and month views. */
-gfloat    calendar_config_get_hpane_pos		(void);
-void	  calendar_config_set_hpane_pos		(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gfloat	      vpane_pos);
-
-gfloat    calendar_config_get_month_hpane_pos	(void);
-void	  calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos);
-
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/calendar-control.oafinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
deleted file mode 100644
index 064e855ba1..0000000000
--- a/calendar/gui/calendar-model.c
+++ /dev/null
@@ -1,2011 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* We need this for strptime. */
-#define _XOPEN_SOURCE
-
-#include <config.h>
-#include <ctype.h>
-#include <math.h>
-#undef _XOPEN_SOURCE
-#include <sys/time.h>
-#define _XOPEN_SOURCE
-#include <time.h>
-#include <gnome.h>
-#include <cal-util/timeutil.h>
-#include "calendar-model.h"
-#include "calendar-commands.h"
-
-
-
-/* Private part of the ECalendarModel structure */
-struct _CalendarModelPrivate {
-	/* Calendar client we are using */
-	CalClient *client;
-
-	/* Types of objects we are dealing with */
-	CalObjType type;
-
-	/* Array of pointers to calendar objects */
-	GArray *objects;
-
-	/* UID -> array index hash */
-	GHashTable *uid_index_hash;
-
-	/* Whether we display dates in 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* HACK: so that ETable can do its stupid append_row() thing */
-	guint appending_row : 1;
-};
-
-
-
-static void calendar_model_class_init (CalendarModelClass *class);
-static void calendar_model_init (CalendarModel *model);
-static void calendar_model_destroy (GtkObject *object);
-
-static int calendar_model_column_count (ETableModel *etm);
-static int calendar_model_row_count (ETableModel *etm);
-static void *calendar_model_value_at (ETableModel *etm, int col, int row);
-static void calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean calendar_model_is_cell_editable (ETableModel *etm, int col, int row);
-static void calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row);
-static void *calendar_model_duplicate_value (ETableModel *etm, int col, const void *value);
-static void calendar_model_free_value (ETableModel *etm, int col, void *value);
-static void *calendar_model_initialize_value (ETableModel *etm, int col);
-static gboolean calendar_model_value_is_empty (ETableModel *etm, int col, const void *value);
-#if 0
-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);
-#endif
-static void load_objects (CalendarModel *model);
-static int remove_object (CalendarModel *model, const char *uid);
-static void ensure_task_complete (CalComponent *comp,
-				  time_t completed_date);
-static void ensure_task_not_complete (CalComponent *comp);
-
-static ETableModelClass *parent_class;
-
-
-
-/**
- * calendar_model_get_type:
- * @void:
- *
- * Registers the #CalendarModel class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalendarModel class.
- **/
-GtkType
-calendar_model_get_type (void)
-{
-	static GtkType calendar_model_type = 0;
-
-	if (!calendar_model_type) {
-		static GtkTypeInfo calendar_model_info = {
-			"CalendarModel",
-			sizeof (CalendarModel),
-			sizeof (CalendarModelClass),
-			(GtkClassInitFunc) calendar_model_class_init,
-			(GtkObjectInitFunc) calendar_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		calendar_model_type = gtk_type_unique (E_TABLE_MODEL_TYPE, &calendar_model_info);
-	}
-
-	return calendar_model_type;
-}
-
-/* Class initialization function for the calendar table model */
-static void
-calendar_model_class_init (CalendarModelClass *class)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *etm_class;
-
-	object_class = (GtkObjectClass *) class;
-	etm_class = (ETableModelClass *) class;
-
-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);
-
-	object_class->destroy = calendar_model_destroy;
-
-	etm_class->column_count = calendar_model_column_count;
-	etm_class->row_count = calendar_model_row_count;
-	etm_class->value_at = calendar_model_value_at;
-	etm_class->set_value_at = calendar_model_set_value_at;
-	etm_class->is_cell_editable = calendar_model_is_cell_editable;
-	etm_class->append_row = calendar_model_append_row;
-	etm_class->duplicate_value = calendar_model_duplicate_value;
-	etm_class->free_value = calendar_model_free_value;
-	etm_class->initialize_value = calendar_model_initialize_value;
-	etm_class->value_is_empty = calendar_model_value_is_empty;
-#if 0
-	etm_class->value_to_string = calendar_model_value_to_string;
-#endif
-}
-
-/* Object initialization function for the calendar table model */
-static void
-calendar_model_init (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	priv = g_new0 (CalendarModelPrivate, 1);
-	model->priv = priv;
-
-	priv->objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));
-	priv->uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->use_24_hour_format = TRUE;
-}
-
-/* Called from g_hash_table_foreach_remove(), frees a stored UID->index
- * mapping.
- */
-static gboolean
-free_uid_index (gpointer key, gpointer value, gpointer data)
-{
-	int *idx;
-
-	idx = value;
-	g_free (idx);
-
-	return TRUE;
-}
-
-/* Frees the objects stored in the calendar model */
-static void
-free_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	int i;
-
-	priv = model->priv;
-
-	g_hash_table_foreach_remove (priv->uid_index_hash, free_uid_index, NULL);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		CalComponent *comp;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	g_array_set_size (priv->objects, 0);
-}
-
-/* Destroy handler for the calendar table model */
-static void
-calendar_model_destroy (GtkObject *object)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (object));
-
-	model = CALENDAR_MODEL (object);
-	priv = model->priv;
-
-	/* Free the calendar client interface object */
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	/* Free the uid->index hash data and the array of UIDs */
-
-	free_objects (model);
-
-	g_hash_table_destroy (priv->uid_index_hash);
-	priv->uid_index_hash = NULL;
-
-	g_array_free (priv->objects, TRUE);
-	priv->objects = NULL;
-
-	/* Free the private structure */
-
-	g_free (priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* ETableModel methods */
-
-/* column_count handler for the calendar table model */
-static int
-calendar_model_column_count (ETableModel *etm)
-{
-	return CAL_COMPONENT_FIELD_NUM_FIELDS;
-}
-
-/* row_count handler for the calendar table model */
-static int
-calendar_model_row_count (ETableModel *etm)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	return priv->objects->len;
-}
-
-/* Creates a nice string representation of a time value */
-static char*
-get_time_t (CalendarModel *model, time_t *t, gboolean skip_midnight)
-{
-	static char buffer[64];
-	struct tm *tmp_tm;
-	char *format;
-
-	if (*t <= 0) {
-		buffer[0] = '\0';
-	} else {
-		tmp_tm = localtime (t);
-
-		if (skip_midnight && tmp_tm->tm_hour == 0
-		    && tmp_tm->tm_min == 0 && tmp_tm->tm_sec == 0)
-			/* strftime format of a weekday and a date. */
-			format = _("%a %m/%d/%Y");
-		else if (model->priv->use_24_hour_format)
-			/* strftime format of a weekday, a date and a time,
-			   in 24-hour format. */
-			format = _("%a %m/%d/%Y %H:%M:%S");
-		else
-			/* strftime format of a weekday, a date and a time,
-			   in 12-hour format. */
-			format = _("%a %m/%d/%Y %I:%M:%S %p");
-			
-		strftime (buffer, sizeof (buffer), format, tmp_tm);
-	}
-
-	return buffer;
-}
-
-/* Builds a string based on the list of CATEGORIES properties of a calendar
- * component.
- */
-static char *
-get_categories (CalComponent *comp)
-{
-	GSList *categories;
-	GString *str;
-	char *s;
-	GSList *l;
-
-	cal_component_get_categories_list (comp, &categories);
-
-	str = g_string_new (NULL);
-
-	for (l = categories; l; l = l->next) {
-		const char *category;
-
-		category = l->data;
-		g_string_append (str, category);
-
-		if (l->next != NULL)
-			g_string_append (str, ", ");
-	}
-
-	s = str->str;
-
-	g_string_free (str, FALSE);
-	cal_component_free_categories_list (categories);
-
-	return s;
-}
-
-/* Returns a string based on the CLASSIFICATION property of a calendar component */
-static char *
-get_classification (CalComponent *comp)
-{
-	CalComponentClassification classif;
-
-	cal_component_get_classification (comp, &classif);
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_NONE:
-		return "";
-
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		return _("Public");
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		return _("Private");
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-
-	case CAL_COMPONENT_CLASS_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the COMPLETED property of a calendar component */
-static char *
-get_completed	(CalendarModel *model,
-		 CalComponent  *comp)
-{
-	struct icaltimetype *completed;
-	time_t t;
-
-	cal_component_get_completed (comp, &completed);
-
-	if (!completed)
-		t = 0;
-	else {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	}
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for and frees a date/time value */
-static char *
-get_and_free_datetime (CalendarModel *model, CalComponentDateTime dt)
-{
-	time_t t;
-
-	if (!dt.value)
-		t = 0;
-	else
-		t = icaltime_as_timet (*dt.value);
-
-	cal_component_free_datetime (&dt);
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for the DTEND property of a calendar component */
-static char *
-get_dtend (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtend (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DTSTART property of a calendar component */
-static char *
-get_dtstart (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtstart (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DUE property of a calendar component */
-static char *
-get_due (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_due (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the GEO property of a calendar component */
-static char*
-get_geo (CalComponent *comp)
-{
-	struct icalgeotype *geo;
-	static gchar buf[32];
-
-	cal_component_get_geo (comp, &geo);
-
-	if (!geo)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",
-			    fabs (geo->lat),
-			    geo->lat >= 0.0 ? _("N") : _("S"),
-			    fabs (geo->lon),
-			    geo->lon >= 0.0 ? _("E") : _("W"));
-		cal_component_free_geo (geo);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PERCENT property of a calendar component */
-static char *
-get_percent (CalComponent *comp)
-{
-	int *percent;
-	static char buf[32];
-
-	cal_component_get_percent (comp, &percent);
-
-	if (!percent)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d%%", *percent);
-		cal_component_free_percent (percent);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PRIORITY property of a calendar component */
-static char *
-get_priority (CalComponent *comp)
-{
-	int *priority;
-	static char buf[32];
-
-	cal_component_get_priority (comp, &priority);
-
-	if (!priority)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d", *priority);
-		cal_component_free_priority (priority);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the SUMMARY property of a calendar component */
-static char *
-get_summary (CalComponent *comp)
-{
-	CalComponentText summary;
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		return (char *) summary.value;
-	else
-		return "";
-}
-
-/* Builds a string for the TRANSPARENCY property of a calendar component */
-static char *
-get_transparency (CalComponent *comp)
-{
-	CalComponentTransparency transp;
-
-	cal_component_get_transparency (comp, &transp);
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_NONE:
-		return "";
-
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		return _("Transparent");
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		return _("Opaque");
-
-	case CAL_COMPONENT_TRANSP_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the URL property of a calendar component */
-static char *
-get_url (CalComponent *comp)
-{
-	const char *url;
-
-	cal_component_get_url (comp, &url);
-
-	if (url)
-		return (char *) url;
-	else
-		return "";
-}
-
-/* Returns whether the completion date has been set on a component */
-static gboolean
-get_is_complete (CalComponent *comp)
-{
-	struct icaltimetype *t;
-	gboolean retval;
-
-	cal_component_get_completed (comp, &t);
-	retval = (t != NULL);
-
-	if (retval)
-		cal_component_free_icaltimetype (t);
-
-	return retval;
-}
-
-/* Returns whether a calendar component is overdue.
- *
- * FIXME: This will only get called when the component is scrolled into the
- * ETable.  There should be some sort of dynamic update thingy for if a component
- * becomes overdue while it is being viewed.
- */
-static gboolean
-get_is_overdue (CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	gboolean retval;
-
-	cal_component_get_due (comp, &dt);
-
-	/* First, do we have a due date? */
-
-	if (!dt.value)
-		retval = FALSE;
-	else {
-		time_t t;
-
-		/* Second, is it already completed? */
-
-		if (get_is_complete (comp)) {
-			retval = FALSE;
-			goto out;
-		}
-
-		/* Third, are we overdue as of right now? */
-
-		t = icaltime_as_timet (*dt.value);
-
-		if (t < time (NULL))
-			retval = TRUE;
-		else
-			retval = FALSE;
-	}
-
- out:
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* value_at handler for the calendar table model */
-static void *
-calendar_model_value_at (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return get_categories (comp);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return get_classification (comp);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		return get_completed (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		return get_dtend (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		return get_dtstart (model, comp);
-
-	case CAL_COMPONENT_FIELD_DUE:
-		return get_due (model, comp);
-
-	case CAL_COMPONENT_FIELD_GEO:
-		return get_geo (comp);
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return get_percent (comp);
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		return get_priority (comp);
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return get_summary (comp);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return get_transparency (comp);
-
-	case CAL_COMPONENT_FIELD_URL:
-		return get_url (comp);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-		return GINT_TO_POINTER (cal_component_has_alarms (comp));
-
-	case CAL_COMPONENT_FIELD_ICON:
-		/* FIXME: Also support 'Assigned to me' & 'Assigned to someone
-		   else'. */
-		if (cal_component_has_recurrences (comp))
-			return GINT_TO_POINTER (1);
-		else
-			return GINT_TO_POINTER (0);
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return GINT_TO_POINTER (get_is_complete (comp));
-
-	case CAL_COMPONENT_FIELD_RECURRING:
-		return GINT_TO_POINTER (cal_component_has_recurrences (comp));
-
-	case CAL_COMPONENT_FIELD_OVERDUE:
-		return GINT_TO_POINTER (get_is_overdue (comp));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		if (get_is_overdue (comp))
-			return "red";
-		else
-			return NULL;
-
-	default:
-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* Returns whether a string is NULL, empty, or full of whitespace */
-static gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace (*p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but
-   the model doesn't know anything about the windows. */
-static void
-show_date_warning (CalendarModel *model)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-
-	if (model->priv->use_24_hour_format)
-		/* strftime format of a weekday, a date and a time, 24-hour. */
-		format = _("%a %m/%d/%Y %H:%M:%S");
-	else
-		/* strftime format of a weekday, a date and a time, 12-hour. */
-		format = _("%a %m/%d/%Y %I:%M:%S %p");
-
-	strftime (buffer, sizeof (buffer), format, tmp_tm);
-
-	g_snprintf (message, 256,
-		    _("The date must be entered in the format: \n\n%s"),
-		    buffer);
-
-	dialog = gnome_message_box_new (message,
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Builds a list of categories from a comma-delimited string */
-static GSList *
-categories_from_string (const char *value)
-{
-	GSList *list;
-	const char *categ_start;
-	const char *categ_end;
-	const char *p;
-
-	if (!value)
-		return NULL;
-
-	list = NULL;
-
-	categ_start = categ_end = NULL;
-
-	for (p = value; *p; p++) {
-		if (categ_start) {
-			if (*p == ',') {
-				char *c;
-
-				c = g_strndup (categ_start, categ_end - categ_start + 1);
-				list = g_slist_prepend (list, c);
-
-				categ_start = categ_end = NULL;
-			} else if (!isspace (*p))
-				categ_end = p;
-		} else if (!isspace (*p) && *p != ',')
-			categ_start = categ_end = p;
-	}
-
-	if (categ_start) {
-		char *c;
-
-		c = g_strndup (categ_start, categ_end - categ_start + 1);
-		list = g_slist_prepend (list, c);
-	}
-
-	return g_slist_reverse (list);
-}
-
-/* Sets the list of categories from a comma-delimited string */
-static void
-set_categories (CalComponent *comp, const char *value)
-{
-	GSList *list;
-	GSList *l;
-
-	list = categories_from_string (value);
-
-	cal_component_set_categories_list (comp, list);
-
-	for (l = list; l; l = l->next) {
-		char *s;
-
-		s = l->data;
-		g_free (s);
-	}
-
-	g_slist_free (list);
-}
-
-/* Parses a time value entered by the user; returns -1 if it could not be
- * parsed.  Returns 0 for an empty time.
- */
-static time_t
-parse_time (const char *value)
-{
-	struct tm discard_tm, date_tm, time_tm;
-	struct tm *today_tm;
-	time_t t;
-	const char *pos, *parse_end;
-	char *format[4];
-	gboolean parsed_date = FALSE, parsed_time = FALSE;
-	gint i;
-
-	if (string_is_empty (value))
-		return 0;
-
-	pos = value;
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	/* strptime format for a date. */
-	parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-	if (parse_end) {
-		pos = parse_end;
-		parsed_date = TRUE;
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated, again. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-
-	/* strptime format for a time of day, in 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[0] = _("%I:%M:%S %p%n");
-
-	/* strptime format for a time of day, in 24-hour format. */
-	format[1] = _("%H:%M:%S%n");
-
-	/* strptime format for time of day, without seconds, 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[2] = _("%I:%M %p%n");
-
-	/* strptime format for time of day, without seconds 24-hour format. */
-	format[3] = _("%H:%M%n");
-
-	for (i = 0; i < sizeof (format) / sizeof (format[0]); i++) {
-		memset (&time_tm, 0, sizeof (time_tm));
-		parse_end = strptime (pos, format[i], &time_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_time = TRUE;
-			break;
-		}
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* If we haven't already parsed a date, try again. */
-	if (!parsed_date) {
-		memset (&date_tm, 0, sizeof (date_tm));
-		/* strptime format for a date. */
-		parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_date = TRUE;
-		}
-	}
-
-	/* If we don't have a date or a time it must be invalid. */
-	if (!parsed_date && !parsed_time)
-		return -1;
-
-
-	if (parsed_date) {
-		/* If a 2-digit year was used we use the current century. */
-		if (date_tm.tm_year < 0) {
-			t = time (NULL);
-			today_tm = localtime (&t);
-
-			/* This should convert it into a value from 0 to 99. */
-			date_tm.tm_year += 1900;
-
-			/* Now add on the century. */
-			date_tm.tm_year += today_tm->tm_year
-				- (today_tm->tm_year % 100);
-		}
-	} else {
-		/* If we didn't get a date we use the current day. */
-		t = time (NULL);
-		today_tm = localtime (&t);
-		date_tm.tm_mday = today_tm->tm_mday;
-		date_tm.tm_mon  = today_tm->tm_mon;
-		date_tm.tm_year = today_tm->tm_year;
-	}
-
-	if (parsed_time) {
-		date_tm.tm_hour = time_tm.tm_hour;
-		date_tm.tm_min = time_tm.tm_min;
-		date_tm.tm_sec = time_tm.tm_sec;
-	} else {
-		date_tm.tm_hour = 0;
-		date_tm.tm_min = 0;
-		date_tm.tm_sec = 0;
-	}
-
-
-	date_tm.tm_isdst = -1;
-	return mktime (&date_tm);
-}
-
-/* Called to set the "Date Completed" field. We also need to update the
-   Status and Percent fields to make sure they match. */
-static void
-set_completed (CalendarModel *model, CalComponent *comp, const char *value)
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-	} else if (t == 0) {
-		ensure_task_not_complete (comp);
-	} else {
-		ensure_task_complete (comp, t);
-	}
-}
-
-/* Sets a CalComponentDateTime value */
-static void
-set_datetime (CalendarModel *model, CalComponent *comp, const char *value,
-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt))
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-		return;
-	} else if (t == 0) {
-		(* set_func) (comp, NULL);
-		return;
-	} else {
-		CalComponentDateTime dt;
-		struct icaltimetype itt;
-
-		itt = icaltime_from_timet (t, FALSE, TRUE);
-		dt.value = &itt;
-		dt.tzid = NULL;
-
-		(* set_func) (comp, &dt);
-	}
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_geo_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The geographical position must be entered "
-					  "in the format: \n\n45.436845,125.862501"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the geographical position value of a component */
-static void
-set_geo (CalComponent *comp, const char *value)
-{
-	double latitude, longitude;
-	int matched;
-	struct icalgeotype geo;
-
-	if (string_is_empty (value)) {
-		cal_component_set_geo (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%lg , %lg", &latitude, &longitude);
-
-	if (matched != 2) {
-		show_geo_warning ();
-		return;
-	}
-
-	geo.lat = latitude;
-	geo.lon = longitude;
-	cal_component_set_geo (comp, &geo);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_percent_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The percent value must be between 0 and 100, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the percent value of a calendar component */
-static void
-set_percent (CalComponent *comp, const char *value)
-{
-	int matched, percent;
-
-	if (string_is_empty (value)) {
-		cal_component_set_percent (comp, NULL);
-		ensure_task_not_complete (comp);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &percent);
-
-	if (matched != 1 || percent < 0 || percent > 100) {
-		show_percent_warning ();
-		return;
-	}
-
-	cal_component_set_percent (comp, &percent);
-
-	if (percent == 100)
-		ensure_task_complete (comp, -1);
-	else
-		ensure_task_not_complete (comp);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.  */
-static void
-show_priority_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The priority must be between 1 and 9, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the priority of a calendar component */
-static void
-set_priority (CalComponent *comp, const char *value)
-{
-	int matched, priority;
-
-	if (string_is_empty (value)) {
-		cal_component_set_priority (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &priority);
-
-	if (matched != 1 || priority < 1 || priority > 9) {
-		show_priority_warning ();
-		return;
-	}
-
-	cal_component_set_priority (comp, &priority);
-}
-
-/* Sets the summary of a calendar component */
-static void
-set_summary (CalComponent *comp, const char *value)
-{
-	CalComponentText text;
-
-	if (string_is_empty (value)) {
-		cal_component_set_summary (comp, NULL);
-		return;
-	}
-
-	text.value = value;
-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */
-
-	cal_component_set_summary (comp, &text);
-}
-
-/* Sets the URI of a calendar component */
-static void
-set_url (CalComponent *comp, const char *value)
-{
-	if (string_is_empty (value)) {
-		cal_component_set_url (comp, NULL);
-		return;
-	}
-
-	cal_component_set_url (comp, value);
-}
-
-/* Called to set the checkbutton field which indicates whether a task is
-   complete. */
-static void
-set_complete (CalComponent *comp, const void *value)
-{
-	gint state = GPOINTER_TO_INT (value);
-
-	if (state) {
-		ensure_task_complete (comp, -1);
-	} else {
-		ensure_task_not_complete (comp);
-	}
-}
-
-/* set_value_at handler for the calendar table model */
-static void
-calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		set_categories (comp, value);
-		break;
-
-	/* FIXME: CLASSIFICATION requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		set_completed (model, comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		/* FIXME: Need to reset dtstart if dtend happens before it */
-		set_datetime (model, comp, value, cal_component_set_dtend);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		/* FIXME: Need to reset dtend if dtstart happens after it */
-		set_datetime (model, comp, value, cal_component_set_dtstart);
-		break;
-
-	case CAL_COMPONENT_FIELD_DUE:
-		set_datetime (model, comp, value, cal_component_set_due);
-		break;
-
-	case CAL_COMPONENT_FIELD_GEO:
-		set_geo (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		set_percent (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		set_priority (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		set_summary (comp, value);
-		break;
-
-	/* FIXME: TRANSPARENCY requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_URL:
-		set_url (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		set_complete (comp, value);
-		break;
-
-	default:
-		g_message ("calendar_model_set_value_at(): Requested invalid column %d", col);
-		break;
-	}
-
-	/* FIXME: this is an ugly HACK.  ETable needs a better API for the
-	 * "click here to add an element" thingy.
-	 */
-	if (priv->appending_row)
-		return;
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_set_value_at(): Could not update the object!");
-}
-
-/* is_cell_editable handler for the calendar table model */
-static gboolean
-calendar_model_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, FALSE);
-
-	/* FIXME: We can't check this as 'click-to-add' passes row 0. */
-	/*g_return_val_if_fail (row >= 0 && row < priv->objects->len, FALSE);*/
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return TRUE;
-
-	default:
-		return FALSE;
-	}
-}
-
-/* append_row handler for the calendar model */
-static void
-calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	int *new_idx, col;
-	const char *uid;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	/* This is a HACK */
-	priv->appending_row = TRUE;
-
-	/* FIXME: This should support other types of components, but for now it
-	 * is only used for the task list.
-	 */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	cal_component_get_uid (comp, &uid);
-
-	g_array_append_val (priv->objects, comp);
-	new_idx = g_new (int, 1);
-	*new_idx = priv->objects->len - 1;
-	g_hash_table_insert (priv->uid_index_hash, (char *) uid, new_idx);
-
-	/* Notify the views about the new row. I think we have to do that here,
-	   or the views may become confused when they start getting
-	   "row_changed" or "cell_changed" signals for this new row. */
-	e_table_model_row_inserted (etm, *new_idx);
-
-	for (col = 0; col < CAL_COMPONENT_FIELD_NUM_FIELDS; col++) {
-		const void *val;
-
-		if (!e_table_model_is_cell_editable (etm, col, *new_idx))
-			continue;
-
-		val = e_table_model_value_at(source, col, row);
-		e_table_model_set_value_at (etm, col, *new_idx, val);
-	}
-
-	/* This is the end of the HACK */
-	priv->appending_row = FALSE;
-
-	if (!cal_client_update_object (priv->client, comp)) {
-		/* FIXME: Show error dialog. */
-		g_message ("calendar_model_append_row(): Could not add new object!");
-		remove_object (model, uid);
-		e_table_model_row_deleted (etm, *new_idx);
-	}
-}
-
-/* Duplicates a string value */
-static char *
-dup_string (const char *value)
-{
-	return g_strdup (value);
-}
-
-/* duplicate_value handler for the calendar table model */
-static void *
-calendar_model_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	/* They are almost all dup_string()s for now, but we'll have real fields
-	 * later.
-	 */
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return (void *) value;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return (void *) value;
-
-	case CAL_COMPONENT_FIELD_URL:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) value;
-
-	default:
-		g_message ("calendar_model_duplicate_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* free_value handler for the calendar table model */
-static void
-calendar_model_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return;
-
-	case CAL_COMPONENT_FIELD_URL:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return;
-
-	default:
-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);
-		return;
-	}
-}
-
-/* Initializes a string value */
-static char *
-init_string (void)
-{
-	return g_strdup ("");
-}
-
-/* initialize_value handler for the calendar table model */
-static void *
-calendar_model_initialize_value (ETableModel *etm, int col)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_URL:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return NULL;
-
-	default:
-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* value_is_empty handler for the calendar model. This should return TRUE
-   unless a significant value has been set. The 'click-to-add' feature
-   checks all fields to see if any are not empty and if so it adds a new
-   row, so we only want to return FALSE if we have a useful object. */
-static gboolean
-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return TRUE;
-
-	default:
-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);
-		return TRUE;
-	}
-}
-
-
-
-/**
- * calendar_model_new:
- *
- * Creates a new calendar model.  It must be told about the calendar client
- * interface object it will monitor with calendar_model_set_cal_client().
- *
- * Return value: A newly-created calendar model.
- **/
-CalendarModel *
-calendar_model_new (void)
-{
-	return CALENDAR_MODEL (gtk_type_new (TYPE_CALENDAR_MODEL));
-}
-
-
-/* Callback used when a calendar is loaded into the server */
-static void
-cal_loaded_cb (CalClient *client,
-	       CalClientLoadStatus status,
-	       CalendarModel *model)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS)
-		load_objects (model);
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-/* Removes an object from the model and updates all the indices that follow.
- * Returns the index of the object that was removed, or -1 if no object with
- * such UID was found.
- */
-static int
-remove_object (CalendarModel *model, const char *uid)
-{
-	CalendarModelPrivate *priv;
-	int *idx;
-	CalComponent *orig_comp;
-	int i;
-	int n;
-
-	priv = model->priv;
-
-	/* Find the index of the object to be removed */
-
-	idx = g_hash_table_lookup (priv->uid_index_hash, uid);
-	if (!idx)
-		return -1;
-
-	orig_comp = g_array_index (priv->objects, CalComponent *, *idx);
-	g_assert (orig_comp != NULL);
-
-	/* Decrease the indices of all the objects that follow in the array */
-
-	for (i = *idx + 1; i < priv->objects->len; i++) {
-		CalComponent *comp;
-		int *comp_idx;
-		const char *comp_uid;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-
-		cal_component_get_uid (comp, &comp_uid);
-
-		comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-		g_assert (comp_idx != NULL);
-
-		(*comp_idx)--;
-		g_assert (*comp_idx >= 0);
-	}
-
-	/* Remove this object from the array and hash */
-
-	g_hash_table_remove (priv->uid_index_hash, uid);
-	g_array_remove_index (priv->objects, *idx);
-
-	gtk_object_unref (GTK_OBJECT (orig_comp));
-
-	n = *idx;
-	g_free (idx);
-
-	return n;
-}
-
-/* Returns whether a component's type matches the types we support */
-static gboolean
-matches_type (CalObjType type, CalComponentVType vtype)
-{
-	return ((vtype == CAL_COMPONENT_EVENT && (type & CALOBJ_TYPE_EVENT))
-		|| (vtype == CAL_COMPONENT_TODO && (type & CALOBJ_TYPE_TODO))
-		|| (vtype == CAL_COMPONENT_JOURNAL && (type & CALOBJ_TYPE_JOURNAL)));
-}
-
-/* Callback used when an object is updated in the server */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	int orig_idx;
-	CalComponent *new_comp;
-	CalComponentVType new_comp_vtype;
-	const char *new_comp_uid;
-	int *new_idx;
-	CalClientGetStatus status;
-
-	model = CALENDAR_MODEL (data);
-	priv = model->priv;
-
-	orig_idx = remove_object (model, uid);
-
-	status = cal_client_get_object (priv->client, uid, &new_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Check if we are interested in this type of object */
-
-		new_comp_vtype = cal_component_get_vtype (new_comp);
-		if (!matches_type (priv->type, new_comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (new_comp));
-			break;
-		}
-
-		/* Insert the object into the model */
-
-		cal_component_get_uid (new_comp, &new_comp_uid);
-
-		if (orig_idx == -1) {
-			/* The object not in the model originally, so we just append it */
-
-			g_array_append_val (priv->objects, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = priv->objects->len - 1;
-
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-		} else {
-			int i;
-
-			/* Insert the new version of the object in its old position */
-
-			g_array_insert_val (priv->objects, orig_idx, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = orig_idx;
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-
-			/* Increase the indices of all subsequent objects */
-
-			for (i = orig_idx + 1; i < priv->objects->len; i++) {
-				CalComponent *comp;
-				int *comp_idx;
-				const char *comp_uid;
-
-				comp = g_array_index (priv->objects, CalComponent *, i);
-				g_assert (comp != NULL);
-
-				cal_component_get_uid (comp, &comp_uid);
-
-				comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-				g_assert (comp_idx != NULL);
-
-				(*comp_idx)++;
-			}
-		}
-
-		e_table_model_row_changed (E_TABLE_MODEL (model), *new_idx);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* Nothing; the object may have been removed from the server.  We just
-		 * notify that the old object was deleted.
-		 */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-
-		/* Same notification as above */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when an object is removed in the server */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	int idx;
-
-	model = CALENDAR_MODEL (data);
-
-	idx = remove_object (model, uid);
-
-	if (idx != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);
-}
-
-/* Loads the required objects from the calendar client */
-static void
-load_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	GList *uids;
-	GList *l;
-
-	priv = model->priv;
-
-	if (!cal_client_is_loaded (priv->client))
-		return;
-
-	uids = cal_client_get_uids (priv->client, priv->type);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		const char *comp_uid;
-		CalClientGetStatus status;
-		CalComponentVType comp_vtype;
-		int *idx;
-
-		uid = l->data;
-		status = cal_client_get_object (priv->client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing; the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("load_objects(): Syntax error when getting object `%s'", uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		/* Check if we are interested in this type of object */
-
-		comp_vtype = cal_component_get_vtype (comp);
-		if (!matches_type (priv->type, comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		/* Insert the object into the model */
-
-		idx = g_new (int, 1);
-
-		g_array_append_val (priv->objects, comp);
-		*idx = priv->objects->len - 1;
-
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (priv->uid_index_hash, (char *) comp_uid, idx);
-	}
-
-	cal_obj_uid_list_free (uids);
-}
-
-/**
- * calendar_model_get_cal_client:
- * @model: A calendar model.
- * 
- * Queries the calendar client interface object that a calendar model is using.
- * 
- * Return value: A calendar client interface object.
- **/
-CalClient *
-calendar_model_get_cal_client (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	return priv->client;
-}
-
-
-/**
- * calendar_model_set_cal_client:
- * @model: A calendar model.
- * @client: A calendar client interface object.
- * @type: Type of objects to present.
- *
- * Sets the calendar client interface object that a calendar model will monitor.
- * It also sets the types of objects this model will present to an #ETable.
- **/
-void
-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = model->priv;
-
-	if (priv->client == client && priv->type == type)
-		return;
-
-	e_table_model_pre_change (E_TABLE_MODEL(model));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	free_objects (model);
-
-	priv->client = client;
-	priv->type = type;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), model);
-
-		load_objects (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-void
-calendar_model_delete_task (CalendarModel *model,
-			    gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	const char *uid;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	cal_component_get_uid (comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-}
-
-
-void
-calendar_model_mark_task_complete (CalendarModel *model,
-				   gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	ensure_task_complete (comp, -1);
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_mark_task_complete(): Could not update the object!");
-}
-
-
-/* Frees the objects stored in the calendar model */
-CalComponent *
-calendar_model_get_cal_object (CalendarModel *model,
-			       gint	      row)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	return g_array_index (priv->objects, CalComponent *, row);
-}
-
-
-/* This makes sure a task is marked as complete.
-   It makes sure the "Date Completed" property is set. If the completed_date
-   is not -1, then that is used, otherwise if the "Date Completed" property
-   is not already set it is set to the current time.
-   It makes sure the percent is set to 100, and that the status is "Completed".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_complete (CalComponent *comp,
-		      time_t completed_date)
-{
-	struct icaltimetype *old_completed = NULL;
-	struct icaltimetype new_completed;
-	const char *old_status;
-	int *old_percent, new_percent;
-	gboolean set_completed = TRUE;
-
-	/* Date Completed. */
-	if (completed_date == -1) {
-		cal_component_get_completed (comp, &old_completed);
-
-		if (old_completed) {
-			cal_component_free_icaltimetype (old_completed);
-			set_completed = FALSE;
-		} else {
-			completed_date = time (NULL);
-		}
-	}
-
-	if (set_completed) {
-		new_completed = icaltime_from_timet (completed_date, FALSE,
-						     TRUE);
-		cal_component_set_completed (comp, &new_completed);
-	}
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (!old_percent || *old_percent != 100) {
-		new_percent = 100;
-		cal_component_set_percent (comp, &new_percent);
-	}
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &old_status);
-}
-
-
-/* This makes sure a task is marked as incomplete. It clears the
-   "Date Completed" property. If the percent is set to 100 it removes it,
-   and if the status is "Completed" it sets it to "Needs Action".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_not_complete (CalComponent *comp)
-{
-	const char *old_status;
-	int *old_percent;
-
-	/* Date Completed. */
-	cal_component_set_completed (comp, NULL);
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (old_percent && *old_percent == 100)
-		cal_component_set_percent (comp, NULL);
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &old_status);
-	if (old_status && !strcmp (old_status, "COMPLETED"))
-		cal_component_set_status (comp, "NEEDS-ACTION");
-}
-
-
-/* Whether we use 24 hour format to display the times. */
-gboolean
-calendar_model_get_use_24_hour_format (CalendarModel *model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), TRUE);
-
-	return model->priv->use_24_hour_format;
-}
-
-
-void
-calendar_model_set_use_24_hour_format (CalendarModel *model,
-				       gboolean	      use_24_hour_format)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (model->priv->use_24_hour_format != use_24_hour_format) {
-		model->priv->use_24_hour_format = use_24_hour_format;
-		/* Get the views to redraw themselves. */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
deleted file mode 100644
index ed04706090..0000000000
--- a/calendar/gui/calendar-model.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_MODEL_H
-#define CALENDAR_MODEL_H
-
-#include <libgnome/gnome-defs.h>
-#include <gal/e-table/e-table-model.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CALENDAR_MODEL            (calendar_model_get_type ())
-#define CALENDAR_MODEL(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_MODEL, CalendarModel))
-#define CALENDAR_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_MODEL,	\
-					CalendarModelClass))
-#define IS_CALENDAR_MODEL(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_MODEL))
-#define IS_CALENDAR_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_MODEL))
-
-typedef struct _CalendarModel CalendarModel;
-typedef struct _CalendarModelClass CalendarModelClass;
-
-typedef struct _CalendarModelPrivate CalendarModelPrivate;
-
-struct _CalendarModel {
-	ETableModel model;
-
-	/* Private data */
-	CalendarModelPrivate *priv;
-};
-
-struct _CalendarModelClass {
-	ETableModelClass parent_class;
-};
-
-GtkType		calendar_model_get_type		  (void);
-
-CalendarModel*	calendar_model_new		  (void);
-
-CalClient*	calendar_model_get_cal_client	  (CalendarModel   *model);
-void		calendar_model_set_cal_client	  (CalendarModel   *model,
-						   CalClient	   *client,
-						   CalObjType	    type);
-
-void		calendar_model_mark_task_complete (CalendarModel   *model,
-						   gint		    row);
-void		calendar_model_delete_task	  (CalendarModel   *model,
-						   gint		    row);
-
-CalComponent*	calendar_model_get_cal_object	  (CalendarModel   *model,
-						   gint		    row);
-
-/* Whether we use 24 hour format to display the times. */
-gboolean	calendar_model_get_use_24_hour_format (CalendarModel *model);
-void		calendar_model_set_use_24_hour_format (CalendarModel *model,
-						       gboolean	      use_24_hour_format);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
deleted file mode 100644
index 0c05ace30a..0000000000
--- a/calendar/gui/calendar-summary.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include <gnome.h>
-
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#include "cal-util/cal-component.h"
-#include "calendar-model.h"
-
-#include "calendar-summary.h"
-
-typedef struct {
-	ExecutiveSummaryComponent *component;
-	CalClient *client;
-} CalSummary;
-
-static char *
-generate_html_summary (CalSummary *summary)
-{
-	GList *uids, *l;
-	char *ret_html, *tmp;
-	
-	ret_html = g_strdup ("<ul>");
-	
-	uids = cal_client_get_uids (summary->client, CALOBJ_TYPE_ANY);
-	for (l = uids; l; l = l->next){
-		CalComponent *comp;
-		CalComponentText text;
-		CalClientGetStatus status;
-		char *uid;
-		char *tmp2;
-		
-		uid = l->data;
-		status = cal_client_get_object (summary->client, uid, &comp);
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			continue;
-		
-		cal_component_get_summary (comp, &text);
-		
-		tmp2 = g_strdup_printf ("<li>%s</li>", text.value);
-		
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, tmp2, NULL);
-		g_free (tmp);
-		g_free (tmp2);
-	}
-	
-	cal_obj_uid_list_free (uids);
-	
-	tmp = ret_html;
-	ret_html = g_strconcat (ret_html, "</ul>", NULL);
-	g_free (tmp);
-	
-	return ret_html;
-}
-
-static void
-cal_loaded (CalClient *client,
-	    CalClientLoadStatus status,
-	    CalSummary *summary)
-{
-	char *html;
-	
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		html = generate_html_summary (summary);
-		executive_summary_component_update (summary->component, html);
-		g_free (html);
-	} else {
-		g_print ("Error loading %d\n", status);
-		executive_summary_component_update (summary->component, " ");
-	}
-}
-
-char *
-create_summary_view (ExecutiveSummaryComponent *component,
-		     char **title,
-		     char **icon,
-		     void *closure)
-{
-	char *ret_html;
-	char *evoldir;
-	char *calfile;
-	CalSummary *summary;
-	gboolean result;
-	
-	evoldir = (char *) closure;
-	
-	/* strdup the title and icon */
-	*title = g_strdup ("Things to do");
-	*icon = g_strdup ("evolution-tasks.png");
-	
-	summary = g_new (CalSummary, 1);
-	summary->component = component;
-	
-	calfile = g_strdup_printf ("%s/local/Calendar/calendar.ics", evoldir);
-	g_print ("calfile: %s\n", calfile);
-	summary->client = cal_client_new ();
-	
-	result = cal_client_load_calendar (summary->client, calfile);
-	if (!result) {
-		g_warning ("%s: Could not load %s", __FUNCTION__, calfile);
-		return "";
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (summary->client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded), summary);
-	
-	return g_strdup (" ");
-}
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
deleted file mode 100644
index 8e21262db3..0000000000
--- a/calendar/gui/calendar-summary.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_SUMMARY_H
-#define CALENDAR_SUMMARY_H
-
-char * create_summary_view (ExecutiveSummaryComponent *component,
-			    char **title,
-			    char **icon,
-			    void *closure);
-
-#endif
diff --git a/calendar/gui/check-filled.xpm b/calendar/gui/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/calendar/gui/check-filled.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_filled_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .        . .  ",
-"  .       .. .  ",
-"  .      ... .  ",
-"  . .   ...  .  ",
-"  . .. ...   .  ",
-"  . .....    .  ",
-"  .  ...     .  ",
-"  .   .      .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
deleted file mode 100644
index b30bae6a02..0000000000
--- a/calendar/gui/component-factory.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#endif
-#include "component-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#if WANT_THE_EXECUTIVE_SUMMARY
-#include "calendar-summary.h"
-#endif
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "calendar") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = control_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	evolution_dir = g_strdup (evolution_homedir);
-	calendar_config_init ();
-	owner_count ++;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-static BonoboObject *
-summary_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-	ExecutiveSummaryComponent *summary_component;
-
-	summary_component = executive_summary_component_new (NULL,
-							     create_summary_view,
-							     NULL,
-							     evolution_dir);
-	return BONOBO_OBJECT (summary_component);
-}
-#endif
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
-#endif
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-#endif
-}
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
deleted file mode 100644
index 8e5cd6605f..0000000000
--- a/calendar/gui/component-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index daf2b8ea15..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#include "control-factory.h"
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_properties (control, pbag);
-}
-
-/* Callback factory function for calendar controls */
-static BonoboObject *
-control_factory_fn (BonoboGenericFactory *Factory, void *data)
-{
-	BonoboControl *control;
-
-	control = control_factory_new_control ();
-
-	if (control)
-		return BONOBO_OBJECT (control);
-	else
-		return NULL;
-}
-
-
-void
-control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = new_calendar (full_name);
-	gtk_widget_show (GTK_WIDGET (gcal));
-
-	control = bonobo_control_new (GTK_WIDGET (gcal));
-	if (!control) {
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-
-	calendar_properties_init (gcal, control);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index bacd2d3d90..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Federico Mena Quintero
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-void           control_factory_init         (void);
-BonoboControl *control_factory_new_control  (void);
-
-#endif /* _CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/dayview.xpm b/calendar/gui/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/calendar/gui/dayview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * dayview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #D8D8D4",
-"@	c #919191",
-"#	c #666666",
-"$	c #FFFFFF",
-"%	c #F2F1ED",
-"....................... ",
-".++++++++++++++++++++@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".@####################. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".+@@#@@@@@@@@@@@@@@@@#. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
deleted file mode 100644
index e995588475..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index 9b80e03f95..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-gladedir = $(datadir)/evolution/glade
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(includedir)					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-noinst_LIBRARIES = libcal-dialogs.a
-
-libcal_dialogs_a_SOURCES =	\
-	alarm-notify-dialog.c	\
-	alarm-notify-dialog.h	\
-	cal-prefs-dialog.c	\
-	cal-prefs-dialog.h	\
-	task-editor.c		\
-	task-editor.h
-
-glade_DATA =			\
-	alarm-notify.glade	\
-	cal-prefs-dialog.glade	\
-	task-editor-dialog.glade
-
-glade_messages =			\
-	alarm-notify.glade.h		\
-	cal-prefs-dialog.glade.h	\
-	task-editor-dialog.glade.h
-
-EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(glade_messages)
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c
deleted file mode 100644
index 7d8357599c..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.h b/calendar/gui/dialogs/alarm-notify-dialog.h
deleted file mode 100644
index 1e56f1c586..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade
deleted file mode 100644
index 32d7e03f8b..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h
deleted file mode 100644
index c7b8918e06..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Close");
-gchar *s = N_("Snooze");
-gchar *s = N_("Edit appointment");
-gchar *s = N_("Snooze time (minutes)");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
deleted file mode 100644
index dd97690727..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "../calendar-commands.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-
-	GtkWidget *working_days[7];
-	GtkWidget *week_start_day;
-	GtkWidget *start_of_day;
-	GtkWidget *end_of_day;
-	GtkWidget *use_12_hour;
-	GtkWidget *use_24_hour;
-	GtkWidget *time_divisions;
-	GtkWidget *show_end_times;
-	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-} CalPrefsDialogPrivate;
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-static void cal_prefs_dialog_class_init		(CalPrefsDialogClass *class);
-static void cal_prefs_dialog_init		(CalPrefsDialog	     *prefs);
-static gboolean get_widgets			(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_destroy		(GtkObject	     *object);
-static void cal_prefs_dialog_init_widgets	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_button_clicked	(GtkWidget	     *dialog,
-						 gint		      button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget	     *button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_show_config	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_update_config	(CalPrefsDialog	     *prefs);
-
-GtkWidget*  cal_prefs_dialog_create_time_edit	(void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE (cal_prefs_dialog, "CalPrefsDialog", CalPrefsDialog,
-	     cal_prefs_dialog_class_init, cal_prefs_dialog_init,
-	     GTK_TYPE_OBJECT)
-
-
-static void
-cal_prefs_dialog_class_init (CalPrefsDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_prefs_dialog_destroy;
-}
-
-
-static void
-cal_prefs_dialog_init (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = g_new0 (CalPrefsDialogPrivate, 1);
-	prefs->priv = priv;
-
-}
-
-
-/**
- * cal_prefs_dialog_new:
- * @Returns: a new #CalPrefsDialog.
- *
- * Creates a new #CalPrefsDialog.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_new (void)
-{
-	CalPrefsDialog *prefs;
-
-	prefs = CAL_PREFS_DIALOG (gtk_type_new (cal_prefs_dialog_get_type ()));
-	return cal_prefs_dialog_construct (prefs);
-}
-
-
-/**
- * cal_prefs_dialog_construct:
- * @prefs: A #CalPrefsDialog.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @prefs, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_construct (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_val_if_fail (IS_CAL_PREFS_DIALOG (prefs), NULL);
-
-	priv = prefs->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (prefs)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	cal_prefs_dialog_init_widgets (prefs);
-
-	cal_prefs_dialog_show_config (prefs);
-
-	gtk_widget_show (priv->dialog);
-
-	return prefs;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (prefs));
-	return NULL;
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->dialog = GW ("cal-prefs-dialog");
-
-	/* The indices must match the mktime() values. */
-	priv->working_days[0] = GW ("sun_button");
-	priv->working_days[1] = GW ("mon_button");
-	priv->working_days[2] = GW ("tue_button");
-	priv->working_days[3] = GW ("wed_button");
-	priv->working_days[4] = GW ("thu_button");
-	priv->working_days[5] = GW ("fri_button");
-	priv->working_days[6] = GW ("sat_button");
-
-	priv->week_start_day = GW ("first_day_of_week");
-	priv->start_of_day = GW ("start_of_day");
-	priv->end_of_day = GW ("end_of_day");
-	priv->use_12_hour = GW ("use_12_hour");
-	priv->use_24_hour = GW ("use_24_hour");
-	priv->time_divisions = GW ("time_divisions");
-	priv->show_end_times = GW ("show_end_times");
-	priv->compress_weekend = GW ("compress_weekend");
-	priv->dnav_show_week_no = GW ("dnav_show_week_no");
-
-#undef GW
-
-	return (priv->dialog
-		&& priv->working_days[0]
-		&& priv->working_days[1]
-		&& priv->working_days[2]
-		&& priv->working_days[3]
-		&& priv->working_days[4]
-		&& priv->working_days[5]
-		&& priv->working_days[6]
-		&& priv->week_start_day
-		&& priv->start_of_day
-		&& priv->end_of_day
-		&& priv->use_12_hour
-		&& priv->use_24_hour
-		&& priv->time_divisions
-		&& priv->show_end_times
-		&& priv->compress_weekend
-		&& priv->dnav_show_week_no);
-}
-
-
-static void
-cal_prefs_dialog_destroy (GtkObject *object)
-{
-	CalPrefsDialog *prefs;
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (object));
-
-	prefs = CAL_PREFS_DIALOG (object);
-	priv = prefs->priv;
-
-
-	g_free (priv);
-	prefs->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-void
-cal_prefs_dialog_show		(CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* If the dialog is already show just raise it, otherwise refresh the
-	   config settings and show it. */
-	if (GTK_WIDGET_MAPPED (priv->dialog)) {
-		gdk_window_raise (priv->dialog->window);
-	} else {
-		cal_prefs_dialog_show_config (prefs);
-		gtk_widget_show (priv->dialog);
-	}
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-cal_prefs_dialog_init_widgets	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->dialog), "clicked",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_button_clicked),
-			    prefs);
-
-	gtk_signal_connect (GTK_OBJECT (priv->use_24_hour), "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),
-			    prefs);
-}
-
-
-static void
-cal_prefs_dialog_button_clicked	(GtkWidget	*dialog,
-				 gint		 button,
-				 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* OK & Apply buttons update the config settings. */
-	if (button == 0 || button == 1)
-		cal_prefs_dialog_update_config	(prefs);
-
-	/* OK & Close buttons close the dialog. */
-	if (button == 0 || button == 2)
-		gtk_widget_hide (priv->dialog);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled	(GtkWidget	*button,
-					 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	gboolean use_24_hour;
-
-	priv = prefs->priv;
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->start_of_day),
-					    use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->end_of_day),
-					    use_24_hour);
-}
-
-
-/* Shows the current config settings in the dialog. */
-static void
-cal_prefs_dialog_show_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->working_days[day]), (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (priv->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_24_hour), TRUE);
-	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_12_hour), TRUE);
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (priv->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_end_times),
-				      calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->compress_weekend), calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no), calendar_config_get_dnav_show_week_no ());
-}
-
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-cal_prefs_dialog_update_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->working_days[day])))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	calendar_config_set_working_days (working_days);
-
-	/* Week Start Day. */
-	week_start_day = e_dialog_option_menu_get (priv->week_start_day,
-						   week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_of_day),
-					 &hour, &minute)) {
-		calendar_config_set_day_start_hour (hour);
-		calendar_config_set_day_start_minute (minute);
-	} else {
-		/* FIXME: Show error dialog? */
-		g_warning ("Couldn't parse start of day");
-	}
-
-	/* End of Day. */
-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_of_day),
-					 &hour, &minute)) {
-		calendar_config_set_day_end_hour (hour);
-		calendar_config_set_day_end_minute (minute);
-	} else {
-		/* FIXME: Show error dialog? */
-		g_warning ("Couldn't parse end of day");
-	}
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour)));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (priv->time_divisions,
-						   time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->show_end_times)));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->compress_weekend)));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no)));
-
-	calendar_config_write ();
-	update_all_config_settings ();
-}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
deleted file mode 100644
index c0e225764b..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,1243 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>preferences</name>
-  <program_name>preferences</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>cal-prefs-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>cal-prefs-dialog</name>
-  <title>Calendar Preferences</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook1</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox8</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame9</name>
-	  <label>Work week</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox8</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>mon_button</name>
-		<can_focus>True</can_focus>
-		<label>Mon</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tue_button</name>
-		<can_focus>True</can_focus>
-		<label>Tue</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>wed_button</name>
-		<can_focus>True</can_focus>
-		<label>Wed</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>thu_button</name>
-		<can_focus>True</can_focus>
-		<label>Thu</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>fri_button</name>
-		<can_focus>True</can_focus>
-		<label>Fri</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sat_button</name>
-		<can_focus>True</can_focus>
-		<label>Sat</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sun_button</name>
-		<can_focus>True</can_focus>
-		<label>Sun</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label16</name>
-		<label>First day of week:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>first_day_of_week</name>
-		<can_focus>True</can_focus>
-		<items>Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-Sunday
-</items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label17</name>
-		<label>Start of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>start_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:12 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label18</name>
-		<label>End of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>end_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame10</name>
-	  <label>Display options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table4</name>
-	    <border_width>4</border_width>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label19</name>
-	      <label>Time divisions:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>Time format:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>show_end_times</name>
-	      <can_focus>True</can_focus>
-	      <label>Show appointment end times</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>compress_weekend</name>
-	      <can_focus>True</can_focus>
-	      <label>Compress weekends</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox10</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>12 hour (am/pm)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_24_hour</name>
-		<can_focus>True</can_focus>
-		<label>24 hour</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment4</name>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>time_divisions</name>
-		<can_focus>True</can_focus>
-		<items>60 minutes
-30 minutes
-15 minutes
-10 minutes
-05 minutes
-</items>
-		<initial_choice>0</initial_choice>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame11</name>
-	  <label>Date navigator options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>dnav_show_week_no</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Show week numbers</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label7</name>
-	<label>Calendar</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame3</name>
-	    <label>Show</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox4</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton1</name>
-		<can_focus>True</can_focus>
-		<label>Due Date</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton2</name>
-		<can_focus>True</can_focus>
-		<label>Time Until Due</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton3</name>
-		<can_focus>True</can_focus>
-		<label>Priority</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame4</name>
-	    <label>Highlight</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox5</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton4</name>
-		<can_focus>True</can_focus>
-		<label>Overdue Items</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton5</name>
-		<can_focus>True</can_focus>
-		<label>Items Due Today</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton6</name>
-		<can_focus>True</can_focus>
-		<label>Items Not Yet Due</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame5</name>
-	  <label>Colors</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table3</name>
-	    <border_width>4</border_width>
-	    <rows>3</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker1</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker2</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker3</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label8</name>
-		<label>Items Not Yet Due:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment2</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label9</name>
-		<label>Items Due Today:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>True</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment3</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label10</name>
-		<label>Overdue Items:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>TaskPad</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox6</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame6</name>
-	  <border_width>4</border_width>
-	  <label>Defaults</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>checkbutton7</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Remind me of all appointments</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinbutton1</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>minutes before they occur.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>3</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame7</name>
-	  <border_width>4</border_width>
-	  <label>Visual Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton8</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Beep when alarm windows appear.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame8</name>
-	  <border_width>4</border_width>
-	  <label>Audio Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox6</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton9</name>
-		<can_focus>True</can_focus>
-		<label>Alarms timeout after</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton2</name>
-		<can_focus>True</can_focus>
-		<climb_rate>1</climb_rate>
-		<digits>0</digits>
-		<numeric>False</numeric>
-		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		<snap>False</snap>
-		<wrap>False</wrap>
-		<value>5</value>
-		<lower>0</lower>
-		<upper>100</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label13</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton10</name>
-		<can_focus>True</can_focus>
-		<label>Enable snoozing for</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton3</name>
-		<can_focus>True</can_focus>
-		<climb_rate>1</climb_rate>
-		<digits>0</digits>
-		<numeric>False</numeric>
-		<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		<snap>False</snap>
-		<wrap>False</wrap>
-		<value>600</value>
-		<lower>0</lower>
-		<upper>1000</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label14</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<label>Reminders</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h
deleted file mode 100644
index 0a29d11999..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Calendar Preferences");
-gchar *s = N_("Work week");
-gchar *s = N_("Mon");
-gchar *s = N_("Tue");
-gchar *s = N_("Wed");
-gchar *s = N_("Thu");
-gchar *s = N_("Fri");
-gchar *s = N_("Sat");
-gchar *s = N_("Sun");
-gchar *s = N_("First day of week:");
-gchar *s = N_("Monday");
-gchar *s = N_("Tuesday");
-gchar *s = N_("Wednesday");
-gchar *s = N_("Thursday");
-gchar *s = N_("Friday");
-gchar *s = N_("Saturday");
-gchar *s = N_("Sunday");
-gchar *s = N_("Start of day:");
-gchar *s = N_("End of day:");
-gchar *s = N_("Display options");
-gchar *s = N_("Time divisions:");
-gchar *s = N_("Time format:");
-gchar *s = N_("Show appointment end times");
-gchar *s = N_("Compress weekends");
-gchar *s = N_("12 hour (am/pm)");
-gchar *s = N_("24 hour");
-gchar *s = N_("60 minutes");
-gchar *s = N_("30 minutes");
-gchar *s = N_("15 minutes");
-gchar *s = N_("10 minutes");
-gchar *s = N_("05 minutes");
-gchar *s = N_("Date navigator options");
-gchar *s = N_("Show week numbers");
-gchar *s = N_("Calendar");
-gchar *s = N_("Show");
-gchar *s = N_("Due Date");
-gchar *s = N_("Time Until Due");
-gchar *s = N_("Priority");
-gchar *s = N_("Highlight");
-gchar *s = N_("Overdue Items");
-gchar *s = N_("Items Due Today");
-gchar *s = N_("Items Not Yet Due");
-gchar *s = N_("Colors");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Items Not Yet Due:");
-gchar *s = N_("Items Due Today:");
-gchar *s = N_("Overdue Items:");
-gchar *s = N_("TaskPad");
-gchar *s = N_("Defaults");
-gchar *s = N_("Remind me of all appointments");
-gchar *s = N_("minutes before they occur.");
-gchar *s = N_("Visual Alarms");
-gchar *s = N_("Beep when alarm windows appear.");
-gchar *s = N_("Audio Alarms");
-gchar *s = N_("Alarms timeout after");
-gchar *s = N_("seconds.");
-gchar *s = N_("Enable snoozing for");
-gchar *s = N_("seconds.");
-gchar *s = N_("Reminders");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index 52f115e0ac..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _CAL_PREFS_DIALOG_H_
-#define _CAL_PREFS_DIALOG_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define CAL_PREFS_DIALOG(obj)          GTK_CHECK_CAST (obj, cal_prefs_dialog_get_type (), CalPrefsDialog)
-#define CAL_PREFS_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, cal_prefs_dialog_get_type (), CalPrefsDialogClass)
-#define IS_CAL_PREFS_DIALOG(obj)       GTK_CHECK_TYPE (obj, cal_prefs_dialog_get_type ())
-
-
-typedef struct _CalPrefsDialog       CalPrefsDialog;
-typedef struct _CalPrefsDialogClass  CalPrefsDialogClass;
-
-struct _CalPrefsDialog
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _CalPrefsDialogClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType		cal_prefs_dialog_get_type	(void);
-CalPrefsDialog* cal_prefs_dialog_construct	(CalPrefsDialog *prefs);
-CalPrefsDialog* cal_prefs_dialog_new		(void);
-
-void		cal_prefs_dialog_show		(CalPrefsDialog *prefs);
-
-END_GNOME_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
deleted file mode 100644
index bdde9ed091..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <title>task-editor-dialog</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook1</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table3</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>S_ummary</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator1</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>4</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>% Comp_lete:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>percent-complete</default_focus_target>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>percent-complete</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>0</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>10</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<left_attach>3</left_attach>
-		<right_attach>4</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator2</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label18</name>
-	    <label>C_lassification:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>classification</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>classification</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Public
-Private
-Confidential
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <height>150</height>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>2</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button3</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <sensitive>False</sensitive>
-	      <label>_Contacts...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>contacts</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button4</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label17</name>
-	      <sensitive>False</sensitive>
-	      <label>Ca_tegories...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>categories</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label1</name>
-	<label>Task</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table4</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label>Date Completed:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label>URL:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>url</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>completed-date</name>
-	  <creation_function>task_editor_create_date_edit</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label2</name>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
deleted file mode 100644
index 8ba4eea0a1..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("task-editor-dialog");
-gchar *s = N_("S_ummary");
-gchar *s = N_("Sta_rt Date:");
-gchar *s = N_("_Due Date:");
-gchar *s = N_("% Comp_lete:");
-gchar *s = N_("_Status:");
-gchar *s = N_("Not Started");
-gchar *s = N_("In Progress");
-gchar *s = N_("Completed");
-gchar *s = N_("Cancelled");
-gchar *s = N_("_Priority:");
-gchar *s = N_("High");
-gchar *s = N_("Normal");
-gchar *s = N_("Low");
-gchar *s = N_("C_lassification:");
-gchar *s = N_("None");
-gchar *s = N_("Public");
-gchar *s = N_("Private");
-gchar *s = N_("Confidential");
-gchar *s = N_("_Contacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Task");
-gchar *s = N_("Date Completed:");
-gchar *s = N_("URL:");
-gchar *s = N_("Details");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
deleted file mode 100644
index f26bae2e09..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,1182 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * TaskEditor - a GtkObject which handles a libglade-loaded dialog to edit
- * tasks.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <cal-util/timeutil.h>
-#include <cal-client/cal-client.h>
-#include "task-editor.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	/* Client to use */
-	CalClient *client;
-	
-	/* Calendar component we are editing; this is an internal copy and is
-	 * not one of the read-only objects from the parent calendar.
-	 */
-	CalComponent *comp;
-
-
-	/* This is TRUE while we are setting the widget values. We just return
-	   from any signal handlers. */
-	gboolean ignore_callbacks;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *summary;
-
-	GtkWidget *due_date;
-	GtkWidget *start_date;
-
-	GtkWidget *percent_complete;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-	GtkWidget *classification;
-
-	GtkWidget *description;
-
-	GtkWidget *contacts;
-	GtkWidget *categories;
-
-	GtkWidget *completed_date;
-	GtkWidget *url;
-} TaskEditorPrivate;
-
-
-/* Note that these two arrays must match. */
-static const int status_map[] = {
-	ICAL_STATUS_NEEDSACTION,
-	ICAL_STATUS_INPROCESS,
-	ICAL_STATUS_COMPLETED,
-	ICAL_STATUS_CANCELLED,
-	-1
-};
-
-static const char* status_string_map[] = {
-	"NEEDS-ACTION",
-	"IN-PROCESS",
-	"COMPLETED",
-	"CANCELLED",
-	NULL
-};
-
-
-typedef enum {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-} TaskEditorPriority;
-
-static const int priority_map[] = {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-	-1
-};
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-
-static void task_editor_class_init (TaskEditorClass *class);
-static void task_editor_init (TaskEditor *tedit);
-static gint app_delete_event_cb (GtkWidget *widget,
-				 GdkEvent *event,
-				 gpointer data);
-static void close_dialog (TaskEditor *tedit);
-static gboolean get_widgets (TaskEditor *tedit);
-static void init_widgets (TaskEditor *tedit);
-static void task_editor_destroy (GtkObject *object);
-static char * make_title_from_comp (CalComponent *comp);
-static void clear_widgets (TaskEditor *tedit);
-static void fill_widgets (TaskEditor *tedit);
-
-static void file_save_cb (GtkWidget *widget, gpointer data);
-static void file_save_and_close_cb (GtkWidget *widget, gpointer data);
-static void file_delete_cb (GtkWidget *widget, gpointer data);
-static void file_close_cb (GtkWidget *widget, gpointer data);
-
-static void debug_xml_cb (GtkWidget *widget, gpointer data);
-
-static void save_todo_object (TaskEditor *tedit);
-static void dialog_to_comp_object (TaskEditor *tedit);
-
-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
-static void raise_and_focus (GtkWidget *widget);
-
-static TaskEditorPriority priority_value_to_index (int priority_value);
-static int priority_index_to_value (TaskEditorPriority priority);
-
-static int status_string_to_value	(const char *status_string);
-static const char* status_value_to_string	(int status);
-
-static void completed_changed		(EDateEdit	*dedit,
-					 TaskEditor	*tedit);
-static void status_changed		(GtkMenu	*menu,
-					 TaskEditor	*tedit);
-static void percent_complete_changed	(GtkAdjustment	*adj,
-					 TaskEditor	*tedit);
-
-GtkWidget * task_editor_create_date_edit (void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE(task_editor, "TaskEditor", TaskEditor,
-	    task_editor_class_init, task_editor_init, GTK_TYPE_OBJECT)
-
-
-static void
-task_editor_class_init (TaskEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = task_editor_destroy;
-}
-
-
-static void
-task_editor_init (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = g_new0 (TaskEditorPrivate, 1);
-	tedit->priv = priv;
-
-	priv->ignore_callbacks = FALSE;
-}
-
-
-/**
- * task_editor_new:
- * @Returns: a new #TaskEditor.
- *
- * Creates a new #TaskEditor.
- **/
-TaskEditor *
-task_editor_new (void)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (gtk_type_new (task_editor_get_type ()));
-	return task_editor_construct (tedit);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-/**
- * task_editor_construct:
- * @tedit: A #TaskEditor.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @tedit, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-TaskEditor *
-task_editor_construct (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	GtkWidget         *bonobo_win;
-
-	g_return_val_if_fail (tedit != NULL, NULL);
-	g_return_val_if_fail (IS_TASK_EDITOR (tedit), NULL);
-
-	priv = tedit->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("task_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (tedit)) {
-		g_message ("task_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (tedit);
-
-	/* Construct the app */
-
-	priv->uic = bonobo_ui_component_new ("task-editor-dialog");
-	if (!priv->uic) {
-		g_message ("task_editor_construct(): Could not create the UI component");
-		goto error;
-	}
-
-	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (priv->app)->dock));
-		if (!contents) {
-			g_message ("event_editor_construct(): Could not get contents");
-			goto error;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (priv->app);
-		priv->app = GTK_WIDGET (bonobo_win);
-	}
-
-	{
-		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->app));
-		bonobo_ui_component_set_container (
-			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	}
-
-	bonobo_ui_component_add_verb_list_with_data (
-		priv->uic, verbs, tedit);
-
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-task-editor-dialog.xml",
-			       "evolution-task-editor");
-
-	/* Hook to destruction of the dialog */
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), tedit);
-
-	/* Show the dialog */
-	gtk_widget_show (priv->app);
-
-	return tedit;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (tedit));
-	return NULL;
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-task_editor_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-	/* FIXME: Set other options. */
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-	return dedit;
-}
-
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	TaskEditor *tedit;
-
-	/* FIXME: need to check for a dirty object */
-
-	tedit = TASK_EDITOR (data);
-	close_dialog (tedit);
-
-	return TRUE;
-}
-
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (tedit));
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("task-editor-dialog");
-
-	priv->summary = GW ("summary");
-
-	priv->due_date = GW ("due-date");
-	priv->start_date = GW ("start-date");
-
-	priv->percent_complete = GW ("percent-complete");
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-	priv->classification = GW ("classification");
-
-	priv->description = GW ("description");
-
-	priv->contacts = GW ("contacts");
-	priv->categories = GW ("categories");
-
-	priv->completed_date = GW ("completed-date");
-	priv->url = GW ("url");
-
-#undef GW
-
-	return (priv->app
-		&& priv->summary
-		&& priv->due_date
-		&& priv->start_date
-		&& priv->percent_complete
-		&& priv->status
-		&& priv->priority
-		&& priv->classification
-		&& priv->description
-		&& priv->contacts
-		&& priv->categories
-		&& priv->completed_date
-		&& priv->url);
-}
-
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	/* Connect signals. The Status, Percent Complete & Date Completed
-	   properties are closely related so whenever one changes we may need
-	   to update the other 2. */
-	gtk_signal_connect (GTK_OBJECT (priv->completed_date), "changed",
-			    GTK_SIGNAL_FUNC (completed_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->status)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (status_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    GTK_SIGNAL_FUNC (percent_complete_changed), tedit);
-}
-
-static void
-task_editor_destroy (GtkObject *object)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (object));
-
-	tedit = TASK_EDITOR (object);
-	priv = tedit->priv;
-
-	if (priv->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->uic));
-		priv->uic = NULL;
-	}
-
-	if (priv->app) {
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tedit->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-void 
-task_editor_set_cal_client (TaskEditor *tedit,
-			    CalClient *client)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_is_loaded (client));	
-	
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), tedit);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), tedit);
-	}
-}
-
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-	
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the task from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-
-/**
- * task_editor_set_todo_object:
- * @tedit: A #TaskEditor.
- * @comp: A todo object.
- * 
- * Sets the todo object that a task editor dialog will manipulate.
- **/
-void
-task_editor_set_todo_object	(TaskEditor	*tedit,
-				 CalComponent	*comp)
-{
-	TaskEditorPrivate *priv;
-	char *title;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp)
-		priv->comp = cal_component_clone (comp);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	fill_widgets (tedit);
-}
-
-
-/* Creates an appropriate title for the task editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-	
-	if (!comp)
-		return g_strdup (_("Edit Task"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-
-}
-
-/* Fills in the widgets with the proper values */
-static void
-fill_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentDateTime d;
-	struct icaltimetype *completed;
-	CalComponentClassification classification;
-	GSList *l;
-	time_t t;
-	int *priority_value, *percent;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	const char *url, *status_string;
-
-	priv = tedit->priv;
-
-	clear_widgets (tedit);
-
-	if (!priv->comp)
-		return;
-
-	/* We want to ignore any signals emitted while changing fields. */
-	priv->ignore_callbacks = TRUE;
-
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	} else {
-		e_dialog_editable_set (priv->description, NULL);
-	}
-	cal_component_free_text_list (l);
-	
-	/* Due Date. */
-	cal_component_get_due (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), t);
-
-	/* Start Date. */
-	cal_component_get_dtstart (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), t);
-
-	/* Completed Date. */
-	cal_component_get_completed (priv->comp, &completed);
-	if (completed) {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), t);
-
-	/* Percent Complete. */
-	cal_component_get_percent (priv->comp, &percent);
-	if (percent) {
-		e_dialog_spin_set (priv->percent_complete, *percent);
-		cal_component_free_percent (percent);
-	} else {
-		/* FIXME: Could check if task is completed and set 100%. */
-		e_dialog_spin_set (priv->percent_complete, 0);
-	}
-
-	/* Status. */
-	cal_component_get_status (priv->comp, &status_string);
-	if (status_string) {
-		status = status_string_to_value (status_string);
-	} else {
-		/* Try to user the percent value. */
-		if (percent) {
-			if (*percent == 0)
-				status = ICAL_STATUS_NEEDSACTION;
-			else if (*percent == 100)
-				status = ICAL_STATUS_COMPLETED;
-			else
-				status = ICAL_STATUS_INPROCESS;
-		} else {
-			status = ICAL_STATUS_NEEDSACTION;
-		}
-	}
-	g_print ("Setting status\n");
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	/* Priority. */
-	cal_component_get_priority (priv->comp, &priority_value);
-	if (priority_value) {
-		priority = priority_value_to_index (*priority_value);
-		cal_component_free_priority (priority_value);
-	} else {
-		priority = PRIORITY_UNDEFINED;
-	}
-	g_print ("Setting priority\n");
-	e_dialog_option_menu_set (priv->priority, priority, priority_map);
-
-
-	/* Classification. */
-	cal_component_get_classification (priv->comp, &classification);
-	g_print ("Setting classification\n");
-	e_dialog_option_menu_set (priv->classification, classification,
-				  classification_map);
-
-
-	/* URL. */
-	cal_component_get_url (priv->comp, &url);
-	e_dialog_editable_set (priv->url, url);
-
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-save_todo_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	char *title;
-
-	priv = tedit->priv;
-
-	g_return_if_fail (priv->client != NULL);
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (tedit);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_todo_object(): Could not update the object!");
-}
-
-
-/* Get the values of the widgets in the event editor and put them in the iCalObject */
-static void
-dialog_to_comp_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalComponentText *text;
-	CalComponentDateTime date;
-	time_t t;
-	GSList *list;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	CalComponentClassification classification;
-	char *url;
-	const char *status_string;
-	
-	priv = tedit->priv;
-	comp = priv->comp;
-
-	/* Summary. */
-	text = g_new0 (CalComponentText, 1);
-	text->value = e_dialog_editable_get (priv->summary);
-	cal_component_set_summary (comp, text);
-
-	/* Description. Note that we use the text variable again, and it is
-	   freed in cal_component_free_text_list(). */
-	list = NULL;
-	text->value  = e_dialog_editable_get (priv->description);
-	list = g_slist_prepend (list, text);
-	cal_component_set_description_list (comp, list);
-	cal_component_free_text_list (list);
-	
-
-	date.value = g_new (struct icaltimetype, 1);
-	date.tzid = NULL;
-
-	/* Due Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_due (comp, &date);
-	} else {
-		cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		cal_component_set_dtstart (comp, NULL);
-	}
-
-	/* Completed Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_completed (comp, date.value);
-	} else {
-		cal_component_set_completed (comp, NULL);
-	}
-
-	g_free (date.value);
-
-	/* Percent Complete. */
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	cal_component_set_percent (comp, &percent);
-
-	/* Status. */
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	status_string = status_value_to_string (status);
-	cal_component_set_status (comp, status_string);
-
-	/* Priority. */
-	priority = e_dialog_option_menu_get (priv->priority, priority_map);
-	priority_value = priority_index_to_value (priority);
-	cal_component_set_priority (comp, &priority_value);
-
-	/* Classification. */
-	classification = e_dialog_option_menu_get (priv->classification,
-						   classification_map);
-	cal_component_set_classification (comp, classification);
-
-
-	/* URL. */
-	url = e_dialog_editable_get (priv->url);
-	cal_component_set_url (comp, url);
-
-
-
-
-	cal_component_commit_sequence (comp);
-}
-
-static void
-debug_xml_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit = TASK_EDITOR (data);
-	TaskEditorPrivate *priv = tedit->priv;
-	
-	bonobo_window_dump (BONOBO_WINDOW (priv->app), "on demand");
-}
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-	save_todo_object (tedit);
-}
-
-/* File/Save and Close callback */
-static void
-file_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-	save_todo_object (tedit);
-	close_dialog (tedit);
-}
-
-/* File/Delete callback */
-static void
-file_delete_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	const char *uid;
-	
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-	
-	g_return_if_fail (priv->comp);
-
-	cal_component_get_uid (priv->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-
-	close_dialog (tedit);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	close_dialog (tedit);
-}
-
-
-static TaskEditorPriority
-priority_value_to_index (int priority_value)
-{
-	TaskEditorPriority retval;
-
-	if (priority_value == 0)
-		retval = PRIORITY_UNDEFINED;
-	else if (priority_value <= 4)
-		retval = PRIORITY_HIGH;
-	else if (priority_value == 5)
-		retval = PRIORITY_NORMAL;
-	else 
-		retval = PRIORITY_LOW;
-
-	return retval;
-}
-
-
-static int
-priority_index_to_value (TaskEditorPriority priority)
-{
-	int retval;
-
-	switch (priority) {
-	case PRIORITY_UNDEFINED:
-		retval = 0;
-		break;
-	case PRIORITY_HIGH:
-		retval = 3;
-		break;
-	case PRIORITY_NORMAL:
-		retval = 5;
-		break;
-	case PRIORITY_LOW:
-		retval = 7;
-		break;
-	default:
-		retval = -1;
-		g_assert_not_reached ();
-		break;
-	}
-
-	return retval;
-}
-
-
-static int
-status_string_to_value	(const char *status_string)
-{
-	int i;
-
-	for (i = 0; status_map[i] != -1; i++) {
-		if (!strcmp (status_string_map[i], status_string))
-			return status_map[i];
-	}
-
-	g_warning ("Invalid todo status string");
-	return ICAL_STATUS_NEEDSACTION;
-}
-
-
-static const char*
-status_value_to_string	(int status)
-{
-	int i;
-
-	for (i = 0; status_map[i] != -1; i++) {
-		if (status_map[i] == status)
-			return status_string_map[i];
-	}
-
-	g_warning ("Invalid todo status value");
-	return NULL;
-}
-
-
-static void
-completed_changed	(EDateEdit	*dedit,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	time_t t;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	priv->ignore_callbacks = TRUE;
-	if (t == -1) {
-		/* If the 'Completed Date' is set to 'None', we set the
-		   status to 'Not Started' and the percent-complete to 0.
-		   The task may actually be partially-complete, but we leave
-		   it to the user to set those fields. */
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_NEEDSACTION,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 0);
-	} else {
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_COMPLETED,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 100);
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-status_changed		(GtkMenu	*menu,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	icalproperty_status status;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	priv->ignore_callbacks = TRUE;
-	if (status == ICAL_STATUS_NEEDSACTION) {
-		e_dialog_spin_set (priv->percent_complete, 0);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-				      time (NULL));
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-percent_complete_changed	(GtkAdjustment	*adj,
-				 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	time_t date_completed;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	priv->ignore_callbacks = TRUE;
-
-	if (percent == 100) {
-		date_completed = time (NULL);
-		status = ICAL_STATUS_COMPLETED;
-	} else {
-		/* FIXME: Set to 'None'. */
-		date_completed = time (NULL);
-
-		if (percent == 0)
-			status = ICAL_STATUS_NEEDSACTION;
-		else
-			status = ICAL_STATUS_INPROCESS;
-	}
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-			      date_completed);
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	priv->ignore_callbacks = FALSE;
-}
-
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index a53d29c2a2..0000000000
--- a/calendar/gui/dialogs/task-editor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _TASK_EDITOR_H_
-#define _TASK_EDITOR_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <bonobo.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define TASK_EDITOR(obj)          GTK_CHECK_CAST (obj, task_editor_get_type (), TaskEditor)
-#define TASK_EDITOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, task_editor_get_type (), TaskEditorClass)
-#define IS_TASK_EDITOR(obj)       GTK_CHECK_TYPE (obj, task_editor_get_type ())
-
-
-typedef struct _TaskEditor       TaskEditor;
-typedef struct _TaskEditorClass  TaskEditorClass;
-
-struct _TaskEditor
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _TaskEditorClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType	    task_editor_get_type	(void);
-TaskEditor* task_editor_construct	(TaskEditor	*tedit);
-TaskEditor* task_editor_new		(void);
-
-void	    task_editor_set_cal_client	(TaskEditor	*tedit,
-					 CalClient	*client);
-void	    task_editor_set_todo_object	(TaskEditor	*tedit,
-					 CalComponent	*comp);
-
-
-END_GNOME_DECLS
-
-#endif /* _TASK_EDITOR_H_ */
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
deleted file mode 100644
index bdde9ed091..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <title>task-editor-dialog</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook1</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table3</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>S_ummary</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator1</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>4</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>% Comp_lete:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>percent-complete</default_focus_target>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>percent-complete</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>0</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>10</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<left_attach>3</left_attach>
-		<right_attach>4</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator2</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label18</name>
-	    <label>C_lassification:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>classification</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>classification</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Public
-Private
-Confidential
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <height>150</height>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>2</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button3</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <sensitive>False</sensitive>
-	      <label>_Contacts...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>contacts</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button4</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label17</name>
-	      <sensitive>False</sensitive>
-	      <label>Ca_tegories...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>categories</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label1</name>
-	<label>Task</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table4</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label>Date Completed:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label>URL:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>url</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>completed-date</name>
-	  <creation_function>task_editor_create_date_edit</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label2</name>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index 7f7b25ada8..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendarTable - displays the CalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include "e-calendar-table.h"
-#include "calendar-model.h"
-#include "dialogs/task-editor.h"
-
-/* Pixmaps. */
-#include "task.xpm"
-#include "task-recurring.xpm"
-#include "task-assigned.xpm"
-#include "task-assigned-to.xpm"
-
-#include "check-filled.xpm"
-
-
-static void e_calendar_table_class_init (ECalendarTableClass *class);
-static void e_calendar_table_init (ECalendarTable *cal_table);
-static void e_calendar_table_destroy (GtkObject *object);
-
-static void e_calendar_table_on_double_click (ETable *table,
-					      gint row,
-					      ECalendarTable *cal_table);
-static gint e_calendar_table_on_right_click (ETable *table,
-					     gint row,
-					     gint col,
-					     GdkEventButton *event,
-					     ECalendarTable *cal_table);
-static void e_calendar_table_on_open_task (GtkWidget *menuitem,
-					   gpointer	  data);
-static void e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,
-						    gpointer   data);
-static void e_calendar_table_on_delete_task (GtkWidget *menuitem,
-					     gpointer   data);
-static gint e_calendar_table_on_key_press (ETable *table,
-					   gint row,
-					   gint col,
-					   GdkEventKey *event,
-					   ECalendarTable *cal_table);
-
-static void e_calendar_table_open_task (ECalendarTable *cal_table,
-					gint row);
-
-/* The icons to represent the task. */
-#define E_CALENDAR_MODEL_NUM_ICONS	4
-static char** icon_xpm_data[E_CALENDAR_MODEL_NUM_ICONS] = {
-	task_xpm, task_recurring_xpm, task_assigned_xpm, task_assigned_to_xpm
-};
-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_calendar_table_get_type (void)
-{
-	static GtkType e_calendar_table_type = 0;
-
-	if (!e_calendar_table_type){
-		GtkTypeInfo e_calendar_table_info = {
-			"ECalendarTable",
-			sizeof (ECalendarTable),
-			sizeof (ECalendarTableClass),
-			(GtkClassInitFunc) e_calendar_table_class_init,
-			(GtkObjectInitFunc) e_calendar_table_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_calendar_table_type = gtk_type_unique (GTK_TYPE_TABLE,
-							 &e_calendar_table_info);
-	}
-
-	return e_calendar_table_type;
-}
-
-
-static void
-e_calendar_table_class_init (ECalendarTableClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_calendar_table_destroy;
-
-#if 0
-	widget_class->realize		= e_calendar_table_realize;
-	widget_class->unrealize		= e_calendar_table_unrealize;
-	widget_class->style_set		= e_calendar_table_style_set;
- 	widget_class->size_allocate	= e_calendar_table_size_allocate;
-	widget_class->focus_in_event	= e_calendar_table_focus_in;
-	widget_class->focus_out_event	= e_calendar_table_focus_out;
-	widget_class->key_press_event	= e_calendar_table_key_press;
-#endif
-}
-
-
-#define E_CALENDAR_TABLE_SPEC				\
-	"<ETableSpecification click-to-add=\"true\" _click-to-add-message=\"Click to add a task\" draw-grid=\"true\">"	\
-        "<ETableColumn model_col= \"0\" _title=\"Categories\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"1\" _title=\"Classification\"        expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"2\" _title=\"Completion Date\"       expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"3\" _title=\"End Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"4\" _title=\"Start Date\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"5\" _title=\"Due Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"6\" _title=\"Geographical Position\" expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"7\" _title=\"Percent complete\"      expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"8\" _title=\"Priority\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"9\" _title=\"Summary\"               expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"summary\"  compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"10\" _title=\"Transparency\"          expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"11\" _title=\"URL\"                   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"12\" _title=\"Alarms\"                expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"13\" pixbuf=\"icon\"                  expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"icon\"     compare=\"integer\"/>" \
-        "<ETableColumn model_col=\"14\" pixbuf=\"complete\"              expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/>" \
-	"<ETableState>" 				\
-                "<column source=\"13\"/>"               \
-                "<column source= \"9\"/>"               \
-                "<column source=\"14\"/>"               \
-        	"<grouping> </grouping>"		\
-	"</ETableState>"				\
-	"</ETableSpecification>"
-
-static void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETableModel *model;
-	ECell *cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_TABLE_COLOR_LAST];
-	gint nfailed;
-
-	/* Allocate the colors we need. */
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal_table));
-
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].red   = 65535;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].green = 0;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, cal_table->colors,
-					     E_CALENDAR_TABLE_COLOR_LAST,
-					     FALSE, TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-	/* Create the model */
-
-	cal_table->model = calendar_model_new ();
-	model = E_TABLE_MODEL (cal_table->model);
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,
-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,
-			"color_column", CAL_COMPONENT_FIELD_COLOR,
-			NULL);
-	e_table_extras_add_cell(extras, "summary", cell);
-
-	/* Create pixmaps */
-
-	if (!icon_pixbufs[0])
-		for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) {
-			icon_pixbufs[i] = gdk_pixbuf_new_from_xpm_data (
-				(const char **) icon_xpm_data[i]);
-		}
-
-	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);
-	e_table_extras_add_cell(extras, "icon", cell);
-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
-
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) check_filled_xpm);
-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
-
-	/* Create the table */
-
-	table = e_table_scrolled_new (model, extras, E_CALENDAR_TABLE_SPEC,
-				      NULL);
-	cal_table->etable = table;
-	gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (table);
-
-	gtk_signal_connect (GTK_OBJECT (table), "double_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (table), "right_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (table), "key_press",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),
-			    cal_table);
-}
-
-
-/**
- * e_calendar_table_new:
- * @Returns: a new #ECalendarTable.
- *
- * Creates a new #ECalendarTable.
- **/
-GtkWidget *
-e_calendar_table_new (void)
-{
-	GtkWidget *cal_table;
-
-	cal_table = GTK_WIDGET (gtk_type_new (e_calendar_table_get_type ()));
-
-	return cal_table;
-}
-
-
-static void
-e_calendar_table_destroy (GtkObject *object)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (object);
-
-	gtk_object_unref (GTK_OBJECT (cal_table->model));
-	cal_table->model = NULL;
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-void
-e_calendar_table_set_cal_client (ECalendarTable *cal_table,
-				 CalClient	*client)
-{
-	calendar_model_set_cal_client (cal_table->model, client,
-				       CALOBJ_TYPE_TODO);
-}
-
-
-static void
-e_calendar_table_on_double_click (ETable *table,
-				  gint row,
-				  ECalendarTable *cal_table)
-{
-	e_calendar_table_open_task (cal_table, row);
-}
-
-
-static GnomeUIInfo e_calendar_table_popup_uiinfo[] = {
-	{ GNOME_APP_UI_ITEM, N_("Open..."),
-	  N_("Open the task"), e_calendar_table_on_open_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Mark Complete"),
-	  N_("Mark the task complete"), e_calendar_table_on_mark_task_complete,
-	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Delete"),
-	  N_("Delete the task"), e_calendar_table_on_delete_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_END
-};
-
-
-typedef struct _ECalendarMenuData ECalendarMenuData;
-struct _ECalendarMenuData {
-	ECalendarTable *cal_table;
-	gint row;
-};
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEventButton *event,
-				 ECalendarTable *cal_table)
-{
-	ECalendarMenuData menu_data;
-	GtkWidget *popup_menu;
-
-	menu_data.cal_table = cal_table;
-	menu_data.row = row;
-
-	popup_menu = gnome_popup_menu_new (e_calendar_table_popup_uiinfo);
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event,
-					 &menu_data);
-
-	gtk_widget_destroy (popup_menu);
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_table_on_open_task (GtkWidget *menuitem,
-			       gpointer	  data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	e_calendar_table_open_task (menu_data->cal_table,
-				    menu_data->row);
-}
-
-
-static void
-e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,
-					gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	calendar_model_mark_task_complete (menu_data->cal_table->model,
-					   menu_data->row);
-}
-
-
-static void
-e_calendar_table_on_delete_task (GtkWidget *menuitem,
-				 gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	calendar_model_delete_task (menu_data->cal_table->model,
-				    menu_data->row);
-}
-
-
-
-static gint
-e_calendar_table_on_key_press (ETable *table,
-			       gint row,
-			       gint col,
-			       GdkEventKey *event,
-			       ECalendarTable *cal_table)
-{
-	if (event->keyval == GDK_Delete) {
-		calendar_model_delete_task (cal_table->model, row);
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_calendar_table_open_task (ECalendarTable *cal_table,
-			    gint row)
-{
-	TaskEditor *tedit;
-	CalComponent *comp;
-
-	tedit = task_editor_new ();
-	task_editor_set_cal_client (tedit, calendar_model_get_cal_client (cal_table->model));
-
-	comp = calendar_model_get_cal_object (cal_table->model, row);
-	task_editor_set_todo_object (tedit, comp);
-}
-
-
-/* Loads the state of the table (headers shown etc.) from the given file. */
-void
-e_calendar_table_load_state	(ECalendarTable *cal_table,
-				 gchar		*filename)
-{
-	struct stat st;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (stat (filename, &st) == 0 && st.st_size > 0
-	    && S_ISREG (st.st_mode)) {
-		e_table_scrolled_load_state (E_TABLE_SCROLLED (cal_table->etable), filename);
-	}
-}
-
-
-/* Saves the state of the table (headers shown etc.) to the given file. */
-void
-e_calendar_table_save_state (ECalendarTable	*cal_table,
-			     gchar		*filename)
-{
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	e_table_scrolled_save_state (E_TABLE_SCROLLED (cal_table->etable),
-				     filename);
-}
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index 1265a80a72..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_TABLE_H_
-#define _E_CALENDAR_TABLE_H_
-
-#include <gtk/gtktable.h>
-#include "calendar-model.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendarTable - displays the iCalendar objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_TABLE_COLOR_OVERDUE,
-	
-	E_CALENDAR_TABLE_COLOR_LAST
-} ECalendarTableColors;
-
-
-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())
-
-
-typedef struct _ECalendarTable       ECalendarTable;
-typedef struct _ECalendarTableClass  ECalendarTableClass;
-
-struct _ECalendarTable
-{
-	GtkTable table;
-
-	CalendarModel *model;
-	
-	GtkWidget *etable;
-	
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];
-};
-
-struct _ECalendarTableClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_calendar_table_get_type		(void);
-GtkWidget* e_calendar_table_new			(void);
-
-
-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,
-						 CalClient	*client);
-
-/* These load and save the state of the table (headers shown etc.) to/from
-   the given file. */
-void	   e_calendar_table_load_state		(ECalendarTable *cal_table,
-						 gchar		*filename);
-void	   e_calendar_table_save_state		(ECalendarTable *cal_table,
-						 gchar		*filename);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
deleted file mode 100644
index edcb0b4b82..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,662 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#include <config.h>
-#include "e-day-view-main-item.h"
-
-static void e_day_view_main_item_class_init (EDayViewMainItemClass *class);
-static void e_day_view_main_item_init (EDayViewMainItem *dvtitem);
-
-static void e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg,
-					  guint arg_id);
-static void e_day_view_main_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_main_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_main_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_main_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-
-static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-							    GdkDrawable *drawable,
-							    int x,
-							    int y,
-							    int width,
-							    int height);
-static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-						       GdkDrawable *drawable,
-						       int x, int y,
-						       int width, int height,
-						       gint day);
-static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-						  GdkDrawable *drawable,
-						  int x, int y,
-						  int width, int height,
-						  gint day);
-static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-						 GdkDrawable *drawable,
-						 int x, int y,
-						 int width, int height,
-						 gint day, gint event_num);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_main_item_get_type (void)
-{
-	static GtkType e_day_view_main_item_type = 0;
-
-	if (!e_day_view_main_item_type) {
-		GtkTypeInfo e_day_view_main_item_info = {
-			"EDayViewMainItem",
-			sizeof (EDayViewMainItem),
-			sizeof (EDayViewMainItemClass),
-			(GtkClassInitFunc) e_day_view_main_item_class_init,
-			(GtkObjectInitFunc) e_day_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_main_item_info);
-	}
-
-	return e_day_view_main_item_type;
-}
-
-
-static void
-e_day_view_main_item_class_init (EDayViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewMainItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_main_item_update;
-	item_class->draw        = e_day_view_main_item_draw;
-	item_class->point       = e_day_view_main_item_point;
-	item_class->event       = e_day_view_main_item_event;
-}
-
-
-static void
-e_day_view_main_item_init (EDayViewMainItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewMainItem *dvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_main_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
-			   int x, int y, int width, int height)
-{
-	EDayViewMainItem *dvmitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc, *gc;
-	GdkFont *font;
-	gint row, row_y, grid_x1, grid_x2;
-	gint day, grid_y1, grid_y2;
-	gint work_day_start_row, work_day_end_row;
-	gint work_day_start_y, work_day_end_y;
-	gint day_x, day_w, work_day;
-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (canvas_item);
-	day_view = dvmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	/* Paint the background colors. */
-	gc = day_view->main_gc;
-	work_day_start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-	work_day_start_y = work_day_start_row * day_view->row_height - y;
-	work_day_end_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_end_hour, day_view->work_day_end_minute);
-	work_day_end_y = work_day_end_row * day_view->row_height - y;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		work_day = day_view->working_days & (1 << day_start->tm_wday);
-
-		day_x = day_view->day_offsets[day] - x;
-		day_w = day_view->day_widths[day];
-
-		if (work_day) {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0 - y,
-					    day_w, work_day_start_y - (0 - y));
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_start_y,
-					    day_w, work_day_end_y - work_day_start_y);
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_end_y,
-					    day_w, height - work_day_end_y);
-		} else {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0,
-					    day_w, height);
-		}
-	}
-
-	/* Paint the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1
-	    && !day_view->selection_in_top_canvas) {
-		for (day = day_view->selection_start_day;
-		     day <= day_view->selection_end_day;
-		     day++) {
-			if (day == day_view->selection_start_day
-			    && day_view->selection_start_row != -1)
-				start_row = day_view->selection_start_row;
-			else
-				start_row = 0;
-			if (day == day_view->selection_end_day
-			    && day_view->selection_end_row != -1)
-				end_row = day_view->selection_end_row;
-			else
-				end_row = day_view->rows - 1;
-
-			rect_x = day_view->day_offsets[day] - x;
-			rect_width = day_view->day_widths[day];
-			rect_y = start_row * day_view->row_height - y;
-			rect_height = (end_row - start_row + 1) * day_view->row_height;
-
-			gc = style->bg_gc[GTK_STATE_SELECTED];
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    rect_x, rect_y,
-					    rect_width, rect_height);
-		}
-	}
-
-	/* Drawing the horizontal grid lines. */
-	grid_x1 = day_view->day_offsets[0] - x;
-	grid_x2 = day_view->day_offsets[day_view->days_shown] - x;
-
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-		if (row_y >= 0 && row_y < height)
-			gdk_draw_line (drawable, dark_gc,
-				       grid_x1, row_y, grid_x2, row_y);
-	}
-
-	/* Draw the vertical bars down the left of each column. */
-	grid_y1 = 0;
-	grid_y2 = height;
-	for (day = 0; day < day_view->days_shown; day++) {
-		grid_x1 = day_view->day_offsets[day] - x;
-
-		/* Skip if it isn't visible. */
-		if (grid_x1 >= width || grid_x1 + E_DAY_VIEW_BAR_WIDTH <= 0)
-			continue;
-
-		gdk_draw_line (drawable, fg_gc,
-			       grid_x1, grid_y1,
-			       grid_x1, grid_y2);
-		gdk_draw_line (drawable, fg_gc,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y1,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y2);
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-			       grid_x1 + 1, grid_y1,
-			       E_DAY_VIEW_BAR_WIDTH - 2, grid_y2 - grid_y1);
-
-		/* Fill in the bars when the user is busy. */
-		e_day_view_main_item_draw_events_in_vbars (dvmitem, drawable,
-							   x, y,
-							   width, height,
-							   day);
-	}
-
-	/* Fill in the vertical bars corresponding to the busy times from the
-	   long events. */
-	e_day_view_main_item_draw_long_events_in_vbars (dvmitem, drawable,
-							x, y, width, height);
-
-	/* Draw the event borders and backgrounds, and the vertical bars
-	   down the left edges. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		e_day_view_main_item_draw_day_events (dvmitem, drawable,
-						      x, y, width, height,
-						      day);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-					   GdkDrawable *drawable,
-					   int x, int y,
-					   int width, int height,
-					   gint day)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GdkGC *gc;
-	gint grid_x, event_num, bar_y, bar_h;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	grid_x = day_view->day_offsets[day] + 1 - x;
-
-	/* Draw the busy times corresponding to the events in the day. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* We can skip the events in the first column since they will
-		   draw over this anyway. */
-		if (event->num_columns > 0 && event->start_row_or_col == 0)
-			continue;
-
-		bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
-		bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
-		bar_y -= y;
-
-		/* Skip it if it isn't visible. */
-		if (bar_y >= height || bar_y + bar_h <= 0)
-			continue;
-
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    grid_x, bar_y,
-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_h);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-						GdkDrawable *drawable,
-						int x, int y,
-						int width, int height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x;
-	GdkGC *gc;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			continue;
-
-		for (day = start_day; day <= end_day; day++) {
-			grid_x = day_view->day_offsets[day] + 1 - x;
-
-			/* Skip if it isn't visible. */
-			if (grid_x >= width
-			    || grid_x + E_DAY_VIEW_BAR_WIDTH <= 0)
-				continue;
-
-			if (event->start <= day_view->day_starts[day]) {
-				bar_y1 = 0;
-			} else {
-				bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (event->end >= day_view->day_starts[day + 1]) {
-				bar_y2 = height;
-			} else {
-				bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (bar_y1 < height && bar_y2 > 0 && bar_y2 > bar_y1) {
-				gdk_draw_rectangle (drawable, gc, TRUE,
-						    grid_x, bar_y1,
-						    E_DAY_VIEW_BAR_WIDTH - 2,
-						    bar_y2 - bar_y1);
-			}
-		}
-
-
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-				      GdkDrawable *drawable,
-				      int x, int y, int width, int height,
-				      gint day)
-{
-	EDayView *day_view;
-	gint event_num;
-
-	day_view = dvmitem->day_view;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_main_item_draw_day_event (dvmitem, drawable,
-						     x, y, width, height,
-						     day, event_num);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-				     GdkDrawable *drawable,
-				     int x, int y, int width, int height,
-				     gint day, gint event_num)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
-	GtkStyle *style;
-	GdkGC *gc;
-	CalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
-	gint max_icon_w, max_icon_h;
-	gboolean draw_reminder_icon, draw_recurrence_icon;
-
-	day_view = dvmitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == day
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	style = GTK_WIDGET (day_view)->style;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	/* Get the position of the event. If it is not shown skip it.*/
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h))
-		return;
-
-	item_x -= x;
-	item_y -= y;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Fill in the white background. Note that for events in the first
-	   column of the day, we might not want to paint over the vertical bar,
-	   since that is used for multiple events. But then you can't see
-	   where the event in the first column finishes. */
-#if 0
-	if (event->start_row_or_col == 0)
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + E_DAY_VIEW_BAR_WIDTH, item_y + 1,
-				    MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1, 0),
-				    item_h - 2);
-	else
-#endif
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + 1, item_y + 1,
-				    MAX (item_w - 2, 0), item_h - 2);
-
-	/* Draw the right edge of the vertical bar. */
-	gdk_draw_line (drawable, style->black_gc,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + 1,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + item_h - 2);
-
-	/* Draw the vertical colored bar showing when the appointment
-	   begins & ends. */
-	bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-	bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-
-	/* When an item is being resized, we fill the bar up to the new row. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			bar_y1 = item_y + 1;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			bar_y2 = item_y + item_h - 1;
-	}
-
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    item_x + 1, bar_y1,
-			    E_DAY_VIEW_BAR_WIDTH - 2, bar_y2 - bar_y1);
-
-	/* Draw the box around the entire event. Do this after drawing
-	   the colored bar so we don't have to worry about being 1
-	   pixel out. */
-	gdk_draw_rectangle (drawable, style->black_gc, FALSE,
-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);
-
-#if 0
-	/* Draw the horizontal bars above and beneath the event if it
-	   is currently being edited. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num) {
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x,
-				    item_y - E_DAY_VIEW_BAR_HEIGHT,
-				    item_w,
-				    E_DAY_VIEW_BAR_HEIGHT);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x, item_y + item_h,
-				    item_w, E_DAY_VIEW_BAR_HEIGHT);
-	}
-#endif
-
-	/* Draw the reminder & recurrence icons, if needed. */
-	num_icons = 0;
-	draw_reminder_icon = FALSE;
-	draw_recurrence_icon = FALSE;
-	icon_x = item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_y = item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		+ E_DAY_VIEW_ICON_Y_PAD;
-	comp = event->comp;
-
-	if (cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	if (num_icons != 0) {
-		if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD)
-		    * num_icons) {
-			icon_x_inc = 0;
-			icon_y_inc = E_DAY_VIEW_ICON_HEIGHT
-				+ E_DAY_VIEW_ICON_Y_PAD;
-		} else {
-			icon_x_inc = E_DAY_VIEW_ICON_WIDTH
-				+ E_DAY_VIEW_ICON_X_PAD;
-			icon_y_inc = 0;
-		}
-
-		if (draw_reminder_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->reminder_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-		if (draw_recurrence_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->recurrence_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-		}
-		gdk_gc_set_clip_mask (gc, NULL);
-	}
-}
-
-
-/* This is supposed to return the nearest item to the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewMainItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_MAIN_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
deleted file mode 100644
index d8305e594d..0000000000
--- a/calendar/gui/e-day-view-main-item.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_MAIN_ITEM_H_
-#define _E_DAY_VIEW_MAIN_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#define E_DAY_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_main_item_get_type (), EDayViewMainItem))
-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_main_item_get_type ()))
-#define E_IS_DAY_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewMainItemClass;
-
-
-GtkType  e_day_view_main_item_get_type      (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
deleted file mode 100644
index 19d8d40317..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "e-day-view-time-item.h"
-#include "calendar-config.h"
-
-
-/* The spacing between items in the time column. GRID_X_PAD is the space down
-   either side of the column, i.e. outside the main horizontal grid lines.
-   HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the
-   big hour number (this is inside the horizontal grid lines).
-   MIN_X_PAD is the spacing either side of the minute number. The smaller
-   horizontal grid lines match with this.
-   60_MIN_X_PAD is the space either side of the HH:MM display used when
-   we are displaying 60 mins per row (inside the main grid lines). */
-#define E_DVTMI_TIME_GRID_X_PAD	4
-#define E_DVTMI_HOUR_L_PAD	4
-#define E_DVTMI_HOUR_R_PAD	2
-#define E_DVTMI_MIN_X_PAD	2
-#define E_DVTMI_60_MIN_X_PAD	4
-
-
-static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class);
-static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_set_arg (GtkObject *o,
-					  GtkArg *arg,
-					  guint arg_id);
-
-static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_time_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_time_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_time_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-static void e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_set_divisions (GtkWidget *item,
-						   EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-						    GdkEvent *event);
-static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-						   GdkEvent *event);
-static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-							  gint y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_time_item_get_type (void)
-{
-	static GtkType e_day_view_time_item_type = 0;
-
-	if (!e_day_view_time_item_type) {
-		GtkTypeInfo e_day_view_time_item_info = {
-			"EDayViewTimeItem",
-			sizeof (EDayViewTimeItem),
-			sizeof (EDayViewTimeItemClass),
-			(GtkClassInitFunc) e_day_view_time_item_class_init,
-			(GtkObjectInitFunc) e_day_view_time_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_time_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_time_item_info);
-	}
-
-	return e_day_view_time_item_type;
-}
-
-
-static void
-e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTimeItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_time_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_time_item_update;
-	item_class->draw        = e_day_view_time_item_draw;
-	item_class->point       = e_day_view_time_item_point;
-	item_class->event       = e_day_view_time_item_event;
-}
-
-
-static void
-e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
-{
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTimeItem *dvtmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_time_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/* Returns the minimum width needed for the column, by adding up all the
-   maximum widths of the strings. The string widths are all calculated in
-   the style_set handlers of EDayView and EDayViewTimeCanvas. */
-gint
-e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, 0);
-
-	/* Calculate the width of each time column. */
-	if (day_view->mins_per_row == 60) {
-		dvtmitem->column_width = day_view->max_small_hour_width
-			+ day_view->colon_width
-			+ day_view->max_minute_width
-			+ E_DVTMI_60_MIN_X_PAD * 2
-			+ E_DVTMI_TIME_GRID_X_PAD * 2;
-	} else {
-		dvtmitem->column_width = day_view->max_large_hour_width
-			+ day_view->max_minute_width
-			+ E_DVTMI_MIN_X_PAD * 2
-			+ E_DVTMI_HOUR_L_PAD
-			+ E_DVTMI_HOUR_R_PAD
-			+ E_DVTMI_TIME_GRID_X_PAD * 2;
-	}
-
-	return dvtmitem->column_width;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
-			   GdkDrawable	   *drawable,
-			   int		    x,
-			   int		    y,
-			   int		    width,
-			   int		    height)
-{
-	EDayView *day_view;
-	EDayViewTimeItem *dvtmitem;
-	gint time_hour_x1, time_hour_x2, time_min_x1;
-	gint hour, minute, hour_y, min_y, hour_r, min_r, start_y;
-	gint row, row_y, min_width, hour_width;
-	GtkStyle *style;
-	GdkFont *small_font, *large_font;
-	GdkGC *fg_gc, *dark_gc;
-	gchar buffer[16];
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	small_font = style->font;
-	large_font = day_view->large_font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	time_min_x1 = 0;
-	hour_r = 0;
-
-	/* Step through each row, drawing the horizontal grid lines for each
-	   day column and the times. */
-	time_hour_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
-	time_hour_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x;
-	if (day_view->mins_per_row == 60) {
-		min_r = time_hour_x2 - E_DVTMI_60_MIN_X_PAD;
-	} else {
-		time_min_x1 = time_hour_x2 - E_DVTMI_MIN_X_PAD * 2
-			- day_view->max_minute_width;
-		hour_r = time_min_x1 - E_DVTMI_HOUR_R_PAD;
-		min_r = time_hour_x2 - E_DVTMI_MIN_X_PAD;
-	}
-
-	hour = day_view->first_hour_shown;
-	if (!day_view->use_24_hour_format) {
-		if (hour == 0 || hour == 12)
-			hour = 12;
-		else
-			hour %= 12;
-	}
-	hour_y = large_font->ascent + 2; /* FIXME */
-	minute = day_view->first_minute_shown;
-	min_y = small_font->ascent + 2; /* FIXME */
-	start_y = 0 - MAX (day_view->row_height, hour_y + large_font->descent);
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-		if (row_y > start_y) {
-			/* Draw the times down the left if needed. */
-			if (min_r <= 0)
-				continue;
-
-			if (day_view->mins_per_row == 60) {
-				gdk_draw_line (drawable, dark_gc,
-					       time_hour_x1, row_y,
-					       time_hour_x2, row_y);
-				sprintf (buffer, "%02i:%02i", hour, minute);
-				min_width = day_view->small_hour_widths[hour] + day_view->minute_widths[minute / 5] + day_view->colon_width;
-				gdk_draw_string (drawable, small_font, fg_gc,
-						 min_r - min_width,
-						 row_y + min_y, buffer);
-			} else {
-				if (minute == 0) {
-					gdk_draw_line (drawable, dark_gc,
-						       time_hour_x1, row_y,
-						       time_hour_x2, row_y);
-					sprintf (buffer, "%02i", hour);
-					hour_width = day_view->large_hour_widths[hour];
-					gdk_draw_string (drawable, large_font,
-							 fg_gc,
-							 hour_r - hour_width,
-							 row_y + hour_y,
-							 buffer);
-				} else {
-					gdk_draw_line (drawable, dark_gc,
-						       time_min_x1, row_y,
-						       time_hour_x2, row_y);
-				}
-
-				if (day_view->mins_per_row != 30
-				    || minute != 30) {
-					sprintf (buffer, "%02i", minute);
-					min_width = day_view->minute_widths[minute / 5];
-					gdk_draw_string (drawable, small_font,
-							 fg_gc,
-							 min_r - min_width,
-							 row_y + min_y,
-							 buffer);
-				}
-			}
-		}
-
-		minute += day_view->mins_per_row;
-		if (minute >= 60) {
-			hour++;
-			if (!day_view->use_24_hour_format) {
-				if (hour == 0 || hour == 12)
-					hour = 12;
-				else
-					hour %= 12;
-			}
-			minute -= 60;
-		}
-	}
-}
-
-
-static double
-e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_time_item_event (GnomeCanvasItem *item,
-			    GdkEvent *event)
-{
-	EDayViewTimeItem *dvtmitem;
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			e_day_view_time_item_on_button_press (dvtmitem, event);
-		} else if (event->button.button == 3) {
-			e_day_view_time_item_show_popup_menu (dvtmitem, event);
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button == 1)
-			e_day_view_time_item_on_button_release (dvtmitem,
-								event);
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		e_day_view_time_item_on_motion_notify (dvtmitem, event);
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	static gint divisions[] = { 60, 30, 15, 10, 5 };
-	EDayView *day_view;
-	gint num_divisions = sizeof (divisions) / sizeof (divisions[0]);
-	GtkWidget *menu, *item;
-	gchar buffer[256];
-	GSList *group = NULL;
-	gint current_divisions, i;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	current_divisions = e_day_view_get_mins_per_row (day_view);
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));
-
-	for (i = 0; i < num_divisions; i++) {
-		sprintf (buffer, _("%02i minute divisions"), divisions[i]);
-		item = gtk_radio_menu_item_new_with_label (group, buffer);
-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		if (current_divisions == divisions[i])
-			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
-
-		gtk_object_set_data (GTK_OBJECT (item), "divisions",
-				     GINT_TO_POINTER (divisions[i]));
-
-		gtk_signal_connect (GTK_OBJECT (item), "toggled",
-				    e_day_view_time_item_on_set_divisions,
-				    dvtmitem);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-			event->button.button, event->button.time);
-}
-
-
-static void
-e_day_view_time_item_on_set_divisions (GtkWidget *item,
-				       EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-	gint divisions;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (!GTK_CHECK_MENU_ITEM (item)->active)
-		return;
-
-	divisions = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item),
-							  "divisions"));
-	e_day_view_set_mins_per_row (day_view, divisions);
-	calendar_config_set_time_divisions (divisions);
-}
-
-
-static void
-e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem,
-							    event->button.y);
-
-	if (row == -1)
-		return;
-
-	if (!GTK_WIDGET_HAS_FOCUS (day_view))
-		gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)->bin_window, FALSE,
-			      GDK_POINTER_MOTION_MASK
-			      | GDK_BUTTON_RELEASE_MASK,
-			      FALSE, NULL, event->button.time) == 0) {
-		e_day_view_start_selection (day_view, -1, row);
-		dvtmitem->dragging_selection = TRUE;
-	}
-}
-
-
-static void
-e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-					GdkEvent *event)
-{
-	EDayView *day_view;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (dvtmitem->dragging_selection) {
-		gdk_pointer_ungrab (event->button.time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	}
-
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-				       GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gdouble window_y;
-	gint y, row;
-
-	if (!dvtmitem->dragging_selection)
-		return;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	y = event->motion.y;
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem, y);
-
-	if (row != -1) {
-		gnome_canvas_world_to_window (canvas, 0, event->motion.y,
-					      NULL, &window_y);
-		e_day_view_update_selection (day_view, -1, row);
-		e_day_view_check_auto_scroll (day_view, -1, (gint) window_y);
-	}
-}
-
-
-/* Returns the row corresponding to the y position, or -1. */
-static gint
-e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-					      gint y)
-{
-	EDayView *day_view;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, -1);
-
-	if (y < 0)
-		return -1;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return -1;
-
-	return row;
-}
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
deleted file mode 100644
index 8b20fe999e..0000000000
--- a/calendar/gui/e-day-view-time-item.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TIME_ITEM_H_
-#define _E_DAY_VIEW_TIME_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#define E_DAY_VIEW_TIME_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_time_item_get_type (), EDayViewTimeItem))
-#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_time_item_get_type ()))
-#define E_IS_DAY_VIEW_TIME_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_time_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-
-	/* The width of the time column. */
-	gint column_width;
-
-	/* TRUE if we are currently dragging the selection times. */
-	gboolean dragging_selection;
-} EDayViewTimeItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTimeItemClass;
-
-
-GtkType  e_day_view_time_item_get_type      (void);
-
-
-gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
deleted file mode 100644
index 8a85983592..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#include <config.h>
-#include "e-day-view-top-item.h"
-
-static void e_day_view_top_item_class_init	(EDayViewTopItemClass *class);
-static void e_day_view_top_item_init		(EDayViewTopItem *dvtitem);
-
-static void e_day_view_top_item_set_arg		(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_day_view_top_item_update		(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_day_view_top_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_long_event	(EDayViewTopItem *dvtitem,
-						 gint		  event_num,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,
-						 GdkDrawable	 *drawable,
-						 gint		  x,
-						 gint		  y,
-						 gint		  w,
-						 gint		  h);
-static double e_day_view_top_item_point		(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_top_item_get_type (void)
-{
-	static GtkType e_day_view_top_item_type = 0;
-
-	if (!e_day_view_top_item_type) {
-		GtkTypeInfo e_day_view_top_item_info = {
-			"EDayViewTopItem",
-			sizeof (EDayViewTopItem),
-			sizeof (EDayViewTopItemClass),
-			(GtkClassInitFunc) e_day_view_top_item_class_init,
-			(GtkObjectInitFunc) e_day_view_top_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_top_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_top_item_info);
-	}
-
-	return e_day_view_top_item_type;
-}
-
-
-static void
-e_day_view_top_item_class_init (EDayViewTopItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTopItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_top_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_top_item_update;
-	item_class->draw        = e_day_view_top_item_draw;
-	item_class->point       = e_day_view_top_item_point;
-	item_class->event       = e_day_view_top_item_event;
-}
-
-
-static void
-e_day_view_top_item_init (EDayViewTopItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTopItem *dvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtitem = E_DAY_VIEW_TOP_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_top_item_update (GnomeCanvasItem *item,
-			    double	    *affine,
-			    ArtSVP	    *clip_path,
-			    int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
-			  GdkDrawable	  *drawable,
-			  int		   x,
-			  int		   y,
-			  int		   width,
-			  int		   height)
-{
-	EDayViewTopItem *dvtitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	gchar buffer[128], *format;
-	GdkRectangle clip_rect;
-	GdkFont *font;
-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
-	gint item_height, event_num;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_top_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvtitem = E_DAY_VIEW_TOP_ITEM (canvas_item);
-	day_view = dvtitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-	left_edge = 0;
-	item_height = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-	/* Clear the entire background. */
-	gdk_draw_rectangle (drawable, dark_gc, TRUE,
-			    left_edge - x, 0,
-			    canvas_width - left_edge, height);
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 2 - y,
-		       left_edge + 1 - x, item_height - 1 - y);
-
-	/* Draw the background for the dates. */
-	gdk_draw_rectangle (drawable, bg_gc, TRUE,
-			    left_edge + 2 - x, 2 - y,
-			    canvas_width - left_edge - 3,
-			    item_height - 3);
-
-	/* Draw the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1) {
-		gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;
-
-		start_col = day_view->selection_start_day;
-		end_col = day_view->selection_end_day;
-
-		if (end_col > start_col
-		    || day_view->selection_start_row == -1
-		    || day_view->selection_end_row == -1) {
-			rect_x = day_view->day_offsets[start_col];
-			rect_y = item_height;
-			rect_w = day_view->day_offsets[end_col + 1] - rect_x;
-			rect_h = canvas_height - 1 - rect_y;
-
-			gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-					    rect_x - x, rect_y - y,
-					    rect_w, rect_h);
-		}
-	}
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
-			/* strftime format %A = full weekday name, %d = day of month,
-			   %B = full month name. Don't use any other specifiers. */
-			format = _("%A %d %B");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_ABBREVIATED)
-			/* strftime format %a = abbreviated weekday name, %d = day of month,
-			   %b = abbreviated month name. Don't use any other specifiers. */
-			format = _("%a %d %b");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)
-			/* strftime format %d = day of month, %b = abbreviated month name.
-			   Don't use any other specifiers. */
-			format = _("%d %b");
-		else
-			format = "%d";
-
-		strftime (buffer, sizeof (buffer), format, day_start);
-			
-		clip_rect.x = day_view->day_offsets[day] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = day_view->day_widths[day];
-		clip_rect.height = item_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		date_width = gdk_string_width (font, buffer);
-		date_x = day_view->day_offsets[day] + (day_view->day_widths[day] - date_width) / 2;
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (day != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       day_view->day_offsets[day] - x,
-				       4 - y,
-				       day_view->day_offsets[day] - x,
-				       item_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       day_view->day_offsets[day] - 1 - x,
-				       4 - y,
-				       day_view->day_offsets[day] - 1 - x,
-				       item_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (day != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       day_view->day_offsets[day] - x,
-				       item_height - y,
-				       day_view->day_offsets[day] - x,
-				       canvas_height - y);
-		}
-	}
-
-	/* Draw the long events. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		e_day_view_top_item_draw_long_event (dvtitem, event_num,
-						     drawable,
-						     x, y, width, height);
-	}
-}
-
-
-/* This draws one event in the top canvas. */
-static void
-e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
-				     gint	      event_num,
-				     GdkDrawable     *drawable,
-				     int	      x,
-				     int	      y,
-				     int	      width,
-				     int	      height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc;
-	GdkFont *font;
-	gint start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gint text_x, icon_x, icon_y, icon_x_inc;
-	CalComponent *comp;
-	gchar buffer[16];
-	gint hour, minute, offset, time_width, time_x, min_end_time_x;
-	gboolean draw_start_triangle, draw_end_triangle;
-	GdkRectangle clip_rect;
-
-	day_view = dvtitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h))
-		return;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	gc = day_view->main_gc;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	comp = event->comp;
-
-	/* Draw the lines across the top & bottom of the entire event. */
-	gdk_draw_line (drawable, fg_gc,
-		       item_x - x, item_y - y,
-		       item_x + item_w - 1 - x, item_y - y);
-	gdk_draw_line (drawable, fg_gc,
-		       item_x - x, item_y + item_h - 1 - y,
-		       item_x + item_w - 1 - x, item_y + item_h - 1 - y);
-
-	/* Fill it in. */
-	gdk_draw_rectangle (drawable, bg_gc, TRUE,
-			    item_x - x, item_y + 1 - y,
-			    item_w, item_h - 2);
-
-	/* When resizing we don't draw the triangles.*/
-	draw_start_triangle = TRUE;
-	draw_end_triangle = TRUE;
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			draw_start_triangle = FALSE;
-
-		if  (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			draw_end_triangle = FALSE;
-	}
-
-	/* If the event starts before the first day shown, draw a triangle,
-	   else just draw a vertical line down the left. */
-	if (draw_start_triangle
-	    && event->start < day_view->day_starts[start_day]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x - x, item_y - y,
-						   -E_DAY_VIEW_BAR_WIDTH,
-						   item_h);
-	} else {
-		gdk_draw_line (drawable, fg_gc,
-			       item_x - x, item_y - y,
-			       item_x - x, item_y + item_h - 1 - y);
-	}
-
-	/* Similar for the event end. */
-	if (draw_end_triangle
-	    && event->end > day_view->day_starts[end_day + 1]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x + item_w - 1 - x,
-						   item_y - y,
-						   E_DAY_VIEW_BAR_WIDTH,
-						   item_h);
-	} else {
-		gdk_draw_line (drawable, fg_gc,
-			       item_x + item_w - 1 - x,
-			       item_y - y,
-			       item_x + item_w - 1 - x,
-			       item_y + item_h - 1 - y);
-	}
-
-	/* If we are editing the event we don't show the icons or the start
-	   & end times. */
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	/* Determine the position of the label, so we know where to place the
-	   icons. Note that since the top canvas never scrolls we don't need
-	   to take the scroll offset into account. It will always be 0. */
-	text_x = event->canvas_item->x1;
-
-	/* Draw the icons. */
-	icon_x_inc = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_x = text_x - icon_x_inc - x;
-	icon_y = item_y + 1 + E_DAY_VIEW_ICON_Y_PAD - y;
-
-	if (cal_component_has_recurrences (comp)) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-
-	if (cal_component_has_alarms (comp)) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-	gdk_gc_set_clip_mask (gc, NULL);
-
-	/* Draw the start & end times, if necessary.
-	   Note that GtkLabel adds 1 to the ascent so we must do that to be
-	   level with it. */
-	min_end_time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-
-	if (event->start > day_view->day_starts[start_day]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown + event->start_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		sprintf (buffer, "%02i:%02i", hour, minute);
-
-		clip_rect.x = item_x - x;
-		clip_rect.y = item_y - y;
-		clip_rect.width = item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH;
-		clip_rect.height = item_h;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x,
-				 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + font->ascent + 1 - y,
-				 buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		min_end_time_x += day_view->small_hour_widths[hour] + 2
-			+ day_view->max_minute_width + day_view->colon_width;
-	}
-
-	if (event->end < day_view->day_starts[end_day + 1]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown
-			+ event->end_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		time_width = day_view->small_hour_widths[hour]
-			+ day_view->max_minute_width + day_view->colon_width;
-		time_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD - time_width - E_DAY_VIEW_LONG_EVENT_TIME_X_PAD - x;
-
-		if (time_x >= min_end_time_x) {
-			sprintf (buffer, "%02i:%02i", hour, minute);
-			gdk_draw_string (drawable, font, fg_gc,
-					 time_x,
-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD
-					 + font->ascent + 1 - y,
-					 buffer);
-		}
-	}
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
-				   GdkDrawable	   *drawable,
-				   gint		    x,
-				   gint		    y,
-				   gint		    w,
-				   gint		    h)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	day_view = dvtitem->day_view;
-
-	style = GTK_WIDGET (day_view)->style;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_draw_polygon (drawable, bg_gc, TRUE, points, 3);
-	gdk_draw_line (drawable, fg_gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, fg_gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
-			   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewTopItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_TOP_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
deleted file mode 100644
index 435ef12b58..0000000000
--- a/calendar/gui/e-day-view-top-item.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TOP_ITEM_H_
-#define _E_DAY_VIEW_TOP_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#define E_DAY_VIEW_TOP_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_top_item_get_type (), EDayViewTopItem))
-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_top_item_get_type ()))
-#define E_IS_DAY_VIEW_TOP_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_top_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewTopItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTopItemClass;
-
-
-GtkType  e_day_view_top_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
deleted file mode 100644
index 50f6639f58..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,6083 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <time.h>
-#include <gnome.h>
-#include <gdk/gdkx.h>
-#include <cal-util/timeutil.h>
-#include "e-day-view.h"
-#include "e-day-view-time-item.h"
-#include "e-day-view-top-item.h"
-#include "e-day-view-main-item.h"
-#include "calendar-commands.h"
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-/* The minimum amount of space wanted on each side of the date string. */
-#define E_DAY_VIEW_DATE_X_PAD	4
-
-#define E_DAY_VIEW_LARGE_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-240-*-*-p-*-iso8859-*"
-#define E_DAY_VIEW_LARGE_FONT_FALLBACK	\
-	"-adobe-helvetica-bold-r-normal-*-*-240-*-*-p-*-iso8859-*"
-
-/* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
-#define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
-
-/* The time between each auto-scroll, in milliseconds. */
-#define E_DAY_VIEW_AUTO_SCROLL_TIMEOUT	50
-
-/* The number of timeouts we skip before we start scrolling. */
-#define E_DAY_VIEW_AUTO_SCROLL_DELAY	5
-
-/* The number of pixels the mouse has to be moved with the button down before
-   we start a drag. */
-#define E_DAY_VIEW_DRAG_START_OFFSET	4
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_CALENDAR_EVENT
-};
-static GtkTargetEntry target_table[] = {
-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-static void e_day_view_class_init (EDayViewClass *class);
-static void e_day_view_init (EDayView *day_view);
-static void e_day_view_destroy (GtkObject *object);
-static void e_day_view_realize (GtkWidget *widget);
-static void e_day_view_unrealize (GtkWidget *widget);
-static void e_day_view_style_set (GtkWidget *widget,
-				  GtkStyle  *previous_style);
-static void e_day_view_size_allocate (GtkWidget *widget,
-				      GtkAllocation *allocation);
-static gboolean e_day_view_update_scroll_regions (EDayView *day_view);
-static gint e_day_view_focus_in (GtkWidget *widget,
-				 GdkEventFocus *event);
-static gint e_day_view_focus_out (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_day_view_key_press (GtkWidget *widget,
-				  GdkEventKey *event);
-static void e_day_view_cursor_key_up_shifted (EDayView *day_view,
-					      GdkEventKey *event);
-static void e_day_view_cursor_key_down_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_left_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_right_shifted (EDayView *day_view,
-						 GdkEventKey *event);
-static void e_day_view_cursor_key_up (EDayView *day_view,
-				      GdkEventKey *event);
-static void e_day_view_cursor_key_down (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_left (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_right (EDayView *day_view,
-					 GdkEventKey *event);
-static void e_day_view_ensure_rows_visible (EDayView *day_view,
-					    gint start_row,
-					    gint end_row);
-
-static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);
-
-static void e_day_view_on_canvas_realized (GtkWidget *widget,
-					   EDayView *day_view);
-
-static gboolean e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-						       GdkEventButton *event,
-						       EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-							 GdkEventButton *event,
-							 EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_motion (GtkWidget *widget,
-						 GdkEventMotion *event,
-						 EDayView *day_view);
-
-static gboolean e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-							  GdkEventButton *event,
-							  EDayView *day_view);
-
-static gboolean e_day_view_on_time_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-
-static void e_day_view_update_calendar_selection_time (EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,
-						  GdkEventMotion *event,
-						  EDayView *day_view);
-static gboolean e_day_view_convert_event_coords (EDayView *day_view,
-						 GdkEvent *event,
-						 GdkWindow *window,
-						 gint *x_return,
-						 gint *y_return);
-static void e_day_view_update_long_event_resize (EDayView *day_view,
-						 gint day);
-static void e_day_view_update_resize (EDayView *day_view,
-				      gint row);
-static void e_day_view_finish_long_event_resize (EDayView *day_view);
-static void e_day_view_finish_resize (EDayView *day_view);
-static void e_day_view_abort_resize (EDayView *day_view,
-				     guint32 time);
-
-
-static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,
-						       gint		 event_num,
-						       GdkEventButton	*event,
-						       EDayViewPosition  pos,
-						       gint		 event_x,
-						       gint		 event_y);
-static gboolean e_day_view_on_event_button_press (EDayView	 *day_view,
-						  gint		  day,
-						  gint		  event_num,
-						  GdkEventButton *event,
-						  EDayViewPosition pos,
-						  gint		  event_x,
-						  gint		  event_y);
-static void e_day_view_on_long_event_click (EDayView *day_view,
-					    gint event_num,
-					    GdkEventButton  *bevent,
-					    EDayViewPosition pos,
-					    gint	     event_x,
-					    gint	     event_y);
-static void e_day_view_on_event_click (EDayView *day_view,
-				       gint day,
-				       gint event_num,
-				       GdkEventButton  *event,
-				       EDayViewPosition pos,
-				       gint		event_x,
-				       gint		event_y);
-static void e_day_view_on_event_double_click (EDayView *day_view,
-					      gint day,
-					      gint event_num);
-static void e_day_view_on_event_right_click (EDayView *day_view,
-					     GdkEventButton *bevent,
-					     gint day,
-					     gint event_num);
-
-static void e_day_view_recalc_day_starts (EDayView *day_view,
-					  time_t start_time);
-static void e_day_view_recalc_num_rows	(EDayView	*day_view);
-static void e_day_view_recalc_cell_sizes	(EDayView	*day_view);
-
-static EDayViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-								   gint x,
-								   gint y,
-								   gint *day_return,
-								   gint *event_num_return);
-static EDayViewPosition e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-								    gint x,
-								    gint y,
-								    gint *day_return,
-								    gint *row_return,
-								    gint *event_num_return);
-static gboolean e_day_view_find_event_from_item (EDayView *day_view,
-						 GnomeCanvasItem *item,
-						 gint *day_return,
-						 gint *event_num_return);
-static gboolean e_day_view_find_event_from_uid (EDayView *day_view,
-						const gchar *uid,
-						gint *day_return,
-						gint *event_num_return);
-
-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,
-						   gint day,
-						   gint event_num,
-						   gpointer data);
-
-static void e_day_view_foreach_event_with_uid (EDayView *day_view,
-					       const gchar *uid,
-					       EDayViewForeachEventCallback callback,
-					       gpointer data);
-
-static void e_day_view_queue_reload_events (EDayView *day_view);
-static gboolean e_day_view_reload_events_idle_cb	(gpointer data);
-static void e_day_view_reload_events (EDayView *day_view);
-static void e_day_view_free_events (EDayView *day_view);
-static void e_day_view_free_event_array (EDayView *day_view,
-					 GArray *array);
-static int e_day_view_add_event (CalComponent *comp,
-				 time_t	  start,
-				 time_t	  end,
-				 gpointer data);
-static void e_day_view_update_event_label (EDayView *day_view,
-					   gint day,
-					   gint event_num);
-static void e_day_view_update_long_event_label (EDayView *day_view,
-						gint event_num);
-
-static void e_day_view_layout_long_events (EDayView *day_view);
-static void e_day_view_layout_long_event (EDayView	   *day_view,
-					  EDayViewEvent *event,
-					  guint8	   *grid);
-static void e_day_view_reshape_long_events (EDayView *day_view);
-static void e_day_view_reshape_long_event (EDayView *day_view,
-					   gint event_num);
-static void e_day_view_layout_day_events (EDayView *day_view,
-					  gint	day);
-static void e_day_view_layout_day_event (EDayView   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid,
-					 guint16   *group_starts);
-static void e_day_view_expand_day_event (EDayView	   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid);
-static void e_day_view_recalc_cols_per_row (EDayView *day_view,
-					    gint      day,
-					    guint16  *group_starts);
-static void e_day_view_reshape_day_events (EDayView *day_view,
-					   gint day);
-static void e_day_view_reshape_day_event (EDayView *day_view,
-					  gint	day,
-					  gint	event_num);
-static void e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view);
-static void e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view);
-static void e_day_view_reshape_resize_rect_item (EDayView *day_view);
-
-static void e_day_view_ensure_events_sorted (EDayView *day_view);
-static gint e_day_view_event_sort_func (const void *arg1,
-					const void *arg2);
-
-static void e_day_view_start_editing_event (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gchar *initial_text);
-static void e_day_view_stop_editing_event (EDayView *day_view);
-static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
-					       GdkEvent *event,
-					       EDayView *day_view);
-static void e_day_view_on_editing_started (EDayView *day_view,
-					   GnomeCanvasItem *item);
-static void e_day_view_on_editing_stopped (EDayView *day_view,
-					   GnomeCanvasItem *item);
-
-static time_t e_day_view_convert_grid_position_to_time (EDayView *day_view,
-							gint col,
-							gint row);
-static gboolean e_day_view_convert_time_to_grid_position (EDayView *day_view,
-							  time_t time,
-							  gint *col,
-							  gint *row);
-
-static void e_day_view_start_auto_scroll (EDayView *day_view,
-					  gboolean scroll_up);
-static gboolean e_day_view_auto_scroll_handler (gpointer data);
-
-static void e_day_view_on_new_appointment (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_edit_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_day_view_on_delete_occurrence (GtkWidget *widget,
-					     gpointer data);
-static void e_day_view_on_delete_appointment (GtkWidget *widget,
-					      gpointer data);
-static void e_day_view_on_unrecur_appointment (GtkWidget *widget,
-					       gpointer data);
-static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
-
-static gint e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  gint            x,
-						  gint            y,
-						  guint           time,
-						  EDayView	  *day_view);
-static void e_day_view_update_top_canvas_drag (EDayView *day_view,
-					       gint day);
-static void e_day_view_reshape_top_canvas_drag_item (EDayView *day_view);
-static gint e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-						   GdkDragContext *context,
-						   gint            x,
-						   gint            y,
-						   guint           time,
-						   EDayView	  *day_view);
-static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view);
-static void e_day_view_update_main_canvas_drag (EDayView *day_view,
-						gint row,
-						gint day);
-static void e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-						 GdkDragContext *context,
-						 guint           time,
-						 EDayView	     *day_view);
-static void e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  guint           time,
-						  EDayView	 *day_view);
-static void e_day_view_on_drag_begin (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      EDayView	   *day_view);
-static void e_day_view_on_drag_end (GtkWidget      *widget,
-				    GdkDragContext *context,
-				    EDayView       *day_view);
-static void e_day_view_on_drag_data_get (GtkWidget          *widget,
-					 GdkDragContext     *context,
-					 GtkSelectionData   *selection_data,
-					 guint               info,
-					 guint               time,
-					 EDayView		*day_view);
-static void e_day_view_on_top_canvas_drag_data_received (GtkWidget	*widget,
-							 GdkDragContext *context,
-							 gint            x,
-							 gint            y,
-							 GtkSelectionData *data,
-							 guint           info,
-							 guint           time,
-							 EDayView	*day_view);
-static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget,
-							  GdkDragContext *context,
-							  gint            x,
-							  gint            y,
-							  GtkSelectionData *data,
-							  guint           info,
-							  guint           time,
-							  EDayView	 *day_view);
-#ifndef NO_WARNINGS
-static gboolean e_day_view_update_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-#endif
-static gboolean e_day_view_remove_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-static void e_day_view_normalize_selection (EDayView *day_view);
-
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_day_view_get_type (void)
-{
-	static GtkType e_day_view_type = 0;
-
-	if (!e_day_view_type){
-		GtkTypeInfo e_day_view_info = {
-			"EDayView",
-			sizeof (EDayView),
-			sizeof (EDayViewClass),
-			(GtkClassInitFunc) e_day_view_class_init,
-			(GtkObjectInitFunc) e_day_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_day_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						   &e_day_view_info);
-	}
-
-	return e_day_view_type;
-}
-
-
-static void
-e_day_view_class_init (EDayViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_day_view_destroy;
-
-	widget_class->realize		= e_day_view_realize;
-	widget_class->unrealize		= e_day_view_unrealize;
-	widget_class->style_set		= e_day_view_style_set;
- 	widget_class->size_allocate	= e_day_view_size_allocate;
-	widget_class->focus_in_event	= e_day_view_focus_in;
-	widget_class->focus_out_event	= e_day_view_focus_out;
-	widget_class->key_press_event	= e_day_view_key_press;
-}
-
-
-static void
-e_day_view_init (EDayView *day_view)
-{
-	gint day;
-	GnomeCanvasGroup *canvas_group;
-
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
-
-	day_view->calendar = NULL;
-	day_view->client = NULL;
-
-	day_view->long_events = g_array_new (FALSE, FALSE,
-					     sizeof (EDayViewEvent));
-	day_view->long_events_sorted = TRUE;
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-	day_view->reload_events_idle_id = 0;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		day_view->events[day] = g_array_new (FALSE, FALSE,
-						     sizeof (EDayViewEvent));
-		day_view->events_sorted[day] = TRUE;
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	/* These indicate that the times haven't been set. */
-	day_view->lower = 0;
-	day_view->upper = 0;
-
-	/* FIXME: Initialize day_starts. */
-	day_view->work_week_view = FALSE;
-	day_view->days_shown = 1;
-
-	day_view->mins_per_row = 30;
-	day_view->date_format = E_DAY_VIEW_DATE_FULL;
-	day_view->rows_in_top_display = 0;
-
-	/* Note that these don't work yet. It would need a few fixes to the
-	   way event->start_minute and event->end_minute are used, and there
-	   may be problems with events that go outside the visible times. */
-	day_view->first_hour_shown = 0;
-	day_view->first_minute_shown = 0;
-	day_view->last_hour_shown = 24;
-	day_view->last_minute_shown = 0;
-
-	day_view->main_gc = NULL;
-	e_day_view_recalc_num_rows (day_view);
-
-	day_view->working_days = E_DAY_VIEW_MONDAY | E_DAY_VIEW_TUESDAY
-		| E_DAY_VIEW_WEDNESDAY | E_DAY_VIEW_THURSDAY
-		| E_DAY_VIEW_FRIDAY;
-
-	day_view->work_day_start_hour = 9;
-	day_view->work_day_start_minute = 0;
-	day_view->work_day_end_hour = 17;
-	day_view->work_day_end_minute = 0;
-	day_view->scroll_to_work_day = TRUE;
-
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-	day_view->selection_is_being_dragged = FALSE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = FALSE;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	day_view->pressed_event_day = -1;
-
-	day_view->drag_event_day = -1;
-	day_view->drag_last_day = -1;
-
-	day_view->auto_scroll_timeout_id = 0;
-
-	/* Create the large font. */
-	day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT);
-	if (!day_view->large_font)
-		day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT_FALLBACK);
-	if (!day_view->large_font)
-		g_warning ("Couldn't load font");
-
-
-	/*
-	 * Top Canvas
-	 */
-	day_view->top_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->top_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->top_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root);
-
-	day_view->top_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_top_item_get_type (),
-				       "EDayViewTopItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->drag_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-
-	day_view->drag_long_event_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "max_lines", 1,
-				       "editable", TRUE,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-
-	/*
-	 * Main Canvas
-	 */
-	day_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->main_canvas);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas), "realize",
-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),
-			    day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root);
-
-	day_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_main_item_get_type (),
-				       "EDayViewMainItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-
-	day_view->resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	day_view->main_canvas_top_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-
-	day_view->main_canvas_bottom_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-
-	day_view->drag_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-
-	day_view->drag_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-
-	day_view->drag_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "editable", TRUE,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-
-	/*
-	 * Times Canvas
-	 */
-	day_view->time_canvas = e_canvas_new ();
-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view->time_canvas),
-				    GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->time_canvas,
-			  0, 1, 1, 2,
-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->time_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->time_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),
-				  day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
-
-	day_view->time_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_time_item_get_type (),
-				       "EDayViewTimeItem::day_view", day_view,
-				       NULL);
-
-
-	/*
-	 * Scrollbar.
-	 */
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	day_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	day_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	day_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	day_view->resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);
-	day_view->last_cursor_set_in_top_canvas = NULL;
-	day_view->last_cursor_set_in_main_canvas = NULL;
-
-	/* Set up the drop sites. */
-	gtk_drag_dest_set (day_view->top_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_day_view_on_canvas_realized (GtkWidget *widget,
-			       EDayView *day_view)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/**
- * e_day_view_new:
- * @Returns: a new #EDayView.
- *
- * Creates a new #EDayView.
- **/
-GtkWidget *
-e_day_view_new (void)
-{
-	GtkWidget *day_view;
-
-	day_view = GTK_WIDGET (gtk_type_new (e_day_view_get_type ()));
-
-	return day_view;
-}
-
-
-static void
-e_day_view_destroy (GtkObject *object)
-{
-	EDayView *day_view;
-	gint day;
-
-	day_view = E_DAY_VIEW (object);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	if (day_view->reload_events_idle_id != 0) {
-		g_source_remove (day_view->reload_events_idle_id);
-		day_view->reload_events_idle_id = 0;
-	}
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-		day_view->client = NULL;
-	}
-
-	if (day_view->large_font)
-		gdk_font_unref (day_view->large_font);
-
-	gdk_cursor_destroy (day_view->normal_cursor);
-	gdk_cursor_destroy (day_view->move_cursor);
-	gdk_cursor_destroy (day_view->resize_width_cursor);
-	gdk_cursor_destroy (day_view->resize_height_cursor);
-
-	e_day_view_free_events (day_view);
-	g_array_free (day_view->long_events, TRUE);
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		g_array_free (day_view->events[day], TRUE);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_day_view_realize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gboolean success[E_DAY_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	day_view = E_DAY_VIEW (widget);
-	day_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 244 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 214 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red   = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, day_view->colors,
-					     E_DAY_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	day_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->reminder_mask, NULL, bell_xpm);
-	day_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->recurrence_mask, NULL, recur_xpm);
-
-
-
-	/* Set the canvas item colors. */
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	/* Set the fonts for the text items used when dragging. */
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-}
-
-
-static void
-e_day_view_unrealize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gint i;
-
-	day_view = E_DAY_VIEW (widget);
-
-	gdk_gc_unref (day_view->main_gc);
-	day_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_DAY_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &day_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (day_view->reminder_icon);
-	day_view->reminder_icon = NULL;
-	gdk_pixmap_unref (day_view->recurrence_icon);
-	day_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_day_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EDayView *day_view;
-	GdkFont *font;
-	gint top_rows, top_canvas_height;
-	gint hour, max_large_hour_width;
-	gint minute, max_minute_width, i;
-	gint month, day, width;
-	gint longest_month_width, longest_abbreviated_month_width;
-	gint longest_weekday_width, longest_abbreviated_weekday_width;
-	struct tm date_tm;
-	gchar buffer[128];
-	gint times_width;
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	day_view = E_DAY_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	day_view->row_height = font->ascent + font->descent + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;
-	day_view->row_height = MAX (day_view->row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);
-	GTK_LAYOUT (day_view->main_canvas)->vadjustment->step_increment = day_view->row_height;
-
-	day_view->top_row_height = font->ascent + font->descent + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	day_view->top_row_height = MAX (day_view->top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	top_rows = MAX (1, day_view->rows_in_top_display);
-	top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-	gtk_widget_set_usize (day_view->top_canvas, -1, top_canvas_height);
-
-	/* Find the longest full & abbreviated month names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mday = 1;
-	date_tm.tm_isdst = -1;
-
-	longest_month_width = 0;
-	longest_abbreviated_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		date_tm.tm_mon = month;
-
-		strftime (buffer, sizeof (buffer), "%B", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_month_width) {
-			longest_month_width = width;
-			day_view->longest_month_name = month;
-		}
-
-		strftime (buffer, sizeof (buffer), "%b", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_month_width) {
-			longest_abbreviated_month_width = width;
-			day_view->longest_abbreviated_month_name = month;
-		}
-	}
-
-	/* Find the longest full & abbreviated weekday names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mon = 0;
-	date_tm.tm_isdst = -1;
-
-	longest_weekday_width = 0;
-	longest_abbreviated_weekday_width = 0;
-	for (day = 0; day < 7; day++) {
-		date_tm.tm_mday = 2 + day;
-		date_tm.tm_wday = day;
-
-		strftime (buffer, sizeof (buffer), "%A", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday_width = width;
-			day_view->longest_weekday_name = day;
-		}
-
-		strftime (buffer, sizeof (buffer), "%a", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_weekday_width) {
-			longest_abbreviated_weekday_width = width;
-			day_view->longest_abbreviated_weekday_name = day;
-		}
-	}
-
-
-	/* Calculate the widths of all the time strings necessary. */
-	day_view->max_small_hour_width = 0;
-	max_large_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		sprintf (buffer, "%02i", hour);
-		day_view->small_hour_widths[hour] = gdk_string_width (font, buffer);
-		day_view->large_hour_widths[hour] = gdk_string_width (day_view->large_font, buffer);
-		day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]);
-		max_large_hour_width = MAX (max_large_hour_width, day_view->large_hour_widths[hour]);
-	}
-	day_view->max_large_hour_width = max_large_hour_width;
-
-	max_minute_width = 0;
-	for (minute = 0, i = 0; minute < 60; minute += 5, i++) {
-		sprintf (buffer, "%02i", minute);
-		day_view->minute_widths[i] = gdk_string_width (font, buffer);
-		max_minute_width = MAX (max_minute_width, day_view->minute_widths[i]);
-	}
-	day_view->max_minute_width = max_minute_width;
-	day_view->colon_width = gdk_string_width (font, ":");
-
-	/* Calculate the width of the time column. */
-	times_width = e_day_view_time_item_get_column_width (E_DAY_VIEW_TIME_ITEM (day_view->time_canvas_item));
-	gtk_widget_set_usize (day_view->time_canvas, times_width, -1);
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EDayView *day_view;
-	gint day, scroll_y;
-	gboolean need_reshape;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-#if 0
-	g_print ("In e_day_view_size_allocate\n");
-#endif
-	day_view = E_DAY_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_day_view_recalc_cell_sizes (day_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->top_canvas->allocation.width - 1;
-	new_y2 = day_view->top_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-						0, 0, new_x2, new_y2);
-
-	need_reshape = e_day_view_update_scroll_regions (day_view);
-
-	/* Scroll to the start of the working day, if this is the initial
-	   allocation. */
-	if (day_view->scroll_to_work_day) {
-		scroll_y = e_day_view_convert_time_to_position (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					0, scroll_y);
-		day_view->scroll_to_work_day = FALSE;
-	}
-
-	/* Flag that we need to reshape the events. Note that changes in height
-	   don't matter, since the rows are always the same height. */
-	if (need_reshape) {
-		day_view->long_events_need_reshape = TRUE;
-		for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-			day_view->need_reshape[day] = TRUE;
-
-		e_day_view_check_layout (day_view);
-	}
-}
-
-
-static void
-e_day_view_recalc_cell_sizes	(EDayView	*day_view)
-{
-	/* An array of dates, one for each month in the year 2000. They must
-	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
-				      23, 20, 17, 22, 19, 24 };
-	gfloat width, offset;
-	gint day, max_width;
-	struct tm date_tm;
-	GdkFont *font;
-	char buffer[128];
-
-	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
-	font = GTK_WIDGET (day_view)->style->font;
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths. */
-	width = day_view->main_canvas->allocation.width;
-	width /= day_view->days_shown;
-	offset = 0;
-	for (day = 0; day <= day_view->days_shown; day++) {
-		day_view->day_offsets[day] = floor (offset + 0.5);
-		offset += width;
-	}
-
-	/* Calculate the days widths based on the offsets. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_view->day_widths[day] = day_view->day_offsets[day + 1] - day_view->day_offsets[day];
-	}
-
-	/* Determine which date format to use, based on the column widths.
-	   We want to check the widths using the longest full or abbreviated
-	   month name and the longest full or abbreviated weekday name, as
-	   appropriate. */
-	max_width = day_view->day_widths[0];
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-
-	/* Try "Thursday 21 January". */
-	date_tm.tm_mon = day_view->longest_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_weekday_name;
-	date_tm.tm_wday = day_view->longest_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %A = full weekday name, %d = day of month,
-	   %B = full month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%A %d %B"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_FULL;
-		return;
-	}
-
-	/* Try "Thu 21 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_wday = day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %a = abbreviated weekday name, %d = day of month,
-	   %b = abbreviated month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%a %d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_ABBREVIATED;
-		return;
-	}
-
-	/* Try "23 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = 23;
-	date_tm.tm_wday = 0;
-	date_tm.tm_isdst = -1;
-	/* strftime format %d = day of month, %b = abbreviated month name.
-	   Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width)
-		day_view->date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;
-	else
-		day_view->date_format = E_DAY_VIEW_DATE_SHORT;
-}
-
-
-static gint
-e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-void
-e_day_view_set_calendar		(EDayView	*day_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->calendar = calendar;
-
-	/* FIXME: free current events? */
-}
-
-
-/* Callback used when the calendar client finishes loading */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	if (status != CAL_CLIENT_LOAD_SUCCESS)
-		return;
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	gint day, event_num;
-
-	g_return_if_fail (E_IS_DAY_VIEW (data));
-
-	day_view = E_DAY_VIEW (data);
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (day_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-#ifndef NO_WARNINGS
-#warning "FIXME"
-#endif
-
-		/* Do this the long way every time for now */
-#if 0
-		if (ical_object_compare_dates (event->ico, ico)) {
-			g_print ("updated object's dates unchanged\n");
-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, ico);
-			ical_object_unref (ico);
-			gtk_widget_queue_draw (day_view->top_canvas);
-			gtk_widget_queue_draw (day_view->main_canvas);
-			return;
-		}
-#endif
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-#if 0
-		g_print ("dates changed - removing occurrences\n");
-#endif
-		e_day_view_foreach_event_with_uid (day_view, uid,
-						   e_day_view_remove_event_cb,
-						   NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	cal_recur_generate_instances (comp, day_view->lower,
-				      day_view->upper,
-				      e_day_view_add_event,
-				      day_view);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_day_view_check_layout (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	e_day_view_foreach_event_with_uid (day_view, uid,
-					   e_day_view_remove_event_cb, NULL);
-
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/**
- * e_day_view_set_cal_client:
- * @day_view: A day view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a day view will monitor.
- **/
-void
-e_day_view_set_cal_client	(EDayView	*day_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (day_view != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (client == day_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-	}
-
-	day_view->client = client;
-
-	if (day_view->client) {
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), day_view);
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), day_view);
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), day_view);
-	}
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-
-#ifndef NO_WARNINGS
-static gboolean
-e_day_view_update_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-	CalComponent *comp;
-
-	comp = data;
-#if 0
-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_long_event_label (day_view, event_num);
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-	return TRUE;
-}
-#endif
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_day_view_foreach_event_with_uid (EDayView *day_view,
-				   const gchar *uid,
-				   EDayViewForeachEventCallback callback,
-				   gpointer data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = day_view->events[day]->len - 1;
-		     event_num >= 0;
-		     event_num--) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			cal_component_get_uid (event->comp, &u);
-			if (uid && !strcmp (uid, u)) {
-				if (!(*callback) (day_view, day, event_num,
-						  data))
-					return;
-			}
-		}
-	}
-
-	for (event_num = day_view->long_events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT,
-					  event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_day_view_remove_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-
-#if 0
-	g_print ("In e_day_view_remove_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		day_view->editing_event_day = -1;
-
-	if (event->canvas_item)
-		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		g_array_remove_index (day_view->long_events, event_num);
-		day_view->long_events_need_layout = TRUE;
-	} else {
-		g_array_remove_index (day_view->events[day], event_num);
-		day_view->need_layout[day] = TRUE;
-	}
-	return TRUE;
-}
-
-
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text;
-	gboolean free_text = FALSE, editing_event = FALSE;
-	gint offset, start_minute, end_minute;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		editing_event = TRUE;
-
-	if (!editing_event
-	    && (event->start_minute % day_view->mins_per_row != 0
-		|| event->end_minute % day_view->mins_per_row != 0)) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown;
-		start_minute = offset + event->start_minute;
-		end_minute = offset + event->end_minute;
-		text = g_strdup_printf ("%02i:%02i-%02i:%02i %s",
-					start_minute / 60,
-					start_minute % 60,
-					end_minute / 60,
-					end_minute % 60,
-					text);
-
-		free_text = TRUE;
-	}
-
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", text,
-			       NULL);
-
-	if (free_text)
-		g_free (text);
-}
-
-
-static void
-e_day_view_update_long_event_label (EDayView *day_view,
-				    gint      event_num)
-{
-	EDayViewEvent *event;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", summary.value ? summary.value : "",
-			       NULL);
-}
-
-
-/* Finds the day and index of the event with the given canvas item.
-   If is is a long event, -1 is returned as the day.
-   Returns TRUE if the event was found. */
-static gboolean
-e_day_view_find_event_from_item (EDayView *day_view,
-				 GnomeCanvasItem *item,
-				 gint *day_return,
-				 gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-			if (event->canvas_item == item) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		if (event->canvas_item == item) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the day and index of the event with the given uid.
-   If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EDayViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_day_view_find_event_from_uid (EDayView *day_view,
-				const gchar *uid,
-				gint *day_return,
-				gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			cal_component_get_uid (event->comp, &u);
-			if (u && !strcmp (uid, u)) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void
-e_day_view_set_selected_time_range	(EDayView	*day_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date;
-	time_t lower;
-	gint start_row, start_col, end_row, end_col;
-	gboolean need_redraw = FALSE, start_in_grid, end_in_grid;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	/* Calculate the first day that should be shown, based on start_time
-	   and the days_shown setting. If we are showing 1 day it is just the
-	   start of the day given by start_time, otherwise it is the previous
-	   Monday. */
-	if (!day_view->work_week_view) {
-		lower = time_day_begin (start_time);
-	} else {
-		g_date_clear (&date, 1);
-		g_date_set_time (&date, start_time);
-		g_date_subtract_days (&date, g_date_weekday (&date) - 1);
-		lower = time_from_day (g_date_year (&date),
-				       g_date_month (&date) - 1,
-				       g_date_day (&date));
-	}
-
-	/* See if we need to change the days shown. */
-	if (lower != day_view->lower) {
-		e_day_view_recalc_day_starts (day_view, lower);
-		e_day_view_queue_reload_events (day_view);
-	}
-
-	/* Set the selection. */
-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								  start_time,
-								  &start_col,
-								  &start_row);
-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								end_time - 60,
-								&end_col,
-								&end_row);
-
-	/* If either of the times isn't in the grid, or the selection covers
-	   an entire day, we set the selection to 1 row from the start of the
-	   working day, in the day corresponding to the start time. */
-	if (!start_in_grid || !end_in_grid
-	    || (start_row == 0 && end_row == day_view->rows - 1)) {
-		end_col = start_col;
-
-		start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		start_row = CLAMP (start_row, 0, day_view->rows - 1);
-		end_row = start_row;
-	}
-
-	if (start_row != day_view->selection_start_row
-	    || start_col != day_view->selection_start_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = start_row;
-		day_view->selection_start_day = start_col;
-	}
-
-	if (end_row != day_view->selection_end_row
-	    || end_col != day_view->selection_end_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_end_row = end_row;
-		day_view->selection_end_day = end_col;
-	}
-
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* Returns the selected time range. */
-void
-e_day_view_get_selected_time_range	(EDayView	*day_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_col, start_row, end_col, end_row;
-	time_t start, end;
-
-	start_col = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_col = day_view->selection_end_day;
-	end_row = day_view->selection_end_row;
-
-	if (start_col == -1) {
-		start_col = 0;
-		start_row = 0;
-		end_col = 0;
-		end_row = 0;
-	}
-
-	/* Check if the selection is only in the top canvas, in which case
-	   we can simply use the day_starts array. */
-	if (day_view->selection_in_top_canvas) {
-		start = day_view->day_starts[start_col];
-		end = day_view->day_starts[end_col + 1];
-	} else {
-		/* Convert the start col + row into a time. */
-		start = e_day_view_convert_grid_position_to_time (day_view, start_col, start_row);
-		end = e_day_view_convert_grid_position_to_time (day_view, end_col, end_row + 1);
-	}
-
-	if (start_time)
-		*start_time = start;
-
-	if (end_time)
-		*end_time = end;
-}
-
-
-static void
-e_day_view_recalc_day_starts (EDayView *day_view,
-			      time_t start_time)
-{
-	gint day;
-
-	day_view->day_starts[0] = start_time;
-	for (day = 1; day <= day_view->days_shown; day++) {
-		day_view->day_starts[day] = time_add_day (day_view->day_starts[day - 1], 1);
-	}
-
-	day_view->lower = start_time;
-	day_view->upper = day_view->day_starts[day_view->days_shown];
-}
-
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean
-e_day_view_get_work_week_view	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->work_week_view;
-}
-
-
-void
-e_day_view_set_work_week_view	(EDayView	*day_view,
-				 gboolean	 work_week_view)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->work_week_view == work_week_view)
-		return;
-
-	day_view->work_week_view = work_week_view;
-
-	/* FIXME: need to recalc the first day shown if now work-week view. */
-}
-
-
-gint
-e_day_view_get_days_shown	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->days_shown;
-}
-
-
-void
-e_day_view_set_days_shown	(EDayView	*day_view,
-				 gint		 days_shown)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (days_shown >= 1);
-	g_return_if_fail (days_shown <= E_DAY_VIEW_MAX_DAYS);
-
-	if (day_view->days_shown != days_shown) {
-		day_view->days_shown = days_shown;
-		e_day_view_recalc_day_starts (day_view, day_view->lower);
-		e_day_view_recalc_cell_sizes (day_view);
-		e_day_view_queue_reload_events (day_view);
-	}
-}
-
-
-gint
-e_day_view_get_mins_per_row	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->mins_per_row;
-}
-
-
-void
-e_day_view_set_mins_per_row	(EDayView	*day_view,
-				 gint		 mins_per_row)
-{
-	gint day;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (mins_per_row != 5 && mins_per_row != 10 && mins_per_row != 15
-	    && mins_per_row != 30 && mins_per_row != 60) {
-		g_warning ("Invalid minutes per row setting");
-		return;
-	}
-
-	if (day_view->mins_per_row == mins_per_row)
-		return;
-
-	day_view->mins_per_row = mins_per_row;
-	e_day_view_recalc_num_rows (day_view);
-
-	/* If we aren't visible, we'll sort it out later. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		day_view->need_layout[day] = TRUE;
-
-	/* We must layout the events before updating the scroll region, since
-	   that will result in a redraw which would crash otherwise. */
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->time_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	e_day_view_update_scroll_regions (day_view);
-}
-
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays
-e_day_view_get_working_days	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return day_view->working_days;
-}
-
-
-void
-e_day_view_set_working_days	(EDayView	*day_view,
-				 EDayViewDays	 days)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->working_days != days) {
-		day_view->working_days = days;
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void
-e_day_view_get_working_day		(EDayView	*day_view,
-					 gint		*start_hour,
-					 gint		*start_minute,
-					 gint		*end_hour,
-					 gint		*end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	*start_hour = day_view->work_day_start_hour;
-	*start_minute = day_view->work_day_start_minute;
-	*end_hour = day_view->work_day_end_hour;
-	*end_minute = day_view->work_day_end_minute;
-}
-
-
-void
-e_day_view_set_working_day		(EDayView	*day_view,
-					 gint		 start_hour,
-					 gint		 start_minute,
-					 gint		 end_hour,
-					 gint		 end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->work_day_start_hour = start_hour;
-	day_view->work_day_start_minute = start_minute;
-	day_view->work_day_end_hour = end_hour;
-	day_view->work_day_end_minute = end_minute;
-
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Whether we use 12-hour of 24-hour format. */
-gboolean
-e_day_view_get_24_hour_format	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->use_24_hour_format;
-}
-
-
-void
-e_day_view_set_24_hour_format	(EDayView	*day_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->use_24_hour_format != use_24_hour) {
-		day_view->use_24_hour_format = use_24_hour;
-
-		/* FIXME: Eventually we need to do a re-layout. */
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static gboolean
-e_day_view_update_scroll_regions (EDayView *day_view)
-{
-	gdouble old_x2, old_y2, new_x2, new_y2;
-	gboolean need_reshape = FALSE;
-
-	/* Set the scroll region of the time canvas to its allocated width,
-	   but with the height the same as the main canvas. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->time_canvas->allocation.width - 1;
-	new_y2 = MAX (day_view->rows * day_view->row_height,
-		      day_view->main_canvas->allocation.height) - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->main_canvas->allocation.width - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		need_reshape = TRUE;
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-						0, 0, new_x2, new_y2);
-	}
-
-	return need_reshape;
-}
-
-
-/* This recalculates the number of rows to display, based on the time range
-   shown and the minutes per row. */
-static void
-e_day_view_recalc_num_rows	(EDayView	*day_view)
-{
-	gint hours, minutes, total_minutes;
-
-	hours = day_view->last_hour_shown - day_view->first_hour_shown;
-	/* This could be negative but it works out OK. */
-	minutes = day_view->last_minute_shown - day_view->first_minute_shown;
-	total_minutes = hours * 60 + minutes;
-	day_view->rows = total_minutes / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a row in the canvas. Note that if we aren't
-   showing all 24 hours of the day, the returned row may be negative or
-   greater than day_view->rows. */
-gint
-e_day_view_convert_time_to_row	(EDayView	*day_view,
-				 gint		 hour,
-				 gint		 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-	if (offset < 0)
-		return -1;
-	else
-		return offset / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a y coordinate in the canvas. */
-gint
-e_day_view_convert_time_to_position (EDayView	*day_view,
-				     gint	 hour,
-				     gint	 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-
-	return offset * day_view->row_height / day_view->mins_per_row;
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-				       GdkEventButton *event,
-				       EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, day, event_num;
-	EDayViewPosition pos;
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 event_x, event_y,
-							 &day, &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_long_event_button_press (day_view,
-							      event_num,
-							      event, pos,
-							      event_x,
-							      event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, -1);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_convert_event_coords (EDayView *day_view,
-				 GdkEvent *event,
-				 GdkWindow *window,
-				 gint *x_return,
-				 gint *y_return)
-{
-	gint event_x, event_y, win_x, win_y;
-	GdkWindow *event_window;;
-
-	/* Get the event window, x & y from the appropriate event struct. */
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		event_x = event->button.x;
-		event_y = event->button.y;
-		event_window = event->button.window;
-		break;
-	case GDK_MOTION_NOTIFY:
-		event_x = event->motion.x;
-		event_y = event->motion.y;
-		event_window = event->motion.window;
-		break;
-	default:
-		/* Shouldn't get here. */
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
-		gdk_window_get_position (event_window, &win_x, &win_y);
-		event_x += win_x;
-		event_y += win_y;
-		event_window = gdk_window_get_parent (event_window);
-	}
-
-	*x_return = event_x;
-	*y_return = event_y;
-
-	if (event_window != window)
-		g_warning ("Couldn't find event window\n");
-
-	return (event_window == window) ? TRUE : FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-					GdkEventButton *event,
-					EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, row, day, event_num;
-	EDayViewPosition pos;
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	/* Find out where the mouse is. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  event_x, event_y,
-							  &day, &row,
-							  &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_event_button_press (day_view, day,
-							 event_num, event, pos,
-							 event_x, event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, row);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_on_time_canvas_button_press (GtkWidget      *widget,
-					GdkEventButton *event,
-					EDayView       *day_view)
-{
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_long_event_button_press (EDayView		*day_view,
-				       gint		 event_num,
-				       GdkEventButton	*event,
-				       EDayViewPosition  pos,
-				       gint		 event_x,
-				       gint		 event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_long_event_click (day_view, event_num,
-							event, pos,
-							event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, -1,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 E_DAY_VIEW_LONG_EVENT,
-						 event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_event_button_press (EDayView	  *day_view,
-				  gint		   day,
-				  gint		   event_num,
-				  GdkEventButton  *event,
-				  EDayViewPosition pos,
-				  gint		   event_x,
-				  gint		   event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_event_click (day_view, day, event_num,
-						   event, pos,
-						   event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, day,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 day, event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_long_event_click (EDayView *day_view,
-				gint event_num,
-				GdkEventButton  *bevent,
-				EDayViewPosition pos,
-				gint	     event_x,
-				gint	     event_y)
-{
-	EDayViewEvent *event;
-	gint start_day, end_day, day;
-	gint item_x, item_y, item_w, item_h;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_LEFT_EDGE
-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_long_event_rect_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-
-
-static void
-e_day_view_on_event_click (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   GdkEventButton  *bevent,
-			   EDayViewPosition pos,
-			   gint		  event_x,
-			   gint		  event_y)
-{
-	EDayViewEvent *event;
-	gint tmp_day, row, start_row;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_TOP_EDGE
-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = day;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = event->start_minute / day_view->mins_per_row;
-			day_view->resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-			day_view->resize_bars_event_day = day;
-			day_view->resize_bars_event_num = event_num;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_rect_item (day_view);
-
-			e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_rect_item);
-			gnome_canvas_item_raise_to_top (day_view->resize_bar_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-
-	} else {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = day;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_main_canvas (day_view,
-							    event_x, event_y,
-							    &tmp_day, &row,
-							    NULL);
-		start_row = event->start_minute / day_view->mins_per_row;
-		day_view->drag_event_offset = row - start_row;
-	}
-}
-
-
-static void
-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
-{
-	gint day, event_num, start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_long_event_position (day_view, event_num,
-						    &start_day, &end_day,
-						    &item_x, &item_y,
-						    &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_long_event_rect_item);
-}
-
-
-static void
-e_day_view_reshape_resize_rect_item (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_event_position (day_view, day, event_num,
-					       &item_x, &item_y,
-					       &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "x1", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_rect_item);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_bar_item);
-}
-
-
-static void
-e_day_view_on_event_double_click (EDayView *day_view,
-				  gint day,
-				  gint event_num)
-{
-#if 0
-	g_print ("In e_day_view_on_event_double_click\n");
-#endif
-
-}
-
-
-static void
-e_day_view_on_event_right_click (EDayView *day_view,
-				 GdkEventButton *bevent,
-				 gint day,
-				 gint event_num)
-{
-	EDayViewEvent *event;
-	int have_selection, not_being_edited, items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item main_items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
-		&& day_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		items = 1;
-		context_menu = &main_items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			items = 6;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
-		} else {
-			items = 4;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < items; i++)
-		context_menu[i].data = day_view;
-
-	day_view->popup_event_day = day;
-	day_view->popup_event_num = event_num;
-	popup_menu (context_menu, items, bevent);
-}
-
-
-static void
-e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-
-	day_view = E_DAY_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-
-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (day_view->calendar, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	gnome_calendar_edit_object (day_view->calendar, event->comp);
-}
-
-
-static void
-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	struct icaltimetype *time;
-	GSList *list;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	time = g_new0 (struct icaltimetype, 1);
-	*time = icaltime_from_timet (event->start, FALSE, FALSE);
-	list = g_slist_append (list, time);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	const char *uid;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	if (day_view->editing_event_day >= 0)
-		e_day_view_stop_editing_event (day_view);
-
-	cal_component_get_uid (event->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (day_view->client, uid);
-}
-
-
-static void
-e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	GSList *list;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	*date.value = icaltime_from_timet (event->start, FALSE, FALSE);
-	list = g_slist_append (list, &date);
-	cal_component_set_exdate_list (comp, list);
-	g_slist_free (list);
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	*date.value = icaltime_from_timet (event->start, FALSE, FALSE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, FALSE, FALSE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	 * present the updates happen synchronously so our event may disappear.
-	 */
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (day_view->client, new_comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static EDayViewEvent*
-e_day_view_get_popup_menu_event (EDayView *day_view)
-{
-	if (day_view->popup_event_num == -1)
-		return NULL;
-
-	if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
-		return &g_array_index (day_view->long_events,
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-	else
-		return &g_array_index (day_view->events[day_view->popup_event_day],
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-					 GdkEventButton *event,
-					 EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_long_event_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_update_calendar_selection_time (EDayView *day_view)
-{
-	time_t start, end;
-
-	e_day_view_get_selected_time_range (day_view, &start, &end);
-	gnome_calendar_set_selected_time_range (day_view->calendar,
-						start, end);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_motion (GtkWidget *widget,
-				 GdkEventMotion *mevent,
-				 EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_top_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 canvas_x, canvas_y,
-							 &day, &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		e_day_view_update_selection (day_view, day, -1);
-		return TRUE;
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_long_event_resize (day_view, day);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day == E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->pressed_event_num);
-
-		if (!(cal_component_has_recurrences (event->comp))
-		    && (abs (canvas_x - day_view->drag_event_x) 
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y) 
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-			case E_DAY_VIEW_POS_RIGHT_EDGE:
-				cursor = day_view->resize_width_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_top_canvas != cursor) {
-			day_view->last_cursor_set_in_top_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_motion (GtkWidget *widget,
-				  GdkEventMotion *mevent,
-				  EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint row, day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row,
-							  &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_selection (day_view, day, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_resize (day_view, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day != -1
-		   && day_view->pressed_event_day != E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->events[day_view->pressed_event_day], EDayViewEvent, day_view->pressed_event_num);
-
-		if (!cal_component_has_recurrences (event->comp)
-		    && (abs (canvas_x - day_view->drag_event_x) 
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y) 
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-				cursor = day_view->move_cursor;
-				break;
-			case E_DAY_VIEW_POS_TOP_EDGE:
-			case E_DAY_VIEW_POS_BOTTOM_EDGE:
-				cursor = day_view->resize_height_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_main_canvas != cursor) {
-			day_view->last_cursor_set_in_main_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selection to a single cell. If day is -1 then the current
-   start day is reused. If row is -1 then the selection is in the top canvas.
-*/
-void
-e_day_view_start_selection (EDayView *day_view,
-			    gint day,
-			    gint row)
-{
-	if (day == -1) {
-		day = day_view->selection_start_day;
-		if (day == -1)
-			day = 0;
-	}
-
-	day_view->selection_start_day = day;
-	day_view->selection_end_day = day;
-
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	day_view->selection_is_being_dragged = TRUE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Updates the selection during a drag. If day is -1 the selection day is
-   unchanged. */
-void
-e_day_view_update_selection (EDayView *day_view,
-			     gint day,
-			     gint row)
-{
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", day, row);
-#endif
-
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	if (day == -1)
-		day = (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			? day_view->selection_start_day
-			: day_view->selection_end_day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START) {
-		if (row != day_view->selection_start_row
-		    || day != day_view->selection_start_day) {
-			need_redraw = TRUE;
-			day_view->selection_start_row = row;
-			day_view->selection_start_day = day;
-		}
-	} else {
-		if (row != day_view->selection_end_row
-		    || day != day_view->selection_end_day) {
-			need_redraw = TRUE;
-			day_view->selection_end_row = row;
-			day_view->selection_end_day = day;
-		}
-	}
-
-	e_day_view_normalize_selection (day_view);
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_normalize_selection (EDayView *day_view)
-{
-	gint tmp_row, tmp_day;
-
-	/* Switch the drag position if necessary. */
-	if (day_view->selection_start_day > day_view->selection_end_day
-	    || (day_view->selection_start_day == day_view->selection_end_day
-		&& day_view->selection_start_row > day_view->selection_end_row)) {
-		tmp_row = day_view->selection_start_row;
-		tmp_day = day_view->selection_start_day;
-		day_view->selection_start_day = day_view->selection_end_day;
-		day_view->selection_start_row = day_view->selection_end_row;
-		day_view->selection_end_day = tmp_day;
-		day_view->selection_end_row = tmp_row;
-		if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-		else
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_START;
-	}
-}
-
-
-void
-e_day_view_finish_selection (EDayView *day_view)
-{
-	day_view->selection_is_being_dragged = FALSE;
-	e_day_view_update_calendar_selection_time (day_view);
-}
-
-
-static void
-e_day_view_update_long_event_resize (EDayView *day_view,
-				     gint day)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Day:%i\n", day);
-#endif
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		day = MIN (day, day_view->resize_end_row);
-		if (day != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = day;
-
-		}
-	} else {
-		day = MAX (day, day_view->resize_start_row);
-		if (day != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = day;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		e_day_view_reshape_resize_long_event_rect_item (day_view);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	}
-}
-
-
-static void
-e_day_view_update_resize (EDayView *day_view,
-			  gint row)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Row:%i\n", row);
-#endif
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		row = MIN (row, day_view->resize_end_row);
-		if (row != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = row;
-
-		}
-	} else {
-		row = MAX (row, day_view->resize_start_row);
-		if (row != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = row;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_resize_rect_item (day_view);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_long_event_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* We use a temporary copy of the comp since we don't want to
-	   change the original comp here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		dt = day_view->day_starts[day_view->resize_start_row];
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* We use a temporary shallow copy of the ico since we don't want to
-	   change the original ico here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	/* Hide the horizontal bars. */
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_abort_resize (EDayView *day_view,
-			 guint32 time)
-{
-	gint day, event_num;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE)
-		return;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-	gdk_pointer_ungrab (time);
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-
-		day_view->last_cursor_set_in_top_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->top_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-	} else {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-
-		day_view->last_cursor_set_in_main_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->main_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		gnome_canvas_item_hide (day_view->resize_bar_item);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_day_view_queue_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (day_view->reload_events_idle_id == 0) {
-		/* We'll use a high idle priority here, so the events are
-		   reloaded before the canvas is updated. */
-		day_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_HIGH_IDLE,
-			 e_day_view_reload_events_idle_cb, day_view, NULL);
-	}
-}
-
-
-static gboolean
-e_day_view_reload_events_idle_cb	(gpointer data)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	day_view = E_DAY_VIEW (data);
-
-	day_view->reload_events_idle_id = 0;
-
-	e_day_view_reload_events (day_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_day_view_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (!(day_view->client && cal_client_is_loaded (day_view->client)))
-		return;
-
-	/* If both lower & upper are 0, then the time range hasn't been set,
-	   so we don't try to load any events. */
-	if (day_view->calendar
-	    && (day_view->lower != 0 || day_view->upper != 0)) {
-		cal_client_generate_instances (day_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       day_view->lower,
-					       day_view->upper,
-					       e_day_view_add_event,
-					       day_view);
-	}
-
-	/* We need to do this to make sure the top canvas is resized. */
-	day_view->long_events_need_layout = TRUE;
-
-	e_day_view_check_layout (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_free_events (EDayView *day_view)
-{
-	gint day;
-
-	/* Reset all our indices. */
-	day_view->editing_event_day = -1;
-	day_view->popup_event_day = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_event_day = -1;
-	day_view->pressed_event_day = -1;
-	day_view->drag_event_day = -1;
-
-	e_day_view_free_event_array (day_view, day_view->long_events);
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		e_day_view_free_event_array (day_view, day_view->events[day]);
-}
-
-
-static void
-e_day_view_free_event_array (EDayView *day_view,
-			     GArray *array)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < array->len; event_num++) {
-		event = &g_array_index (array, EDayViewEvent, event_num);
-		if (event->canvas_item)
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (array, 0);
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_day_view_add_event (CalComponent *comp,
-		      time_t	  start,
-		      time_t	  end,
-		      gpointer	  data)
-
-{
-	EDayView *day_view;
-	EDayViewEvent event;
-	gint day, offset;
-	struct tm start_tm, end_tm;
-
-	day_view = E_DAY_VIEW (data);
-
-#if 0
-	g_print ("Day view lower: %s", ctime (&day_view->lower));
-	g_print ("Day view upper: %s", ctime (&day_view->upper));
-	g_print ("Event start: %s", ctime (&start));
-	g_print ("Event end  : %s\n", ctime (&end));
-#endif
-
-	/* Check that the event times are valid. */
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < day_view->upper, TRUE);
-	g_return_val_if_fail (end > day_view->lower, TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-	event.start = start;
-	event.end = end;
-	event.canvas_item = NULL;
-
-	/* Calculate the start & end minute, relative to the top of the
-	   display. */
-	offset = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min - offset;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min - offset;
-
-	event.start_row_or_col = -1;
-	event.num_columns = -1;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start >= day_view->day_starts[day]
-		    && end <= day_view->day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == day_view->day_starts[day + 1]) {
-
-				/* If the event last the entire day, then we
-				   skip it here so it gets added to the top
-				   canvas. */
-				if (start == day_view->day_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (day_view->events[day], event);
-			day_view->events_sorted[day] = FALSE;
-			day_view->need_layout[day] = TRUE;
-			return TRUE;
-		}
-	}
-
-	/* The event wasn't within one day so it must be a long event,
-	   i.e. shown in the top canvas. */
-	g_array_append_val (day_view->long_events, event);
-	day_view->long_events_sorted = FALSE;
-	day_view->long_events_need_layout = TRUE;
-	return TRUE;
-}
-
-
-/* This lays out the short (less than 1 day) events in the columns.
-   Any long events are simply skipped. */
-void
-e_day_view_check_layout (EDayView *day_view)
-{
-	gint day;
-
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_day_view_ensure_events_sorted (day_view);
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (day_view->need_layout[day])
-			e_day_view_layout_day_events (day_view, day);
-
-		if (day_view->need_layout[day]
-		    || day_view->need_reshape[day]) {
-			e_day_view_reshape_day_events (day_view, day);
-
-			if (day_view->resize_bars_event_day == day)
-				e_day_view_reshape_main_canvas_resize_bars (day_view);
-		}
-
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	if (day_view->long_events_need_layout)
-		e_day_view_layout_long_events (day_view);
-
-	if (day_view->long_events_need_layout
-	    || day_view->long_events_need_reshape)
-		e_day_view_reshape_long_events (day_view);
-
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-}
-
-
-static void
-e_day_view_layout_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num, old_rows_in_top_display, top_canvas_height, top_rows;
-	guint8 *grid;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8,
-		       day_view->long_events->len * E_DAY_VIEW_MAX_DAYS);
-
-	/* Reset the number of rows in the top display to 0. It will be
-	   updated as events are layed out below. */
-	old_rows_in_top_display = day_view->rows_in_top_display;
-	day_view->rows_in_top_display = 0;
-
-	/* Iterate over the events, finding which days they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		e_day_view_layout_long_event (day_view, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	if (day_view->rows_in_top_display != old_rows_in_top_display) {
-		top_rows = MAX (1, day_view->rows_in_top_display);
-		top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-		gtk_widget_set_usize (day_view->top_canvas, -1,
-				      top_canvas_height);
-	}
-}
-
-
-static void
-e_day_view_layout_long_event (EDayView	   *day_view,
-			      EDayViewEvent *event,
-			      guint8	   *grid)
-{
-	gint start_day, end_day, free_row, day, row;
-
-	event->num_columns = 0;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      &start_day, &end_day))
-		return;
-
-	/* Try each row until we find a free one. */
-	row = 0;
-	do {
-		free_row = row;
-		for (day = start_day; day <= end_day; day++) {
-			if (grid[row * E_DAY_VIEW_MAX_DAYS + day]) {
-				free_row = -1;
-				break;
-			}
-		}
-		row++;
-	} while (free_row == -1);
-
-	event->start_row_or_col = free_row;
-	event->num_columns = 1;
-
-	/* Mark the cells as full. */
-	for (day = start_day; day <= end_day; day++) {
-		grid[free_row * E_DAY_VIEW_MAX_DAYS + day] = 1;
-	}
-
-	/* Update the number of rows in the top canvas if necessary. */
-	day_view->rows_in_top_display = MAX (day_view->rows_in_top_display,
-					     free_row + 1);
-}
-
-
-static void
-e_day_view_reshape_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->num_columns == 0) {
-			if (event->canvas_item) {
-				gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-				event->canvas_item = NULL;
-			}
-		} else {
-			e_day_view_reshape_long_event (day_view, event_num);
-		}
-	}
-}
-
-
-static void
-e_day_view_reshape_long_event (EDayView *day_view,
-			       gint	 event_num)
-{
-	EDayViewEvent *event;
-	GdkFont *font;
-	gint start_day, end_day, item_x, item_y, item_w, item_h;
-	gint text_x, text_w, num_icons, icons_width, width, time_width;
-	CalComponent *comp;
-	gint min_text_x, max_text_w, text_width, line_len;
-	gchar *text, *end_of_line;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-		return;
-	}
-
-	/* Take off the border and padding. */
-	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;
-	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;
-	item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD;
-	item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2;
-
-	/* We don't show the icons while resizing, since we'd have to
-	   draw them on top of the resize rect. Nor when editing. */
-	num_icons = 0;
-	comp = event->comp;
-	font = GTK_WIDGET (day_view)->style->font;
-
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num)
-		show_icons = FALSE;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	if (show_icons) {
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-	}
-
-	if (!event->canvas_item) {
-		event->canvas_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (day_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-					       "max_lines", 1,
-					       "editable", TRUE,
-					       "use_ellipsis", TRUE,
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (event->canvas_item), "event",
-				    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-				    day_view);
-		e_day_view_update_long_event_label (day_view, event_num);
-	}
-
-	/* Calculate its position. We first calculate the ideal position which
-	   is centered with the icons. We then make sure we haven't gone off
-	   the left edge of the available space. Finally we make sure we don't
-	   go off the right edge. */
-	icons_width = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD)
-		* num_icons;
-	time_width = day_view->max_small_hour_width + day_view->colon_width
-		+ day_view->max_minute_width;
-
-	if (use_max_width) {
-		text_x = item_x;
-		text_w = item_w;
-	} else {
-		/* Get the requested size of the label. */
-		gtk_object_get (GTK_OBJECT (event->canvas_item),
-				"text", &text,
-				NULL);
-		text_width = 0;
-		if (text) {
-			end_of_line = strchr (text, '\n');
-			if (end_of_line)
-				line_len = end_of_line - text;
-			else
-				line_len = strlen (text);
-			text_width = gdk_text_width (font, text, line_len);
-			g_free (text);
-		}
-
-		width = text_width + icons_width;
-		text_x = item_x + (item_w - width) / 2;
-
-		min_text_x = item_x;
-		if (event->start > day_view->day_starts[start_day])
-			min_text_x += time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_x = MAX (text_x, min_text_x);
-
-		max_text_w = item_x + item_w - text_x;
-		if (event->end < day_view->day_starts[end_day + 1])
-			max_text_w -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_w = MIN (width, max_text_w);
-
-		/* Now take out the space for the icons. */
-		text_x += icons_width;
-		text_w -= icons_width;
-	}
-
-	text_w = MAX (text_w, 0);
-	gnome_canvas_item_set (event->canvas_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) item_h,
-			       NULL);
-	e_canvas_item_move_absolute(event->canvas_item,
-				    text_x, item_y);
-}
-
-
-/* Find the start and end days for the event. */
-gboolean
-e_day_view_find_long_event_days (EDayView	*day_view,
-				 EDayViewEvent	*event,
-				 gint		*start_day_return,
-				 gint		*end_day_return)
-{
-	gint day, start_day, end_day;
-
-	start_day = -1;
-	end_day = -1;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start_day == -1
-		    && event->start < day_view->day_starts[day + 1])
-			start_day = day;
-		if (event->end > day_view->day_starts[day])
-			end_day = day;
-	}
-
-	/* Sanity check. */
-	if (start_day < 0 || start_day >= day_view->days_shown
-	    || end_day < 0 || end_day >= day_view->days_shown
-	    || end_day < start_day) {
-		g_warning ("Invalid date range for event");
-		return FALSE;
-	}
-
-	*start_day_return = start_day;
-	*end_day_return = end_day;
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_layout_day_events (EDayView *day_view,
-			      gint	day)
-{
-	EDayViewEvent *event;
-	gint row, event_num;
-	guint8 *grid;
-
-	/* This is a temporary array which keeps track of rows which are
-	   connected. When an appointment spans multiple rows then the number
-	   of columns in each of these rows must be the same (i.e. the maximum
-	   of all of them). Each element in the array corresponds to one row
-	   and contains the index of the first row in the group of connected
-	   rows. */
-	guint16 group_starts[12 * 24];
-
-	/* Reset the cols_per_row array, and initialize the connected rows. */
-	for (row = 0; row < day_view->rows; row++) {
-		day_view->cols_per_row[day][row] = 0;
-		group_starts[row] = row;
-	}
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied. */
-	grid = g_new0 (guint8, day_view->rows * E_DAY_VIEW_MAX_COLUMNS);
-
-
-	/* Iterate over the events, finding which rows they cover, and putting
-	   them in the first free column available. Increment the number of
-	   events in each of the rows it covers, and make sure they are all
-	   in one group. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		e_day_view_layout_day_event (day_view, day, event,
-					     grid, group_starts);
-	}
-
-	/* Recalculate the number of columns needed in each row. */
-	e_day_view_recalc_cols_per_row (day_view, day, group_starts);
-
-	/* Iterate over the events again, trying to expand events horizontally
-	   if there is enough space. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		e_day_view_expand_day_event (day_view, day, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-/* Finds the first free position to place the event in.
-   Increments the number of events in each of the rows it covers, and makes
-   sure they are all in one group. */
-static void
-e_day_view_layout_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid,
-			     guint16	   *group_starts)
-{
-	gint start_row, end_row, free_col, col, row, group_start;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	event->num_columns = 0;
-
-	/* If the event can't currently be seen, just return. */
-	if (start_row >= day_view->rows || end_row < 0)
-		return;
-
-	/* Make sure we don't go outside the visible times. */
-	start_row = CLAMP (start_row, 0, day_view->rows - 1);
-	end_row = CLAMP (end_row, 0, day_view->rows - 1);
-
-	/* Try each column until we find a free one. */
-	for (col = 0; col < E_DAY_VIEW_MAX_COLUMNS; col++) {
-		free_col = col;
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				free_col = -1;
-				break;
-			}
-		}
-
-		if (free_col != -1)
-			break;
-	}
-
-	/* If we can't find space for the event, just return. */
-	if (free_col == -1)
-		return;
-
-	/* The event is assigned 1 col initially, but may be expanded later. */
-	event->start_row_or_col = free_col;
-	event->num_columns = 1;
-
-	/* Determine the start index of the group. */
-	group_start = group_starts[start_row];
-
-	/* Increment number of events in each of the rows the event covers.
-	   We use the cols_per_row array for this. It will be sorted out after
-	   all the events have been layed out. Also make sure all the rows that
-	   the event covers are in one group. */
-	for (row = start_row; row <= end_row; row++) {
-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;
-		day_view->cols_per_row[day][row]++;
-		group_starts[row] = group_start;
-	}
-
-	/* If any following rows should be in the same group, add them. */
-	for (row = end_row + 1; row < day_view->rows; row++) {
-		if (group_starts[row] > end_row)
-			break;
-		group_starts[row] = group_start;
-	}
-}
-
-
-/* For each group of rows, find the max number of events in all the
-   rows, and set the number of cols in each of the rows to that. */
-static void
-e_day_view_recalc_cols_per_row (EDayView *day_view,
-				gint	  day,
-				guint16  *group_starts)
-{
-	gint start_row = 0, row, next_start_row, max_events;
-
-	while (start_row < day_view->rows) {
-
-		max_events = 0;
-		for (row = start_row; row < day_view->rows && group_starts[row] == start_row; row++)
-			max_events = MAX (max_events, day_view->cols_per_row[day][row]);
-
-		next_start_row = row;
-
-		for (row = start_row; row < next_start_row; row++)
-			day_view->cols_per_row[day][row] = max_events;
-
-		start_row = next_start_row;
-	}
-}
-
-
-/* Expands the event horizontally to fill any free space. */
-static void
-e_day_view_expand_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid)
-{
-	gint start_row, end_row, col, row;
-	gboolean clashed;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	/* Try each column until we find a free one. */
-	clashed = FALSE;
-	for (col = event->start_row_or_col + 1; col < day_view->cols_per_row[day][start_row]; col++) {
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				clashed = TRUE;
-				break;
-			}
-		}
-
-		if (clashed)
-			break;
-
-		event->num_columns++;
-	}
-}
-
-
-/* This creates or updates the sizes of the canvas items for one day of the
-   main canvas. */
-static void
-e_day_view_reshape_day_events (EDayView *day_view,
-			       gint	 day)
-{
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-}
-
-
-static void
-e_day_view_reshape_day_event (EDayView *day_view,
-			      gint	day,
-			      gint	event_num)
-{
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h;
-	gint num_icons, icons_offset;
-	CalComponent *comp;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	comp = event->comp;
-
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-	} else {
-		/* Skip the border and padding. */
-		item_x += E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD;
-		item_w -= E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD * 2;
-		item_y += E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD;
-		item_h -= (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2;
-
-		/* We don't show the icons while resizing, since we'd have to
-		   draw them on top of the resize rect. */
-		num_icons = 0;
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-		    || day_view->resize_event_day != day
-		    || day_view->resize_event_num != event_num) {
-			if (cal_component_has_alarms (comp))
-				num_icons++;
-			if (cal_component_has_recurrences (comp))
-				num_icons++;
-		}
-
-		if (num_icons > 0) {
-			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)
-				icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;
-			else
-				icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;
-			item_x += icons_offset;
-			item_w -= icons_offset;
-		}
-
-		if (!event->canvas_item) {
-			event->canvas_item =
-				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
-						       e_text_get_type (),
-						       "font_gdk", GTK_WIDGET (day_view)->style->font,
-						       "anchor", GTK_ANCHOR_NW,
-						       "line_wrap", TRUE,
-						       "editable", TRUE,
-						       "clip", TRUE,
-						       "use_ellipsis", TRUE,
-						       NULL);
-			gtk_signal_connect (GTK_OBJECT (event->canvas_item),
-					    "event",
-					    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-					    day_view);
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-		}
-
-		item_w = MAX (item_w, 0);
-		gnome_canvas_item_set (event->canvas_item,
-				       "clip_width", (gdouble) item_w,
-				       "clip_height", (gdouble) item_h,
-				       NULL);
-		e_canvas_item_move_absolute(event->canvas_item,
-					    item_x, item_y);
-	}
-}
-
-
-/* This creates or resizes the horizontal bars used to resize events in the
-   main canvas. */
-static void
-e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x, y, w, h;
-
-	day = day_view->resize_bars_event_day;
-	event_num = day_view->resize_bars_event_num;
-
-	/* If we're not editing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day != -1 && day == day_view->drag_event_day
-	    && event_num == day_view->drag_event_num) {
-		gtk_object_get (GTK_OBJECT (day_view->drag_rect_item),
-				"x1", &x,
-				"y1", &y,
-				"x2", &w,
-				"y2", &h,
-				NULL);
-		w -= x;
-		x++;
-		h -= y;
-	} else if (day != -1
-		   && e_day_view_get_event_position (day_view, day, event_num,
-						     &item_x, &item_y,
-						     &item_w, &item_h)) {
-		x = item_x + E_DAY_VIEW_BAR_WIDTH;
-		y = item_y;
-		w = item_w - E_DAY_VIEW_BAR_WIDTH;
-		h = item_h;
-	} else {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-		return;
-	}
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y - E_DAY_VIEW_BAR_HEIGHT,
-			       "x2", x + w - 1,
-			       "y2", y - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_top_resize_bar_item);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y + h,
-			       "x2", x + w - 1,
-			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
-}
-
-
-static void
-e_day_view_ensure_events_sorted (EDayView *day_view)
-{
-	gint day;
-
-	/* Sort the long events. */
-	if (!day_view->long_events_sorted) {
-		qsort (day_view->long_events->data,
-		       day_view->long_events->len,
-		       sizeof (EDayViewEvent),
-		       e_day_view_event_sort_func);
-		day_view->long_events_sorted = TRUE;
-	}
-
-	/* Sort the events for each day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (!day_view->events_sorted[day]) {
-			qsort (day_view->events[day]->data,
-			       day_view->events[day]->len,
-			       sizeof (EDayViewEvent),
-			       e_day_view_event_sort_func);
-			day_view->events_sorted[day] = TRUE;
-		}
-	}
-}
-
-
-static gint
-e_day_view_event_sort_func (const void *arg1,
-			    const void *arg2)
-{
-	EDayViewEvent *event1, *event2;
-
-	event1 = (EDayViewEvent*) arg1;
-	event2 = (EDayViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static gint
-e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	gint day, event_num;
-	gchar *initial_text;
-	guint keyval;
-	gboolean stop_emission;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-	keyval = event->keyval;
-
-	/* The Escape key aborts a resize operation. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (keyval == GDK_Escape) {
-			e_day_view_abort_resize (day_view, event->time);
-		}
-		return FALSE;
-	}
-
-	/* Handle the cursor keys for moving & extending the selection. */
-	stop_emission = TRUE;
-	if (event->state & GDK_SHIFT_MASK) {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up_shifted (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down_shifted (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left_shifted (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right_shifted (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	} else {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	}
-	if (stop_emission)
-		return TRUE;
-
-	if (day_view->selection_start_day == -1)
-		return FALSE;
-
-	/* Check if there is room for a new event to be typed in. If there
-	   isn't we don't want to add an event as we will then add a new
-	   event for every key press. */
-	if (!e_day_view_check_if_new_event_fits (day_view)) {
-		return FALSE;
-	}
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((keyval < 0x20)
-		   || (keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range */
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	*dt.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	*dt.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_day_view_add_event (comp, dtstart, dtend, day_view);
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		e_day_view_start_editing_event (day_view, day, event_num,
-						initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row == 0)
-		return;
-
-	*row = *row - 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row >= day_view->rows - 1)
-		return;
-
-	*row = *row + 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day == 0)
-		return;
-
-	*day = *day - 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day >= day_view->days_shown - 1)
-		return;
-
-	*day = *day + 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		return;
-	} else if (day_view->selection_start_row == 0) {
-		day_view->selection_in_top_canvas = TRUE;
-		day_view->selection_start_row = -1;
-	} else {
-		day_view->selection_start_row--;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = 0;
-	} else if (day_view->selection_start_row >= day_view->rows - 1) {
-		return;
-	} else {
-		day_view->selection_start_row++;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == 0) {
-		gnome_calendar_previous (day_view->calendar);
-	} else {
-		day_view->selection_start_day--;
-		day_view->selection_end_day--;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_end_day == day_view->days_shown - 1) {
-		gnome_calendar_next (day_view->calendar);
-	} else {
-		day_view->selection_start_day++;
-		day_view->selection_end_day++;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static gboolean
-e_day_view_check_if_new_event_fits (EDayView *day_view)
-{
-	gint day, start_row, end_row, row;
-
-	day = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_row = day_view->selection_end_row;
-
-	/* Long events always fit, since we keep adding rows to the top
-	   canvas. */
-	if (day != day_view->selection_end_day)
-		return TRUE;
-	if (start_row == 0 && end_row == day_view->rows)
-		return TRUE;
-
-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,
-	   return FALSE. */
-	for (row = start_row; row <= end_row; row++) {
-		if (day_view->cols_per_row[day][row] >= E_DAY_VIEW_MAX_COLUMNS)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_ensure_rows_visible (EDayView *day_view,
-				gint start_row,
-				gint end_row)
-{
-	GtkAdjustment *adj;
-	gfloat value, min_value, max_value;
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	value = adj->value;
-
-	min_value = (end_row + 1) * day_view->row_height - adj->page_size;
-	if (value < min_value)
-		value = min_value;
-
-	max_value = start_row * day_view->row_height;
-	if (value > max_value)
-		value = max_value;
-
-	if (value != adj->value) {
-		adj->value = value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_day_view_start_editing_event (EDayView *day_view,
-				gint	  day,
-				gint	  event_num,
-				gchar    *initial_text)
-{
-	EDayViewEvent *event;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-#if 0
-	g_print ("In e_day_view_start_editing_event\n");
-#endif
-
-	/* If we are already editing the event, just return. */
-	if (day == day_view->editing_event_day
-	    && event_num == day_view->editing_event_num)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!event->canvas_item)
-		return;
-
-	/* We must grab the focus before setting the initial text, since
-	   grabbing the focus will result in a call to
-	   e_day_view_on_editing_started(), which will reset the text to get
-	   rid of the start and end times. */
-	e_canvas_item_grab_focus (event->canvas_item);
-
-	if (initial_text) {
-		gnome_canvas_item_set (event->canvas_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops the current edit. If accept is TRUE the event summary is update,
-   else the edit is cancelled. */
-static void
-e_day_view_stop_editing_event (EDayView *day_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (day_view->editing_event_day == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_day_view_on_text_item_event (GnomeCanvasItem *item,
-			       GdkEvent *event,
-			       EDayView *day_view)
-{
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing)
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in)
-			e_day_view_on_editing_started (day_view, item);
-		else
-			e_day_view_on_editing_stopped (day_view, item);
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_editing_started (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-
-	if (!e_day_view_find_event_from_item (day_view, item,
-					      &day, &event_num))
-		return;
-
-#if 0
-	g_print ("In e_day_view_on_editing_started Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* FIXME: This is a temporary workaround for a bug which seems to stop
-	   us getting focus_out signals. It is not a complete fix since if we
-	   don't get focus_out signals we don't save the appointment text so
-	   this may be lost. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	day_view->editing_event_day = day;
-	day_view->editing_event_num = event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		day_view->resize_bars_event_day = day;
-		day_view->resize_bars_event_num = event_num;
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-	}
-}
-
-
-static void
-e_day_view_on_editing_stopped (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-	gboolean editing_long_event = FALSE;
-	EDayViewEvent *event;
-	gchar *text = NULL;
-	CalComponentText summary;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-#if 0
-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* If no item is being edited, just return. */
-	if (day == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		editing_long_event = TRUE;
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* Hide the horizontal bars. */
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-
-	/* Reset the edit fields. */
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		return;
-	}
-
-	if (text) {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		g_free (text);
-	} else
-		cal_component_set_summary (event->comp, NULL);
-
-	if (!cal_client_update_object (day_view->client, event->comp))
-		g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-/* FIXME: It is possible that we may produce an invalid time due to daylight
-   saving times (i.e. when clocks go forward there is a range of time which
-   is not valid). I don't know the best way to handle daylight saving time. */
-static time_t
-e_day_view_convert_grid_position_to_time (EDayView *day_view,
-					  gint col,
-					  gint row)
-{
-	struct tm *tmp_tm;
-	time_t val;
-	gint minutes;
-
-	/* Calulate the number of minutes since the start of the day. */
-	minutes = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown
-		+ row * day_view->mins_per_row;
-
-	/* A special case for midnight, where we can use the start of the
-	   next day. */
-	if (minutes == 60 * 24)
-		return day_view->day_starts[col + 1];
-
-	/* We convert the start of the day to a struct tm, then set the
-	   hour and minute, then convert it back to a time_t. */
-	tmp_tm = localtime (&day_view->day_starts[col]);
-
-	tmp_tm->tm_hour = minutes / 60;
-	tmp_tm->tm_min = minutes % 60;
-	tmp_tm->tm_isdst = -1;
-
-	val = mktime (tmp_tm);
-	return val;
-}
-
-
-static gboolean
-e_day_view_convert_time_to_grid_position (EDayView *day_view,
-					  time_t time,
-					  gint *col,
-					  gint *row)
-{
-	struct tm *tmp_tm;
-	gint day, minutes;
-
-	*col = *row = 0;
-
-	if (time < day_view->lower || time >= day_view->upper)
-		return FALSE;
-
-	/* We can find the column easily using the day_starts array. */
-	for (day = 1; day <= day_view->days_shown; day++) {
-		if (time < day_view->day_starts[day]) {
-			*col = day - 1;
-			break;
-		}
-	}
-
-	/* To find the row we need to convert the time to a struct tm,
-	   calculate the offset in minutes from the top of the display and
-	   divide it by the mins per row setting. */
-	tmp_tm = localtime (&time);
-	minutes = tmp_tm->tm_hour * 60 + tmp_tm->tm_min;
-	minutes -= day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-
-	*row = minutes / day_view->mins_per_row;
-
-	if (*row < 0 || *row >= day_view->rows)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* This starts or stops auto-scrolling when dragging a selection or resizing
-   an event. */
-void
-e_day_view_check_auto_scroll (EDayView *day_view,
-			      gint event_x,
-			      gint event_y)
-{
-	day_view->last_mouse_x = event_x;
-	day_view->last_mouse_y = event_y;
-
-	if (event_y < E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, TRUE);
-	else if (event_y >= day_view->main_canvas->allocation.height
-		 - E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, FALSE);
-	else
-		e_day_view_stop_auto_scroll (day_view);
-}
-
-
-static void
-e_day_view_start_auto_scroll (EDayView *day_view,
-			      gboolean scroll_up)
-{
-	if (day_view->auto_scroll_timeout_id == 0) {
-		day_view->auto_scroll_timeout_id = g_timeout_add (E_DAY_VIEW_AUTO_SCROLL_TIMEOUT, e_day_view_auto_scroll_handler, day_view);
-		day_view->auto_scroll_delay = E_DAY_VIEW_AUTO_SCROLL_DELAY;
-	}
-	day_view->auto_scroll_up = scroll_up;
-}
-
-
-void
-e_day_view_stop_auto_scroll (EDayView *day_view)
-{
-	if (day_view->auto_scroll_timeout_id != 0) {
-		gtk_timeout_remove (day_view->auto_scroll_timeout_id);
-		day_view->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_day_view_auto_scroll_handler (gpointer data)
-{
-	EDayView *day_view;
-	EDayViewPosition pos;
-	gint scroll_x, scroll_y, new_scroll_y, canvas_x, canvas_y, row, day;
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	day_view = E_DAY_VIEW (data);
-
-	GDK_THREADS_ENTER ();
-
-	if (day_view->auto_scroll_delay > 0) {
-		day_view->auto_scroll_delay--;
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	if (day_view->auto_scroll_up)
-		new_scroll_y = MAX (scroll_y - adj->step_increment, 0);
-	else
-		new_scroll_y = MIN (scroll_y + adj->step_increment,
-				    adj->upper - adj->page_size);
-
-	if (new_scroll_y != scroll_y) {
-		/* NOTE: This reduces flicker, but only works if we don't use
-		   canvas items which have X windows. */
-		gtk_layout_freeze (GTK_LAYOUT (day_view->main_canvas));
-
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					scroll_x, new_scroll_y);
-
-		gtk_layout_thaw (GTK_LAYOUT (day_view->main_canvas));
-	}
-
-	canvas_x = day_view->last_mouse_x + scroll_x;
-	canvas_y = day_view->last_mouse_y + new_scroll_y;
-
-	/* The last_mouse_x position is set to -1 when we are selecting using
-	   the time column. In this case we set canvas_x to 0 and we ignore
-	   the resulting day. */
-	if (day_view->last_mouse_x == -1)
-		canvas_x = 0;
-
-	/* Update the selection/resize/drag if necessary. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row, NULL);
-
-	if (day_view->last_mouse_x == -1)
-		day = -1;
-
-	if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-		if (day_view->selection_is_being_dragged) {
-			e_day_view_update_selection (day_view, day, row);
-		} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-			e_day_view_update_resize (day_view, row);
-		} else if (day_view->drag_item->object.flags
-			   & GNOME_CANVAS_ITEM_VISIBLE) {
-			e_day_view_update_main_canvas_drag (day_view, row,
-							    day);
-		}
-	}
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_event_position (EDayView *day_view,
-			       gint day,
-			       gint event_num,
-			       gint *item_x,
-			       gint *item_y,
-			       gint *item_w,
-			       gint *item_h)
-{
-	EDayViewEvent *event;
-	gint start_row, end_row, cols_in_row, start_col, num_columns;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	cols_in_row = day_view->cols_per_row[day][start_row];
-	start_col = event->start_row_or_col;
-	num_columns = event->num_columns;
-
-	if (cols_in_row == 0)
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			start_row = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			end_row = day_view->resize_end_row;
-	}
-
-
-	*item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = start_row * day_view->row_height;
-#if 0
-	*item_h = (end_row - start_row + 1) * day_view->row_height;
-#else
-	/* This makes the event end on the grid line of the next row,
-	   which maybe looks nicer if you have 2 events on consecutive rows. */
-	*item_h = (end_row - start_row + 1) * day_view->row_height + 1;
-#endif
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_long_event_position	(EDayView	*day_view,
-					 gint		 event_num,
-					 gint		*start_day,
-					 gint		*end_day,
-					 gint		*item_x,
-					 gint		*item_y,
-					 gint		*item_w,
-					 gint		*item_h)
-{
-	EDayViewEvent *event;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      start_day, end_day))
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			*start_day = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			*end_day = day_view->resize_end_row;
-	}
-
-	*item_x = day_view->day_offsets[*start_day] + E_DAY_VIEW_BAR_WIDTH;
-	*item_w = day_view->day_offsets[*end_day + 1] - *item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = (event->start_row_or_col + 1) * day_view->top_row_height;
-	*item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	return TRUE;
-}
-
-
-/* Converts a position within the entire top canvas to a day & event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-					   gint x,
-					   gint y,
-					   gint *day_return,
-					   gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, row, col;
-	gint event_num, start_day, end_day, item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->top_row_height - 1;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->start_row_or_col != row)
-			continue;
-
-		if (!e_day_view_get_long_event_position (day_view, event_num,
-							 &start_day, &end_day,
-							 &item_x, &item_y,
-							 &item_w, &item_h))
-			continue;
-
-		if (x < item_x)
-			continue;
-
-		if (x >= item_x + item_w)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    + E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item_x + item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    - E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_RIGHT_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-/* Converts a position within the entire main canvas to a day, row, event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-					    gint x,
-					    gint y,
-					    gint *day_return,
-					    gint *row_return,
-					    gint *event_num_return)
-{
-	gint day, row, col, event_num;
-	gint item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	*row_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	/* Check the position is inside the canvas, and determine the day
-	   and row. */
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-	*row_return = row;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	/* Check the selected item first, since the horizontal resizing bars
-	   may be above other events. */
-	if (day_view->resize_bars_event_day == day) {
-		if (e_day_view_get_event_position (day_view, day,
-						   day_view->resize_bars_event_num,
-						   &item_x, &item_y,
-						   &item_w, &item_h)) {
-			if (x >= item_x && x < item_x + item_w) {
-				*event_num_return = day_view->resize_bars_event_num;
-				if (y >= item_y - E_DAY_VIEW_BAR_HEIGHT
-				    && y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT)
-					return E_DAY_VIEW_POS_TOP_EDGE;
-				if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-				    && y < item_y + item_h + E_DAY_VIEW_BAR_HEIGHT)
-					return E_DAY_VIEW_POS_BOTTOM_EDGE;
-			}
-		}
-	}
-
-	/* Try to find the event at the found position. */
-	*event_num_return = -1;
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		if (!e_day_view_get_event_position (day_view, day, event_num,
-						    &item_x, &item_y,
-						    &item_w, &item_h))
-			continue;
-
-		if (x < item_x || x >= item_x + item_w
-		    || y < item_y || y >= item_y + item_h)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_BAR_WIDTH)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    + E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_TOP_EDGE;
-
-		if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    - E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_BOTTOM_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-static gint
-e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      gint            x,
-				      gint            y,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_top_canvas_drag_item (day_view);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_top_canvas (day_view, x, y,
-							 &day, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT)
-		day -= day_view->drag_event_offset;
-	day = MAX (day, 0);
-
-	e_day_view_update_top_canvas_drag (day_view, day);
-}
-
-
-static void
-e_day_view_update_top_canvas_drag (EDayView *day_view,
-				   gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint row, num_days, start_day, end_day;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	row = day_view->rows_in_top_display + 1;
-	num_days = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-		row = event->start_row_or_col + 1;
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		num_days = end_day - start_day + 1;
-
-		/* Make sure we don't go off the screen. */
-		day = MIN (day, day_view->days_shown - num_days);
-
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-	}
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && (day_view->drag_long_event_item->object.flags
-		& GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-
-
-	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
-	item_w = day_view->day_offsets[day + num_days] - item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->top_row_height;
-	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_long_event_item,
-				     item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD);
-
-	if (!(day_view->drag_long_event_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_rect_item);
-		gnome_canvas_item_show (day_view->drag_long_event_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_long_event_item->object.flags
-	      & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		cal_component_get_summary (event->comp, &summary);
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_long_event_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_item);
-		gnome_canvas_item_show (day_view->drag_long_event_item);
-
-		g_free (text);
-	}
-}
-
-
-static gint
-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-				       GdkDragContext *context,
-				       gint            x,
-				       gint            y,
-				       guint           time,
-				       EDayView	      *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_main_canvas_drag_item (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	e_day_view_check_auto_scroll (day_view, x, y);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day, row;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,
-							  &day, &row, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day != -1
-	    && day_view->drag_event_day != E_DAY_VIEW_LONG_EVENT)
-		row -= day_view->drag_event_offset;
-	row = MAX (row, 0);
-
-	e_day_view_update_main_canvas_drag (day_view, row, day);
-}
-
-
-static void
-e_day_view_update_main_canvas_drag (EDayView *day_view,
-				    gint row,
-				    gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && day_view->drag_last_row == row
-	    && (day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-	day_view->drag_last_row = row;
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	cols_in_row = 1;
-	start_row = 0;
-	start_col = 0;
-	num_columns = 1;
-	num_rows = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-		start_row = event->start_minute / day_view->mins_per_row;
-		end_row = (event->end_minute - 1) / day_view->mins_per_row;
-		num_rows = end_row - start_row + 1;
-	}
-
-	if (day_view->drag_event_day == day && start_row == row) {
-		cols_in_row = day_view->cols_per_row[day][row];
-		start_col = event->start_row_or_col;
-		num_columns = event->num_columns;
-	}
-
-	item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->row_height;
-	item_h = num_rows * day_view->row_height;
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_item,
-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);
-
-	if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_bar_item);
-		gnome_canvas_item_show (day_view->drag_bar_item);
-	}
-
-	if (!(day_view->drag_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_rect_item);
-		gnome_canvas_item_show (day_view->drag_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_item);
-		gnome_canvas_item_show (day_view->drag_item);
-
-		g_free (text);
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-				     GdkDragContext *context,
-				     guint           time,
-				     EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-	/* Hide the resize bars if they are being used in the drag. */
-	if (day_view->drag_event_day == day_view->resize_bars_event_day
-	    && day_view->drag_event_num == day_view->resize_bars_event_num) {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-}
-
-
-static void
-e_day_view_on_drag_begin (GtkWidget      *widget,
-			  GdkDragContext *context,
-			  EDayView	 *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	/* Hide the text item, since it will be shown in the special drag
-	   items. */
-	gnome_canvas_item_hide (event->canvas_item);
-}
-
-
-static void
-e_day_view_on_drag_end (GtkWidget      *widget,
-			GdkDragContext *context,
-			EDayView       *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* If the calendar has already been updated in drag_data_received()
-	   we just return. */
-	if (day == -1 || event_num == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-
-	/* Show the text item again. */
-	gnome_canvas_item_show (event->canvas_item);
-
-	day_view->drag_event_day = -1;
-	day_view->drag_event_num = -1;
-}
-
-
-static void
-e_day_view_on_drag_data_get (GtkWidget          *widget,
-			     GdkDragContext     *context,
-			     GtkSelectionData   *selection_data,
-			     guint               info,
-			     guint               time,
-			     EDayView		*day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *event_uid;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-
-	cal_component_get_uid (event->comp, &event_uid);
-
-	g_return_if_fail (event_uid != NULL);
-
-	if (info == TARGET_CALENDAR_EVENT) {
-		gtk_selection_data_set (selection_data,	selection_data->target,
-					8, event_uid, strlen (event_uid));
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
-					      GdkDragContext     *context,
-					      gint                x,
-					      gint                y,
-					      GtkSelectionData   *data,
-					      guint               info,
-					      guint               time,
-					      EDayView	         *day_view)
-{
-	EDayViewEvent *event=NULL;
-	EDayViewPosition pos;
-	gint day, start_day, end_day, num_days;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_days = 1;
-			start_offset = 0;
-			end_offset = -1;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (day_view,
-								 event,
-								 &start_day,
-								 &end_day);
-				num_days = end_day - start_day + 1;
-				/* Make sure we don't go off the screen. */
-				day = MIN (day, day_view->days_shown - num_days);
-
-				start_offset = event->start_minute;
-				end_offset = event->end_minute;
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow of the comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			if (end_offset == -1 || end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "
-					   "not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
-					       GdkDragContext     *context,
-					       gint                x,
-					       gint                y,
-					       GtkSelectionData   *data,
-					       guint               info,
-					       guint               time,
-					       EDayView		  *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	x += scroll_x;
-	y += scroll_y;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_rows = 1;
-			start_offset = 0;
-			end_offset = 0;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-				row -= day_view->drag_event_offset;
-
-				/* Calculate time offset from start row. */
-				start_row = event->start_minute / day_view->mins_per_row;
-				end_row = (event->end_minute - 1) / day_view->mins_per_row;
-				num_rows = end_row - start_row + 1;
-
-				start_offset = event->start_minute % day_view->mins_per_row;
-				end_offset = event->end_minute % day_view->mins_per_row;
-				if (end_offset != 0)
-					end_offset = day_view->mins_per_row - end_offset;
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow copy of comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_main_canvas_drag_data_received(): "
-					   "Could not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index bf72d47f46..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,565 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_H_
-#define _E_DAY_VIEW_H_
-
-#include <time.h>
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-/* The maximum number of days shown. We use the week view for anything more
-   than about 9 days. */
-#define E_DAY_VIEW_MAX_DAYS		10
-
-/* This is used as a special code to signify a long event instead of the day
-   of a normal event. */
-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
-
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
-
-/* The width of the gap between appointments. This should be at least
-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
-   the triangle to represent continuing events. */
-#define E_DAY_VIEW_GAP_WIDTH		7
-
-/* The width of the bars down the left of each column and appointment.
-   This includes the borders on each side of it. */
-#define E_DAY_VIEW_BAR_WIDTH		7
-
-/* The height of the horizontal bar above & beneath the selected event.
-   This includes the borders on the top and bottom. */
-#define E_DAY_VIEW_BAR_HEIGHT		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_DAY_VIEW_ICON_WIDTH		16
-#define E_DAY_VIEW_ICON_HEIGHT		16
-#define E_DAY_VIEW_ICON_X_PAD		0
-#define E_DAY_VIEW_ICON_Y_PAD		0
-
-/* The size of the border around the event. */
-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_DAY_VIEW_EVENT_X_PAD		2
-#define E_DAY_VIEW_EVENT_Y_PAD		1
-
-/* The padding on each side of the event text for events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2
-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2
-
-/* The size of the border around the long events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1
-
-/* The space between the time and the icon/text in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2
-
-/* The gap between rows in the top canvas. */
-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	E_DAY_VIEW_SUNDAY	= 1 << 0,
-	E_DAY_VIEW_MONDAY	= 1 << 1,
-	E_DAY_VIEW_TUESDAY	= 1 << 2,
-	E_DAY_VIEW_WEDNESDAY	= 1 << 3,
-	E_DAY_VIEW_THURSDAY	= 1 << 4,
-	E_DAY_VIEW_FRIDAY	= 1 << 5,
-	E_DAY_VIEW_SATURDAY	= 1 << 6
-} EDayViewDays;
-
-
-/* These are used to specify the type of an appointment. They match those
-   used in EMeetingTimeSelector. */
-typedef enum
-{
-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,
-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,
-	E_DAY_VIEW_BUSY_BUSY		= 2,
-
-	E_DAY_VIEW_BUSY_LAST		= 3
-} EDayViewBusyType;
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Thursday 12 September'. The abbreviated format is
-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
-   is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
-typedef enum
-{
-	E_DAY_VIEW_DATE_FULL,
-	E_DAY_VIEW_DATE_ABBREVIATED,
-	E_DAY_VIEW_DATE_NO_WEEKDAY,
-	E_DAY_VIEW_DATE_SHORT
-} EDayViewDateFormat;
-
-/* These index our colors array. */
-typedef enum
-{
-	E_DAY_VIEW_COLOR_BG_WORKING,
-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,
-	E_DAY_VIEW_COLOR_EVENT_VBAR,
-
-	E_DAY_VIEW_COLOR_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_EVENT_BORDER,
-	
-	E_DAY_VIEW_COLOR_LAST
-} EDayViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_DAY_VIEW_DRAG_START,
-	E_DAY_VIEW_DRAG_END
-} EDayViewDragPosition;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_DAY_VIEW_POS_OUTSIDE,
-	E_DAY_VIEW_POS_NONE,
-	E_DAY_VIEW_POS_EVENT,
-	E_DAY_VIEW_POS_LEFT_EDGE,
-	E_DAY_VIEW_POS_RIGHT_EDGE,
-	E_DAY_VIEW_POS_TOP_EDGE,
-	E_DAY_VIEW_POS_BOTTOM_EDGE
-} EDayViewPosition;
-
-typedef struct _EDayViewEvent EDayViewEvent;
-struct _EDayViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint8 start_row_or_col;/* The start column for normal events, or the
-				   start row for long events. */
-	guint8 num_columns;	/* 0 indicates not displayed. For long events
-				   this is just 1 if the event is shown. */
-	guint16 start_minute;	/* Offsets from the start of the display. */
-	guint16 end_minute;
-	GnomeCanvasItem *canvas_item;
-};
-
-
-#define E_DAY_VIEW(obj)          GTK_CHECK_CAST (obj, e_day_view_get_type (), EDayView)
-#define E_DAY_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
-#define E_IS_DAY_VIEW(obj)       GTK_CHECK_TYPE (obj, e_day_view_get_type ())
-
-
-typedef struct _EDayView       EDayView;
-typedef struct _EDayViewClass  EDayViewClass;
-
-struct _EDayView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates and long appointments are shown. */
-	GtkWidget *top_canvas;
-	GnomeCanvasItem *top_canvas_item;
-
-	/* The main canvas where the rest of the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	/* The canvas displaying the times of the day. */
-	GtkWidget *time_canvas;
-	GnomeCanvasItem *time_canvas_item;
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The start and end of the day shown. */
-	time_t lower;
-	time_t upper;
-
-	/* Whether we are showing the work-week view. */
-	gboolean work_week_view;
-
-	/* The number of days we are showing. Usually 1 or 5, but can be up
-	   to E_DAY_VIEW_MAX_DAYS, e.g. when the user selects a range of
-	   days in the mini calendar. */
-	gint days_shown;
-
-	/* The start of each day & an extra element to hold the last time. */
-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];
-
-
-	/* An array of EDayViewEvent elements for the top view and each day. */
-	GArray *long_events;
-	GArray *events[E_DAY_VIEW_MAX_DAYS];
-
-	/* These are set to FALSE whenever an event in the corresponding array
-	   is changed. Any function that needs the events sorted calls
-	   e_day_view_ensure_events_sorted(). */
-	gboolean long_events_sorted;
-	gboolean events_sorted[E_DAY_VIEW_MAX_DAYS];
-
-	/* This is TRUE if we need to relayout the events before drawing. */
-	gboolean long_events_need_layout;
-	gboolean need_layout[E_DAY_VIEW_MAX_DAYS];
-
-	/* This is TRUE if we need to reshape the canvas items, but a full
-	   layout is not necessary. */
-	gboolean long_events_need_reshape;
-	gboolean need_reshape[E_DAY_VIEW_MAX_DAYS];
-
-	/* The id of our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* The number of minutes per row. 5, 10, 15, 30 or 60. */
-	gint mins_per_row;
-
-	/* The number of rows needed, depending on the times shown and the
-	   minutes per row. */
-	gint rows;
-
-	/* The height of each row. */
-	gint row_height;
-
-	/* The number of rows in the top display. */
-	gint rows_in_top_display;
-
-	/* The height of each row in the top canvas. */
-	gint top_row_height;
-
-	/* The first and last times shown in the display. The last time isn't
-	   included in the range. Default is 0:00-24:00 */
-	gint first_hour_shown;
-	gint first_minute_shown;
-	gint last_hour_shown;
-	gint last_minute_shown;
-
-	/* Bitwise combination of working days. Defaults to Mon-Fri. */
-	EDayViewDays working_days;
-
-	/* The start and end of the work day, rounded to the nearest row. */
-	gint work_day_start_hour;
-	gint work_day_start_minute;
-	gint work_day_end_hour;
-	gint work_day_end_minute;
-
-	/* Whether we use 12-hour of 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* This is set to TRUE when the widget is created, so it scrolls to
-	   the start of the working day when first shown. */
-	gboolean scroll_to_work_day;
-
-	/* This is the width & offset of each of the day columns in the
-	   display. */
-	gint day_widths[E_DAY_VIEW_MAX_DAYS];
-	gint day_offsets[E_DAY_VIEW_MAX_DAYS + 1];
-
-	/* An array holding the number of columns in each row, in each day. */
-	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
-
-	/* Sizes of the various time strings. */
-	gint large_hour_widths[24];
-	gint small_hour_widths[24];
-	gint minute_widths[12];		/* intervals of 5 minutes. */
-	gint max_small_hour_width;
-	gint max_large_hour_width;
-	gint max_minute_width;
-	gint colon_width;
-
-	/* This specifies how we are displaying the dates at the top. */
-	EDayViewDateFormat date_format;
-
-	/* These are the longest month & weekday names in the current font.
-	   Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */
-	gint longest_month_name;
-	gint longest_abbreviated_month_name;
-	gint longest_weekday_name;
-	gint longest_abbreviated_weekday_name;
-
-	/* The large font use to display the hours. I don't think we need a
-	   fontset since we only display numbers. */
-	GdkFont *large_font;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_DAY_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-	GdkCursor *resize_height_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set_in_top_canvas;
-	GdkCursor *last_cursor_set_in_main_canvas;
-
-	/*
-	 * Editing, Selection & Dragging data
-	 */
-
-	/* The horizontal bars to resize events in the main canvas. */
-	GnomeCanvasItem *main_canvas_top_resize_bar_item;
-	GnomeCanvasItem *main_canvas_bottom_resize_bar_item;
-
-	/* The event currently being edited. The day is -1 if no event is
-	 being edited, or E_DAY_VIEW_LONG_EVENT if a long event is edited. */
-	gint editing_event_day;
-	gint editing_event_num;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *resize_long_event_rect_item;
-	GnomeCanvasItem *resize_rect_item;
-	GnomeCanvasItem *resize_bar_item;
-
-	/* The event for which a popup menu is being displayed, as above. */
-	gint popup_event_day;
-	gint popup_event_num;
-
-	/* The currently selected region. If selection_start_day is -1 there is
-	   no current selection. If start_row or end_row is -1 then the
-	   selection is in the top canvas. */
-	gint selection_start_day;
-	gint selection_end_day;
-	gint selection_start_row;
-	gint selection_end_row;
-
-	/* This is TRUE if the selection is currently being dragged using the
-	   mouse. */
-	gboolean selection_is_being_dragged;
-
-	/* This specifies which end of the selection is being dragged. */
-	EDayViewDragPosition selection_drag_pos;
-
-	/* This is TRUE if the selection is in the top canvas only (i.e. if the
-	   last motion event was in the top canvas). */
-	gboolean selection_in_top_canvas;
-
-	/* The last mouse position, relative to the main canvas window.
-	   Used when auto-scrolling to update the selection. */
-	gint last_mouse_x;
-	gint last_mouse_y;
-
-	/* Auto-scroll info for when selecting an area or dragging an item. */
-	gint auto_scroll_timeout_id;
-	gint auto_scroll_delay;
-	gboolean auto_scroll_up;
-
-	/* These are used for the resize bars. */
-	gint resize_bars_event_day;
-	gint resize_bars_event_num;
-
-	/* These are used when resizing events. */
-	gint resize_event_day;
-	gint resize_event_num;
-	EDayViewPosition resize_drag_pos;
-	gint resize_start_row;
-	gint resize_end_row;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_day;
-	gint pressed_event_num;
-
-	/* These are used when dragging events. If drag_event_day is not -1 we
-	   know that we are dragging one of the EDayView events around. */
-	gint drag_event_day;
-	gint drag_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* The offset of the mouse from the top of the event, in rows.
-	   In the top canvas this is the offset from the left, in days. */
-	gint drag_event_offset;
-
-	/* The last day & row dragged to, so we know when we need to update
-	   the dragged event's position. */
-	gint drag_last_day;
-	gint drag_last_row;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *drag_long_event_rect_item;
-	GnomeCanvasItem *drag_long_event_item;
-	GnomeCanvasItem *drag_rect_item;
-	GnomeCanvasItem *drag_bar_item;
-	GnomeCanvasItem *drag_item;
-};
-
-struct _EDayViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_day_view_get_type			(void);
-GtkWidget* e_day_view_new			(void);
-
-void       e_day_view_set_calendar		(EDayView	*day_view,
-						 GnomeCalendar	*calendar);
-
-void       e_day_view_set_cal_client		(EDayView	*day_view,
-						 CalClient	*client);
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void       e_day_view_set_selected_time_range	(EDayView	*day_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-/* Returns the selected time range. */
-void       e_day_view_get_selected_time_range	(EDayView	*day_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-
-/* This is called when one event has been added or updated. */
-void       e_day_view_update_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* This removes all the events associated with the given uid. Note that for
-   recurring events there may be more than one. If any events are found and
-   removed we need to layout the events again. */
-void	   e_day_view_remove_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);
-void	   e_day_view_set_work_week_view	(EDayView	*day_view,
-						 gboolean	 work_week_view);
-
-/* The number of days shown in the EDayView, from 1 to 7. This is normally
-   either 1 or 5 (for the Work-Week view). */
-gint	   e_day_view_get_days_shown		(EDayView	*day_view);
-void	   e_day_view_set_days_shown		(EDayView	*day_view,
-						 gint		 days_shown);
-
-/* This specifies how many minutes are represented by one row in the display.
-   It can be 60, 30, 15, 10 or 5. The default is 30. */
-gint	   e_day_view_get_mins_per_row		(EDayView	*day_view);
-void	   e_day_view_set_mins_per_row		(EDayView	*day_view,
-						 gint		 mins_per_row);
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays e_day_view_get_working_days	(EDayView	*day_view);
-void	   e_day_view_set_working_days		(EDayView	*day_view,
-						 EDayViewDays	 days);
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void	   e_day_view_get_working_day		(EDayView	*day_view,
-						 gint		*start_hour,
-						 gint		*start_minute,
-						 gint		*end_hour,
-						 gint		*end_minute);
-void	   e_day_view_set_working_day		(EDayView	*day_view,
-						 gint		 start_hour,
-						 gint		 start_minute,
-						 gint		 end_hour,
-						 gint		 end_minute);
-
-/* Whether we use 12-hour of 24-hour format. */
-gboolean   e_day_view_get_24_hour_format	(EDayView	*day_view);
-void	   e_day_view_set_24_hour_format	(EDayView	*day_view,
-						 gboolean	 use_24_hour);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void	   e_day_view_check_layout		(EDayView	*day_view);
-gint	   e_day_view_convert_time_to_row	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gint	   e_day_view_convert_time_to_position	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gboolean   e_day_view_get_event_position	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_get_long_event_position	(EDayView	*day_view,
-						 gint		 event_num,
-						 gint		*start_day,
-						 gint		*end_day,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_find_long_event_days	(EDayView	*day_view,
-						 EDayViewEvent	*event,
-						 gint		*start_day,
-						 gint		*end_day);
-
-void	   e_day_view_start_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_update_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_finish_selection		(EDayView	*day_view);
-
-void	   e_day_view_check_auto_scroll		(EDayView	*day_view,
-						 gint		 event_x,
-						 gint		 event_y);
-void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_H_ */
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
deleted file mode 100644
index 193667b9b7..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-itip-control.c
- *
- * Authors:
- *    Jesse Pavel <jpavel@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <glade/glade.h>
-#include <icaltypes.h>
-#include <ical.h>
-#include <time.h>
-
-#include "e-itip-control.h"
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-
-
-#define DEFAULT_WIDTH 500
-#define DEFAULT_HEIGHT 400
-
-extern gchar *evolution_dir;
-
-typedef struct _EItipControlPrivate EItipControlPrivate;
-
-struct _EItipControlPrivate {
-	GladeXML *xml;
-	GtkWidget *main_frame;
-	GtkWidget *text_box;
-	GtkWidget *organizer_entry, *dtstart_label, *dtend_label;
-	GtkWidget *summary_entry, *description_box;
-	GtkWidget *add_button;
-	GtkWidget *loading_window;
-	GtkWidget *loading_progress;
-
-	icalcomponent *main_comp, *comp;
-	CalComponent *cal_comp;
-};
-
-
-#if 0
-static icalparameter *
-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
-{
-	icalparameter *param;
-
-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
-	     param != NULL && icalparameter_isa (param) != kind;
-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
-
-	return param;
-}
-#endif
-
-static void
-itip_control_destroy_cb (GtkObject *object,
-		    gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-	if (priv->main_comp != NULL) {
-		icalcomponent_free (priv->main_comp);
-	}
-
-	if (priv->cal_comp != NULL) {
-		gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-	}
-	g_free (priv);
-}
-	
-static void
-itip_control_size_request_cb (GtkWidget *widget, GtkRequisition *requisition)
-{
-	requisition->width = DEFAULT_WIDTH;
-	requisition->height = DEFAULT_HEIGHT;
-}
-
-static void
-cal_loaded_cb (GtkObject *object, CalClientGetStatus status, gpointer data)
-{
-	CalClient *client = CAL_CLIENT (object);
-	EItipControlPrivate *priv = data;
-
-	gtk_widget_hide (priv->loading_progress);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		if (cal_client_update_object (client, priv->cal_comp) == FALSE) {
-			GtkWidget *dialog;
-	
-			dialog = gnome_warning_dialog("I couldn't update your calendar file!\n");
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-		else {
-			/* We have success. */
-			GtkWidget *dialog;
-	
-			dialog = gnome_ok_dialog("Component successfully added.");
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-	}
-	else {
-		GtkWidget *dialog;
-
-		dialog = gnome_ok_dialog("There was an error loading the calendar file.");
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-
-	gtk_object_unref (GTK_OBJECT (client));
-	return;
-}
-
-static void
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-	gchar cal_uri[255];
-	CalClient *client;
-
-	sprintf (cal_uri, "%s/local/Calendar/calendar.ics", evolution_dir);
-	
-	client = cal_client_new ();
-	if (cal_client_load_calendar (client, cal_uri) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog("I couldn't open your calendar file!\n");
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (client));
-	
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_loaded",
-	    	   	    GTK_SIGNAL_FUNC (cal_loaded_cb), priv);
-	
-	gtk_progress_bar_update (GTK_PROGRESS_BAR (priv->loading_progress), 0.5);
-	gtk_widget_show (priv->loading_progress);
-
-	return;
-}
-
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	gchar *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-	  data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gchar *vcalendar;
-	gint pos, length, length2;
-	icalcomponent_kind comp_kind;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcalendar = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	/* Do something with the data, here. */
-	pos = 0;
-	length = strlen (vcalendar);
-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
-	
-
-	if (length2 > 0) 
-		gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
-
-	gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
-				  vcalendar,
-				  length,
-				  &pos);
-
-	priv->main_comp = icalparser_parse_string (vcalendar);
-	if (priv->main_comp == NULL) {
-		g_printerr ("e-itip-control.c: the iCalendar data was invalid!\n");
-		return;
-	}
-
-	priv->comp = icalcomponent_get_first_component (priv->main_comp,
-							ICAL_ANY_COMPONENT);
-	if (priv->comp == NULL) {
-		g_printerr ("e-itip-control.c: I could not extract a proper component from\n"
-			    "     the vCalendar data.\n");
-		icalcomponent_free (priv->main_comp);
-		return;
-	}
-
-	comp_kind = icalcomponent_isa (priv->comp);
-
-	switch (comp_kind) {
-	case ICAL_VEVENT_COMPONENT:
-	case ICAL_VTODO_COMPONENT:
-	case ICAL_VJOURNAL_COMPONENT:
-		priv->cal_comp = cal_component_new ();
-		if (cal_component_set_icalcomponent (priv->cal_comp, priv->comp) == FALSE) {
-			g_printerr ("e-itip-control.c: I couldn't create a CalComponent from the iTip data.\n");
-			gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-		}
-		break;
-	case ICAL_VFREEBUSY_COMPONENT:
-		/* Take care of busy time information. */
-		break;
-	default:
-		/* We don't know what this is, so bail. */
-		{
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog("I don't recognize this type of calendar component.");
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-
-		g_free (vcalendar);
-
-		return;
-		}
-		break;
-	} /* End switch. */
-
-
-	/* Okay, good then; now I will pick apart the component to get
-	 all the things I'll show in my control. */
-	{
-		icalproperty *prop;
-		gchar *new_text;
-		gchar *organizer, *description, *summary;
-		struct icaltimetype dtstart, dtend;
-		time_t tstart, tend;
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_ORGANIZER_PROPERTY);
-		if (prop) {
-			organizer = icalproperty_get_organizer (prop);
-		
-			/* Here I strip off the "MAILTO:" if it is present. */
-			new_text = strchr (organizer, ':');
-			if (new_text != NULL)
-				new_text++;
-			else
-				new_text = organizer;
-
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), new_text);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_SUMMARY_PROPERTY);
-		if (prop) {
-			summary = icalproperty_get_summary (prop);
-			gtk_entry_set_text (GTK_ENTRY (priv->summary_entry), summary);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DESCRIPTION_PROPERTY);
-		if (prop) {
-			description = icalproperty_get_summary (prop);
-	
-			pos = 0;
-			length = strlen (description);
-			length2 = strlen (gtk_editable_get_chars 
-						(GTK_EDITABLE (priv->description_box), 0, -1));
-		
-			if (length2 > 0)
-				gtk_editable_delete_text (GTK_EDITABLE (priv->description_box), 0, length2);
-		
-			gtk_editable_insert_text (GTK_EDITABLE (priv->description_box),
-						  description,
-						  length,
-						  &pos);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTSTART_PROPERTY);
-		dtstart = icalproperty_get_dtstart (prop);
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTEND_PROPERTY);
-		dtend = icalproperty_get_dtend (prop);
-
-		tstart = icaltime_as_timet (dtstart);
-		tend = icaltime_as_timet (dtend);
-
-		gtk_label_set_text (GTK_LABEL (priv->dtstart_label), ctime (&tstart));
-		gtk_label_set_text (GTK_LABEL (priv->dtend_label), ctime (&tend));
-	}
-	
-	pos = 0;
-	length = strlen (vcalendar);
-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
-	
-
-	if (length2 > 0) 
-		gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
-
-	gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
-				  vcalendar,
-				  length,
-				  &pos);
-
-
-	g_free (vcalendar);
-
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gchar                *vcalendar;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	/* Put something into vcalendar here. */
-	length = gtk_text_get_length (GTK_TEXT (priv->text_box));
-	vcalendar = gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1);
-
-	bonobo_stream_client_write (stream, vcalendar, length, ev);
-	g_free (vcalendar);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gint length;
-  
-	length = gtk_text_get_length (GTK_TEXT (priv->text_box));
-
-	return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar");
-}
-
-static BonoboObject *
-e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	EItipControlPrivate *priv;
-
-	priv = g_new0 (EItipControlPrivate, 1);
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" "e-itip-control.glade", "main_frame");
-
-	/* Create the control. */
-	priv->main_frame = glade_xml_get_widget (priv->xml, "main_frame");
-	priv->text_box = glade_xml_get_widget (priv->xml, "text_box");
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-	priv->dtstart_label = glade_xml_get_widget (priv->xml, "dtstart_label");
-	priv->dtend_label = glade_xml_get_widget (priv->xml, "dtend_label");
-	priv->summary_entry = glade_xml_get_widget (priv->xml, "summary_entry");
-	priv->description_box = glade_xml_get_widget (priv->xml, "description_box");
-	priv->add_button = glade_xml_get_widget (priv->xml, "add_button");
-	priv->loading_progress = glade_xml_get_widget (priv->xml, "loading_progress");
-	priv->loading_window = glade_xml_get_widget (priv->xml, "loading_window");
-
-	gtk_text_set_editable (GTK_TEXT (priv->text_box), FALSE);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy",
-			    GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv);
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "size_request",
-			    GTK_SIGNAL_FUNC (itip_control_size_request_cb), priv);
-	gtk_signal_connect (GTK_OBJECT (priv->add_button), "clicked",
-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), priv);
-
-	gtk_widget_show (priv->text_box);
-	gtk_widget_show (priv->main_frame);
-
-	control = bonobo_control_new (priv->main_frame);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    priv);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a",
-			e_itip_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
deleted file mode 100644
index e17d20190e..0000000000
--- a/calendar/gui/e-itip-control.glade
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-itip-control</name>
-  <program_name>e-itip-control</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>main_frame</name>
-    <border_width>4</border_width>
-    <label>Test iTip control</label>
-    <label_xalign>0.11</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-      <widget>
-	<class>GtkViewport</class>
-	<name>viewport1</name>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>4</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>9</column_spacing>
-	    <child>
-	      <padding>6</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>organizer_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>summary_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkScrolledWindow</class>
-	      <name>scrolledwindow2</name>
-	      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkText</class>
-		<name>description_box</name>
-		<can_focus>True</can_focus>
-		<editable>False</editable>
-		<text></text>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>Date:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Organizer:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label8</name>
-	      <label>Summary:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>Description:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>0</xalign>
-	      <yalign>0</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox1</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtstart_label</name>
-		  <label>date-start</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label3</name>
-		  <label>--to--</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>19</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtend_label</name>
-		  <label>date-end</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHButtonBox</class>
-	    <name>hbuttonbox1</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>30</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>7</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>add_button</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add to Calendar</label>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text_box</name>
-	    <can_focus>True</can_focus>
-	    <editable>False</editable>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>loading_window</name>
-  <visible>False</visible>
-  <title>Loading Calendar</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>frame1</name>
-    <border_width>4</border_width>
-    <label></label>
-    <label_xalign>0</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_OUT</shadow_type>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <border_width>7</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>1</spacing>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>9</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label>Loading calendar...</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkProgressBar</class>
-	  <name>progressbar1</name>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <bar_style>GTK_PROGRESS_CONTINUOUS</bar_style>
-	  <orientation>GTK_PROGRESS_LEFT_TO_RIGHT</orientation>
-	  <activity_mode>False</activity_mode>
-	  <show_text>False</show_text>
-	  <format>%P %%</format>
-	  <text_xalign>0.5</text_xalign>
-	  <text_yalign>0.5</text_yalign>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
deleted file mode 100644
index 467f0578ef..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __E_ITIP_CONTROL_H__
-#define __E_ITIP_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_itip_control_factory_init (void);
-
-#endif /* __E_ITIP_CONTROL_H__ */
diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade
deleted file mode 100644
index 96e6707013..0000000000
--- a/calendar/gui/e-meeting-dialog.glade
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-meeting-dialog</name>
-  <program_name>e-meeting-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>meeting_window</name>
-  <width>486</width>
-  <height>330</height>
-  <visible>False</visible>
-  <title>Meeting Invitations</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkToolbar</class>
-      <name>toolbar1</name>
-      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-      <type>GTK_TOOLBAR_BOTH</type>
-      <space_size>5</space_size>
-      <space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <tooltips>True</tooltips>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>send_button</name>
-	<label>Send
-Updates</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_MAIL_SND</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator1</name>
-	<width>13</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>cancel_button</name>
-	<label>Cancel
-Meeting</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator2</name>
-	<width>12</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>schedule_button</name>
-	<label>Schedule
-Time</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_MULTIPLE</stock_pixmap>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>4</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Organizer: </label>
-	<justify>GTK_JUSTIFY_RIGHT</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>3</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>1</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>organizer_entry</name>
-	<width>252</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Attendees: </label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>4</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox3</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>0</spacing>
-	<child_min_width>83</child_min_width>
-	<child_min_height>29</child_min_height>
-	<child_ipad_x>8</child_ipad_x>
-	<child_ipad_y>1</child_ipad_y>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>add_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Add</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>delete_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Delete</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Edit</label>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCList</class>
-	<name>attendee_list</name>
-	<can_focus>True</can_focus>
-	<columns>4</columns>
-	<column_widths>145,141,60,80</column_widths>
-	<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	<show_titles>True</show_titles>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label8</name>
-	  <label>Attendee</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label5</name>
-	  <label>Role</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label6</name>
-	  <label>RSVP</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>CList:title</child_name>
-	  <name>label7</name>
-	  <label>Status</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_dialog</name>
-  <width>344</width>
-  <height>152</height>
-  <visible>False</visible>
-  <title>Attendee</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_MOUSE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Attendee address</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>6</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>address_entry</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label9</name>
-	<label>Role</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>5</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>role_combo</name>
-	<width>160</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>Chair
-Required Participant
-Optional Participant
-Non-Participant
-Other
-
-
-</items>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>role_entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text>Required Participant</text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>rsvp_check</name>
-	<can_focus>True</can_focus>
-	<label>RSVP</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
deleted file mode 100644
index 107dfc66a3..0000000000
--- a/calendar/gui/e-meeting-edit.c
+++ /dev/null
@@ -1,997 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Jesse Pavel <jpavel@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <icaltypes.h>
-#include <ical.h>
-#include <widgets/meeting-time-sel/e-meeting-time-sel.h>
-#include <Evolution-Composer.h>
-#include <string.h>
-#include "e-meeting-edit.h"
-
-#define E_MEETING_GLADE_XML "e-meeting-dialog.glade"
-
-
-typedef struct _EMeetingEditorPrivate EMeetingEditorPrivate;
-
-struct _EMeetingEditorPrivate {
-	/* These are the widgets to be used in the GUI. */
-	GladeXML *xml;
-	GtkWidget *meeting_window;
-	GtkWidget *attendee_list;
-	GtkWidget *address_entry;
-	GtkWidget *edit_dialog;
-	GtkWidget *organizer_entry;
-	GtkWidget *role_entry;
-	GtkWidget *rsvp_check;
-	GtkWidget *send_button, *schedule_button;
-	
-	gint changed_signal_id;
-
-	/* Various pieces of information. */
-	gint selected_row;
-	CalComponent *comp;
-	CalClient *client;
-	icalcomponent *icalcomp, *vevent;
-	EventEditor *ee;
-
-	gint numentries;  /* How many attendees are there? */
-	gboolean dirty;  /* Has anything changed? */
-}; 
-
-#define NUM_COLUMNS 4  /* The number of columns in our attendee list. */
-
-enum column_names {ADDRESS_COL, ROLE_COL, RSVP_COL, STATUS_COL};
-
-static gchar *partstat_values[] = {
-	"Needs action",
-	"Accepted",
-	"Declined",
-	"Tentative",
-	"Delegated",
-	"Completed",
-	"In Progress",
-	"Unknown"
-};
-
-static gchar *role_values[] = {
-	"Chair",
-	"Required Participant",
-	"Optional Participant",
-	"Non-Participant",
-	"Other"
-};
-
-
-/* Note that I have to iterate and check myself because
-   ical_property_get_xxx_parameter doesn't take into account the
-   kind of parameter for which you wish to search! */
-static icalparameter *
-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
-{
-	icalparameter *param;
-
-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
-	     param != NULL && icalparameter_isa (param) != kind;
-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
-
-	return param;
-}
-
-
-static void
-save_organizer (EMeetingEditorPrivate *priv)
-{
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *text;
-
-	/* Save the organizer into the iCAL object. */
-
-	text = gtk_entry_get_text (GTK_ENTRY (priv->organizer_entry));
-	if (strlen (text) > 0) {
-		gchar buffer[200];
-		g_snprintf (buffer, 190, "MAILTO:%s", text);
-	
-		prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-		if (prop == NULL) {
-			/* We need to add an ORGANIZER property. */
-			prop = icalproperty_new (ICAL_ORGANIZER_PROPERTY);
-			icalcomponent_add_property (priv->vevent, prop);
-		}
-		value = icalvalue_new_text (buffer);
-		icalproperty_set_value (prop, value);
-	}
-}
-	
-	
-
-static gboolean
-window_delete_cb (GtkWidget *widget,
-		  GdkEvent *event,
-		  gpointer data)
-{	
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	save_organizer (priv);
-
-	if (priv->dirty == TRUE) {
-		/* FIXME: notify the event editor that our data has changed. 
-			For now, I'll just display a dialog box. */
-		{
-			GtkWidget *dialog;
-		
-			dialog = gnome_warning_dialog_parented ("Note that the meeting has changed,\n"
-								"and you should save this event.",
-								GTK_WINDOW (priv->meeting_window));
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-	}
-
-	gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), "");
-
-	return (FALSE);
-}
-
-static void 
-window_destroy_cb (GtkWidget *widget,
-		   gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_main_quit ();
-	return;
-}
-
-/* put_property_in_list() synchronizes the display of row `rownum'
-   in our attendee list to the values of `prop'. If rownum < 0,
-   then put_property_in_list() will append a new row. 
-   If the property doesn't contain certain parameters that we deem
-   necessary, it will add them. */
-static void
-put_property_in_list (icalproperty *prop, gint rownum, gpointer data)
-{
-	gchar *row_text[NUM_COLUMNS];
-	gchar *text, *new_text;
-	icalparameter *param;
-	icalvalue *value;
-	gint enumval;
-	gint cntr;
-
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		row_text[ADDRESS_COL] = g_strdup (new_text);
-		g_free (text);
-	}
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		icalproperty_add_parameter (prop, param);
-	}
-		
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	row_text[ROLE_COL] = role_values [enumval];
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_rsvp (TRUE);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	if (icalparameter_get_rsvp (param))
-		row_text[RSVP_COL] = "Y";
-	else
-		row_text[RSVP_COL] = "N";
-
-	param = get_icalparam_by_type (prop, ICAL_PARTSTAT_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	enumval = icalparameter_get_partstat (param);
-	if (enumval < 0 || enumval > 7) {
-		enumval = 7;
-	}
-
-	row_text[STATUS_COL] = partstat_values [enumval];
-
-	if (rownum < 0) {
-		gtk_clist_append (GTK_CLIST (priv->attendee_list), row_text);
-		gtk_clist_set_row_data (GTK_CLIST (priv->attendee_list), priv->numentries, prop);
-		priv->numentries++;
-	}
-	else {
-		for (cntr = 0; cntr < NUM_COLUMNS; cntr++) {
-			gtk_clist_set_text (GTK_CLIST (priv->attendee_list), 
-					    rownum,
-					    cntr,
-					    row_text[cntr]);
-		}
-	}
-
-	g_free (row_text[ADDRESS_COL]);
-}
-
-	
-
-/********
- * edit_attendee() performs the GUI manipulation and interaction for
- * editing `prop' and returns TRUE if the user indicated that he wants
- * to save the new property information.
- * 
- * Note that it is necessary that the property have parameters of the types
- * RSVP, PARTSTAT, and ROLE already when passed into this function. 
- ********/
-static gboolean
-edit_attendee (icalproperty *prop, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	gint button_num;
-	gchar *new_text, *text;
-	icalparameter *param;
-	icalvalue *value;
-	gchar buffer[200];
-	gint cntr;
-	gint enumval;
-	gboolean retval;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	g_return_val_if_fail (prop != NULL, FALSE);
-
-	if (priv->edit_dialog == NULL || priv->address_entry == NULL) {
-		priv->edit_dialog = glade_xml_get_widget (priv->xml, "edit_dialog");
-		priv->address_entry = glade_xml_get_widget (priv->xml, "address_entry");
-
-		gnome_dialog_set_close (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_editable_enters (GNOME_DIALOG (priv->edit_dialog), 
-					      GTK_EDITABLE (priv->address_entry));
-		gnome_dialog_close_hides (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_set_default (GNOME_DIALOG (priv->edit_dialog), 0);
-	}
-
-	g_return_val_if_fail (priv->edit_dialog != NULL, FALSE);
-	g_return_val_if_fail (priv->address_entry != NULL, FALSE);
-
-	gtk_widget_realize (priv->edit_dialog);
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), new_text);
-		g_free (text);
-	}
-	else {
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), "");
-	}
-				
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	text = role_values [enumval];
-	gtk_entry_set_text (GTK_ENTRY (priv->role_entry), text);
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rsvp_check),
-					icalparameter_get_rsvp (param));
-
-	gtk_widget_show (priv->edit_dialog);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (priv->edit_dialog));
-
-	if (button_num == 0) {
-		/* The user pressed the OK button. */
-		new_text = gtk_entry_get_text (GTK_ENTRY (priv->address_entry));
-
-		g_snprintf (buffer, 190, "MAILTO:%s", new_text);
-		value = icalvalue_new_text (buffer);
-		icalproperty_set_value (prop, value);
-
-		/* Take care of the ROLE. */
-		icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-
-		param = NULL;
-		text = gtk_entry_get_text (GTK_ENTRY(priv->role_entry));
-
-		for (cntr = 0; cntr < 5; cntr++) {
-			if (strncmp (text, role_values[cntr], 3) == 0) {
-				param = icalparameter_new_role (cntr);
-				break;
-			}
-		}
-
-		if (param == NULL) {
-			g_print ("e-meeting-edit.c: edit_attendee() the ROLE param was null.\n");
-			/* Use this as a default case, if none of the others match. */
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		}
-
-		icalproperty_add_parameter (prop, param);
-
-		/* Now the RSVP. */
-		icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-
-		param = icalparameter_new_rsvp 
-				(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->rsvp_check)));
-		icalproperty_add_parameter (prop, param);
-
-		retval = TRUE;
-	}
-	else  /* The user didn't say OK. */
-		retval = FALSE;
-	
-	return retval;
-}
-
-static void
-schedule_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendeeType type;
-	GtkWidget *dialog;
-	gchar *attendee;
-	gint cntr, row;
-	icalproperty *prop;
-	icalparameter *param;
-	gint button_num;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	
-	gtk_widget_push_visual (gdk_imlib_get_visual ());
-	gtk_widget_push_colormap (gdk_imlib_get_colormap ());
-	
-	dialog = gnome_dialog_new ("Schedule Meeting", "Set Time", "Cancel", NULL);
-
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
-
-	mts = (EMeetingTimeSelector *)e_meeting_time_selector_new ();
-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (dialog)->vbox), GTK_WIDGET (mts));
-	gtk_window_add_accel_group (GTK_WINDOW (dialog),
-				    E_MEETING_TIME_SELECTOR (mts)->accel_group);
-	gtk_widget_show (GTK_WIDGET (mts));
-	
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	
-
-	/* Let's stick all the attendees that we have in our clist, into the
-	   meeting time widget. */
-	for (cntr = 0; cntr < priv->numentries; cntr++ ) {
-		gtk_clist_get_text (GTK_CLIST (priv->attendee_list), cntr, 
-				    ADDRESS_COL, &attendee);
-		row = e_meeting_time_selector_attendee_add (mts, attendee, NULL);
-
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list), cntr);
-		param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-
-		switch (icalparameter_get_role (param)) {
-			case ICAL_ROLE_CHAIR:
-			case ICAL_ROLE_REQPARTICIPANT:
-			  type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-			  break;
-			default:
-			  type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;
-		}
-
-		e_meeting_time_selector_attendee_set_type (mts, row, type);
-	}
-
-	/* I don't want the meeting widget to be destroyed before I can
-	   extract information from it; so now the dialog window will just
-	   be hidden when the user clicks a button or closes it. */
-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
-
-	gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (dialog));
-
-	if (button_num == 0) {
-		/* The user clicked "Set Time". */
-                gint start_year, start_month, start_day, start_hour, start_minute, 
-		     end_year, end_month, end_day, end_hour, end_minute;
-		CalComponentDateTime cal_dtstart, cal_dtend;
-
-
-		e_meeting_time_selector_get_meeting_time (mts,
-							       &start_year,
-							       &start_month,
-							       &start_day,
-							       &start_hour,
-							       &start_minute,
-							       &end_year,
-							       &end_month,
-							       &end_day,
-							       &end_hour,
-							       &end_minute);
-		
-		cal_component_get_dtstart (priv->comp, &cal_dtstart);
-		cal_component_get_dtend (priv->comp, &cal_dtend);
-
-		cal_dtstart.value->second = 0;
-		cal_dtstart.value->minute = start_minute;
-		cal_dtstart.value->hour = start_hour;
-		cal_dtstart.value->day = start_day;
-		cal_dtstart.value->month = start_month;
-		cal_dtstart.value->year = start_year;
-
-		cal_dtend.value->second = 0;
-		cal_dtend.value->minute = end_minute;
-		cal_dtend.value->hour = end_hour;
-		cal_dtend.value->day = end_day;
-		cal_dtend.value->month = end_month;
-		cal_dtend.value->year = end_year;
-
-		cal_component_set_dtstart (priv->comp, &cal_dtstart);
-		cal_component_set_dtend (priv->comp, &cal_dtend);
-
-		cal_component_free_datetime (&cal_dtstart);
-		cal_component_free_datetime (&cal_dtend);
-
-		event_editor_update_widgets (priv->ee);	
-
-		priv->dirty = TRUE;
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-
-	return;
-}
-
-#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
-
-
-static gchar *itip_methods[] = {
-	"REQUEST"
-};
-
-enum itip_method_enum {
-	METHOD_REQUEST
-};
-
-/********
- * This routine is called when the send button is clicked. Duh. 
- * Actually, I'm just testing my commenting macros.
- ********/
-static void
-send_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	BonoboObjectClient *bonobo_server;
-	Evolution_Composer composer_server;
-	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-	Evolution_Composer_Recipient *recipient;
-	gchar *cell_text;
-	CORBA_char *subject;
-	gint cntr;
-	gint len;
-	CalComponentText caltext;
-	CORBA_char *content_type, *filename, *description, *attach_data;
-	CORBA_boolean show_inline;
-	CORBA_char tempstr[200];
-
-
-	/********
-	 * CODE
-	 ********/
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	CORBA_exception_init (&ev);
-
-	/* First, I obtain an object reference that represents the Composer. */
-	bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0);
-
-	g_return_if_fail (bonobo_server != NULL);
-
-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));
-
-	/* All right, now I have to convert my list of recipients into one of those
-	   CORBA sequences. */
-	to_list = Evolution_Composer_RecipientList__alloc ();
-	to_list->_maximum = priv->numentries;
-	to_list->_length = priv->numentries; 
-	to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (priv->numentries);
-
-	for (cntr = 0; cntr < priv->numentries; cntr++) {
-		gtk_clist_get_text (GTK_CLIST (priv->attendee_list),
-				    cntr, ADDRESS_COL,
-				    &cell_text);
-		len = strlen (cell_text);
-
-		recipient = &(to_list->_buffer[cntr]);
-		recipient->name = CORBA_string_alloc (0);  /* FIXME: we may want an actual name here. */
-		recipient->name[0] = '\0';
-		recipient->address = CORBA_string_alloc (len);
-		strcpy (recipient->address, cell_text);
-	}
-
-	cc_list = Evolution_Composer_RecipientList__alloc ();
-	cc_list->_maximum = cc_list->_length = 0;
-	bcc_list = Evolution_Composer_RecipientList__alloc ();
-	bcc_list->_maximum = bcc_list->_length = 0;
-
-	cal_component_get_summary (priv->comp, &caltext);
-	subject = CORBA_string_alloc (strlen (caltext.value));
-	strcpy (subject, caltext.value);
-
-	Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	sprintf (tempstr, "text/calendar;METHOD=%s", itip_methods[METHOD_REQUEST]);
-	content_type = CORBA_string_alloc (strlen (tempstr));
-	strcpy (content_type, tempstr);
-	filename = CORBA_string_alloc (0);
-	filename[0] = '\0';
-	sprintf (tempstr, "Calendar attachment");
-	description = CORBA_string_alloc (strlen (tempstr));
-	strcpy (description, tempstr);
-	show_inline = FALSE;
-
-	/* I need to create an encapsulating iCalendar component, and stuff our vEvent
-	   into it. */
-	{
-		icalcomponent *comp;
-		icalproperty *prop;
-		icalvalue *value;
-		gchar *ical_string;
-
-		save_organizer (priv);
-		
-		comp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-		
-		prop = icalproperty_new (ICAL_PRODID_PROPERTY);
-		value = icalvalue_new_text ("-//HelixCode/Evolution//EN");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_VERSION_PROPERTY);
-		value = icalvalue_new_text ("2.0");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		prop = icalproperty_new (ICAL_METHOD_PROPERTY);
-		value = icalvalue_new_text ("REQUEST");
-		icalproperty_set_value (prop, value);
-		icalcomponent_add_property (comp, prop);
-
-		icalcomponent_add_component (comp, priv->vevent);
-
-		ical_string = icalcomponent_as_ical_string (comp);
-		attach_data = CORBA_string_alloc (strlen (ical_string));
-		strcpy (attach_data, ical_string);
-
-		icalcomponent_remove_component (comp, priv->vevent);
-		icalcomponent_free (comp);
-	}
-
-
-	/********
-	 * This is for debugging.
-	 ********/
-	{
-		FILE *fp = fopen ("/home/jpavel/attach_data.icl", "w");
-
-		fputs (attach_data, fp);
-
-		fclose (fp);
-	}
-
-	Evolution_Composer_attach_data (composer_server, 
-					content_type, filename, description,
-					show_inline, attach_data,
-					&ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	/* Let's free shit up. */
-
-	/* Beware--depending on whether CORBA_free is recursive, which I
-	   think is is, we might have memory leaks, in which case the code
-	   below is necessary. */
-#if 0
-	for (cntr = 0; cntr < priv->numentries; cntr++) {
-		recipient = &(to_list->_buffer[cntr]);
-		CORBA_free (recipient->name);
-		CORBA_free (recipient->address);
-		recipient->name = recipient->address = NULL;
-	}
-#endif
-
-	if (CORBA_sequence_get_release (to_list) != FALSE)
-		CORBA_free (to_list->_buffer);
-
-	CORBA_free (to_list);
-	CORBA_free (cc_list);
-	CORBA_free (bcc_list);
-
-	CORBA_free (subject);
-	CORBA_free (content_type);
-	CORBA_free (filename);
-	CORBA_free (description);
-	CORBA_free (attach_data);
-
-	/* bonobo_object_unref (BONOBO_OBJECT (bonobo_server));   */
-}
-
-	
-static void 
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	icalproperty *prop;
-	icalparameter *param;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	prop = icalproperty_new (ICAL_ATTENDEE_PROPERTY);
-	param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_rsvp (TRUE); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-	icalproperty_add_parameter (prop, param);
-
-	if (edit_attendee (prop, data) == TRUE) {
-		/* Let's add this property to our component and to the CList. */
-		icalcomponent_add_property (priv->vevent, prop);
-
-		/* The -1 indicates that we should add a new row. */
-		put_property_in_list (prop, -1, data);
-
-		priv->dirty = TRUE;
-	}
-	else {
-		icalproperty_free (prop);
-	}
-}	
-
-static void 
-delete_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to delete.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-	else {
-		/* Delete the associated property from the iCAL object. */
-		icalproperty *prop;
-
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-		icalcomponent_remove_property (priv->vevent, prop);
-		icalproperty_free (prop);
-
-		gtk_clist_remove (GTK_CLIST (priv->attendee_list), priv->selected_row);
-		priv->selected_row = -1;
-		priv->numentries--;
-		priv->dirty = TRUE;
-	}
-}
-
-static void 
-edit_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to edit.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		return;
-	}
-	else {
-		icalproperty *prop, *new_prop;
-		icalparameter *param;
-		icalvalue *value;
-		
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-
-		g_assert (prop != NULL);
-
-		new_prop = icalproperty_new_clone (prop);
-
-		if (edit_attendee (new_prop, data)) {
-			/* The user hit Okay. */
-			/*We need to synchronize the old property with the newly edited one.*/
-			value = icalvalue_new_clone (icalproperty_get_value (new_prop));
-			icalproperty_set_value (prop, value);
-
-			icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-			icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-			icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_ROLE_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_RSVP_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_PARTSTAT_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			
-			put_property_in_list (prop, priv->selected_row, data);
-			priv->dirty = TRUE;
-
-		}
-		icalproperty_free (new_prop);
-	}
-}
-
-
-
-static void 
-list_row_select_cb  (GtkWidget *widget,
-                     gint row,
-                     gint column,
-                     GdkEventButton *event,
-                     gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	priv->selected_row = row;
-}
-
-static void
-organizer_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_signal_disconnect (GTK_OBJECT (priv->organizer_entry), priv->changed_signal_id);
-
-	priv->dirty = TRUE;
-}
-
-
-/* ------------------------------------------------------------ */
-/* --------------------- Exported Functions ------------------- */
-/* ------------------------------------------------------------ */
-
-EMeetingEditor * 
-e_meeting_editor_new (CalComponent *comp, CalClient *client, EventEditor *ee)
-{
-	EMeetingEditor *object;
-	EMeetingEditorPrivate *priv;
-
-	object = (EMeetingEditor *)g_new(EMeetingEditor, 1);
-	
-	priv = (EMeetingEditorPrivate *) g_new0(EMeetingEditorPrivate, 1);
-	priv->selected_row = -1;
-	priv->comp = comp;
-	priv->client = client;
-	priv->icalcomp = cal_component_get_icalcomponent (comp);
-	priv->ee = ee;
-	
-	object->priv = priv;
-
-	return object;	
-}
-
-void
-e_meeting_editor_free (EMeetingEditor *editor)
-{
-	if (editor == NULL)
-		return;
-		
-	if (editor->priv != NULL)
-		g_free (editor->priv);
-	
-	g_free (editor);
-}
-	
-
-
-void 
-e_meeting_edit (EMeetingEditor *editor)
-{
-	EMeetingEditorPrivate *priv;
-	GtkWidget *add_button, *delete_button, *edit_button;
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *text;
-
-
-	g_return_if_fail (editor != NULL);
-
-	priv = (EMeetingEditorPrivate *)editor->priv;
-
-	g_return_if_fail (priv != NULL);
-
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" E_MEETING_GLADE_XML, NULL);
-	
-	priv->meeting_window =  glade_xml_get_widget (priv->xml, "meeting_window");
-	priv->attendee_list = glade_xml_get_widget (priv->xml, "attendee_list");
-	priv->role_entry = glade_xml_get_widget (priv->xml, "role_entry");
-	priv->rsvp_check = glade_xml_get_widget (priv->xml, "rsvp_check");
-	priv->schedule_button = glade_xml_get_widget (priv->xml, "schedule_button");
-	priv->send_button = glade_xml_get_widget (priv->xml, "send_button");
-
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), STATUS_COL, GTK_JUSTIFY_CENTER);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "delete_event",
-                            GTK_SIGNAL_FUNC (window_delete_cb), editor);
-
-	gtk_signal_connect_after (GTK_OBJECT (priv->meeting_window), "delete_event",
-				  GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "destroy_event",
-                            GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->attendee_list), "select_row",
-			    GTK_SIGNAL_FUNC (list_row_select_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->schedule_button), "clicked",
-			    GTK_SIGNAL_FUNC (schedule_button_clicked_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->send_button), "clicked",
-			    GTK_SIGNAL_FUNC (send_button_clicked_cb), editor);
-
-
-	add_button = glade_xml_get_widget (priv->xml, "add_button");
-	delete_button = glade_xml_get_widget (priv->xml, "delete_button");
-	edit_button = glade_xml_get_widget (priv->xml, "edit_button");
-
-	gtk_signal_connect (GTK_OBJECT (add_button), "clicked",
-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (delete_button), "clicked",
-			    GTK_SIGNAL_FUNC (delete_button_clicked_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (edit_button), "clicked",
-			    GTK_SIGNAL_FUNC (edit_button_clicked_cb), editor);
-
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-
-	if (icalcomponent_isa (priv->icalcomp) != ICAL_VEVENT_COMPONENT)
-		priv->vevent = icalcomponent_get_first_component(priv->icalcomp,ICAL_VEVENT_COMPONENT);
-	else
-		priv->vevent = priv->icalcomp;
-
-	g_assert (priv->vevent != NULL);
-
-	/* Let's extract the organizer, if there is one. */
-        prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-
-	if (prop != NULL) {
-		gchar *buffer;
-
-	        value = icalproperty_get_value (prop);
-		buffer = g_strdup (icalvalue_as_ical_string (value));
-	        if (buffer != NULL) {
-			/* Strip off the MAILTO:, if it is present. */
-	        	text = strchr (buffer, ':');
-			if (text == NULL)
-				text = buffer;
-			else
-				text++;
-				
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), text);
-			g_free (buffer);
-		}
-		
-	}
-
-	priv->changed_signal_id = gtk_signal_connect (GTK_OBJECT (priv->organizer_entry), "changed",
-						      GTK_SIGNAL_FUNC (organizer_changed_cb), editor);
-
-
-	/* Let's go through the iCAL object, and create a list entry
-	   for each ATTENDEE property. */
-        for (prop = icalcomponent_get_first_property (priv->vevent, ICAL_ATTENDEE_PROPERTY);
-             prop != NULL;
-             prop = icalcomponent_get_next_property (priv->vevent, ICAL_ATTENDEE_PROPERTY))
-	{
-		put_property_in_list (prop, -1, editor);
-	}
-	
-
-	gtk_widget_show (priv->meeting_window);
-
-	gtk_main ();
-
-	if (priv->meeting_window != NULL)
-		gtk_widget_destroy (priv->meeting_window);
-
-	if (priv->edit_dialog != NULL)
-		gtk_widget_destroy (priv->edit_dialog);
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-}
diff --git a/calendar/gui/e-meeting-edit.h b/calendar/gui/e-meeting-edit.h
deleted file mode 100644
index 953dd23428..0000000000
--- a/calendar/gui/e-meeting-edit.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Jesse Pavel <jpavel@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_MEETING_EDIT_H__
-#define __E_MEETING_EDIT_H__
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-#include "event-editor.h"
-
-typedef struct _EMeetingEditor EMeetingEditor;
-
-struct _EMeetingEditor {
-	gpointer priv;
-};
-
-
-EMeetingEditor * e_meeting_editor_new (CalComponent *comp, CalClient *client, 
-				       EventEditor *ee);
-void e_meeting_edit (EMeetingEditor *editor);
-void e_meeting_editor_free (EMeetingEditor *editor);
-
-
-#endif /*  __E_MEETING_EDIT_H__  */
-
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
deleted file mode 100644
index 074aebe486..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,754 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#include <config.h>
-#include <gal/e-text/e-text.h>
-#include "e-week-view-event-item.h"
-
-static void e_week_view_event_item_class_init	(EWeekViewEventItemClass *class);
-static void e_week_view_event_item_init		(EWeekViewEventItem *wveitem);
-
-static void e_week_view_event_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_event_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_event_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_event_item_draw_icons	(EWeekViewEventItem *wveitem,
-						 GdkDrawable        *drawable,
-						 gint		     icon_x,
-						 gint		     icon_y,
-						 gint		     x2,
-						 gboolean	     right_align);
-static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-						  GdkDrawable	     *drawable,
-						  gint		      x,
-						  gint		      y,
-						  gint		      w,
-						  gint		      h);
-static double e_week_view_event_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_week_view_event_item_event	(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-static gboolean e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-						     GdkEvent		*event);
-static gboolean e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-						       GdkEvent		  *event);
-static EWeekViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-							      gdouble x,
-							      gdouble y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_EVENT_NUM,
-	ARG_SPAN_NUM
-};
-
-
-GtkType
-e_week_view_event_item_get_type (void)
-{
-	static GtkType e_week_view_event_item_type = 0;
-
-	if (!e_week_view_event_item_type) {
-		GtkTypeInfo e_week_view_event_item_info = {
-			"EWeekViewEventItem",
-			sizeof (EWeekViewEventItem),
-			sizeof (EWeekViewEventItemClass),
-			(GtkClassInitFunc) e_week_view_event_item_class_init,
-			(GtkObjectInitFunc) e_week_view_event_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_event_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_event_item_info);
-	}
-
-	return e_week_view_event_item_type;
-}
-
-
-static void
-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewEventItem::event_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_EVENT_NUM);
-	gtk_object_add_arg_type ("EWeekViewEventItem::span_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_SPAN_NUM);
-
-	object_class->set_arg = e_week_view_event_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_event_item_update;
-	item_class->draw        = e_week_view_event_item_draw;
-	item_class->point       = e_week_view_event_item_point;
-	item_class->event       = e_week_view_event_item_event;
-}
-
-
-static void
-e_week_view_event_item_init (EWeekViewEventItem *wveitem)
-{
-	wveitem->event_num = -1;
-	wveitem->span_num = -1;
-}
-
-
-static void
-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewEventItem *wveitem;
-	gboolean needs_update = FALSE;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_EVENT_NUM:
-		wveitem->event_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	case ARG_SPAN_NUM:
-		wveitem->span_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	}
-
-	if (needs_update)
-		gnome_canvas_item_request_update (item);
-}
-
-
-static void
-e_week_view_event_item_update (GnomeCanvasItem *item,
-			       double	       *affine,
-			       ArtSVP	       *clip_path,
-			       int	        flags)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	gint span_x, span_y, span_w;
-
-#if 0
-	g_print ("In e_week_view_event_item_update\n");
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	if (wveitem->event_num != -1 && wveitem->span_num != -1) {
-		if (e_week_view_get_span_position (week_view,
-						   wveitem->event_num,
-						   wveitem->span_num,
-						   &span_x, &span_y,
-						   &span_w)) {
-#if 0
-			g_print ("  Event:%i Span:%i %i,%i W:%i\n",
-				 wveitem->event_num, wveitem->span_num,
-				 span_x, span_y, span_w);
-#endif
-			item->x1 = span_x;
-			item->y1 = span_y;
-			item->x2 = span_x + span_w - 1;
-			item->y2 = span_y + week_view->row_height - 1;
-		}
-	}
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
-			     GdkDrawable      *drawable,
-			     int	       x,
-			     int	       y,
-			     int	       width,
-			     int	       height)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GtkStyle *style;
-	GdkGC *fg_gc, *gc;
-	GdkFont *font;
-	gint x1, y1, x2, y2, time_x, time_y, time_y_small_min;
-	gint icon_x, icon_y, time_width, min_end_time_x;
-	gint rect_x, rect_w, rect_x2;
-	gboolean one_day_event, editing_span = FALSE;
-	gint start_minute, end_minute;
-	gchar buffer[128];
-	gboolean draw_start_triangle = FALSE, draw_end_triangle = FALSE;
-	GdkRectangle clip_rect;
-
-#if 0
-	g_print ("In e_week_view_event_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (canvas_item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (canvas_item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (wveitem->event_num == -1 || wveitem->span_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	gc = week_view->main_gc;
-
-	x1 = canvas_item->x1 - x;
-	y1 = canvas_item->y1 - y;
-	x2 = canvas_item->x2 - x;
-	y2 = canvas_item->y2 - y;
-
-	if (x1 == x2 || y1 == y2)
-		return;
-
-	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;
-	start_minute = event->start_minute;
-	end_minute = event->end_minute;
-	time_y_small_min = 0;
-	icon_x = 0;
-
-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD + font->ascent;
-
-	if (week_view->small_font)
-		time_y_small_min = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-			+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD
-			+ week_view->small_font->ascent;
-
-	if (week_view->use_small_font && week_view->small_font)
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-	else
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-
-	one_day_event = e_week_view_is_one_day_event (week_view,
-						      wveitem->event_num);
-	if (one_day_event) {
-		time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-
-		/* Convert the time into a string. We use different parts of
-		   the string for the different time formats. Notice that the
-		   string is always 11 characters long. */
-		sprintf (buffer, "%02i:%02i %02i:%02i",
-			 start_minute / 60, start_minute % 60,
-			 end_minute / 60, end_minute % 60);
-
-		/* Draw the start and end times, as required. */
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 2,
-				       time_y_small_min, buffer + 3, 2);
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x + week_view->digit_width * 4 - 2,
-				       time_y, buffer + 6, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 6 - 2,
-				       time_y_small_min, buffer + 9, 2);
-
-			icon_x = x1 + time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 2,
-				       time_y_small_min, buffer + 3, 2);
-
-			icon_x = x1 + time_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_BOTH:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 11);
-			icon_x = x1 + time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 5);
-			icon_x = x1 + time_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			icon_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-			break;
-		}
-
-		/* Draw the icons. */
-		e_week_view_event_item_draw_icons (wveitem, drawable,
-						   icon_x, icon_y,
-						   x2, FALSE);
-
-	} else {
-		rect_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-		rect_w = x2 - x1 - E_WEEK_VIEW_EVENT_L_PAD
-			- E_WEEK_VIEW_EVENT_R_PAD + 1;
-
-		/* Draw the triangles at the start & end, if needed. */
-		if (event->start < week_view->day_starts[span->start_day]) {
-			draw_start_triangle = TRUE;
-			rect_x += 2;
-			rect_w -= 2;
-		}
-
-		if (event->end > week_view->day_starts[span->start_day
-						      + span->num_days]) {
-			draw_end_triangle = TRUE;
-			rect_w -= 2;
-		}
-
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    rect_x, y1 + 1, rect_w, y2 - y1 - 1);
-
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-		rect_x2 = rect_x + rect_w - 1;
-		gdk_draw_line (drawable, gc, rect_x,  y1, rect_x2, y1);
-		gdk_draw_line (drawable, gc, rect_x,  y2, rect_x2, y2);
-
-		if (draw_start_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x1 + E_WEEK_VIEW_EVENT_L_PAD + 2, y1, -3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x,  y1, rect_x, y2);
-		}
-
-		if (draw_end_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x2 - E_WEEK_VIEW_EVENT_R_PAD - 2, y1, 3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x2, y1, rect_x2, y2);
-		}
-
-		if (span->text_item && E_TEXT (span->text_item)->editing)
-			editing_span = TRUE;
-
-		/* Draw the start & end times, if necessary. */
-		min_end_time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-			+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-		if (!editing_span
-		    && event->start > week_view->day_starts[span->start_day]) {
-			sprintf (buffer, "%02i:%02i",
-				 start_minute / 60, start_minute % 60);
-			time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-
-			clip_rect.x = x1;
-			clip_rect.y = y1;
-			clip_rect.width = x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1;
-			clip_rect.height = y2 - y1 + 1;
-			gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-			if (week_view->use_small_font
-			    && week_view->small_font) {
-				gdk_draw_text (drawable, font, fg_gc,
-					       time_x, time_y, buffer, 2);
-				gdk_draw_text (drawable, week_view->small_font,
-					       fg_gc,
-					       time_x + week_view->digit_width * 2,
-					       time_y_small_min,
-					       buffer + 3, 2);
-			} else {
-				gdk_draw_text (drawable, font, fg_gc,
-					       time_x, time_y, buffer, 5);
-			}
-
-			gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-			min_end_time_x += time_width + 2;
-		}
-
-		if (!editing_span
-		    && event->end < week_view->day_starts[span->start_day
-							 + span->num_days]) {
-			sprintf (buffer, "%02i:%02i",
-				 end_minute / 60, end_minute % 60);
-			time_x = x2 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - 1
-				- time_width;
-
-			if (time_x >= min_end_time_x) {
-				if (week_view->use_small_font
-				    && week_view->small_font) {
-					gdk_draw_text (drawable, font, fg_gc,
-						       time_x, time_y,
-						       buffer, 2);
-					gdk_draw_text (drawable,
-						       week_view->small_font,
-						       fg_gc,
-						       time_x + week_view->digit_width * 2,
-						       time_y_small_min,
-						       buffer + 3, 2);
-				} else {
-					gdk_draw_text (drawable, font, fg_gc,
-						       time_x, time_y,
-						       buffer, 5);
-				}
-			}
-		}
-
-		/* Draw the icons. */
-		if (span->text_item) {
-			icon_x = span->text_item->x1 - x;
-			e_week_view_event_item_draw_icons (wveitem, drawable,
-							   icon_x, icon_y,
-							   x2, TRUE);
-		}
-	}
-}
-
-
-static void
-e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
-				   GdkDrawable        *drawable,
-				   gint		       icon_x,
-				   gint		       icon_y,
-				   gint		       x2,
-				   gboolean	       right_align)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	CalComponent *comp;
-	GdkGC *gc;
-	gint num_icons = 0, icon_x_inc;
-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-	comp = event->comp;
-
-	gc = week_view->main_gc;
-
-	if (cal_component_has_alarms (comp)) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	icon_x_inc = E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD;
-
-	if (right_align)
-		icon_x -= icon_x_inc * num_icons;
-
-	if (draw_reminder_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	if (draw_recurrence_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	gdk_gc_set_clip_mask (gc, NULL);
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-				      GdkDrawable	 *drawable,
-				      gint		  x,
-				      gint		  y,
-				      gint		  w,
-				      gint		  h)
-{
-	EWeekView *week_view;
-	GdkGC *gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	gc = week_view->main_gc;
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_draw_line (drawable, gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
-			      int cx, int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EWeekViewEventItem *wveitem;
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_week_view_event_item_button_press (wveitem, event);
-	case GDK_BUTTON_RELEASE:
-		return e_week_view_event_item_button_release (wveitem, event);
-	case GDK_MOTION_NOTIFY:
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-				     GdkEvent		*bevent)
-{
-	EWeekView *week_view;
-	EWeekViewPosition pos;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_press\n");
-#endif
-
-	pos = e_week_view_event_item_get_position (wveitem, bevent->button.x,
-						   bevent->button.y);
-	if (pos == E_WEEK_VIEW_POS_NONE)
-		return FALSE;
-
-	week_view->pressed_event_num = wveitem->event_num;
-	week_view->pressed_span_num = wveitem->span_num;
-
-	if (bevent->button.button == 1) {
-		/* Ignore clicks on the event while editing. */
-		if (E_TEXT (span->text_item)->editing)
-			return FALSE;
-
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		week_view->drag_event_x = bevent->button.x;
-		week_view->drag_event_y = bevent->button.y;
-
-		/* FIXME: Remember the day offset from the start of the event.
-		 */
-	} else if (bevent->button.button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view,
-					     (GdkEventButton*) bevent,
-					     wveitem->event_num);
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-					      "button_press_event");
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-				       GdkEvent		  *event)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_release\n");
-#endif
-
-	if (week_view->pressed_event_num != -1
-	    && week_view->pressed_event_num == wveitem->event_num
-	    && week_view->pressed_span_num == wveitem->span_num) {
-		e_week_view_start_editing_event (week_view,
-						 wveitem->event_num,
-						 wveitem->span_num,
-						 NULL);
-		week_view->pressed_event_num = -1;
-		return TRUE;
-	}
-
-	week_view->pressed_event_num = -1;
-
-	return FALSE;
-}
-
-
-static EWeekViewPosition
-e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-				     gdouble x,
-				     gdouble y)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), E_WEEK_VIEW_POS_NONE);
-
-#if 0
-	g_print ("In e_week_view_event_item_get_position item: %g,%g %g,%g point: %g,%g\n", item->x1, item->y1, item->x2, item->y2, x, y);
-#endif
-
-	if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-	    || x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD)
-		return E_WEEK_VIEW_POS_NONE;
-
-	/* Support left/right edge for long events only. */
-	if (!e_week_view_is_one_day_event (week_view, wveitem->event_num)) {
-		if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-		    + E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    + E_WEEK_VIEW_EVENT_TEXT_X_PAD)
-			return E_WEEK_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD
-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    - E_WEEK_VIEW_EVENT_TEXT_X_PAD)
-			return E_WEEK_VIEW_POS_RIGHT_EDGE;
-	}
-
-	return E_WEEK_VIEW_POS_EVENT;
-}
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
deleted file mode 100644
index cfe58699b0..0000000000
--- a/calendar/gui/e-week-view-event-item.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_EVENT_ITEM_H_
-#define _E_WEEK_VIEW_EVENT_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#define E_WEEK_VIEW_EVENT_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_event_item_get_type (), EWeekViewEventItem))
-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_event_item_get_type ()))
-#define E_IS_WEEK_VIEW_EVENT_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_event_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The event index in the EWeekView events array. */
-	gint event_num;
-
-	/* The span index within the event. */
-	gint span_num;
-} EWeekViewEventItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewEventItemClass;
-
-
-GtkType  e_week_view_event_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
deleted file mode 100644
index 10990324ff..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#include <config.h>
-#include "e-week-view-main-item.h"
-
-static void e_week_view_main_item_class_init	(EWeekViewMainItemClass *class);
-static void e_week_view_main_item_init		(EWeekViewMainItem *wvmitem);
-
-static void e_week_view_main_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_main_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_main_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,
-						 gint		   day,
-						 GDate		  *date,
-						 GdkDrawable       *drawable,
-						 gint		   x,
-						 gint		   y,
-						 gint		   width,
-						 gint		   height);
-static double e_week_view_main_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_main_item_get_type (void)
-{
-	static GtkType e_week_view_main_item_type = 0;
-
-	if (!e_week_view_main_item_type) {
-		GtkTypeInfo e_week_view_main_item_info = {
-			"EWeekViewMainItem",
-			sizeof (EWeekViewMainItem),
-			sizeof (EWeekViewMainItemClass),
-			(GtkClassInitFunc) e_week_view_main_item_class_init,
-			(GtkObjectInitFunc) e_week_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_main_item_info);
-	}
-
-	return e_week_view_main_item_type;
-}
-
-
-static void
-e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewMainItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_main_item_update;
-	item_class->draw        = e_week_view_main_item_draw;
-	item_class->point       = e_week_view_main_item_point;
-}
-
-
-static void
-e_week_view_main_item_init (EWeekViewMainItem *wvmitem)
-{
-	wvmitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewMainItem *wvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvmitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_main_item_update (GnomeCanvasItem *item,
-			      double	      *affine,
-			      ArtSVP	      *clip_path,
-			      int	       flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,
-			    GdkDrawable      *drawable,
-			    int		      x,
-			    int		      y,
-			    int		      width,
-			    int		      height)
-{
-	EWeekViewMainItem *wvmitem;
-	EWeekView *week_view;
-	GDate date;
-	gint num_days, day, day_x, day_y, day_w, day_h;
-
-#if 0
-	g_print ("In e_week_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (canvas_item);
-	week_view = wvmitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	/* Step through each of the days. */
-	date = week_view->first_day_shown;
-
-	/* If no date has been set, we just use Dec 1999/January 2000. */
-	if (!g_date_valid (&date))
-		g_date_set_dmy (&date, 27, 12, 1999);
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		e_week_view_get_day_position (week_view, day,
-					      &day_x, &day_y,
-					      &day_w, &day_h);
-		/* Skip any days which are outside the area. */
-		if (day_x < x + width && day_x + day_w >= x
-		    && day_y < y + height && day_y + day_h >= y) {
-			e_week_view_main_item_draw_day (wvmitem, day, &date,
-							drawable,
-							day_x - x, day_y - y,
-							day_w, day_h);
-		}
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-static void
-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
-				gint		   day,
-				GDate		  *date,
-				GdkDrawable       *drawable,
-				gint		   x,
-				gint		   y,
-				gint		   width,
-				gint		   height)
-{
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc, *gc, *date_gc;
-	GdkGC *selected_fg_gc, *selected_bg_gc;
-	GdkFont *font;
-	gint right_edge, bottom_edge, date_width, date_x, line_y;
-	gboolean show_day_name, show_month_name, selected;
-	gchar buffer[128], *format_string;
-	gint month, day_of_month, max_width;
-	GdkColor *bg_color;
-
-#if 0
-	g_print ("Drawing Day:%i at %i,%i\n", day, x, y);
-#endif
-	week_view = wvmitem->week_view;
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_PRELIGHT];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	selected_fg_gc = style->fg_gc[GTK_STATE_SELECTED];
-	selected_bg_gc = style->bg_gc[GTK_STATE_SELECTED];
-	gc = week_view->main_gc;
-
-	g_return_if_fail (gc != NULL);
-
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
-	line_y = y + E_WEEK_VIEW_DATE_T_PAD + font->ascent
-		+ font->descent	+ E_WEEK_VIEW_DATE_LINE_T_PAD;
-
-	/* Draw the background of the day. In the month view odd months are
-	   one color and even months another, so you can easily see when each
-	   month starts (defaults are white for odd - January, March, ... and
-	   light gray for even). In the week view the background is always the
-	   same color, the color used for the odd months in the month view. */
-	if (week_view->multi_week_view && (month % 2 == 0))
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];
-	else
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];
-
-	gdk_gc_set_foreground (gc, bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
-
-	/* Draw the lines on the right and bottom of the cell. The canvas is
-	   sized so that the lines on the right & bottom edges will be off the
-	   edge of the canvas, so we don't have to worry about them. */
-	right_edge = x + width - 1;
-	bottom_edge = y + height - 1;
-
-	gdk_draw_line (drawable, fg_gc,
-		       right_edge, y, right_edge, bottom_edge);
-	gdk_draw_line (drawable, fg_gc,
-		       x, bottom_edge, right_edge, bottom_edge);
-
-	/* If the day is selected, draw the blue background. */
-	selected = TRUE;
-	if (!GTK_WIDGET_HAS_FOCUS (week_view)
-	    || week_view->selection_start_day == -1
-	    || week_view->selection_start_day > day
-	    || week_view->selection_end_day < day)
-		selected = FALSE;
-	if (selected) {
-		if (week_view->multi_week_view)
-			gdk_draw_rectangle (drawable, selected_bg_gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5,
-					    E_WEEK_VIEW_DATE_T_PAD - 1
-					    + font->ascent + font->descent);
-		else
-			gdk_draw_rectangle (drawable, selected_bg_gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5, line_y - y);
-	}
-
-	/* Display the date in the top of the cell.
-	   In the week view, display the long format "10 January" in all cells,
-	   or abbreviate it to "10 Jan" or "10" if that doesn't fit.
-	   In the month view, only use the long format for the first cell and
-	   the 1st of each month, otherwise use "10". */
-	show_day_name = FALSE;
-	show_month_name = FALSE;
-	if (!week_view->multi_week_view) {
-		show_day_name = TRUE;
-		show_month_name = TRUE;
-	} else if (day == 0 || day_of_month == 1) {
-		show_month_name = TRUE;
-	}
-
-	/* Now find the longest form of the date that will fit. */
-	max_width = width - 4;
-	format_string = NULL;
-	if (show_day_name) {
-		if (week_view->max_day_width + week_view->digit_width * 2
-		    + week_view->space_width * 2
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %A = full weekday name, %d = day of
-			   month, %B = full month name. You can change the
-			   order but don't change the specifiers or add
-			   anything. */
-			format_string = _("%A %d %B");
-		else if (week_view->max_abbr_day_width
-			 + week_view->digit_width * 2
-			 + week_view->space_width * 2
-			 + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %a = abbreviated weekday name,
-			   %d = day of month, %b = abbreviated month name.
-			   You can change the order but don't change the
-			   specifiers or add anything. */
-			format_string = _("%a %d %b");
-	}
-	if (!format_string && show_month_name) {
-		if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %B = full
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %B");
-		else if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %b = abbreviated
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %b");
-	}
-
-	g_date_strftime (buffer, sizeof (buffer),
-			 format_string ? format_string : "%d", date);
-	date_width = gdk_string_width (font, buffer);
-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;
-	date_x = MAX (date_x, x + 1);
-
-	if (selected)
-		date_gc = selected_fg_gc;
-	else
-		date_gc = fg_gc;
-	gdk_draw_string (drawable, font, date_gc,
-			 date_x, y + E_WEEK_VIEW_DATE_T_PAD + font->ascent,
-			 buffer);
-
-	/* Draw the line under the date. */
-	if (!week_view->multi_week_view) {
-		gdk_draw_line (drawable, fg_gc,
-			       x + E_WEEK_VIEW_DATE_LINE_L_PAD, line_y,
-			       right_edge, line_y);
-	}
-}
-
-
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			     int cx, int cy,
-			     GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
deleted file mode 100644
index f75dcb0ec9..0000000000
--- a/calendar/gui/e-week-view-main-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_MAIN_ITEM_H_
-#define _E_WEEK_VIEW_MAIN_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#define E_WEEK_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_main_item_get_type (), EWeekViewMainItem))
-#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_main_item_get_type ()))
-#define E_IS_WEEK_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewMainItemClass;
-
-
-GtkType  e_week_view_main_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
deleted file mode 100644
index 14f47e4bcf..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#include <config.h>
-#include "e-week-view-titles-item.h"
-
-static void e_week_view_titles_item_class_init	(EWeekViewTitlesItemClass *class);
-static void e_week_view_titles_item_init	(EWeekViewTitlesItem *wvtitem);
-
-static void e_week_view_titles_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_titles_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static double e_week_view_titles_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_titles_item_get_type (void)
-{
-	static GtkType e_week_view_titles_item_type = 0;
-
-	if (!e_week_view_titles_item_type) {
-		GtkTypeInfo e_week_view_titles_item_info = {
-			"EWeekViewTitlesItem",
-			sizeof (EWeekViewTitlesItem),
-			sizeof (EWeekViewTitlesItemClass),
-			(GtkClassInitFunc) e_week_view_titles_item_class_init,
-			(GtkObjectInitFunc) e_week_view_titles_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_titles_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_titles_item_info);
-	}
-
-	return e_week_view_titles_item_type;
-}
-
-
-static void
-e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_titles_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_titles_item_update;
-	item_class->draw        = e_week_view_titles_item_draw;
-	item_class->point       = e_week_view_titles_item_point;
-}
-
-
-static void
-e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
-{
-	wvtitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewTitlesItem *wvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvtitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_titles_item_update (GnomeCanvasItem *item,
-				double	    *affine,
-				ArtSVP	    *clip_path,
-				int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
-			      GdkDrawable      *drawable,
-			      int		x,
-			      int		y,
-			      int		width,
-			      int		height)
-{
-	EWeekViewTitlesItem *wvtitem;
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	GdkFont *font;
-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
-	gchar buffer[128], *date_format;
-	GDate date;
-	GdkRectangle clip_rect;
-	gboolean long_format;
-
-#if 0
-	g_print ("In e_week_view_titles_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (canvas_item);
-	week_view = wvtitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 2 - y,
-		       1 - x, canvas_height - 1 - y);
-
-	gdk_draw_rectangle (drawable, dark_gc, FALSE,
-			    0 - x, 0 - y,
-			    canvas_width - 1, canvas_height);
-
-	/* Determine the format to use. */
-	col_width = canvas_width / week_view->columns;
-	if (col_width > week_view->max_day_width + 2) {
-	  date_format = "%A";
-	  long_format = TRUE;
-	} else {
-	  date_format = "%a";
-	  long_format = FALSE;
-	}
-
-	/* Shift right one pixel to account for the shadow around the main
-	   canvas. */
-	x--;
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
-	for (col = 0; col < week_view->columns; col++) {
-		if (col == 5 && week_view->compress_weekend) {
-			g_date_strftime (buffer, 128, "%a/", &date);
-			g_date_add_days (&date, 1);
-			g_date_strftime (buffer + strlen (buffer), 100,
-					 "%a", &date);
-		} else {
-			g_date_strftime (buffer, 128, date_format, &date);
-		}
-
-		clip_rect.x = week_view->col_offsets[col] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = week_view->col_widths[col];
-		clip_rect.height = canvas_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		if (col == 5 && week_view->compress_weekend)
-			date_width = week_view->abbr_day_widths[5]
-				+ week_view->slash_width
-				+ week_view->abbr_day_widths[6];
-		else if (long_format)
-			date_width = week_view->day_widths[col];
-		else
-			date_width = week_view->abbr_day_widths[col];
-
-		date_x = week_view->col_offsets[col]
-			+ (week_view->col_widths[col] - date_width) / 2;
-		date_x = MAX (date_x, week_view->col_offsets[col]);
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (col != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       week_view->col_offsets[col] - x,
-				       4 - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       week_view->col_offsets[col] - 1 - x,
-				       4 - y,
-				       week_view->col_offsets[col] - 1 - x,
-				       canvas_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (col != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y);
-		}
-
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
-			       int cx, int cy,
-			       GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
deleted file mode 100644
index 7ce1ccd386..0000000000
--- a/calendar/gui/e-week-view-titles-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_TITLES_ITEM_H_
-#define _E_WEEK_VIEW_TITLES_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#define E_WEEK_VIEW_TITLES_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_titles_item_get_type (), EWeekViewTitlesItem))
-#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_titles_item_get_type ()))
-#define E_IS_WEEK_VIEW_TITLES_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_titles_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewTitlesItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewTitlesItemClass;
-
-
-GtkType  e_week_view_titles_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
deleted file mode 100644
index eadc3c9bd3..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,3182 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "calendar-commands.h"
-#include "e-week-view.h"
-#include "e-week-view-event-item.h"
-#include "e-week-view-main-item.h"
-#include "e-week-view-titles-item.h"
-#include <cal-util/timeutil.h>
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-#include "jump.xpm"
-
-#define E_WEEK_VIEW_SMALL_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
-#define E_WEEK_VIEW_SMALL_FONT_FALLBACK	\
-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"
-
-/* We use a 7-bit field to store row numbers in EWeekViewEventSpan, so the
-   maximum number or rows we can allow is 127. It is very unlikely to be
-   reached anyway. */
-#define E_WEEK_VIEW_MAX_ROWS_PER_CELL	127
-
-#define E_WEEK_VIEW_JUMP_BUTTON_WIDTH	16
-#define E_WEEK_VIEW_JUMP_BUTTON_HEIGHT	8
-
-#define E_WEEK_VIEW_JUMP_BUTTON_X_PAD	3
-#define E_WEEK_VIEW_JUMP_BUTTON_Y_PAD	3
-
-static void e_week_view_class_init (EWeekViewClass *class);
-static void e_week_view_init (EWeekView *week_view);
-static void e_week_view_destroy (GtkObject *object);
-static void e_week_view_realize (GtkWidget *widget);
-static void e_week_view_unrealize (GtkWidget *widget);
-static void e_week_view_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style);
-static void e_week_view_size_allocate (GtkWidget *widget,
-				       GtkAllocation *allocation);
-static void e_week_view_recalc_cell_sizes (EWeekView *week_view);
-static gint e_week_view_focus_in (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_week_view_focus_out (GtkWidget *widget,
-				   GdkEventFocus *event);
-static gint e_week_view_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event);
-static void e_week_view_draw (GtkWidget    *widget,
-			      GdkRectangle *area);
-static void e_week_view_draw_shadow (EWeekView *week_view);
-
-static gboolean e_week_view_on_button_press (GtkWidget *widget,
-					     GdkEventButton *event,
-					     EWeekView *week_view);
-static gboolean e_week_view_on_button_release (GtkWidget *widget,
-					       GdkEventButton *event,
-					       EWeekView *week_view);
-static gboolean e_week_view_on_motion (GtkWidget *widget,
-				       GdkEventMotion *event,
-				       EWeekView *week_view);
-static gint e_week_view_convert_position_to_day (EWeekView *week_view,
-						 gint x,
-						 gint y);
-static void e_week_view_update_selection (EWeekView *week_view,
-					  gint day);
-
-static void e_week_view_queue_reload_events (EWeekView *week_view);
-static gboolean e_week_view_reload_events_idle_cb	(gpointer data);
-static void e_week_view_reload_events (EWeekView *week_view);
-static void e_week_view_free_events (EWeekView *week_view);
-static gboolean e_week_view_add_event (CalComponent *comp,
-				       time_t	  start,
-				       time_t	  end,
-				       gpointer	  data);
-static void e_week_view_check_layout (EWeekView *week_view);
-static void e_week_view_layout_events (EWeekView *week_view);
-static void e_week_view_layout_event (EWeekView	   *week_view,
-				      EWeekViewEvent   *event,
-				      guint8	   *grid,
-				      GArray	   *spans);
-static void e_week_view_ensure_events_sorted (EWeekView *week_view);
-static gint e_week_view_event_sort_func (const void *arg1,
-					 const void *arg2);
-static void e_week_view_reshape_events (EWeekView *week_view);
-static void e_week_view_reshape_event_span (EWeekView *week_view,
-					    gint event_num,
-					    gint span_num);
-static gint e_week_view_find_day (EWeekView *week_view,
-				  time_t time_to_find,
-				  gboolean include_midnight_in_prev_day);
-static gint e_week_view_find_span_end (EWeekView *week_view,
-				       gint day);
-static void e_week_view_recalc_day_starts (EWeekView *week_view,
-					   time_t lower);
-static void e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-					       EWeekView *week_view);
-static void e_week_view_on_editing_started (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static void e_week_view_on_editing_stopped (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static gboolean e_week_view_find_event_from_item (EWeekView	  *week_view,
-						  GnomeCanvasItem *item,
-						  gint		  *event_num,
-						  gint		  *span_num);
-static gboolean e_week_view_find_event_from_uid (EWeekView	  *week_view,
-						 const gchar	  *uid,
-						 gint		  *event_num_return);
-typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,
-						    gint event_num,
-						    gpointer data);
-
-static void e_week_view_foreach_event_with_uid (EWeekView *week_view,
-						const gchar *uid,
-						EWeekViewForeachEventCallback callback,
-						gpointer data);
-static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
-						GdkEvent *event,
-						EWeekView *week_view);
-static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-						  GdkEvent *event,
-						  EWeekView *week_view);
-static gint e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);
-static void e_week_view_on_new_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_week_view_on_edit_appointment (GtkWidget *widget,
-					     gpointer data);
-static void e_week_view_on_delete_occurrence (GtkWidget *widget,
-					      gpointer data);
-static void e_week_view_on_delete_appointment (GtkWidget *widget,
-					       gpointer data);
-static void e_week_view_on_unrecur_appointment (GtkWidget *widget,
-						gpointer data);
-
-#ifndef NO_WARNINGS
-static gboolean e_week_view_update_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-#endif
-static gboolean e_week_view_remove_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_week_view_get_type (void)
-{
-	static GtkType e_week_view_type = 0;
-
-	if (!e_week_view_type){
-		GtkTypeInfo e_week_view_info = {
-			"EWeekView",
-			sizeof (EWeekView),
-			sizeof (EWeekViewClass),
-			(GtkClassInitFunc) e_week_view_class_init,
-			(GtkObjectInitFunc) e_week_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_week_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						    &e_week_view_info);
-	}
-
-	return e_week_view_type;
-}
-
-
-static void
-e_week_view_class_init (EWeekViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_week_view_destroy;
-
-	widget_class->realize		= e_week_view_realize;
-	widget_class->unrealize		= e_week_view_unrealize;
-	widget_class->style_set		= e_week_view_style_set;
- 	widget_class->size_allocate	= e_week_view_size_allocate;
-	widget_class->focus_in_event	= e_week_view_focus_in;
-	widget_class->focus_out_event	= e_week_view_focus_out;
-	widget_class->key_press_event	= e_week_view_key_press;
-	widget_class->expose_event	= e_week_view_expose_event;
-	widget_class->draw		= e_week_view_draw;
-}
-
-
-static void
-e_week_view_init (EWeekView *week_view)
-{
-	GnomeCanvasGroup *canvas_group;
-	GtkObject *adjustment;
-	GdkPixbuf *pixbuf;
-	gint i;
-
-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);
-
-	week_view->calendar = NULL;
-	week_view->client = NULL;
-
-	week_view->events = g_array_new (FALSE, FALSE,
-					 sizeof (EWeekViewEvent));
-	week_view->events_sorted = TRUE;
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-	week_view->reload_events_idle_id = 0;
-
-	week_view->spans = NULL;
-
-	week_view->multi_week_view = FALSE;
-	week_view->weeks_shown = 6;
-	week_view->rows = 6;
-	week_view->columns = 2;
-	week_view->compress_weekend = TRUE;
-
-	g_date_clear (&week_view->base_date, 1);
-	g_date_clear (&week_view->first_day_shown, 1);
-
-	week_view->row_height = 10;
-	week_view->rows_per_cell = 1;
-
-	week_view->selection_start_day = -1;
-	week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-
-	week_view->pressed_event_num = -1;
-	week_view->editing_event_num = -1;
-
-	week_view->main_gc = NULL;
-
-	/* Create the small font. */
-	week_view->use_small_font = TRUE;
-	week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT);
-	if (!week_view->small_font)
-		week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT_FALLBACK);
-	if (!week_view->small_font)
-		g_warning ("Couldn't load font");
-
-
-	/*
-	 * Titles Canvas. Note that we don't show it is only shown in the
-	 * Month view.
-	 */
-	week_view->titles_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->titles_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->titles_canvas)->root);
-
-	week_view->titles_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_titles_item_get_type (),
-				       "EWeekViewTitlesItem::week_view", week_view,
-				       NULL);
-
-	/*
-	 * Main Canvas
-	 */
-	week_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-	gtk_widget_show (week_view->main_canvas);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root);
-
-	week_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_main_item_get_type (),
-				       "EWeekViewMainItem::week_view", week_view,
-				       NULL);
-
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_press),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_release),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_motion),
-				  week_view);
-
-	/* Create the buttons to jump to each days. */
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
-
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		week_view->jump_buttons[i] = gnome_canvas_item_new
-			(canvas_group,
-			 gnome_canvas_pixbuf_get_type (),
-			 "GnomeCanvasPixbuf::pixbuf", pixbuf,
-			 NULL);
-
-		gtk_signal_connect (GTK_OBJECT (week_view->jump_buttons[i]),
-				    "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_jump_button_event),
-				    week_view);
-	}
-
-
-	/*
-	 * Scrollbar.
-	 */
-	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
-	gtk_signal_connect (adjustment, "value_changed",
-			    GTK_SIGNAL_FUNC (e_week_view_on_adjustment_changed),
-			    week_view);
-
-	week_view->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));
-	gtk_table_attach (GTK_TABLE (week_view), week_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (week_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	week_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	week_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	week_view->last_cursor_set = NULL;
-}
-
-
-/**
- * e_week_view_new:
- * @Returns: a new #EWeekView.
- *
- * Creates a new #EWeekView.
- **/
-GtkWidget *
-e_week_view_new (void)
-{
-	GtkWidget *week_view;
-
-	week_view = GTK_WIDGET (gtk_type_new (e_week_view_get_type ()));
-
-	return week_view;
-}
-
-
-static void
-e_week_view_destroy (GtkObject *object)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (object);
-
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id != 0) {
-		g_source_remove (week_view->reload_events_idle_id);
-		week_view->reload_events_idle_id = 0;
-	}
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-		week_view->client = NULL;
-	}
-
-	if (week_view->small_font)
-		gdk_font_unref (week_view->small_font);
-
-	gdk_cursor_destroy (week_view->normal_cursor);
-	gdk_cursor_destroy (week_view->move_cursor);
-	gdk_cursor_destroy (week_view->resize_width_cursor);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_week_view_realize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gboolean success[E_WEEK_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	week_view = E_WEEK_VIEW (widget);
-	week_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xeded;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].blue  = 65535;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red   = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 0xd6d6;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, week_view->colors,
-					     E_WEEK_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	week_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->reminder_mask, NULL, bell_xpm);
-	week_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->recurrence_mask, NULL, recur_xpm);
-}
-
-
-static void
-e_week_view_unrealize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gint i;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	gdk_gc_unref (week_view->main_gc);
-	week_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_WEEK_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &week_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (week_view->reminder_icon);
-	week_view->reminder_icon = NULL;
-	gdk_pixmap_unref (week_view->recurrence_icon);
-	week_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_week_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EWeekView *week_view;
-	GdkFont *font;
-	gint day, day_width, max_day_width, max_abbr_day_width;
-	gint month, month_width, max_month_width, max_abbr_month_width;
-	GDate date;
-	gchar buffer[128];
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	week_view = E_WEEK_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	week_view->row_height = font->ascent + font->descent + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2 + E_WEEK_VIEW_EVENT_TEXT_Y_PAD * 2;
-	week_view->row_height = MAX (week_view->row_height, E_WEEK_VIEW_ICON_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2);
-
-	/* Set the height of the top canvas. */
-	gtk_widget_set_usize (week_view->titles_canvas, -1,
-			      font->ascent + font->descent + 5);
-
-	/* Save the sizes of various strings in the font, so we can quickly
-	   decide which date formats to use. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
-
-	max_day_width = 0;
-	max_abbr_day_width = 0;
-	for (day = 0; day < 7; day++) {
-		g_date_strftime (buffer, 128, "%A", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->day_widths[day] = day_width;
-		max_day_width = MAX (max_day_width, day_width);
-
-		g_date_strftime (buffer, 128, "%a", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->abbr_day_widths[day] = day_width;
-		max_abbr_day_width = MAX (max_abbr_day_width, day_width);
-
-		g_date_add_days (&date, 1);
-	}
-
-	max_month_width = 0;
-	max_abbr_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		g_date_set_month (&date, month + 1);
-
-		g_date_strftime (buffer, 128, "%B", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->month_widths[month] = month_width;
-		max_month_width = MAX (max_month_width, month_width);
-
-		g_date_strftime (buffer, 128, "%b", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->abbr_month_widths[month] = month_width;
-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);
-	}
-
-	week_view->space_width = gdk_string_width (font, " ");
-	week_view->colon_width = gdk_string_width (font, ":");
-	week_view->slash_width = gdk_string_width (font, "/");
-	week_view->digit_width = gdk_string_width (font, "5");
-	if (week_view->small_font)
-		week_view->small_digit_width = gdk_string_width (week_view->small_font, "5");
-	week_view->max_day_width = max_day_width;
-	week_view->max_abbr_day_width = max_abbr_day_width;
-	week_view->max_month_width = max_month_width;
-	week_view->max_abbr_month_width = max_abbr_month_width;
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EWeekView *week_view;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->titles_canvas->allocation.width - 1;
-	new_y2 = week_view->titles_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-						0, 0, new_x2, new_y2);
-
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->main_canvas->allocation.width - 1;
-	new_y2 = week_view->main_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Flag that we need to reshape the events. */
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-static void
-e_week_view_recalc_cell_sizes (EWeekView *week_view)
-{
-	gfloat canvas_width, canvas_height, offset;
-	gint row, col;
-	GtkWidget *widget;
-	GdkFont *font;
-	gint width, height, time_width;
-
-	if (week_view->multi_week_view) {
-		week_view->rows = week_view->weeks_shown * 2;
-		week_view->columns = week_view->compress_weekend ? 6 : 7;
-	} else {
-		week_view->rows = 6;
-		week_view->columns = 2;
-	}
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths.
-	   We also add one to the width so that the right border of the last
-	   column is off the edge of the displayed area. */
-	canvas_width = week_view->main_canvas->allocation.width + 1;
-	canvas_width /= week_view->columns;
-	offset = 0;
-	for (col = 0; col <= week_view->columns; col++) {
-		week_view->col_offsets[col] = floor (offset + 0.5);
-		offset += canvas_width;
-	}
-
-	/* Calculate the cell widths based on the offsets. */
-	for (col = 0; col < week_view->columns; col++) {
-		week_view->col_widths[col] = week_view->col_offsets[col + 1]
-			- week_view->col_offsets[col];
-	}
-
-	/* Now do the same for the row heights. */
-	canvas_height = week_view->main_canvas->allocation.height + 1;
-	canvas_height /= week_view->rows;
-	offset = 0;
-	for (row = 0; row <= week_view->rows; row++) {
-		week_view->row_offsets[row] = floor (offset + 0.5);
-		offset += canvas_height;
-	}
-
-	/* Calculate the cell heights based on the offsets. */
-	for (row = 0; row < week_view->rows; row++) {
-		week_view->row_heights[row] = week_view->row_offsets[row + 1]
-			- week_view->row_offsets[row];
-	}
-
-
-	/* If the font hasn't been set yet just return. */
-	widget = GTK_WIDGET (week_view);
-	if (!widget->style || ! widget->style->font)
-		return;
-
-	font = widget->style->font;
-
-	/* Calculate the number of rows of events in each cell, for the large
-	   cells and the compressed weekend cells. */
-	if (week_view->multi_week_view) {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_B_PAD;
-	} else {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1
-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;
-	}
-
-	height = week_view->row_heights[0];
-	week_view->rows_per_cell = (height * 2 - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_cell = MIN (week_view->rows_per_cell,
-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	week_view->rows_per_compressed_cell =
-		(height - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_compressed_cell = MIN (week_view->rows_per_compressed_cell,
-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	/* Determine which time format to use, based on the width of the cells.
-	   We only allow the time to take up about half of the width. */
-	width = week_view->col_widths[0];
-
-	week_view->time_format = E_WEEK_VIEW_TIME_NONE;
-	if (week_view->use_small_font && week_view->small_font) {
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-		if (width / 2 > time_width * 2 + week_view->space_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH_SMALL_MIN;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START_SMALL_MIN;
-	} else {
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-		if (width / 2 > time_width * 2 + week_view->space_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START;
-	}
-}
-
-
-static gint
-e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_week_view_expose_event (GtkWidget *widget,
-			  GdkEventExpose *event)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_draw (GtkWidget    *widget,
-		  GdkRectangle *area)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-static void
-e_week_view_draw_shadow (EWeekView *week_view)
-{
-	gint x1, y1, x2, y2;
-	GtkStyle *style;
-	GdkGC *light_gc, *dark_gc;
-	GdkWindow *window;
-
-	/* Draw the shadow around the graphical displays. */
-	x1 = week_view->main_canvas->allocation.x - 1;
-	y1 = week_view->main_canvas->allocation.y - 1;
-	x2 = x1 + week_view->main_canvas->allocation.width + 2;
-	y2 = y1 + week_view->main_canvas->allocation.height + 2;
-
-	style = GTK_WIDGET (week_view)->style;
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-
-	window = GTK_WIDGET (week_view)->window;
-	gdk_draw_line (window, dark_gc, x1, y1, x1, y2);
-	gdk_draw_line (window, dark_gc, x1, y1, x2, y1);
-	gdk_draw_line (window, light_gc, x2, y1, x2, y2);
-	gdk_draw_line (window, light_gc, x1, y2, x2, y2);
-}
-
-
-void
-e_week_view_set_calendar	(EWeekView	*week_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	week_view->calendar = calendar;
-
-	/* FIXME: free current events? */
-}
-
-
-/* Callback used when the calendar client finishes loading */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (status != CAL_CLIENT_LOAD_SUCCESS)
-		return;
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	gint event_num, num_days;
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (week_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-#ifndef NO_WARNINGS
-#warning "FIXME"
-#endif
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		/* Do this the long way every time for now */
-#if 0
-		if (ical_object_compare_dates (event->ico, ico)) {
-			e_week_view_foreach_event_with_uid (week_view, uid, e_week_view_update_event_cb, comp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			gtk_widget_queue_draw (week_view->main_canvas);
-			return;
-		}
-#endif
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-		e_week_view_foreach_event_with_uid (week_view, uid,
-						    e_week_view_remove_event_cb,
-						    NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	cal_recur_generate_instances (comp,
-				      week_view->day_starts[0],
-				      week_view->day_starts[num_days],
-				      e_week_view_add_event,
-				      week_view);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	e_week_view_foreach_event_with_uid (week_view, uid,
-					    e_week_view_remove_event_cb, NULL);
-
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/**
- * e_week_view_set_cal_client:
- * @week_view: A week view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a week view will monitor.
- **/
-void
-e_week_view_set_cal_client	(EWeekView	*week_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (week_view != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (client == week_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-	}
-
-	week_view->client = client;
-
-	if (week_view->client) {
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), week_view);
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), week_view);
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), week_view);
-	}
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-
-/* This sets the selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void
-e_week_view_set_selected_time_range	(EWeekView	*week_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date, base_date, end_date;
-	gint day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	g_date_clear (&date, 1);
-	g_date_set_time (&date, start_time);
-
-	if (week_view->multi_week_view) {
-		/* Find the number of days since the start of the month. */
-		day_offset = g_date_day (&date) - 1;
-
-		/* Find the 1st Monday at or before the start of the month. */
-		base_date = date;
-		g_date_set_day (&base_date, 1);
-		day_offset += g_date_weekday (&base_date) - 1;
-	} else {
-		/* Find the 1st Monday at or before the given day. */
-		day_offset = g_date_weekday (&date) - 1;
-	}
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		start_time = time_add_day (start_time, -day_offset);
-		start_time = time_day_begin (start_time);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&base_date);
-	if (end_time == start_time
-	    || end_time <= time_add_day (start_time, 1))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		g_date_clear (&end_date, 1);
-		g_date_set_time (&end_date, end_time - 60);
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&base_date);
-	}
-
-	/* Make sure the selection is valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	num_days--;
-	week_view->selection_start_day = CLAMP (week_view->selection_start_day,
-						0, num_days);
-	week_view->selection_end_day = CLAMP (week_view->selection_end_day,
-					      week_view->selection_start_day,
-					      num_days);
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Returns the selected time range. */
-void
-e_week_view_get_selected_time_range	(EWeekView	*week_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_day, end_day;
-
-	start_day = week_view->selection_start_day;
-	end_day = week_view->selection_end_day;
-
-	if (start_day == -1) {
-		start_day = 0;
-		end_day = 0;
-	}
-
-	if (start_time)
-		*start_time = week_view->day_starts[start_day];
-
-	if (end_time)
-		*end_time = week_view->day_starts[end_day + 1];
-}
-
-
-/* Note that the returned date may be invalid if no date has been set yet. */
-void
-e_week_view_get_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	*date = week_view->first_day_shown;
-}
-
-
-/* This sets the first day shown in the view. It will be rounded down to the
-   nearest week. */
-void
-e_week_view_set_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	GDate base_date;
-	gint day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;
-	struct tm start_tm;
-	time_t start_time;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	/* Calculate the old selection range. */
-	if (week_view->selection_start_day != -1) {
-		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_start_day;
-		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_end_day;
-	}
-
-	/* Find the 1st Monday at or before the given day. */
-	day_offset = g_date_weekday (date) - 1;
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = *date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		g_date_to_struct_tm (&base_date, &start_tm);
-		start_time = mktime (&start_tm);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Try to keep the previous selection, but if it is no longer shown
-	   just select the first day. */
-	if (week_view->selection_start_day != -1) {
-		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
-		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
-
-		/* Make sure the selection is valid. */
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-		num_days--;
-		week_view->selection_start_day =
-			CLAMP (week_view->selection_start_day, 0, num_days);
-		week_view->selection_end_day =
-			CLAMP (week_view->selection_end_day,
-			       week_view->selection_start_day,
-			       num_days);
-	}
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Recalculates the time_t corresponding to the start of each day. */
-static void
-e_week_view_recalc_day_starts (EWeekView *week_view,
-			       time_t lower)
-{
-	gint num_days, day;
-	time_t tmp_time;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	tmp_time = lower;
-	week_view->day_starts[0] = tmp_time;
-	for (day = 1; day <= num_days; day++) {
-		tmp_time = time_add_day (tmp_time, 1);
-		week_view->day_starts[day] = tmp_time;
-	}
-}
-
-
-gboolean
-e_week_view_get_multi_week_view	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->multi_week_view;
-}
-
-
-void
-e_week_view_set_multi_week_view	(EWeekView	*week_view,
-				 gboolean	 multi_week_view)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->multi_week_view == multi_week_view)
-		return;
-
-	week_view->multi_week_view = multi_week_view;
-
-	if (multi_week_view) {
-		gtk_widget_show (week_view->titles_canvas);
-		page_increment = 4;
-		page_size = 5;
-	} else {
-		gtk_widget_hide (week_view->titles_canvas);
-		page_increment = page_size = 1;
-	}
-
-	adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	adjustment->page_increment = page_increment;
-	adjustment->page_size = page_size;
-	gtk_adjustment_changed (adjustment);
-
-	/* FIXME: Need to change start date and adjustment value? */
-
-	e_week_view_recalc_day_starts (week_view, week_view->day_starts[0]);
-	e_week_view_recalc_cell_sizes (week_view);
-	e_week_view_queue_reload_events (week_view);
-}
-
-
-gint
-e_week_view_get_weeks_shown	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 1);
-
-	return week_view->weeks_shown;
-}
-
-
-void
-e_week_view_set_weeks_shown	(EWeekView	*week_view,
-				 gint		 weeks_shown)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	weeks_shown = MIN (weeks_shown, E_WEEK_VIEW_MAX_WEEKS);
-
-	if (week_view->weeks_shown == weeks_shown)
-		return;
-
-	week_view->weeks_shown = weeks_shown;
-
-	if (week_view->multi_week_view) {
-		page_increment = 4;
-		page_size = 5;
-
-		adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		adjustment->page_increment = page_increment;
-		adjustment->page_size = page_size;
-		gtk_adjustment_changed (adjustment);
-
-		/* FIXME: Need to change start date and adjustment value? */
-		e_week_view_recalc_day_starts (week_view,
-					       week_view->day_starts[0]);
-		e_week_view_recalc_cell_sizes (week_view);
-		e_week_view_queue_reload_events (week_view);
-	}
-}
-
-
-gboolean
-e_week_view_get_compress_weekend	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->compress_weekend;
-}
-
-
-void
-e_week_view_set_compress_weekend	(EWeekView	*week_view,
-					 gboolean	 compress)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->compress_weekend == compress)
-		return;
-
-	week_view->compress_weekend = compress;
-
-	/* The option only affects the month view. */
-	if (!week_view->multi_week_view)
-		return;
-
-	e_week_view_recalc_cell_sizes (week_view);
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-}
-
-
-#ifndef NO_WARNINGS
-static gboolean
-e_week_view_update_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-	gchar *text;
-	CalComponent *comp;
-
-	comp = data;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			CalComponentText t;
-
-			cal_component_get_summary (event->comp, &t);
-			text = (char*) t.value;
-			gnome_canvas_item_set (span->text_item,
-					       "text", text ? text : "",
-					       NULL);
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	return TRUE;
-}
-#endif
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_week_view_foreach_event_with_uid (EWeekView *week_view,
-				    const gchar *uid,
-				    EWeekViewForeachEventCallback callback,
-				    gpointer data)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-
-	for (event_num = week_view->events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (week_view, event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_week_view_remove_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (week_view->editing_event_num == event_num)
-		week_view->editing_event_num = -1;
-
-	/* We leave the span elements in the array, but set the canvas item
-	   pointers to NULL. */
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-			span->text_item = NULL;
-		}
-		if (span->background_item) {
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-			span->background_item = NULL;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	g_array_remove_index (week_view->events, event_num);
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-void
-e_week_view_get_day_position	(EWeekView	*week_view,
-				 gint		 day,
-				 gint		*day_x,
-				 gint		*day_y,
-				 gint		*day_w,
-				 gint		*day_h)
-{
-	gint week, day_of_week, row;
-
-	*day_x = *day_y = *day_w = *day_h = 0;
-	g_return_if_fail (day >= 0);
-
-	if (week_view->multi_week_view) {
-		g_return_if_fail (day < week_view->weeks_shown * 7);
-
-		week = day / 7;
-		day_of_week = day % 7;
-		if (week_view->compress_weekend && day_of_week >= 5) {
-			/* In the compressed view Saturday is above Sunday and
-			   both have just one row as opposed to 2 for all the
-			   other days. */
-			if (day_of_week == 5) {
-				*day_y = week_view->row_offsets[week * 2];
-				*day_h = week_view->row_heights[week * 2];
-			} else {
-				*day_y = week_view->row_offsets[week * 2 + 1];
-				*day_h = week_view->row_heights[week * 2 + 1];
-			}
-			/* Both Saturday and Sunday are in the 6th column. */
-			*day_x = week_view->col_offsets[5];
-			*day_w = week_view->col_widths[5];
-		} else {
-			*day_y = week_view->row_offsets[week * 2];
-			*day_h = week_view->row_heights[week * 2]
-				+ week_view->row_heights[week * 2 + 1];
-			*day_x = week_view->col_offsets[day_of_week];
-			*day_w = week_view->col_widths[day_of_week];
-		}
-	} else {
-		g_return_if_fail (day < 7);
-
-		/* The week view has Mon, Tue & Wed down the left column and
-		   Thu, Fri & Sat/Sun down the right. */
-		if (day < 3) {
-			*day_x = week_view->col_offsets[0];
-			*day_w = week_view->col_widths[0];
-		} else {
-			*day_x = week_view->col_offsets[1];
-			*day_w = week_view->col_widths[1];
-		}
-
-		if (day < 5) {
-			row = (day % 3) * 2;
-			*day_y = week_view->row_offsets[row];
-			*day_h = week_view->row_heights[row]
-				+ week_view->row_heights[row + 1];
-		} else {
-			/* Saturday & Sunday. */
-			*day_y = week_view->row_offsets[day - 1];
-			*day_h = week_view->row_heights[day - 1];
-		}
-	}
-}
-
-
-/* Returns the bounding box for a span of an event. Usually this can easily
-   be determined by the start & end days and row of the span, which are set in
-   e_week_view_layout_event(). Though we need a special case for the weekends
-   when they are compressed, since the span may not fit. */
-gboolean
-e_week_view_get_span_position	(EWeekView	*week_view,
-				 gint		 event_num,
-				 gint		 span_num,
-				 gint		*span_x,
-				 gint		*span_y,
-				 gint		*span_w)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint end_day_of_week, num_days;
-	gint start_x, start_y, start_w, start_h;
-	gint end_x, end_y, end_w, end_h;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-	g_return_val_if_fail (event_num < week_view->events->len, FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	g_return_val_if_fail (span_num < event->num_spans, FALSE);
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	if (span->row >= week_view->rows_per_cell)
-		return FALSE;
-
-	end_day_of_week = (span->start_day + span->num_days - 1) % 7;
-	num_days = span->num_days;
-	/* Check if the row will not be visible in compressed cells. */
-	if (span->row >= week_view->rows_per_compressed_cell) {
-		if (week_view->multi_week_view) {
-			if (week_view->compress_weekend) {
-				/* If it ends on a Saturday and is 1 day long
-				   we skip it, else we shorten it. If it ends
-				   on a Sunday it must be 1 day long and we
-				   skip it. */
-				if (end_day_of_week == 5) {	   /* Sat */
-					if (num_days == 1) {
-						return FALSE;
-					} else {
-						num_days--;
-					}
-				} else if (end_day_of_week == 6) { /* Sun */
-					return FALSE;
-				}
-			}
-		} else {
-			/* All spans are 1 day long in the week view, so we
-			   just skip it. */
-			if (end_day_of_week > 4)
-				return FALSE;
-		}
-	}
-
-	e_week_view_get_day_position (week_view, span->start_day,
-				      &start_x, &start_y, &start_w, &start_h);
-	*span_y = start_y + week_view->events_y_offset
-		+ span->row * (week_view->row_height
-			       + E_WEEK_VIEW_EVENT_Y_SPACING);
-	if (num_days == 1) {
-		*span_x = start_x;
-		*span_w = start_w;
-	} else {
-		e_week_view_get_day_position (week_view,
-					      span->start_day + num_days - 1,
-					      &end_x, &end_y, &end_w, &end_h);
-		*span_x = start_x;
-		*span_w = end_x - start_x + end_w;
-	}
-
-	return TRUE;
-}
-
-
-
-static gboolean
-e_week_view_on_button_press (GtkWidget *widget,
-			     GdkEventButton *event,
-			     EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_button_press\n");
-#endif
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment:
-					  adj->page_increment);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	/* Convert the mouse position to a week & day. */
-	x = event->x;
-	y = event->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			week_view->selection_start_day = day;
-			week_view->selection_end_day = day;
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-
-			/* FIXME: Optimise? */
-			gtk_widget_queue_draw (week_view->main_canvas);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view, event, -1);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_button_release (GtkWidget *widget,
-			       GdkEventButton *event,
-			       EWeekView *week_view)
-{
-	time_t start, end;
-
-#if 0
-	g_print ("In e_week_view_on_button_release\n");
-#endif
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-		gdk_pointer_ungrab (event->time);
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-		gnome_calendar_set_selected_time_range (week_view->calendar,
-							start, end);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_motion (GtkWidget *widget,
-		       GdkEventMotion *mevent,
-		       EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_motion\n");
-#endif
-
-	/* Convert the mouse position to a week & day. */
-	x = mevent->x;
-	y = mevent->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		e_week_view_update_selection (week_view, day);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/* Converts a position in the canvas window to a day offset from the first
-   day displayed. Returns -1 if the position is outside the grid. */
-static gint
-e_week_view_convert_position_to_day (EWeekView *week_view,
-				     gint x,
-				     gint y)
-{
-	gint col, row, grid_x = -1, grid_y = -1, week, day;
-
-	/* First we convert it to a grid position. */
-	for (col = 0; col <= week_view->columns; col++) {
-		if (x < week_view->col_offsets[col]) {
-			grid_x = col - 1;
-			break;
-		}
-	}
-
-	for (row = 0; row <= week_view->rows; row++) {
-		if (y < week_view->row_offsets[row]) {
-			grid_y = row - 1;
-			break;
-		}
-	}
-
-	/* If the mouse is outside the grid return FALSE. */
-	if (grid_x == -1 || grid_y == -1)
-		return -1;
-
-	/* Now convert the grid position to a week and day. */
-	if (week_view->multi_week_view) {
-		week = grid_y / 2;
-		if (week_view->compress_weekend && grid_x == 5
-		    && grid_y % 2 == 1)
-			day = 6;
-		else
-			day = grid_x;
-	} else {
-		week = 0;
-		if (grid_x == 0)
-			day = grid_y / 2;
-		else if (grid_y == 5)
-			day = 6;
-		else
-			day = grid_y / 2 + 3;
-	}
-
-	return week * 7 + day;
-}
-
-
-static void
-e_week_view_update_selection (EWeekView *week_view,
-			      gint day)
-{
-	gint tmp_day;
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", week, day);
-#endif
-
-	if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START) {
-		if (day != week_view->selection_start_day) {
-			need_redraw = TRUE;
-			week_view->selection_start_day = day;
-		}
-	} else {
-		if (day != week_view->selection_end_day) {
-			need_redraw = TRUE;
-			week_view->selection_end_day = day;
-		}
-	}
-
-	/* Switch the drag position if necessary. */
-	if (week_view->selection_start_day > week_view->selection_end_day) {
-		tmp_day = week_view->selection_start_day;
-		week_view->selection_start_day = week_view->selection_end_day;
-		week_view->selection_end_day = tmp_day;
-		if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START)
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-		else
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_START;
-	}
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (week_view->main_canvas);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_week_view_queue_reload_events (EWeekView *week_view)
-{
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id == 0) {
-		/* We'll use a low priority here, so the user can scroll
-		   the view quickly. */
-		week_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_LOW,
-			 e_week_view_reload_events_idle_cb, week_view, NULL);
-	}
-}
-
-
-static gboolean
-e_week_view_reload_events_idle_cb	(gpointer data)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	week_view = E_WEEK_VIEW (data);
-
-	week_view->reload_events_idle_id = 0;
-
-	e_week_view_reload_events (week_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_week_view_reload_events (EWeekView *week_view)
-{
-	gint num_days;
-
-	e_week_view_free_events (week_view);
-
-	if (!(week_view->client && cal_client_is_loaded (week_view->client)))
-		return;
-
-	if (week_view->calendar
-	    && g_date_valid (&week_view->first_day_shown)) {
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-
-		cal_client_generate_instances (week_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       week_view->day_starts[0],
-					       week_view->day_starts[num_days],
-					       e_week_view_add_event,
-					       week_view);
-	}
-
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-static void
-e_week_view_free_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_days, day;
-
-	/* Reset all our indices. */
-	week_view->pressed_event_num = -1;
-	week_view->pressed_span_num = -1;
-	week_view->editing_event_num = -1;
-	week_view->editing_span_num = -1;
-	week_view->popup_event_num = -1;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (week_view->events, 0);
-
-	/* Destroy all the old canvas items. */
-	if (week_view->spans) {
-		for (span_num = 0; span_num < week_view->spans->len;
-		     span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan, span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (week_view->spans, TRUE);
-		week_view->spans = NULL;
-	}
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_week_view_add_event (CalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gpointer	  data)
-
-{
-	EWeekView *week_view;
-	EWeekViewEvent event;
-	gint num_days;
-	struct tm start_tm, end_tm;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* Check that the event times are valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 week_view->day_starts[0], week_view->day_starts[num_days],
-		 start, end);
-#endif
-
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < week_view->day_starts[num_days], TRUE);
-	g_return_val_if_fail (end > week_view->day_starts[0], TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (event.comp));
-	event.start = start;
-	event.end = end;
-	event.spans_index = 0;
-	event.num_spans = 0;
-
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	g_array_append_val (week_view->events, event);
-	week_view->events_sorted = FALSE;
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-/* This lays out the events, or reshapes them, as necessary. */
-static void
-e_week_view_check_layout (EWeekView *week_view)
-{
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (week_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_week_view_ensure_events_sorted (week_view);
-
-	if (week_view->events_need_layout)
-		e_week_view_layout_events (week_view);
-
-	if (week_view->events_need_layout || week_view->events_need_reshape)
-		e_week_view_reshape_events (week_view);
-
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-}
-
-
-static void
-e_week_view_layout_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days, day, event_num, span_num;
-	guint8 *grid;
-	GArray *spans, *old_spans;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8, E_WEEK_VIEW_MAX_ROWS_PER_CELL * 7
-		       * E_WEEK_VIEW_MAX_WEEKS);
-
-	/* We create a new array of spans, which will replace the old one. */
-	spans = g_array_new (FALSE, FALSE, sizeof (EWeekViewEventSpan));
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-
-	/* Iterate over the events, finding which weeks they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		e_week_view_layout_event (week_view, event, grid, spans);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Replace the spans array. */
-	old_spans = week_view->spans;
-	week_view->spans = spans;
-
-	/* Destroy the old spans array, destroying any unused canvas items. */
-	if (old_spans) {
-		for (span_num = 0; span_num < old_spans->len; span_num++) {
-			span = &g_array_index (old_spans, EWeekViewEventSpan,
-					       span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (old_spans, TRUE);
-	}
-}
-
-
-static void
-e_week_view_layout_event (EWeekView	   *week_view,
-			  EWeekViewEvent   *event,
-			  guint8	   *grid,
-			  GArray	   *spans)
-{
-	gint start_day, end_day, span_start_day, span_end_day, rows_per_cell;
-	gint free_row, row, day, span_num, spans_index, num_spans, max_day;
-	EWeekViewEventSpan span, *old_span;
-
-	start_day = e_week_view_find_day (week_view, event->start, FALSE);
-	end_day = e_week_view_find_day (week_view, event->end, TRUE);
-	max_day = week_view->multi_week_view ? week_view->weeks_shown * 7 - 1
-		: 7 - 1;
-	start_day = CLAMP (start_day, 0, max_day);
-	end_day = CLAMP (end_day, 0, max_day);
-
-#if 0
-	g_print ("In e_week_view_layout_event Start:%i End: %i\n",
-		 start_day, end_day);
-#endif
-
-	/* Iterate through each of the spans of the event, where each span
-	   is a sequence of 1 or more days displayed next to each other. */
-	span_start_day = start_day;
-	rows_per_cell = E_WEEK_VIEW_MAX_ROWS_PER_CELL;
-	span_num = 0;
-	spans_index = spans->len;
-	num_spans = 0;
-	while (span_start_day <= end_day) {
-		span_end_day = e_week_view_find_span_end (week_view,
-							  span_start_day);
-		span_end_day = MIN (span_end_day, end_day);
-#if 0
-		g_print ("  Span start:%i end:%i\n", span_start_day,
-			 span_end_day);
-#endif
-		/* Try each row until we find a free one or we fall off the
-		   bottom of the available rows. */
-		row = 0;
-		free_row = -1;
-		while (free_row == -1 && row < rows_per_cell) {
-			free_row = row;
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				if (grid[day * rows_per_cell + row]) {
-					free_row = -1;
-					break;
-				}
-			}
-			row++;
-		};
-
-		if (free_row != -1) {
-			/* Mark the cells as full. */
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				grid[day * rows_per_cell + free_row] = 1;
-				week_view->rows_per_day[day] = MAX (week_view->rows_per_day[day], free_row + 1);
-			}
-#if 0
-			g_print ("  Span start:%i end:%i row:%i\n",
-				 span_start_day, span_end_day, free_row);
-#endif
-			/* Add the span to the array, and try to reuse any
-			   canvas items from the old spans. */
-			span.start_day = span_start_day;
-			span.num_days = span_end_day - span_start_day + 1;
-			span.row = free_row;
-			span.background_item = NULL;
-			span.text_item = NULL;
-			if (event->num_spans > span_num) {
-				old_span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
-				span.background_item = old_span->background_item;
-				span.text_item = old_span->text_item;
-				old_span->background_item = NULL;
-				old_span->text_item = NULL;
-			}
-
-			g_array_append_val (spans, span);
-			num_spans++;
-		}
-
-		span_start_day = span_end_day + 1;
-		span_num++;
-	}
-
-	/* Set the event's spans. */
-	event->spans_index = spans_index;
-	event->num_spans = num_spans;
-}
-
-
-static void
-e_week_view_ensure_events_sorted (EWeekView *week_view)
-{
-	if (!week_view->events_sorted) {
-		qsort (week_view->events->data,
-		       week_view->events->len,
-		       sizeof (EWeekViewEvent),
-		       e_week_view_event_sort_func);
-		week_view->events_sorted = TRUE;
-	}
-}
-
-
-static gint
-e_week_view_event_sort_func (const void *arg1,
-			     const void *arg2)
-{
-	EWeekViewEvent *event1, *event2;
-
-	event1 = (EWeekViewEvent*) arg1;
-	event2 = (EWeekViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static void
-e_week_view_reshape_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-	gint num_days, day, day_x, day_y, day_w, day_h, max_rows;
-	gboolean is_weekend;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	/* Reshape the jump buttons and show/hide them as appropriate. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-
-		is_weekend = (day % 7 >= 5) ? TRUE : FALSE;
-		if (!is_weekend || (week_view->multi_week_view
-				    && !week_view->compress_weekend))
-			max_rows = week_view->rows_per_cell;
-		else
-			max_rows = week_view->rows_per_compressed_cell;
-
-		/* Determine whether the jump button should be shown. */
-		if (week_view->rows_per_day[day] <= max_rows) {
-			gnome_canvas_item_hide (week_view->jump_buttons[day]);
-		} else {
-			e_week_view_get_day_position (week_view, day,
-						      &day_x, &day_y,
-						      &day_w, &day_h);
-
-			gnome_canvas_item_set (week_view->jump_buttons[day],
-					       "GnomeCanvasPixbuf::x", (gdouble) (day_x + day_w - E_WEEK_VIEW_JUMP_BUTTON_X_PAD - E_WEEK_VIEW_JUMP_BUTTON_WIDTH),
-					       "GnomeCanvasPixbuf::y", (gdouble) (day_y + day_h - E_WEEK_VIEW_JUMP_BUTTON_Y_PAD - E_WEEK_VIEW_JUMP_BUTTON_HEIGHT),
-					       NULL);
-
-			gnome_canvas_item_show (week_view->jump_buttons[day]);
-			gnome_canvas_item_raise_to_top (week_view->jump_buttons[day]);
-		}
-	}
-
-	for (day = num_days; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-		gnome_canvas_item_hide (week_view->jump_buttons[day]);
-	}
-}
-
-
-static void
-e_week_view_reshape_event_span (EWeekView *week_view,
-				gint event_num,
-				gint span_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GdkFont *font;
-	gint span_x, span_y, span_w, num_icons, icons_width, time_width;
-	gint min_text_x, max_text_w, width;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-	gboolean one_day_event;
-	CalComponent *comp;
-	gdouble text_x, text_y, text_w, text_h;
-	gchar *text, *end_of_line;
-	gint line_len, text_width;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-	comp = event->comp;
-	font = GTK_WIDGET (week_view)->style->font;
-
-	one_day_event = e_week_view_is_one_day_event (week_view, event_num);
-
-	/* If the span will not be visible destroy the canvas items and
-	   return. */
-	if (!e_week_view_get_span_position (week_view, event_num, span_num,
-					    &span_x, &span_y, &span_w)) {
-		if (span->background_item)
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-		if (span->text_item)
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-		span->background_item = NULL;
-		span->text_item = NULL;
-		return;
-	}
-
-	if (!one_day_event && week_view->editing_event_num == event_num
-	    && week_view->editing_span_num == span_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	num_icons = 0;
-	if (show_icons) {
-		if (cal_component_has_alarms (comp))
-			num_icons++;
-		if (cal_component_has_recurrences (comp))
-			num_icons++;
-	}
-
-	/* Create the background canvas item if necessary. */
-	if (!span->background_item) {
-		span->background_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_week_view_event_item_get_type (),
-					       NULL);
-	}
-
-	gnome_canvas_item_set (span->background_item,
-			       "event_num", event_num,
-			       "span_num", span_num,
-			       NULL);
-
-	/* Create the text item if necessary. */
-	if (!span->text_item) {
-		CalComponentText text;
-
-		cal_component_get_summary (comp, &text);
-		span->text_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (week_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-#if 0
-					       "max_lines", 1,
-#endif
-					       "editable", TRUE,
-					       "text", text.value ? text.value : "",
-					       "use_ellipsis", TRUE,
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (span->text_item), "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_text_item_event),
-				    week_view);
-	}
-
-	/* Calculate the position of the text item.
-	   For events < 1 day it starts after the times & icons and ends at the
-	   right edge of the span.
-	   For events > 1 day we need to determine whether times are shown at
-	   the start and end of the span, then try to center the text item with
-	   the icons in the middle, but making sure we don't go over the times.
-	*/
-
-
-	/* Calculate the space necessary to display a time, e.g. "13:00". */
-	if (week_view->use_small_font && week_view->small_font)
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-	else
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-
-	/* Calculate the space needed for the icons. */
-	icons_width = (E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD)
-		* num_icons;
-
-	/* The y position and height are the same for both event types. */
-	text_y = span_y + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;
-	text_h = font->ascent + font->descent;
-
-	if (one_day_event) {
-		text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD + icons_width;
-
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			text_x += time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_R_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			break;
-		}
-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			- E_WEEK_VIEW_EVENT_R_PAD - text_x;
-
-	} else {
-		if (use_max_width) {
-			text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - text_x;
-		} else {
-			/* Get the requested size of the label. */
-			gtk_object_get (GTK_OBJECT (span->text_item),
-					"text", &text,
-					NULL);
-			text_width = 0;
-			if (text) {
-				end_of_line = strchr (text, '\n');
-				if (end_of_line)
-					line_len = end_of_line - text;
-				else
-					line_len = strlen (text);
-				text_width = gdk_text_width (font, text, line_len);
-				g_free (text);
-			}
-
-			/* Add on the width of the icons and find the default
-			   position. */
-			width = text_width + icons_width;
-			text_x = span_x + (span_w - width) / 2;
-
-			/* Now calculate the left-most valid position, and make
-			   sure we don't go to the left of that. */
-			min_text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			if (event->start > week_view->day_starts[span->start_day])
-				min_text_x += time_width
-					+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-
-			text_x = MAX (text_x, min_text_x);
-
-			/* Now calculate the largest valid width, using the
-			   calculated x position, and make sure we don't
-			   exceed that. */
-			max_text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - text_x;
-			if (event->end < week_view->day_starts[span->start_day
-							      + span->num_days])
-				max_text_w -= time_width
-					+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-
-			text_w = MIN (width, max_text_w);
-
-			/* Now take out the space for the icons. */
-			text_x += icons_width;
-			text_w -= icons_width;
-		}
-	}
-
-	text_w = MAX (text_w, 0);
-	gnome_canvas_item_set (span->text_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) text_h,
-			       NULL);
-	e_canvas_item_move_absolute(span->text_item,
-				    text_x, text_y);
-}
-
-
-/* Finds the day containing the given time.
-   If include_midnight_in_prev_day is TRUE then if the time exactly
-   matches the start of a day the previous day is returned. This is useful
-   when calculating the end day of an event. */
-static gint
-e_week_view_find_day (EWeekView *week_view,
-		      time_t time_to_find,
-		      gboolean include_midnight_in_prev_day)
-{
-	gint num_days, day;
-	time_t *day_starts;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	day_starts = week_view->day_starts;
-
-	if (time_to_find < day_starts[0])
-		return -1;
-	if (time_to_find > day_starts[num_days])
-		return num_days;
-
-	for (day = 1; day <= num_days; day++) {
-		if (time_to_find <= day_starts[day]) {
-			if (time_to_find == day_starts[day]
-			    && !include_midnight_in_prev_day)
-				return day;
-			return day - 1;
-		}
-	}
-
-	g_assert_not_reached ();
-	return num_days;
-}
-
-
-/* This returns the last day in the same span as the given day. A span is all
-   the days which are displayed next to each other from left to right.
-   In the week view all spans are only 1 day, since Tuesday is below Monday
-   rather than beside it etc. In the month view, if the weekends are not
-   compressed then each week is a span, otherwise Monday to Saturday of each
-   week is a span, and the Sundays are separate spans. */
-static gint
-e_week_view_find_span_end (EWeekView *week_view,
-			   gint day)
-{
-	gint week, day_of_week, end_day;
-
-	if (week_view->multi_week_view) {
-		week = day / 7;
-		day_of_week = day % 7;
-		if (week_view->compress_weekend && day_of_week <= 5)
-			end_day = 5;
-		else
-			end_day = 6;
-		return week * 7 + end_day;
-	} else {
-		return day;
-	}
-}
-
-
-static void
-e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-				   EWeekView *week_view)
-{
-	GDate date;
-	gint week_offset;
-	struct tm tm;
-	time_t lower, start, end;
-	guint32 old_first_day_julian, new_first_day_julian;
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Determine the first date shown. */
-	date = week_view->base_date;
-	week_offset = floor (adjustment->value + 0.5);
-	g_date_add_days (&date, week_offset * 7);
-
-	/* Convert the old & new first days shown to julian values. */
-	old_first_day_julian = g_date_julian (&week_view->first_day_shown);
-	new_first_day_julian = g_date_julian (&date);
-
-	/* If we are already showing the date, just return. */
-	if (old_first_day_julian == new_first_day_julian)
-		return;
-
-	/* Set the new first day shown. */
-	week_view->first_day_shown = date;
-
-	/* Convert it to a time_t. */
-	g_date_to_struct_tm (&date, &tm);
-	lower = mktime (&tm);
-	lower = time_day_begin (lower);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	e_week_view_queue_reload_events (week_view);
-
-	/* Update the selection, if needed. */
-	if (week_view->selection_start_day != -1) {
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-		gnome_calendar_set_selected_time_range (week_view->calendar,
-							start, end);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-void
-e_week_view_start_editing_event (EWeekView *week_view,
-				 gint	    event_num,
-				 gint	    span_num,
-				 gchar     *initial_text)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-	/* If we are already editing the event, just return. */
-	if (event_num == week_view->editing_event_num
-	    && span_num == week_view->editing_span_num)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!span->text_item)
-		return;
-
-	if (initial_text) {
-		gnome_canvas_item_set (span->text_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	e_canvas_item_grab_focus (span->text_item);
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops any current edit. */
-void
-e_week_view_stop_editing_event (EWeekView *week_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (week_view->editing_event_num == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *event,
-				EWeekView *week_view)
-{
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (event->button.button == 3) {
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-			e_week_view_show_popup_menu (week_view,
-						     (GdkEventButton*) event,
-						     event_num);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-
-		week_view->pressed_event_num = event_num;
-		week_view->pressed_span_num = span_num;
-
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-
-			if (event) {
-				week_view->drag_event_x = event->button.x;
-				week_view->drag_event_y = event->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event. */
-
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (!E_TEXT (item)->editing) {
-			/* This shouldn't ever happen. */
-			if (!e_week_view_find_event_from_item (week_view,
-							       item,
-							       &event_num,
-							       &span_num))
-				return FALSE;
-
-			if (week_view->pressed_event_num != -1
-			    && week_view->pressed_event_num == event_num
-			    && week_view->pressed_span_num == span_num) {
-				e_week_view_start_editing_event (week_view,
-								 event_num,
-								 span_num,
-								 NULL);
-				week_view->pressed_event_num = -1;
-			}
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		week_view->pressed_event_num = -1;
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in) {
-			e_week_view_on_editing_started (week_view, item);
-		} else {
-			e_week_view_on_editing_stopped (week_view, item);
-		}
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_on_editing_started (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-
-	if (!e_week_view_find_event_from_item (week_view, item,
-					       &event_num, &span_num))
-		return;
-
-#if 0
-	g_print ("In e_week_view_on_editing_started event_num:%i span_num:%i\n", event_num, span_num);
-#endif
-
-	week_view->editing_event_num = event_num;
-	week_view->editing_span_num = span_num;
-
-	/* We need to reshape long events so the whole width is used while
-	   editing. */
-	if (!e_week_view_is_one_day_event (week_view, event_num)) {
-		e_week_view_reshape_event_span (week_view, event_num,
-						span_num);
-	}
-}
-
-
-static void
-e_week_view_on_editing_stopped (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gchar *text = NULL;
-	CalComponentText summary;
-	const char *uid;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* Reset the edit fields. */
-	week_view->editing_event_num = -1;
-
-	/* Check that the event is still valid. */
-	cal_component_get_uid (event->comp, &uid);
-	if (!uid)
-		return;
-
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		return;
-	}
-
-	summary.value = text;
-	cal_component_set_summary (event->comp, &summary);
-	g_free (text);
-
-	if (!cal_client_update_object (week_view->client, event->comp))
-		g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-static gboolean
-e_week_view_find_event_from_item (EWeekView	  *week_view,
-				  GnomeCanvasItem *item,
-				  gint		  *event_num_return,
-				  gint		  *span_num_return)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan,
-					       event->spans_index + span_num);
-			if (span->text_item == item) {
-				*event_num_return = event_num;
-				*span_num_return = span_num;
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the index of the event with the given uid.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EWeekViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_week_view_find_event_from_uid (EWeekView	  *week_view,
-				 const gchar	  *uid,
-				 gint		  *event_num_return)
-{
-	EWeekViewEvent *event;
-	gint event_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-gboolean
-e_week_view_is_one_day_event	(EWeekView	*week_view,
-				 gint		 event_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	if (event->num_spans != 1)
-		return FALSE;
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index);
-
-	if (event->start == week_view->day_starts[span->start_day]
-	    && event->end == week_view->day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= week_view->day_starts[span->start_day]
-	    && event->end <= week_view->day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	gint event_num;
-	gchar *initial_text;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dtstart, dtend;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	/* The Escape key aborts a resize operation. */
-#if 0
-	if (week_view->resize_drag_pos != E_WEEK_VIEW_POS_NONE) {
-		if (event->keyval == GDK_Escape) {
-			e_week_view_abort_resize (week_view, event->time);
-		}
-		return FALSE;
-	}
-#endif
-
-	if (week_view->selection_start_day == -1)
-		return FALSE;
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (event->keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((event->keyval < 0x20)
-		   || (event->keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range. */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	dtstart = week_view->day_starts[week_view->selection_start_day];
-	dtend = week_view->day_starts[week_view->selection_end_day + 1];
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_week_view_add_event (comp, dtstart, dtend, week_view);
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-		e_week_view_start_editing_event (week_view, event_num, 0,
-						 initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-void
-e_week_view_show_popup_menu (EWeekView	     *week_view,
-			     GdkEventButton  *bevent,
-			     gint	      event_num)
-{
-	EWeekViewEvent *event;
-	int have_selection, not_being_edited, num_items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_week_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (week_view)
-		&& week_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		num_items = 1;
-		context_menu = &items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			num_items = 6;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
-		} else {
-			num_items = 4;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < num_items; i++)
-		context_menu[i].data = week_view;
-
-	week_view->popup_event_num = event_num;
-	popup_menu (context_menu, num_items, bevent);
-}
-
-
-static void
-e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	week_view = E_WEEK_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	dt = week_view->day_starts[week_view->selection_start_day];
-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-
-	dt = week_view->day_starts[week_view->selection_end_day + 1];
-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (week_view->calendar, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	gnome_calendar_edit_object (week_view->calendar, event->comp);
-}
-
-
-static void
-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp;
-	CalComponentDateTime *date=NULL;
-	GSList *list;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	list = g_slist_append (list, date);
-	date = g_new0 (CalComponentDateTime, 1);
-	date->value = g_new (struct icaltimetype, 1);
-	*date->value = icaltime_from_timet (event->start, TRUE, FALSE);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	const char *uid;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	cal_component_get_uid (event->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (week_view->client, uid);
-}
-
-
-static void
-e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	GSList *list;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	*date.value = icaltime_from_timet (event->start, TRUE, FALSE);
-	list = g_slist_append (list, &date);
-	cal_component_set_exdate_list (comp, list);
-	g_slist_free (list);
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	*date.value = icaltime_from_timet (event->start, TRUE, FALSE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, TRUE, FALSE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	   present the updates happen synchronously so our event may disappear.
-	*/
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (week_view->client, new_comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static gboolean
-e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-				  GdkEvent *event,
-				  EWeekView *week_view)
-{
-	gint day;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-			if (item == week_view->jump_buttons[day]) {
-				gnome_calendar_dayjump
-					(week_view->calendar,
-					 week_view->day_starts[day]);
-				return TRUE;
-			}
-		}
-
-	}
-
-	return FALSE;
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index e4d5ee72db..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_H_
-#define _E_WEEK_VIEW_H_
-
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-/* The maximum number of weeks we show. 5 is usually enough for 1 month,
-   but we allow 6 for longer selections. */
-#define E_WEEK_VIEW_MAX_WEEKS		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_WEEK_VIEW_ICON_WIDTH		16
-#define E_WEEK_VIEW_ICON_HEIGHT		16
-#define E_WEEK_VIEW_ICON_X_PAD		0
-#define E_WEEK_VIEW_ICON_Y_PAD		0
-
-/* The space on the left & right of the event. (The triangle to indicate the
-   event continues is displayed in this space). */
-#define E_WEEK_VIEW_EVENT_L_PAD		2
-#define E_WEEK_VIEW_EVENT_R_PAD		3
-
-/* The vertical spacing between rows of events. */
-#define E_WEEK_VIEW_EVENT_Y_SPACING	1
-
-/* The size of the border around the event. */
-#define E_WEEK_VIEW_EVENT_BORDER_WIDTH	1
-#define E_WEEK_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_WEEK_VIEW_EVENT_TEXT_X_PAD	4
-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1
-
-/* The space on the right of the time string, if it is shown. */
-#define E_WEEK_VIEW_EVENT_TIME_R_PAD	2
-
-/* The padding above and on the right of the date string at the top of each
-   cell. */
-#define E_WEEK_VIEW_DATE_T_PAD		2
-#define E_WEEK_VIEW_DATE_R_PAD		4
-
-/* The padding above and below the line under the date string, in the Week
-   view, and also the space on the left of it. */
-#define E_WEEK_VIEW_DATE_LINE_T_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_B_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_L_PAD	10
-
-/* The padding below the date string in the Month view. */
-#define E_WEEK_VIEW_DATE_B_PAD		1
-
-/* These index our colors array. */
-typedef enum
-{
-	E_WEEK_VIEW_COLOR_EVEN_MONTHS,
-	E_WEEK_VIEW_COLOR_ODD_MONTHS,
-	E_WEEK_VIEW_COLOR_EVENT_BACKGROUND,
-	E_WEEK_VIEW_COLOR_EVENT_BORDER,
-	
-	E_WEEK_VIEW_COLOR_LAST
-} EWeekViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_WEEK_VIEW_DRAG_NONE,
-	E_WEEK_VIEW_DRAG_START,
-	E_WEEK_VIEW_DRAG_END
-} EWeekViewDragPosition;
-
-/* These specify which times are shown for the 1-day events. We use the small
-   font for the minutes if it can be loaded and the option is on. */
-typedef enum
-{
-	E_WEEK_VIEW_TIME_NONE,
-	E_WEEK_VIEW_TIME_START,
-	E_WEEK_VIEW_TIME_BOTH,
-	E_WEEK_VIEW_TIME_START_SMALL_MIN,
-	E_WEEK_VIEW_TIME_BOTH_SMALL_MIN
-} EWeekViewTimeFormat;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_WEEK_VIEW_POS_OUTSIDE,
-	E_WEEK_VIEW_POS_NONE,
-	E_WEEK_VIEW_POS_EVENT,
-	E_WEEK_VIEW_POS_LEFT_EDGE,
-	E_WEEK_VIEW_POS_RIGHT_EDGE
-} EWeekViewPosition;
-
-
-typedef struct _EWeekViewEventSpan EWeekViewEventSpan;
-struct _EWeekViewEventSpan {
-	guint start_day : 6;
-	guint num_days : 3;
-	guint row : 7;
-	GnomeCanvasItem *background_item;
-	GnomeCanvasItem *text_item;
-};
-
-typedef struct _EWeekViewEvent EWeekViewEvent;
-struct _EWeekViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint16 start_minute;	/* Minutes from the start of the day. */
-	guint16 end_minute;
-	gint spans_index;
-	guint num_spans;
-};
-
-
-#define E_WEEK_VIEW(obj)          GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)
-#define E_WEEK_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
-#define E_IS_WEEK_VIEW(obj)       GTK_CHECK_TYPE (obj, e_week_view_get_type ())
-
-
-typedef struct _EWeekView       EWeekView;
-typedef struct _EWeekViewClass  EWeekViewClass;
-
-struct _EWeekView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates are shown. */
-	GtkWidget *titles_canvas;
-	GnomeCanvasItem *titles_canvas_item;
-
-	/* The main canvas where the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	GnomeCanvasItem *jump_buttons[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The array of EWeekViewEvent elements. */
-	GArray *events;
-	gboolean events_sorted;
-	gboolean events_need_layout;
-	gboolean events_need_reshape;
-
-	/* The id of our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* An array of EWeekViewEventSpan elements. Each event has its own
-	   space within this array, and uses the spans_index and num_spans
-	   fields of the EWeekViewEvent struct to access it. */
-	GArray *spans;
-
-	/* The start of each day displayed. */
-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];
-
-	/* The base date, where the adjustment value is 0. */
-	GDate base_date;
-
-	/* The first day shown in the view. */
-	GDate first_day_shown;
-
-	/* If we are displaying multiple weeks in rows. If this is FALSE only
-	   one week is shown, with a different layout. */
-	gboolean multi_week_view;
-
-	/* How many weeks we are showing. This is only relevant if
-	   display_month is TRUE. */
-	gint weeks_shown;
-
-	/* If Sat & Sun are compressed. Only applicable in month view, since
-	   they are always compressed into 1 cell in the week view. */
-	gboolean compress_weekend;
-
-	/* The vertical offset of the events from the top of the cells. */
-	gint events_y_offset;
-
-	/* The height of the events, not including spacing between them. */
-	gint row_height;
-
-	/* The number of rows of events in each cell. */
-	gint rows_per_cell;
-	gint rows_per_compressed_cell;
-
-	/* The number of rows we have used for each day (i.e. each cell) */
-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	/* If the small font is used for displaying the minutes. */
-	gboolean use_small_font;
-
-	/* Small font to display the minutes. */
-	GdkFont *small_font;
-
-	/* The widths of various pieces of text, used to determine which of
-	   several date formats to display, set in e_week_view_style_set(). */
-	gint space_width;		/* One space character ' '. */
-	gint colon_width;		/* Size of ':' in the font. */
-	gint slash_width;		/* Size of '/' in the font. */
-	gint digit_width;		/* Size of a '0' digit. */
-	gint small_digit_width;		/* Size of a small_font '0' digit. */
-	gint day_widths[7];		/* Monday first. */
-	gint max_day_width;
-	gint abbr_day_widths[7];
-	gint max_abbr_day_width;
-	gint month_widths[12];
-	gint max_month_width;
-	gint abbr_month_widths[12];
-	gint max_abbr_month_width;
-
-	/* The size of the main grid of days and of the cells. A row
-	   corresponds to a compressed day, so normal days usually take
-	   up 2 rows. Note that the offsets arrays have one more element
-	   than the widths/heights arrays since they also contain the
-	   right/bottom edge. */
-	gint rows;
-	gint columns;
-	gint col_widths[7];
-	gint col_offsets[8];
-	gint row_heights[E_WEEK_VIEW_MAX_WEEKS * 2];
-	gint row_offsets[E_WEEK_VIEW_MAX_WEEKS * 2 + 1];
-
-	/* This specifies which times we are showing for the events, depending
-	   on how much room is available. */
-	EWeekViewTimeFormat time_format;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_WEEK_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-
-	/* The currently selected region, in days from the first day shown.
-	   If selection_start_day is -1 there is no current selection. */
-	gint selection_start_day;
-	gint selection_end_day;
-
-	/* This specifies which end of the selection is being dragged, or is
-	   E_WEEK_VIEW_DRAG_NONE if the selection isn't being dragged. */
-	EWeekViewDragPosition selection_drag_pos;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_num;
-	gint pressed_span_num;
-
-	/* The event span currently being edited. The num is -1 if no event is
-	   being edited. */
-	gint editing_event_num;
-	gint editing_span_num;
-
-	/* The event that the context menu is for. */
-	gint popup_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-};
-
-struct _EWeekViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_week_view_get_type			(void);
-GtkWidget* e_week_view_new			(void);
-
-void       e_week_view_set_calendar		(EWeekView	*week_view,
-						 GnomeCalendar	*calendar);
-
-/* The first day shown. Note that it will be rounded down to the start of a
-   week when set. The returned value will be invalid if no date has been set
-   yet. */
-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-
-void       e_week_view_set_cal_client		(EWeekView	*week_view,
-						 CalClient	*client);
-
-/* The selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-
-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */
-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);
-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,
-						 gboolean	 multi_week_view);
-
-/* The number of weeks shown in the multi-week view. */
-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);
-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,
-						 gint		 weeks_shown);
-
-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
-   view. In the Week view they are always compressed. */
-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);
-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,
-						 gboolean	 compress);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void       e_week_view_get_day_position		(EWeekView	*week_view,
-						 gint		 day,
-						 gint		*day_x,
-						 gint		*day_y,
-						 gint		*day_w,
-						 gint		*day_h);
-gboolean   e_week_view_get_span_position	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gint		*span_x,
-						 gint		*span_y,
-						 gint		*span_w);
-gboolean   e_week_view_is_one_day_event		(EWeekView	*week_view,
-						 gint		 event_num);
-void	   e_week_view_start_editing_event	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gchar		*initial_text);
-void	   e_week_view_stop_editing_event	(EWeekView	*week_view);
-
-void	   e_week_view_show_popup_menu		(EWeekView	*week_view,
-						 GdkEventButton *event,
-						 gint		 event_num);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_H_ */
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
deleted file mode 100644
index ed1a55af7d..0000000000
--- a/calendar/gui/event-editor-dialog.glade
+++ /dev/null
@@ -1,1370 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>event-editor-dialog</name>
-  <program_name>event-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>.</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>event-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>event-editor-dialog</name>
-  <visible>False</visible>
-  <title>event-editor-dialog</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock2</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>dialog-contents</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table5</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label13</name>
-	    <label>Su_mmary:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>general-summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>general-summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame4</name>
-	  <label>Time</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table3</name>
-	    <border_width>4</border_width>
-	    <rows>2</rows>
-	    <columns>3</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label15</name>
-	      <label>_Start time:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <label>_End time:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>all-day-event</name>
-	      <can_focus>True</can_focus>
-	      <label>A_ll day event</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-time</name>
-	      <creation_function>make_date_edit_with_time</creation_function>
-	      <string1></string1>
-	      <string2></string2>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:05 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>end-time</name>
-	      <creation_function>make_date_edit_with_time</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:10 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame5</name>
-	  <label>Classification</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox6</name>
-	    <border_width>2</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>classification-radio</name>
-	      <can_focus>True</can_focus>
-	      <label>Pu_blic</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name></name>
-	      <can_focus>True</can_focus>
-	      <label>Pri_vate</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name></name>
-	      <can_focus>True</can_focus>
-	      <label>_Confidential</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table4</name>
-	<border_width>4</border_width>
-	<rows>4</rows>
-	<columns>5</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-display-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-audio-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-program-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-mail-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-display</name>
-	  <can_focus>True</can_focus>
-	  <label>_Display</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-program</name>
-	  <can_focus>True</can_focus>
-	  <label>_Program</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-mail</name>
-	  <can_focus>True</can_focus>
-	  <label>_Mail</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label>Mail _to:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-mail-mail-to</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label17</name>
-	  <label>_Run program:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-program-run-program-entry</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>alarm-mail-mail-to</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeFileEntry</class>
-	  <name>alarm-program-run-program</name>
-	  <max_saved>10</max_saved>
-	  <directory>False</directory>
-	  <modal>False</modal>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GnomeEntry:entry</child_name>
-	    <name>alarm-program-run-program-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-audio</name>
-	  <can_focus>True</can_focus>
-	  <label>_Audio</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-display-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>True</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-audio-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-program-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-mail-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label42</name>
-	<label>Reminder</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox41</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame26</name>
-	  <label>Appointment Basics</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table9</name>
-	    <border_width>4</border_width>
-	    <rows>2</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>2</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label44</name>
-	      <label>Su_mmary:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>recurrence-summary</default_focus_target>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label45</name>
-	      <label>_Starting date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>recurrence-summary</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>True</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment37</name>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>recurrence-starting-date</name>
-		<creation_function>make_date_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 22 Sep 2000 20:51:38 GMT</last_modification_time>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox43</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame28</name>
-	    <label>Recurrence Rule</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox47</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox47</name>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-none</name>
-		  <can_focus>True</can_focus>
-		  <label>No recurrence</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence-radio</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-simple</name>
-		  <can_focus>True</can_focus>
-		  <label>Simple recurrence</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence-radio</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-custom</name>
-		  <can_focus>True</can_focus>
-		  <label>Custom recurrence</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence-radio</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>recurrence-params</name>
-		<homogeneous>False</homogeneous>
-		<spacing>2</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label46</name>
-		  <label>Every</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-interval-value</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>True</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>1</value>
-		  <lower>1</lower>
-		  <upper>10000</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-interval-unit</name>
-		  <can_focus>True</can_focus>
-		  <items>day(s)
-week(s)
-month(s)
-year(s)
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkAlignment</class>
-		  <name>recurrence-special</name>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xscale>0</xscale>
-		  <yscale>0</yscale>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-ending-menu</name>
-		  <can_focus>True</can_focus>
-		  <items>for
-until
-forever
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkAlignment</class>
-		  <name>recurrence-ending-special</name>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xscale>0</xscale>
-		  <yscale>0</yscale>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox45</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame24</name>
-	      <label>Exceptions</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox46</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox44</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>4</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exception-add</name>
-		    <can_focus>True</can_focus>
-		    <label>Add</label>
-		    <relief>GTK_RELIEF_NORMAL</relief>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exception-modify</name>
-		    <can_focus>True</can_focus>
-		    <label>Modify</label>
-		    <relief>GTK_RELIEF_NORMAL</relief>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exception-delete</name>
-		    <can_focus>True</can_focus>
-		    <label>Delete</label>
-		    <relief>GTK_RELIEF_NORMAL</relief>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox45</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>4</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>Custom</class>
-		    <name>recurrence-exception-date</name>
-		    <creation_function>make_date_edit</creation_function>
-		    <int1>0</int1>
-		    <int2>0</int2>
-		    <last_modification_time>Tue, 16 May 2000 01:42:29 GMT</last_modification_time>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow10</name>
-		    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>recurrence-exception-list</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_BROWSE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label49</name>
-			<label>label21</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>recurrence-custom-warning</name>
-	      <label>This appointment has custom recurrence rules that cannot be edited by Evolution.
-
-However, the appointment will recur at the appropriate time and will be displayed properly in the calendar views.</label>
-	      <justify>GTK_JUSTIFY_LEFT</justify>
-	      <wrap>True</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label43</name>
-	<label>Recurrence</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
deleted file mode 100644
index 97a9366d66..0000000000
--- a/calendar/gui/event-editor-dialog.glade.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("event-editor-dialog");
-gchar *s = N_("Su_mmary:");
-gchar *s = N_("Time");
-gchar *s = N_("_Start time:");
-gchar *s = N_("_End time:");
-gchar *s = N_("A_ll day event");
-gchar *s = N_("Classification");
-gchar *s = N_("Pu_blic");
-gchar *s = N_("Pri_vate");
-gchar *s = N_("_Confidential");
-gchar *s = N_("General");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("_Display");
-gchar *s = N_("_Program");
-gchar *s = N_("_Mail");
-gchar *s = N_("Mail _to:");
-gchar *s = N_("_Run program:");
-gchar *s = N_("_Audio");
-gchar *s = N_("Reminder");
-gchar *s = N_("Appointment Basics");
-gchar *s = N_("Su_mmary:");
-gchar *s = N_("_Starting date:");
-gchar *s = N_("Recurrence Rule");
-gchar *s = N_("No recurrence");
-gchar *s = N_("Simple recurrence");
-gchar *s = N_("Custom recurrence");
-gchar *s = N_("Every");
-gchar *s = N_("day(s)");
-gchar *s = N_("week(s)");
-gchar *s = N_("month(s)");
-gchar *s = N_("year(s)");
-gchar *s = N_("for");
-gchar *s = N_("until");
-gchar *s = N_("forever");
-gchar *s = N_("Exceptions");
-gchar *s = N_("Add");
-gchar *s = N_("Modify");
-gchar *s = N_("Delete");
-gchar *s = N_("label21");
-gchar *s = N_("This appointment has custom recurrence rules that cannot be edited by Evolution.\n"
-              "\n"
-              "However, the appointment will recur at the appropriate time and will be displayed properly in the calendar views.");
-gchar *s = N_("Recurrence");
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
deleted file mode 100644
index f1cbc1c624..0000000000
--- a/calendar/gui/event-editor.c
+++ /dev/null
@@ -1,2633 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *          Seth Alves <alves@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "event-editor.h"
-#include "e-meeting-edit.h"
-#include "weekday-picker.h"
-
-
-
-/* Options for monthly recurrences */
-enum month_day_options {
-	MONTH_DAY_NTH,
-	MONTH_DAY_MON,
-	MONTH_DAY_TUE,
-	MONTH_DAY_WED,
-	MONTH_DAY_THU,
-	MONTH_DAY_FRI,
-	MONTH_DAY_SAT,
-	MONTH_DAY_SUN
-};
-
-static const int month_day_options_map[] = {
-	MONTH_DAY_NTH,
-	MONTH_DAY_MON,
-	MONTH_DAY_TUE,
-	MONTH_DAY_WED,
-	MONTH_DAY_THU,
-	MONTH_DAY_FRI,
-	MONTH_DAY_SAT,
-	MONTH_DAY_SUN,
-	-1
-};
-
-struct _EventEditorPrivate {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	/* Client to use */
-	CalClient *client;
-	
-	/* Calendar object/uid we are editing; this is an internal copy */
-	CalComponent *comp;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *general_summary;
-
-	GtkWidget *start_time;
-	GtkWidget *end_time;
-	GtkWidget *all_day_event;
-
-	GtkWidget *description;
-
-	GtkWidget *alarm_display;
-	GtkWidget *alarm_program;
-	GtkWidget *alarm_audio;
-	GtkWidget *alarm_mail;
-	GtkWidget *alarm_display_amount;
-	GtkWidget *alarm_display_unit;
-	GtkWidget *alarm_audio_amount;
-	GtkWidget *alarm_audio_unit;
-	GtkWidget *alarm_program_amount;
-	GtkWidget *alarm_program_unit;
-	GtkWidget *alarm_program_run_program;
-	GtkWidget *alarm_program_run_program_entry;
-	GtkWidget *alarm_mail_amount;
-	GtkWidget *alarm_mail_unit;
-	GtkWidget *alarm_mail_mail_to;
-
-	GtkWidget *classification_radio;
-
-	GtkWidget *recurrence_summary;
-	GtkWidget *recurrence_starting_date;
-
-	GtkWidget *recurrence_none;
-	GtkWidget *recurrence_simple;
-	GtkWidget *recurrence_custom;
-	GtkWidget *recurrence_custom_warning;
-
-	GtkWidget *recurrence_params;
-	GtkWidget *recurrence_interval_value;
-	GtkWidget *recurrence_interval_unit;
-	GtkWidget *recurrence_special;
-	GtkWidget *recurrence_ending_menu;
-	GtkWidget *recurrence_ending_special;
-
-	/* For weekly recurrences, created by hand */
-	GtkWidget *recurrence_weekday_picker;
-	guint8 recurrence_weekday_day_mask;
-
-	/* For monthly recurrences, created by hand */
-	GtkWidget *recurrence_month_index_spin;
-	int recurrence_month_index;
-
-	GtkWidget *recurrence_month_day_menu;
-	enum month_day_options recurrence_month_day;
-
-	/* For ending date, created by hand */
-	GtkWidget *recurrence_ending_date_edit;
-	time_t recurrence_ending_date;
-
-	/* For ending count of ocurrences, created by hand */
-	GtkWidget *recurrence_ending_count_spin;
-	int recurrence_ending_count;
-
-	/* More widgets from the Glade file */
-
-	GtkWidget *recurrence_exception_date;
-	GtkWidget *recurrence_exception_list;
-	GtkWidget *recurrence_exception_add;
-	GtkWidget *recurrence_exception_modify;
-	GtkWidget *recurrence_exception_delete;
-};
-
-
-
-static void event_editor_class_init (EventEditorClass *class);
-static void event_editor_init (EventEditor *ee);
-static void event_editor_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-extern int day_begin, day_end;
-extern char *user_name;
-extern int am_pm_flag;
-extern int week_starts_on_monday;
-
-
-static void append_exception (EventEditor *ee, time_t t);
-static void check_all_day (EventEditor *ee);
-static void set_all_day (GtkWidget *toggle, EventEditor *ee);
-static void alarm_toggle (GtkWidget *toggle, EventEditor *ee);
-static void date_changed_cb (EDateEdit *dedit, gpointer data);
-static void recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee);
-
-
-
-/**
- * event_editor_get_type:
- *
- * Registers the #EventEditor class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #EventEditor class.
- **/
-GtkType
-event_editor_get_type (void)
-{
-	static GtkType event_editor_type = 0;
-
-	if (!event_editor_type) {
-		static const GtkTypeInfo event_editor_info = {
-			"EventEditor",
-			sizeof (EventEditor),
-			sizeof (EventEditorClass),
-			(GtkClassInitFunc) event_editor_class_init,
-			(GtkObjectInitFunc) event_editor_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		event_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &event_editor_info);
-	}
-
-	return event_editor_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-event_editor_class_init (EventEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = event_editor_destroy;
-}
-
-/* Object initialization function for the event editor */
-static void
-event_editor_init (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = g_new0 (EventEditorPrivate, 1);
-	ee->priv = priv;
-}
-
-/* Frees the rows and the row data in the recurrence exceptions GtkCList */
-static void
-free_exception_clist_data (GtkCList *clist)
-{
-	int i;
-
-	for (i = 0; i < clist->rows; i++) {
-		gpointer data;
-
-		data = gtk_clist_get_row_data (clist, i);
-		g_free (data);
-		gtk_clist_set_row_data (clist, i, NULL);
-	}
-
-	gtk_clist_clear (clist);
-}
-
-/* Destroy handler for the event editor */
-static void
-event_editor_destroy (GtkObject *object)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (object));
-
-	ee = EVENT_EDITOR (object);
-	priv = ee->priv;
-
-	if (priv->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->uic));
-		priv->uic = NULL;
-	}
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exception_list));
-
-	if (priv->app) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->app), ee);
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	ee->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-	
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-/* Creates the special contents for weekly recurrences */
-static void
-make_recur_weekly_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	WeekdayPicker *wp;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_special)->child == NULL);
-	g_assert (priv->recurrence_weekday_picker == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_special), hbox);
-
-	label = gtk_label_new (_("on"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	wp = WEEKDAY_PICKER (weekday_picker_new ());
-
-	priv->recurrence_weekday_picker = GTK_WIDGET (wp);
-	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the weekdays */
-
-	weekday_picker_set_week_starts_on_monday (wp, week_starts_on_monday);
-	weekday_picker_set_days (wp, priv->recurrence_weekday_day_mask);
-}
-
-/* Creates the option menu for the monthly recurrence days */
-static GtkWidget *
-make_recur_month_menu (void)
-{
-	static const char *options[] = {
-		N_("day"),
-		N_("Monday"),
-		N_("Tuesday"),
-		N_("Wednesday"),
-		N_("Thursday"),
-		N_("Friday"),
-		N_("Saturday"),
-		N_("Sunday")
-	};
-
-	GtkWidget *menu;
-	GtkWidget *omenu;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) {
-		GtkWidget *item;
-
-		item = gtk_menu_item_new_with_label (_(options[i]));
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-	}
-
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-	return omenu;
-}
-
-/* Creates the special contents for monthly recurrences */
-static void
-make_recur_monthly_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_special)->child == NULL);
-	g_assert (priv->recurrence_month_index_spin == NULL);
-	g_assert (priv->recurrence_month_day_menu == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_special), hbox);
-
-	label = gtk_label_new (_("on the"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));
-	priv->recurrence_month_index_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_month_index_spin, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("th"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	priv->recurrence_month_day_menu = make_recur_month_menu ();
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_month_day_menu, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the options */
-
-	e_dialog_spin_set (priv->recurrence_month_index_spin, priv->recurrence_month_index);
-	e_dialog_option_menu_set (priv->recurrence_month_day_menu,
-				  priv->recurrence_month_day,
-				  month_day_options_map);
-}
-
-static const int recur_freq_map[] = {
-	ICAL_DAILY_RECURRENCE,
-	ICAL_WEEKLY_RECURRENCE,
-	ICAL_MONTHLY_RECURRENCE,
-	ICAL_YEARLY_RECURRENCE,
-	-1
-};
-
-/* Changes the recurrence-special widget to match the interval units.
- *
- * For daily recurrences: nothing.
- * For weekly recurrences: weekday selector.
- * For monthly recurrences: "on the" <nth> [day, Weekday]
- * For yearly recurrences: nothing.
- */
-static void
-make_recurrence_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	icalrecurrencetype_frequency frequency;
-
-	priv = ee->priv;
-
-	if (GTK_BIN (priv->recurrence_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->recurrence_special)->child);
-
-		priv->recurrence_weekday_picker = NULL;
-		priv->recurrence_month_index_spin = NULL;
-		priv->recurrence_month_day_menu = NULL;
-	}
-
-	frequency = e_dialog_option_menu_get (priv->recurrence_interval_unit, recur_freq_map);
-
-	switch (frequency) {
-	case ICAL_DAILY_RECURRENCE:
-		gtk_widget_hide (priv->recurrence_special);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:
-		make_recur_weekly_special (ee);
-		gtk_widget_show (priv->recurrence_special);
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-		make_recur_monthly_special (ee);
-		gtk_widget_show (priv->recurrence_special);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		gtk_widget_hide (priv->recurrence_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Creates the special contents for "ending until" (end date) recurrences */
-static void
-make_recur_ending_until_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	EDateEdit *de;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_ending_special)->child == NULL);
-	g_assert (priv->recurrence_ending_date_edit == NULL);
-
-	/* Create the widget */
-
-	priv->recurrence_ending_date_edit = e_date_edit_new ();
-	de = E_DATE_EDIT (priv->recurrence_ending_date_edit);
-
-	e_date_edit_set_show_time (de, FALSE);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_ending_special), GTK_WIDGET (de));
-
-	gtk_widget_show_all (GTK_WIDGET (de));
-
-	/* Set the value */
-
-	e_date_edit_set_time (de, priv->recurrence_ending_date);
-}
-
-/* Creates the special contents for the ocurrence count case */
-static void
-make_recur_ending_count_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkAdjustment *adj;
-
-	priv = ee->priv;
-
-	g_assert (GTK_BIN (priv->recurrence_ending_special)->child == NULL);
-	g_assert (priv->recurrence_ending_count_spin == NULL);
-
-	/* Create the widgets */
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (priv->recurrence_ending_special), hbox);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
-	priv->recurrence_ending_count_spin = gtk_spin_button_new (adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->recurrence_ending_count_spin, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("ocurrences"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (hbox);
-
-	/* Set the values */
-
-	e_dialog_spin_set (priv->recurrence_ending_count_spin,
-			   priv->recurrence_ending_count);
-}
-
-enum ending_type {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER
-};
-
-static const int ending_types_map[] = {
-	ENDING_FOR,
-	ENDING_UNTIL,
-	ENDING_FOREVER,
-	-1
-};
-
-/* Changes the recurrence-ending-special widget to match the ending date option.
- *
- * For: <n> [days, weeks, months, years, occurrences]
- * Until: <date selector>
- * Forever: nothing.
- */
-static void
-make_recurrence_ending_special (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	enum ending_type ending_type;
-
-	priv = ee->priv;
-
-	if (GTK_BIN (priv->recurrence_ending_special)->child != NULL) {
-		gtk_widget_destroy (GTK_BIN (priv->recurrence_ending_special)->child);
-
-		priv->recurrence_ending_date_edit = NULL;
-		priv->recurrence_ending_count_spin = NULL;
-	}
-
-	ending_type = e_dialog_option_menu_get (priv->recurrence_ending_menu, ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		make_recur_ending_count_special (ee);
-		gtk_widget_show (priv->recurrence_ending_special);
-		break;
-
-	case ENDING_UNTIL:
-		make_recur_ending_until_special (ee);
-		gtk_widget_show (priv->recurrence_ending_special);
-		break;
-
-	case ENDING_FOREVER:
-		gtk_widget_hide (priv->recurrence_ending_special);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-enum recur_type {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM
-};
-
-static const int recur_type_map[] = {
-	RECUR_NONE,
-	RECUR_SIMPLE,
-	RECUR_CUSTOM,
-	-1
-};
-
-/* Sensitizes the recurrence widgets based on the state of the recurrence type
- * radio group.
- */
-static void
-sensitize_recur_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	enum recur_type type;
-
-	priv = ee->priv;
-
-	type = e_dialog_radio_get (priv->recurrence_none, recur_type_map);
-
-	switch (type) {
-	case RECUR_NONE:
-		gtk_widget_set_sensitive (priv->recurrence_params, FALSE);
-		gtk_widget_hide (priv->recurrence_custom_warning);
-		break;
-
-	case RECUR_SIMPLE:
-		gtk_widget_set_sensitive (priv->recurrence_params, TRUE);
-		gtk_widget_hide (priv->recurrence_custom_warning);
-		break;
-
-	case RECUR_CUSTOM:
-		gtk_widget_set_sensitive (priv->recurrence_params, FALSE);
-		gtk_widget_show (priv->recurrence_custom_warning);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-	
-/* Callback used when one of the recurrence type radio buttons is toggled.  We
- * enable or the recurrence parameters.
- */
-static void
-recurrence_type_toggled_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	sensitize_recur_widgets (ee);
-}
-
-/* Callback used when the recurrence interval option menu changes.  We need to
- * change the contents of the recurrence special widget.
- */
-static void
-recur_interval_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	make_recurrence_special (ee);
-}
-
-/* Callback used when the recurrence ending option menu changes.  We need to
- * change the contents of the ending special widget.
- */
-static void
-recur_ending_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	make_recurrence_ending_special (ee);
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("event-editor-dialog");
-
-	priv->general_summary = GW ("general-summary");
-
-	priv->start_time = GW ("start-time");
-	priv->end_time = GW ("end-time");
-	priv->all_day_event = GW ("all-day-event");
-
-	priv->description = GW ("description");
-
-	priv->alarm_display = GW ("alarm-display");
-	priv->alarm_program = GW ("alarm-program");
-	priv->alarm_audio = GW ("alarm-audio");
-	priv->alarm_mail = GW ("alarm-mail");
-	priv->alarm_display_amount = GW ("alarm-display-amount");
-	priv->alarm_display_unit = GW ("alarm-display-unit");
-	priv->alarm_audio_amount = GW ("alarm-audio-amount");
-	priv->alarm_audio_unit = GW ("alarm-audio-unit");
-	priv->alarm_program_amount = GW ("alarm-program-amount");
-	priv->alarm_program_unit = GW ("alarm-program-unit");
-	priv->alarm_program_run_program = GW ("alarm-program-run-program");
-	priv->alarm_program_run_program_entry = GW ("alarm-program-run-program-entry");
-	priv->alarm_mail_amount = GW ("alarm-mail-amount");
-	priv->alarm_mail_unit = GW ("alarm-mail-unit");
-	priv->alarm_mail_mail_to = GW ("alarm-mail-mail-to");
-
-	priv->classification_radio = GW ("classification-radio");
-
-	priv->recurrence_summary = GW ("recurrence-summary");
-	priv->recurrence_starting_date = GW ("recurrence-starting-date");
-
-	priv->recurrence_none = GW ("recurrence-none");
-	priv->recurrence_simple = GW ("recurrence-simple");
-	priv->recurrence_custom = GW ("recurrence-custom");
-	priv->recurrence_custom_warning = GW ("recurrence-custom-warning");
-	priv->recurrence_params = GW ("recurrence-params");
-
-	priv->recurrence_interval_value = GW ("recurrence-interval-value");
-	priv->recurrence_interval_unit = GW ("recurrence-interval-unit");
-	priv->recurrence_special = GW ("recurrence-special");
-	priv->recurrence_ending_menu = GW ("recurrence-ending-menu");
-	priv->recurrence_ending_special = GW ("recurrence-ending-special");
-
-	priv->recurrence_exception_date = GW ("recurrence-exception-date");
-	priv->recurrence_exception_list = GW ("recurrence-exception-list");
-	priv->recurrence_exception_add = GW ("recurrence-exception-add");
-	priv->recurrence_exception_modify = GW ("recurrence-exception-modify");
-	priv->recurrence_exception_delete = GW ("recurrence-exception-delete");
-
-#undef GW
-
-	return (priv->general_summary
-		&& priv->start_time
-		&& priv->end_time
-		&& priv->all_day_event
-		&& priv->description
-		&& priv->alarm_display
-		&& priv->alarm_program
-		&& priv->alarm_audio
-		&& priv->alarm_mail
-		&& priv->alarm_display_amount
-		&& priv->alarm_display_unit
-		&& priv->alarm_audio_amount
-		&& priv->alarm_audio_unit
-		&& priv->alarm_program_amount
-		&& priv->alarm_program_unit
-		&& priv->alarm_program_run_program
-		&& priv->alarm_program_run_program_entry
-		&& priv->alarm_mail_amount
-		&& priv->alarm_mail_unit
-		&& priv->alarm_mail_mail_to
-		&& priv->classification_radio
-		&& priv->recurrence_summary
-		&& priv->recurrence_starting_date
-		&& priv->recurrence_none
-		&& priv->recurrence_simple
-		&& priv->recurrence_custom
-		&& priv->recurrence_custom_warning
-		&& priv->recurrence_params
-		&& priv->recurrence_interval_value
-		&& priv->recurrence_interval_unit
-		&& priv->recurrence_special
-		&& priv->recurrence_ending_menu
-		&& priv->recurrence_ending_special
-		&& priv->recurrence_exception_date
-		&& priv->recurrence_exception_list
-		&& priv->recurrence_exception_add
-		&& priv->recurrence_exception_modify
-		&& priv->recurrence_exception_delete);
-}
-
-/* Syncs the contents of two entry widgets, while blocking signals from each
- * other.
- */
-static void
-sync_entries (GtkEditable *source, GtkEditable *dest)
-{
-	char *str;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), source);
-
-	str = gtk_editable_get_chars (source, 0, -1);
-	gtk_entry_set_text (GTK_ENTRY (dest), str);
-	g_free (str);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), source);
-}
-
-/* Syncs the contents of two date editor widgets, while blocking signals on the
- * specified data.
- */
-static void
-sync_date_edits (EDateEdit *source, EDateEdit *dest)
-{
-	time_t t;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), source);
-
-	t = e_date_edit_get_time (source);
-	e_date_edit_set_time (dest, t);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), source);
-}
-
-/* Callback used when one of the general or recurrence summary entries change;
- * we sync the other entry to it.
- */
-static void
-summary_changed_cb (GtkEditable *editable, gpointer data)
-{
-	sync_entries (editable, GTK_EDITABLE (data));
-}
-
-/* Callback used when one of the general or recurrence starting date widgets
- * change; we sync the other date editor to it.
- */
-static void
-start_date_changed_cb (EDateEdit *de, gpointer data)
-{
-	sync_date_edits (de, E_DATE_EDIT (data));
-}
-
-/* Hooks the widget signals */
-static void
-init_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *menu;
-
-	priv = ee->priv;
-
-	/* Summary in the main and recurrence pages */
-
-	gtk_signal_connect (GTK_OBJECT (priv->general_summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), priv->recurrence_summary);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_summary), "changed",
-			    GTK_SIGNAL_FUNC (summary_changed_cb), priv->general_summary);
-
-	/* Start dates in the main and recurrence pages */
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (start_date_changed_cb), priv->recurrence_starting_date);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_starting_date), "changed",
-			    GTK_SIGNAL_FUNC (start_date_changed_cb), priv->start_time);
-
-	/* Start and end times */
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed",
-			    GTK_SIGNAL_FUNC (date_changed_cb), ee);
-
-	gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled",
-			    GTK_SIGNAL_FUNC (set_all_day), ee);
-
-	/* Alarms */
-
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_display), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_program), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_audio), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_mail), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-
-	/* Recurrence types */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_none), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_simple), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_custom), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);
-
-	/* Recurrence units */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit));
-	g_assert (menu != NULL);
-
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (recur_interval_selection_done_cb), ee);
-
-	/* Recurrence ending */
-
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_ending_menu));
-	g_assert (menu != NULL);
-
-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",
-			    GTK_SIGNAL_FUNC (recur_ending_selection_done_cb), ee);
-
-	/* Exception buttons */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_add), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_add_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_modify), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_modify_cb), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_delete), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_delete_cb), ee);
-}
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-#if 0
-static const int alarm_unit_map[] = {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS,
-	-1
-};
-
-static void
-alarm_unit_set (GtkWidget *widget, enum AlarmUnit unit)
-{
-	e_dialog_option_menu_set (widget, unit, alarm_unit_map);
-}
-
-static enum AlarmUnit
-alarm_unit_get (GtkWidget *widget)
-{
-	return e_dialog_option_menu_get (widget, alarm_unit_map);
-}
-#endif
-
-static const int month_pos_map[] = { 0, 1, 2, 3, 4, -1 };
-static const int weekday_map[] = { 0, 1, 2, 3, 4, 5, 6, -1 };
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t now;
-
-	priv = ee->priv;
-
-	now = time (NULL);
-
-	/* Summary, description */
-
-	e_dialog_editable_set (priv->general_summary, NULL); /* will also change recur summary */
-	e_dialog_editable_set (priv->description, NULL);
-
-	/* Start and end times */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), now); /* will set recur start too */
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), now);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Alarms */
-
-	/* FIXME: these should use configurable defaults */
-
-	e_dialog_toggle_set (priv->alarm_display, FALSE);
-	e_dialog_toggle_set (priv->alarm_program, FALSE);
-	e_dialog_toggle_set (priv->alarm_audio, FALSE);
-	e_dialog_toggle_set (priv->alarm_mail, FALSE);
-
-	e_dialog_spin_set (priv->alarm_display_amount, 15);
-	e_dialog_spin_set (priv->alarm_audio_amount, 15);
-	e_dialog_spin_set (priv->alarm_program_amount, 15);
-	e_dialog_spin_set (priv->alarm_mail_amount, 15);
-
-#if 0
-	alarm_unit_set (priv->alarm_display_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_audio_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_program_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_mail_unit, ALARM_MINUTES);
-#endif
-
-	e_dialog_editable_set (priv->alarm_program_run_program_entry, NULL);
-	e_dialog_editable_set (priv->alarm_mail_mail_to, NULL);
-
-	/* Classification */
-
-	e_dialog_radio_set (priv->classification_radio,
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Recurrences */
-
-	priv->recurrence_weekday_day_mask = 0;
-
-	priv->recurrence_month_index = 1;
-	priv->recurrence_month_day = MONTH_DAY_NTH;
-
-	e_dialog_radio_set (priv->recurrence_none, RECUR_NONE, recur_type_map);
-
-	e_dialog_spin_set (priv->recurrence_interval_value, 1);
-	e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_DAILY_RECURRENCE,
-				  recur_freq_map);
-
-	priv->recurrence_ending_date = time (NULL);
-	priv->recurrence_ending_count = 1;
-
-	e_dialog_option_menu_set (priv->recurrence_ending_menu, ENDING_FOREVER,
-				  ending_types_map);
-
-	/* Exceptions list */
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exception_list));
-}
-
-/* Fills the recurrence ending date widgets with the values from the calendar
- * component.
- */
-static void
-fill_ending_date (EventEditor *ee, struct icalrecurrencetype *r)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	if (r->count == 0) {
-		if (r->until.year == 0) {
-			/* Forever */
-
-			e_dialog_option_menu_set (priv->recurrence_ending_menu,
-						  ENDING_FOREVER,
-						  ending_types_map);
-		} else {
-			/* Ending date */
-
-			priv->recurrence_ending_date = icaltime_as_timet (r->until);
-			e_dialog_option_menu_set (priv->recurrence_ending_menu,
-						  ENDING_UNTIL,
-						  ending_types_map);
-		}
-	} else {
-		/* Count of ocurrences */
-
-		priv->recurrence_ending_count = r->count;
-		e_dialog_option_menu_set (priv->recurrence_ending_menu,
-					  ENDING_FOR,
-					  ending_types_map);
-	}
-
-	make_recurrence_ending_special (ee);
-}
-
-/* Counts the number of elements in the by_xxx fields of an icalrecurrencetype */
-static int
-count_by_xxx (short *field, int max_elements)
-{
-	int i;
-
-	for (i = 0; i < max_elements; i++)
-		if (field[i] == ICAL_RECURRENCE_ARRAY_MAX)
-			break;
-
-	return i;
-}
-
-/* Fills in the recurrence widgets with the values from the calendar component.
- * This function is particularly tricky because it has to discriminate between
- * recurrences we support for editing and the ones we don't.  We only support at
- * most one recurrence rule; no rdates or exrules (exdates are handled just fine
- * elsewhere).
- */
-static void
-fill_recurrence_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GSList *rrule_list;
-	int len;
-	struct icalrecurrencetype *r;
-	int n_by_second, n_by_minute, n_by_hour;
-	int n_by_day, n_by_month_day, n_by_year_day;
-	int n_by_week_no, n_by_month, n_by_set_pos;
-
-	priv = ee->priv;
-	g_assert (priv->comp != NULL);
-
-	/* No recurrences? */
-
-	if (!cal_component_has_rdates (priv->comp)
-	    && !cal_component_has_rrules (priv->comp)
-	    && !cal_component_has_exrules (priv->comp)) {
-		e_dialog_radio_set (priv->recurrence_none, RECUR_NONE, recur_type_map);
-		sensitize_recur_widgets (ee);
-		return;
-	}
-
-	/* See if it is a custom set we don't support */
-
-	cal_component_get_rrule_list (priv->comp, &rrule_list);
-	len = g_slist_length (rrule_list);
-
-	if (len > 1
-	    || cal_component_has_rdates (priv->comp)
-	    || cal_component_has_exrules (priv->comp))
-		goto custom;
-
-	/* Down to one rule, so test that one */
-
-	g_assert (len == 1);
-	r = rrule_list->data;
-
-	/* Any funky frequency? */
-
-	if (r->freq == ICAL_SECONDLY_RECURRENCE
-	    || r->freq == ICAL_MINUTELY_RECURRENCE
-	    || r->freq == ICAL_HOURLY_RECURRENCE)
-		goto custom;
-
-	/* Any funky shit? */
-
-#define N_HAS_BY(field) (count_by_xxx (field, sizeof (field) / sizeof (field[0])))
-
-	n_by_second = N_HAS_BY (r->by_second);
-	n_by_minute = N_HAS_BY (r->by_minute);
-	n_by_hour = N_HAS_BY (r->by_hour);
-	n_by_day = N_HAS_BY (r->by_day);
-	n_by_month_day = N_HAS_BY (r->by_month_day);
-	n_by_year_day = N_HAS_BY (r->by_year_day);
-	n_by_week_no = N_HAS_BY (r->by_week_no);
-	n_by_month = N_HAS_BY (r->by_month);
-	n_by_set_pos = N_HAS_BY (r->by_set_pos);
-
-	if (n_by_second != 0
-	    || n_by_minute != 0
-	    || n_by_hour != 0)
-		goto custom;
-
-	/* Filter the funky shit based on the frequency; if there is nothing
-	 * weird we can actually set the widgets.
-	 */
-
-	switch (r->freq) {
-	case ICAL_DAILY_RECURRENCE:
-		if (n_by_day != 0
-		    || n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_DAILY_RECURRENCE,
-					  recur_freq_map);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE: {
-		int i;
-		guint8 day_mask;
-
-		if (n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		day_mask = 0;
-
-		for (i = 0; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[i]);
-			pos = icalrecurrencetype_day_position (r->by_day[i]);
-
-			if (pos != 0)
-				goto custom;
-
-			switch (weekday) {
-			case ICAL_SUNDAY_WEEKDAY:
-				day_mask |= 1 << 0;
-				break;
-
-			case ICAL_MONDAY_WEEKDAY:
-				day_mask |= 1 << 1;
-				break;
-
-			case ICAL_TUESDAY_WEEKDAY:
-				day_mask |= 1 << 2;
-				break;
-
-			case ICAL_WEDNESDAY_WEEKDAY:
-				day_mask |= 1 << 3;
-				break;
-
-			case ICAL_THURSDAY_WEEKDAY:
-				day_mask |= 1 << 4;
-				break;
-
-			case ICAL_FRIDAY_WEEKDAY:
-				day_mask |= 1 << 5;
-				break;
-
-			case ICAL_SATURDAY_WEEKDAY:
-				day_mask |= 1 << 6;
-				break;
-
-			default:
-				break;
-			}
-		}
-
-		priv->recurrence_weekday_day_mask = day_mask;
-
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_WEEKLY_RECURRENCE,
-					  recur_freq_map);
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE:
-		if (n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		if (n_by_month_day == 1) {
-			int nth;
-
-			nth = r->by_month_day[0];
-			if (nth < 1)
-				goto custom;
-
-			priv->recurrence_month_index = nth;
-			priv->recurrence_month_day = MONTH_DAY_NTH;
-		} else if (n_by_day == 1) {
-			enum icalrecurrencetype_weekday weekday;
-			int pos;
-			enum month_day_options month_day;
-
-			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
-			pos = icalrecurrencetype_day_position (r->by_day[0]);
-
-			if (pos < 1)
-				goto custom;
-
-			switch (weekday) {
-			case ICAL_MONDAY_WEEKDAY:
-				month_day = MONTH_DAY_MON;
-				break;
-
-			case ICAL_TUESDAY_WEEKDAY:
-				month_day = MONTH_DAY_TUE;
-				break;
-
-			case ICAL_WEDNESDAY_WEEKDAY:
-				month_day = MONTH_DAY_WED;
-				break;
-
-			case ICAL_THURSDAY_WEEKDAY:
-				month_day = MONTH_DAY_THU;
-				break;
-
-			case ICAL_FRIDAY_WEEKDAY:
-				month_day = MONTH_DAY_FRI;
-				break;
-
-			case ICAL_SATURDAY_WEEKDAY:
-				month_day = MONTH_DAY_SAT;
-				break;
-
-			case ICAL_SUNDAY_WEEKDAY:
-				month_day = MONTH_DAY_SUN;
-				break;
-
-			default:
-				goto custom;
-			}
-
-			priv->recurrence_month_index = pos;
-			priv->recurrence_month_day = month_day;
-		} else
-			goto custom;
-
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_MONTHLY_RECURRENCE,
-					  recur_freq_map);
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		if (n_by_day != 0
-		    || n_by_month_day != 0
-		    || n_by_year_day != 0
-		    || n_by_week_no != 0
-		    || n_by_month != 0
-		    || n_by_set_pos != 0)
-			goto custom;
-
-		e_dialog_option_menu_set (priv->recurrence_interval_unit, ICAL_YEARLY_RECURRENCE,
-					  recur_freq_map);
-		break;
-
-	default:
-		goto custom;
-	}
-
-	/* If we got here it means it is a simple recurrence */
-
-	e_dialog_radio_set (priv->recurrence_simple, RECUR_SIMPLE, recur_type_map);
-	sensitize_recur_widgets (ee);
-	make_recurrence_special (ee);
-	e_dialog_spin_set (priv->recurrence_interval_value, r->interval);
-
-	fill_ending_date (ee, r);
-
-	goto out;
-
- custom:
-
-	e_dialog_radio_set (priv->recurrence_custom, RECUR_CUSTOM, recur_type_map);
-	sensitize_recur_widgets (ee);
-
- out:
-
-	cal_component_free_recur_list (rrule_list);
-}
-
-/* Fills in the widgets with the value from the calendar component */
-static void
-fill_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentClassification cl;
-	CalComponentDateTime d;
-	GSList *list, *l;
-	time_t dtstart, dtend;
-
-	priv = ee->priv;
-
-	clear_widgets (ee);
-
-	if (!priv->comp)
-		return;
-
-	/* Summary, description(s) */
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->general_summary, text.value); /* will also set recur summary */
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	}
-	cal_component_free_text_list (l);
-	
-	/* Start and end times */
-
-	/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb
-	   then the event includes all of the 2nd Feb. We would normally show
-	   3rd Feb as the end date, since it really ends at midnight on 3rd,
-	   so we have to subtract a day so we only show the 2nd. */
-	cal_component_get_dtstart (priv->comp, &d);
-	dtstart = icaltime_as_timet (*d.value);
-	cal_component_get_dtend (priv->comp, &d);
-	dtend = icaltime_as_timet (*d.value);
-
-	if (time_day_begin (dtstart) == dtstart
-	    && time_day_begin (dtend) == dtend) {
-		dtend = time_add_day (dtend, -1);
-	}
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), dtstart); /* will set recur start too */
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), dtend);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Alarms */
-#if 0
-	e_dialog_toggle_set (priv->alarm_display, priv->ico->dalarm.enabled);
-	e_dialog_toggle_set (priv->alarm_program, priv->ico->palarm.enabled);
-	e_dialog_toggle_set (priv->alarm_audio, priv->ico->aalarm.enabled);
-	e_dialog_toggle_set (priv->alarm_mail, priv->ico->malarm.enabled);
-
-	/* Alarm data */
-
-	e_dialog_spin_set (priv->alarm_display_amount, priv->ico->dalarm.count);
-	e_dialog_spin_set (priv->alarm_audio_amount, priv->ico->aalarm.count);
-	e_dialog_spin_set (priv->alarm_program_amount, priv->ico->palarm.count);
-	e_dialog_spin_set (priv->alarm_mail_amount, priv->ico->malarm.count);
-
-	alarm_unit_set (priv->alarm_display_unit, priv->ico->dalarm.units);
-	alarm_unit_set (priv->alarm_audio_unit, priv->ico->aalarm.units);
-	alarm_unit_set (priv->alarm_program_unit, priv->ico->palarm.units);
-	alarm_unit_set (priv->alarm_mail_unit, priv->ico->malarm.units);
-
-	e_dialog_editable_set (priv->alarm_program_run_program_entry, priv->ico->palarm.data);
-	e_dialog_editable_set (priv->alarm_mail_mail_to, priv->ico->malarm.data);
-#endif
-	/* Classification */
-
-	cal_component_get_classification (priv->comp, &cl);
-
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-	default:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-
-	/* Recurrences */
-	fill_recurrence_widgets (ee);
-
-	/* Exceptions list */
-
-	cal_component_get_exdate_list (priv->comp, &list);
-
-	for (l = list; l; l = l->next) {
-		struct icaltimetype *t;
-		time_t ext;
-		
-		t = l->data;
-		ext = icaltime_as_timet (*t);
-		append_exception (ee, ext);
-	}
-
-	cal_component_free_exdate_list (list);
-}
-
-
-/**
- * event_editor_update_widgets:
- * @ee: An event editor.
- * 
- * Causes an event editor dialog to re-read the values of its calendar component
- * object.  This function should be used if the #CalComponent is changed by
- * external means while it is open in the editor.
- **/
-void
-event_editor_update_widgets (EventEditor *ee)
-{
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	fill_widgets (ee);
-}
-
-
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day.
- */
-static short
-nth_weekday (int pos, icalrecurrencetype_weekday weekday)
-{
-	return (pos << 3) | (int) weekday;
-}
-
-/* Gets the simple recurrence data from the recurrence widgets and stores it in
- * the calendar component object.
- */
-static void
-simple_recur_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	struct icalrecurrencetype r;
-	GSList l;
-	enum ending_type ending_type;
-
-	priv = ee->priv;
-
-	icalrecurrencetype_clear (&r);
-
-	/* Frequency, interval, week start */
-
-	r.freq = e_dialog_option_menu_get (priv->recurrence_interval_unit, recur_freq_map);
-	r.interval = e_dialog_spin_get_int (priv->recurrence_interval_value);
-	r.week_start = week_starts_on_monday ? ICAL_MONDAY_WEEKDAY : ICAL_SUNDAY_WEEKDAY;
-
-	/* Frequency-specific data */
-
-	switch (r.freq) {
-	case ICAL_DAILY_RECURRENCE:
-		/* Nothing else is required */
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE: {
-		guint8 day_mask;
-		int i;
-
-		g_assert (GTK_BIN (priv->recurrence_special)->child != NULL);
-		g_assert (priv->recurrence_weekday_picker != NULL);
-		g_assert (IS_WEEKDAY_PICKER (priv->recurrence_weekday_picker));
-
-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv->recurrence_weekday_picker));
-
-		i = 0;
-
-		if (day_mask & (1 << 0))
-			r.by_day[i++] = ICAL_SUNDAY_WEEKDAY;
-
-		if (day_mask & (1 << 1))
-			r.by_day[i++] = ICAL_MONDAY_WEEKDAY;
-
-		if (day_mask & (1 << 2))
-			r.by_day[i++] = ICAL_TUESDAY_WEEKDAY;
-
-		if (day_mask & (1 << 3))
-			r.by_day[i++] = ICAL_WEDNESDAY_WEEKDAY;
-
-		if (day_mask & (1 << 4))
-			r.by_day[i++] = ICAL_THURSDAY_WEEKDAY;
-
-		if (day_mask & (1 << 5))
-			r.by_day[i++] = ICAL_FRIDAY_WEEKDAY;
-
-		if (day_mask & (1 << 6))
-			r.by_day[i++] = ICAL_SATURDAY_WEEKDAY;
-
-		break;
-	}
-
-	case ICAL_MONTHLY_RECURRENCE: {
-		int day_index;
-		enum month_day_options month_day;
-
-		g_assert (GTK_BIN (priv->recurrence_special)->child != NULL);
-		g_assert (priv->recurrence_month_index_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->recurrence_month_index_spin));
-		g_assert (priv->recurrence_month_day_menu != NULL);
-		g_assert (GTK_IS_OPTION_MENU (priv->recurrence_month_day_menu));
-
-		day_index = e_dialog_spin_get_int (priv->recurrence_month_index_spin);
-		month_day = e_dialog_option_menu_get (priv->recurrence_month_day_menu,
-						      month_day_options_map);
-
-		switch (month_day) {
-		case MONTH_DAY_NTH:
-			r.by_month_day[0] = day_index;
-			break;
-
-		case MONTH_DAY_MON:
-			r.by_day[0] = nth_weekday (day_index, ICAL_MONDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_TUE:
-			r.by_day[0] = nth_weekday (day_index, ICAL_TUESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_WED:
-			r.by_day[0] = nth_weekday (day_index, ICAL_WEDNESDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_THU:
-			r.by_day[0] = nth_weekday (day_index, ICAL_THURSDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_FRI:
-			r.by_day[0] = nth_weekday (day_index, ICAL_FRIDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SAT:
-			r.by_day[0] = nth_weekday (day_index, ICAL_SATURDAY_WEEKDAY);
-			break;
-
-		case MONTH_DAY_SUN:
-			r.by_day[0] = nth_weekday (day_index, ICAL_SUNDAY_WEEKDAY);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		break;
-	}
-
-	case ICAL_YEARLY_RECURRENCE:
-		/* Nothing else is required */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Ending date */
-
-	ending_type = e_dialog_option_menu_get (priv->recurrence_ending_menu, ending_types_map);
-
-	switch (ending_type) {
-	case ENDING_FOR:
-		g_assert (priv->recurrence_ending_count_spin != NULL);
-		g_assert (GTK_IS_SPIN_BUTTON (priv->recurrence_ending_count_spin));
-
-		r.count = e_dialog_spin_get_int (priv->recurrence_ending_count_spin);
-		break;
-
-	case ENDING_UNTIL:
-		g_assert (priv->recurrence_ending_date_edit != NULL);
-		g_assert (E_IS_DATE_EDIT (priv->recurrence_ending_date_edit));
-
-		r.until = icaltime_from_timet (
-			e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_ending_date_edit)),
-			TRUE, FALSE);
-		break;
-
-	case ENDING_FOREVER:
-		/* Nothing to be done */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	/* Set the recurrence */
-
-	l.data = &r;
-	l.next = NULL;
-
-	cal_component_set_rrule_list (comp, &l);
-}
-
-/* Gets the data from the recurrence widgets and stores it in the calendar
- * component object.
- */
-static void
-recur_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	enum recur_type recur_type;
-
-	priv = ee->priv;
-
-	recur_type = e_dialog_radio_get (priv->recurrence_none, recur_type_map);
-
-	switch (recur_type) {
-	case RECUR_NONE:
-		cal_component_set_rdate_list (comp, NULL);
-		cal_component_set_rrule_list (comp, NULL);
-		cal_component_set_exrule_list (comp, NULL);
-		break;
-
-	case RECUR_SIMPLE:
-		simple_recur_to_comp_object (ee, comp);
-		break;
-
-	case RECUR_CUSTOM:
-		/* We just keep whatever the component has currently */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Gets the data from the widgets and stores it in the calendar component object */
-static void
-dialog_to_comp_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	CalComponentDateTime date;
-	time_t t;
-	gboolean all_day_event;
-	GtkCList *exception_list;
-	GSList *list;
-	char *str;
-	int i;
-	
-	priv = ee->priv;
-
-	/* Summary */
-
-	str = e_dialog_editable_get (priv->general_summary);
-	if (strlen (str) == 0)
-		cal_component_set_summary (comp, NULL);
-	else {
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-
-		cal_component_set_summary (comp, &text);
-	}
-
-	/* Description */
-
-	str = e_dialog_editable_get (priv->description);
-	if (strlen (str) == 0)
-		cal_component_set_description_list (comp, NULL);
-	else {
-		GSList l;
-		CalComponentText text;
-
-		text.value = str;
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		cal_component_set_description_list (comp, &l);
-	}
-
-	/* Dates */
-	
-	date.value = g_new (struct icaltimetype, 1);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	date.tzid = NULL;
-	cal_component_set_dtstart (comp, &date);
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	if (all_day_event)
-		t = time_day_end (t);
-
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-	g_free (date.value);
-
-#if 0
-	ico->dalarm.enabled = e_dialog_toggle_get (priv->alarm_display);
-	ico->aalarm.enabled = e_dialog_toggle_get (priv->alarm_program);
-	ico->palarm.enabled = e_dialog_toggle_get (priv->alarm_audio);
-	ico->malarm.enabled = e_dialog_toggle_get (priv->alarm_mail);
-
-	ico->dalarm.count = e_dialog_spin_get_int (priv->alarm_display_amount);
-	ico->aalarm.count = e_dialog_spin_get_int (priv->alarm_audio_amount);
-	ico->palarm.count = e_dialog_spin_get_int (priv->alarm_program_amount);
-	ico->malarm.count = e_dialog_spin_get_int (priv->alarm_mail_amount);
-
-	ico->dalarm.units = alarm_unit_get (priv->alarm_display_unit);
-	ico->aalarm.units = alarm_unit_get (priv->alarm_audio_unit);
-	ico->palarm.units = alarm_unit_get (priv->alarm_program_unit);
-	ico->malarm.units = alarm_unit_get (priv->alarm_mail_unit);
-
-	if (ico->palarm.data)
-		g_free (ico->palarm.data);
-
-	if (ico->malarm.data)
-		g_free (ico->malarm.data);
-
-	ico->palarm.data = e_dialog_editable_get (priv->alarm_program_run_program_entry);
-	ico->malarm.data = e_dialog_editable_get (priv->alarm_mail_mail_to);
-#endif
-
-	cal_component_set_classification (comp, classification_get (priv->classification_radio));
-
-	/* Recurrence information */
-	recur_to_comp_object (ee, comp);
-
-	/* Set exceptions */
-
-	list = NULL;
-	exception_list = GTK_CLIST (priv->recurrence_exception_list);
-	for (i = 0; i < exception_list->rows; i++) {
-		struct icaltimetype *tt;
-		time_t *tim;
-		
-		tim = gtk_clist_get_row_data (exception_list, i);
-		tt = g_new0 (struct icaltimetype, 1);
-		*tt = icaltime_from_timet (*tim, FALSE, FALSE);
-		
-		list = g_slist_prepend (list, tt);
-	}
-	cal_component_set_exdate_list (comp, list);
-	if (list)
-		cal_component_free_exdate_list (list);
-
-	cal_component_commit_sequence (comp);
-}
-
-/* Fills the calendar component object from the data in the widgets and commits
- * the component to the storage.
- */
-static void
-save_event_object (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	char *title;
-
-	priv = ee->priv;
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (ee, priv->comp);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_event_object(): Could not update the object!");
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (ee));
-}
-
-
-
-static void
-debug_xml_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	EventEditorPrivate *priv = ee->priv;
-	
-	bonobo_window_dump (BONOBO_WINDOW (priv->app), "on demand");
-}
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	save_event_object (ee);
-}
-
-/* File/Save and Close callback */
-static void
-file_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	save_event_object (ee);
-	close_dialog (ee);
-}
-
-/* File/Delete callback */
-static void
-file_delete_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	const char *uid;
-	
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	
-	g_return_if_fail (priv->comp);
-
-	cal_component_get_uid (priv->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-
-	close_dialog (ee);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	close_dialog (ee);
-}
-
-static void
-schedule_meeting_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	EMeetingEditor *editor;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = (EventEditorPrivate *)ee->priv;
-
-	editor = e_meeting_editor_new (priv->comp, priv->client, ee);
-	e_meeting_edit (editor);
-	e_meeting_editor_free (editor);
-}
-
-
-/*
- * NB. there is an insane amount of replication here between
- * this and the task-editor.
- */
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EventEditor *ee;
-
-	/* FIXME: need to check for a dirty object */
-
-	ee = EVENT_EDITOR (data);
-	close_dialog (ee);
-
-	return TRUE;
-}
-
-/**
- * event_editor_construct:
- * @ee: An event editor.
- * 
- * Constructs an event editor by loading its Glade data.
- * 
- * Return value: The same object as @ee, or NULL if the widgets could not be
- * created.  In the latter case, the event editor will automatically be
- * destroyed.
- **/
-EventEditor *
-event_editor_construct (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *bonobo_win;
-
-	g_return_val_if_fail (ee != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);
-
-	priv = ee->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("event_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (ee)) {
-		g_message ("event_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (ee);
-
-	priv->uic = bonobo_ui_component_new ("event-editor-dialog");
-	if (!priv->uic) {
-		g_message ("task_editor_construct(): Could not create the UI component");
-		goto error;
-	}
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (priv->app)->dock));
-		if (!contents) {
-			g_message ("event_editor_construct(): Could not get contents");
-			goto error;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (priv->app);
-		priv->app = bonobo_win;
-	}
-
-	{
-		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->app));
-		bonobo_ui_component_set_container (
-			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	}
-
-	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, ee);
-
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-event-editor.xml",
-			       "evolution-event-editor");
-
-	/* Hook to destruction of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), ee);
-
-
-	/* Add focus to the summary entry */
-	
-	gtk_widget_grab_focus (GTK_WIDGET (priv->general_summary));
-
-	/* Show the dialog */
-
-	gtk_widget_show (priv->app);
-
-	return ee;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (ee));
-	return NULL;
-}
-
-/**
- * event_editor_new:
- * 
- * Creates a new event editor dialog.
- * 
- * Return value: A newly-created event editor dialog, or NULL if the event
- * editor could not be created.
- **/
-EventEditor *
-event_editor_new (void)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));
-	return event_editor_construct (EVENT_EDITOR (ee));
-}
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-/**
- * event_editor_set_cal_client:
- * @ee: An event editor.
- * @client: Calendar client.
- * 
- * Sets the calendar client than an event editor will use for updating its
- * calendar components.
- **/
-void 
-event_editor_set_cal_client (EventEditor *ee, CalClient *client)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_is_loaded (client));	
-	
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), ee);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), ee);
-	}
-}
-
-/**
- * event_editor_get_cal_client:
- * @ee: An event editor.
- * 
- * Queries the calendar client that an event editor is using to update its
- * calendar components.
- * 
- * Return value: A calendar client object.
- **/
-CalClient *
-event_editor_get_cal_client (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_val_if_fail (ee != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);
-
-	priv = ee->priv;
-	return priv->client;
-}
-
-/**
- * event_editor_set_event_object:
- * @ee: An event editor.
- * @comp: A calendar object.
- * 
- * Sets the calendar object that an event editor dialog will manipulate.
- **/
-void
-event_editor_set_event_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	char *title;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp) {
-		priv->comp = cal_component_clone (comp);
-	}
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	fill_widgets (ee);
-}
-
-/**
- * event_editor_focus:
- * @ee: An event editor.
- * 
- * Makes sure an event editor is shown, on top of other windows, and focused.
- **/
-void
-event_editor_focus (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	gtk_widget_show_now (priv->app);
-	raise_and_focus (priv->app);
-}
-
-static void
-alarm_toggle (GtkWidget *toggle, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *alarm_amount = NULL;
-	GtkWidget *alarm_unit = NULL;
-	gboolean active;
-
-	priv = ee->priv;
-
-	active = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	if (toggle == priv->alarm_display) {
-		alarm_amount = priv->alarm_display_amount;
-		alarm_unit = priv->alarm_display_unit;
-	} else if (toggle == priv->alarm_audio) {
-		alarm_amount = priv->alarm_audio_amount;
-		alarm_unit = priv->alarm_audio_unit;
-	} else if (toggle == priv->alarm_program) {
-		alarm_amount = priv->alarm_program_amount;
-		alarm_unit = priv->alarm_program_unit;
-		gtk_widget_set_sensitive (priv->alarm_program_run_program, active);
-	} else if (toggle == priv->alarm_mail) {
-		alarm_amount = priv->alarm_mail_amount;
-		alarm_unit = priv->alarm_mail_unit;
-		gtk_widget_set_sensitive (priv->alarm_mail_mail_to, active);
-	} else
-		g_assert_not_reached ();
-
-	gtk_widget_set_sensitive (alarm_amount, active);
-	gtk_widget_set_sensitive (alarm_unit, active);
-}
-
-/* Checks if the day range occupies a single whole day, and if so, check. the
- * "all day event" box accordingly.
- */
-static void
-check_all_day (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t ev_start, ev_end;
-	time_t start_begin_day, end_begin_day;
-	struct tm tm_start, tm_end;
-	gboolean all_day;
-
-	priv = ee->priv;
-
-	ev_start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	ev_end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-
-	start_begin_day = time_day_begin (ev_start);
-	end_begin_day = time_day_begin (ev_end);
-
-	tm_start = *localtime (&start_begin_day);
-	tm_end = *localtime (&end_begin_day);
-
-	tm_end.tm_mday--;
-	if (mktime (&tm_start) == mktime (&tm_end))
-		all_day = TRUE;
-	else
-		all_day = FALSE;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->all_day_event), ee);
-
-	e_dialog_toggle_set (priv->all_day_event, all_day);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->all_day_event), ee);
-}
-
-/*
- * Callback: all day event box clicked
- */
-static void
-set_all_day (GtkWidget *toggle, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	struct tm start_tm, end_tm;
-	time_t start_t, end_t;
-	gboolean all_day;
-
-	priv = ee->priv;
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	start_t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	start_tm = *localtime (&start_t);
-	start_tm.tm_min  = 0;
-	start_tm.tm_sec  = 0;
-
-	if (all_day)
-		start_tm.tm_hour = 0;
-	else
-		start_tm.tm_hour = day_begin;
-
-	/* will set recur start too */
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&start_tm));
-
-	end_t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	end_tm = *localtime (&end_t);
-	end_tm.tm_min  = 0;
-	end_tm.tm_sec  = 0;
-
-	if (all_day) {
-		/* mktime() will fix this if we go past the end of the month.*/
-		end_tm.tm_hour = 0;
-	} else {
-		if (end_tm.tm_year == start_tm.tm_year
-		    && end_tm.tm_mon == start_tm.tm_mon
-		    && end_tm.tm_mday == start_tm.tm_mday
-		    && end_tm.tm_hour <= start_tm.tm_hour)
-			end_tm.tm_hour = start_tm.tm_hour + 1;
-	}
-
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), mktime (&end_tm));
-}
-
-/* Callback used when the start or end date widgets change.  We check that the
- * start date < end date and we set the "all day event" button as appropriate.
- */
-static void
-date_changed_cb (EDateEdit *dedit, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	time_t start, end;
-	struct tm tm_start, tm_end;
-
-	ee = EVENT_EDITOR (data);
-	priv = ee->priv;
-
-	/* Ensure that start < end */
-
-	start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-
-	if (start > end) {
-		tm_start = *localtime (&start);
-		tm_end = *localtime (&end);
-
-		if (GTK_WIDGET (dedit) == priv->start_time) {
-			/* Modify the end time */
-
-			tm_end.tm_year = tm_start.tm_year;
-			tm_end.tm_mon  = tm_start.tm_mon;
-			tm_end.tm_mday = tm_start.tm_mday;
-			tm_end.tm_hour = tm_start.tm_hour + 1;
-			tm_end.tm_min  = tm_start.tm_min;
-			tm_end.tm_sec  = tm_start.tm_sec;
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->end_time), mktime (&tm_end));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-		} else if (GTK_WIDGET (dedit) == priv->end_time) {
-			/* Modify the start time */
-
-			tm_start.tm_year = tm_end.tm_year;
-			tm_start.tm_mon  = tm_end.tm_mon;
-			tm_start.tm_mday = tm_end.tm_mday;
-			tm_start.tm_hour = tm_end.tm_hour - 1;
-			tm_start.tm_min  = tm_end.tm_min;
-			tm_start.tm_sec  = tm_end.tm_sec;
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->start_time), mktime (&tm_start));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-		} else
-			g_assert_not_reached ();
-	}
-
-	/* Set the "all day event" button as appropriate */
-
-	check_all_day (ee);
-}
-
-/* Builds a static string out of an exception date */
-static char *
-get_exception_string (time_t t)
-{
-	static char buf[256];
-
-	strftime (buf, sizeof (buf), _("%a %b %d %Y"), localtime (&t));
-	return buf;
-}
-
-/* Appends an exception date to the list */
-static void
-append_exception (EventEditor *ee, time_t t)
-{
-	EventEditorPrivate *priv;
-	time_t *tt;
-	char *c[1];
-	int i;
-	GtkCList *clist;
-
-	priv = ee->priv;
-
-	tt = g_new (time_t, 1);
-	*tt = t;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-
-	c[0] = get_exception_string (t);
-	i = e_utf8_gtk_clist_append (clist, c);
-
-	gtk_clist_set_row_data (clist, i, tt);
-	gtk_clist_select_row (clist, i, 0);
-
-	gtk_widget_set_sensitive (priv->recurrence_exception_modify, TRUE);
-	gtk_widget_set_sensitive (priv->recurrence_exception_delete, TRUE);
-}
-
-
-/* Callback for the "add exception" button */
-static void
-recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t t;
-
-	priv = ee->priv;
-
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exception_date));
-	append_exception (ee, t);
-}
-
-/* Callback for the "modify exception" button */
-static void
-recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	time_t *t;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-	if (!clist->selection)
-		return;
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	t = gtk_clist_get_row_data (clist, sel);
-	*t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exception_date));
-
-	e_utf8_gtk_clist_set_text (clist, sel, 0, get_exception_string (*t));
-}
-
-/* Callback for the "delete exception" button */
-static void
-recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exception_list);
-	if (!clist->selection)
-		return;
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */
-
-	gtk_clist_remove (clist, sel);
-	if (sel >= clist->rows)
-		sel--;
-
-	if (clist->rows > 0)
-		gtk_clist_select_row (clist, sel, 0);
-	else {
-		gtk_widget_set_sensitive (priv->recurrence_exception_modify, FALSE);
-		gtk_widget_set_sensitive (priv->recurrence_exception_delete, FALSE);
-	}
-}
-
-
-GtkWidget *
-make_date_edit (void)
-{
-	return date_edit_new (time (NULL), FALSE);
-}
-
-
-GtkWidget *
-make_date_edit_with_time (void)
-{
-	return date_edit_new (time (NULL), TRUE);
-}
-
-
-GtkWidget *
-date_edit_new (time_t the_time, int show_time)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-	/* FIXME: Set other options. */
-	e_date_edit_set_show_time (E_DATE_EDIT (dedit), show_time);
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);
-	return dedit;
-}
-
-
-
-GtkWidget *
-make_spin_button (int val, int low, int high)
-{
-	GtkAdjustment *adj;
-	GtkWidget *spin;
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (val, low, high, 1, 10, 10));
-	spin = gtk_spin_button_new (adj, 0.5, 0);
-	gtk_widget_set_usize (spin, 60, 0);
-
-	return spin;
-}
-
-
-/* todo
-
-   get the apply button to work right
-
-   make the properties stuff unglobal
-
-   figure out why alarm units aren't sticking between edits
-
-   closing the dialog window with the wm caused a crash
-   Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-   on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
- */
diff --git a/calendar/gui/event-editor.h b/calendar/gui/event-editor.h
deleted file mode 100644
index 0c7e1f34c7..0000000000
--- a/calendar/gui/event-editor.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *          Seth Alves <alves@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EVENT_EDITOR_DIALOG_H__
-#define __EVENT_EDITOR_DIALOG_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "gnome-cal.h"
-
-
-
-#define TYPE_EVENT_EDITOR            (event_editor_get_type ())
-#define EVENT_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor))
-#define EVENT_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR,	\
-				      EventEditorClass))
-#define IS_EVENT_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_EDITOR))
-#define IS_EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR))
-
-typedef struct _EventEditor EventEditor;
-typedef struct _EventEditorClass EventEditorClass;
-typedef struct _EventEditorPrivate EventEditorPrivate;
-
-struct _EventEditor {
-	GtkObject object;
-
-	/* Private data */
-	EventEditorPrivate *priv;
-};
-
-struct _EventEditorClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType event_editor_get_type (void);
-EventEditor *event_editor_construct (EventEditor *ee);
-
-EventEditor *event_editor_new (void);
-
-void event_editor_set_cal_client (EventEditor *ee, CalClient *client);
-CalClient *event_editor_get_cal_client (EventEditor *ee);
-
-void event_editor_set_event_object (EventEditor *ee, CalComponent *comp);
-
-void event_editor_focus (EventEditor *ee);
-
-void event_editor_update_widgets (EventEditor *ee);
-
-#if 0
-/* Convenience function to create and show a new event editor for an
- * event that goes from day_begin to day_end of the specified day.
- */
-void event_editor_new_whole_day (GnomeCalendar *owner, time_t day);
-#endif
-
-GtkWidget *make_date_edit (void);
-GtkWidget *make_date_edit_with_time (void);
-GtkWidget *date_edit_new (time_t the_time, int show_time);
-
-GtkWidget *make_spin_button (int val, int low, int high);
-
-
-
-#endif /* __EVENT_EDITOR_DIALOG_H__ */
diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c
deleted file mode 100644
index 7ebe2b5f8e..0000000000
--- a/calendar/gui/evolution-calendar-control.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#ifdef USING_OAF
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-#else
-#define CONTROL_FACTORY_ID   "control-factory:calendar"
-#endif
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-#ifdef USING_OAF
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-#else
-	gnome_CORBA_init_with_popt_table (
-		"evolution-calendar", "0.0",
-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-#endif
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.vcf",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal)
-{
-	gcal->properties = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (gcal->properties,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_property_bag (gcal->control, gcal->properties);
-}
-
-
-
-static BonoboObject *
-calendar_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl *control;
-
-	/* Create the control. */
-	GnomeCalendar *cal = new_calendar (full_name, NULL, NULL, 0);
-
-	gtk_widget_show (GTK_WIDGET (cal));
-
-	control = bonobo_control_new (GTK_WIDGET (cal));
-	cal->control = control;
-
-	calendar_properties_init (cal);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, cal);
-
-	return BONOBO_OBJECT (control);
-}
-
-
-static void
-calendar_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-
-	CORBA_exception_init (&ev);
-
-	calendar_control_factory_init ();
-	component_factory_init ();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/evolution-calendar.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/getdate.y b/calendar/gui/getdate.y
deleted file mode 100644
index 43917089d6..0000000000
--- a/calendar/gui/getdate.y
+++ /dev/null
@@ -1,1004 +0,0 @@
-%{
-/*
-**  Originally) written by Steven M. Bellovin <smb@research.att.com> while
-**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
-**  send any email to Rich.
-**
-**  This grammar has 10 shift/reduce conflicts.
-**
-**  This code is in the public domain and has no copyright.
-*/
-/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
-/* SUPPRESS 288 on yyerrlab *//* Label unused */
-
-#include <config.h>
-#include <gnome.h>
-	
-/* Since the code of getdate.y is not included in the Emacs executable
-   itself, there is no need to #define static in this file.  Even if
-   the code were included in the Emacs executable, it probably
-   wouldn't do any harm to #undef it here; this will only cause
-   problems if we try to write to a static variable, which I don't
-   think this code needs to do.  */
-#ifdef emacs
-#undef static
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-/* The code at the top of get_date which figures out the offset of the
-   current time zone checks various CPP symbols to see if special
-   tricks are need, but defaults to using the gettimeofday system call.
-   Include <sys/time.h> if that will be used.  */
-
-#if	defined(vms)
-
-#include <types.h>
-#include <time.h>
-
-#else
-
-#include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
-#ifdef timezone
-#undef timezone /* needed for sgi */
-#endif
-
-#if defined(HAVE_SYS_TIMEB_H)
-#include <sys/timeb.h>
-#else
-/*
-** We use the obsolete `struct timeb' as part of our interface!
-** Since the system doesn't have it, we define it here;
-** our callers must do likewise.
-*/
-struct timeb {
-    time_t		time;		/* Seconds since the epoch	*/
-    unsigned short	millitm;	/* Field not used		*/
-    short		timezone;	/* Minutes west of GMT		*/
-    short		dstflag;	/* Field not used		*/
-};
-#endif /* defined(HAVE_SYS_TIMEB_H) */
-
-#endif	/* defined(vms) */
-
-#if defined (STDC_HEADERS) || defined (USG)
-#include <string.h>
-#endif
-
-/* Some old versions of bison generate parsers that use bcopy.
-   That loses on systems that don't provide the function, so we have
-   to redefine it here.  */
-#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
-#define bcopy(from, to, len) memcpy ((to), (from), (len))
-#endif
-
-#if defined (STDC_HEADERS)
-#include <stdlib.h>
-#endif
-
-/* NOTES on rebuilding getdate.c (particularly for inclusion in CVS
-   releases):
-
-   We don't want to mess with all the portability hassles of alloca.
-   In particular, most (all?) versions of bison will use alloca in
-   their parser.  If bison works on your system (e.g. it should work
-   with gcc), then go ahead and use it, but the more general solution
-   is to use byacc instead of bison, which should generate a portable
-   parser.  I played with adding "#define alloca dont_use_alloca", to
-   give an error if the parser generator uses alloca (and thus detect
-   unportable getdate.c's), but that seems to cause as many problems
-   as it solves.  */
-
-extern struct tm	*gmtime();
-extern struct tm	*localtime();
-
-#define yyparse getdate_yyparse
-#define yylex getdate_yylex
-#define yyerror getdate_yyerror
-
-static int yylex (void);
-static int yyerror (char *s);
-
-#define EPOCH		1970
-#define HOUR(x)		((time_t)(x) * 60)
-#define SECSPERDAY	(24L * 60L * 60L)
-
-
-/*
-**  An entry in the lexical lookup table.
-*/
-typedef struct _TABLE {
-    char	*name;
-    int		type;
-    time_t	value;
-} TABLE;
-
-
-/*
-**  Daylight-savings mode:  on, off, or not yet known.
-*/
-typedef enum _DSTMODE {
-    DSTon, DSToff, DSTmaybe
-} DSTMODE;
-
-/*
-**  Meridian:  am, pm, or 24-hour style.
-*/
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-
-/*
-**  Global variables.  We could get rid of most of these by using a good
-**  union as the yacc stack.  (This routine was originally written before
-**  yacc had the %union construct.)  Maybe someday; right now we only use
-**  the %union very rarely.
-*/
-static char	*yyInput;
-static DSTMODE	yyDSTmode;
-static time_t	yyDayOrdinal;
-static time_t	yyDayNumber;
-static int	yyHaveDate;
-static int	yyHaveDay;
-static int	yyHaveRel;
-static int	yyHaveTime;
-static int	yyHaveZone;
-static time_t	yyTimezone;
-static time_t	yyDay;
-static time_t	yyHour;
-static time_t	yyMinutes;
-static time_t	yyMonth;
-static time_t	yySeconds;
-static time_t	yyYear;
-static MERIDIAN	yyMeridian;
-static time_t	yyRelMonth;
-static time_t	yyRelSeconds;
-
-%}
-
-%union {
-    time_t		Number;
-    enum _MERIDIAN	Meridian;
-}
-
-%token	tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token	tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST
-
-%type	<Number>	tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
-%type	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tZONE
-%type	<Meridian>	tMERIDIAN o_merid
-
-%%
-
-spec	: /* NULL */
-	| spec item
-	;
-
-item	: time {
-	    yyHaveTime++;
-	}
-	| zone {
-	    yyHaveZone++;
-	}
-	| date {
-	    yyHaveDate++;
-	}
-	| day {
-	    yyHaveDay++;
-	}
-	| rel {
-	    yyHaveRel++;
-	}
-	| number
-	;
-
-time	: tUNUMBER tMERIDIAN {
-	    yyHour = $1;
-	    yyMinutes = 0;
-	    yySeconds = 0;
-	    yyMeridian = $2;
-	}
-	| tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = 0;
-	    yyMeridian = $4;
-	}
-	| tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yyMeridian = MER24;
-	    yyDSTmode = DSToff;
-	    yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = $5;
-	    yyMeridian = $6;
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = $5;
-	    yyMeridian = MER24;
-	    yyDSTmode = DSToff;
-	    yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
-	}
-	;
-
-zone	: tZONE {
-	    yyTimezone = $1;
-	    yyDSTmode = DSToff;
-	}
-	| tDAYZONE {
-	    yyTimezone = $1;
-	    yyDSTmode = DSTon;
-	}
-	|
-	  tZONE tDST {
-	    yyTimezone = $1;
-	    yyDSTmode = DSTon;
-	}
-	;
-
-day	: tDAY {
-	    yyDayOrdinal = 1;
-	    yyDayNumber = $1;
-	}
-	| tDAY ',' {
-	    yyDayOrdinal = 1;
-	    yyDayNumber = $1;
-	}
-	| tUNUMBER tDAY {
-	    yyDayOrdinal = $1;
-	    yyDayNumber = $2;
-	}
-	;
-
-date	: tUNUMBER '/' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $3;
-	}
-	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $3;
-	    yyYear = $5;
-	}
-	| tUNUMBER tSNUMBER tSNUMBER {
-	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    yyYear = $1;
-	    yyMonth = -$2;
-	    yyDay = -$3;
-	}
-	| tUNUMBER tMONTH tSNUMBER {
-	    /* e.g. 17-JUN-1992.  */
-	    yyDay = $1;
-	    yyMonth = $2;
-	    yyYear = -$3;
-	}
-	| tMONTH tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $2;
-	}
-	| tMONTH tUNUMBER ',' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $2;
-	    yyYear = $4;
-	}
-	| tUNUMBER tMONTH {
-	    yyMonth = $2;
-	    yyDay = $1;
-	}
-	| tUNUMBER tMONTH tUNUMBER {
-	    yyMonth = $2;
-	    yyDay = $1;
-	    yyYear = $3;
-	}
-	;
-
-rel	: relunit tAGO {
-	    yyRelSeconds = -yyRelSeconds;
-	    yyRelMonth = -yyRelMonth;
-	}
-	| relunit
-	;
-
-relunit	: tUNUMBER tMINUTE_UNIT {
-	    yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tSNUMBER tMINUTE_UNIT {
-	    yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tMINUTE_UNIT {
-	    yyRelSeconds += $1 * 60L;
-	}
-	| tSNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1;
-	}
-	| tUNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1;
-	}
-	| tSEC_UNIT {
-	    yyRelSeconds++;
-	}
-	| tSNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
-	}
-	| tUNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
-	}
-	| tMONTH_UNIT {
-	    yyRelMonth += $1;
-	}
-	;
-
-number	: tUNUMBER {
-	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
-		yyYear = $1;
-	    else {
-		if($1>10000) {
-		    yyHaveDate++;
-		    yyDay= ($1)%100;
-		    yyMonth= ($1/100)%100;
-		    yyYear = $1/10000;
-		}
-		else {
-		    yyHaveTime++;
-		    if ($1 < 100) {
-			yyHour = $1;
-			yyMinutes = 0;
-		    }
-		    else {
-		    	yyHour = $1 / 100;
-		    	yyMinutes = $1 % 100;
-		    }
-		    yySeconds = 0;
-		    yyMeridian = MER24;
-	        }
-	    }
-	}
-	;
-
-o_merid	: /* NULL */ {
-	    $$ = MER24;
-	}
-	| tMERIDIAN {
-	    $$ = $1;
-	}
-	;
-
-%%
-
-/* Month and day table. */
-static TABLE const MonthDayTable[] = {
-    { N_("january"),	tMONTH,  1 },
-    { N_("february"),	tMONTH,  2 },
-    { N_("march"),		tMONTH,  3 },
-    { N_("april"),		tMONTH,  4 },
-    { N_("may"),		tMONTH,  5 },
-    { N_("june"),		tMONTH,  6 },
-    { N_("july"),		tMONTH,  7 },
-    { N_("august"),		tMONTH,  8 },
-    { N_("september"),	tMONTH,  9 },
-    { N_("sept"),		tMONTH,  9 },
-    { N_("october"),	tMONTH, 10 },
-    { N_("november"),	tMONTH, 11 },
-    { N_("december"),	tMONTH, 12 },
-    { N_("sunday"),		tDAY, 0 },
-    { N_("monday"),		tDAY, 1 },
-    { N_("tuesday"),	tDAY, 2 },
-    { N_("tues"),		tDAY, 2 },
-    { N_("wednesday"),	tDAY, 3 },
-    { N_("wednes"),		tDAY, 3 },
-    { N_("thursday"),	tDAY, 4 },
-    { N_("thur"),		tDAY, 4 },
-    { N_("thurs"),		tDAY, 4 },
-    { N_("friday"),		tDAY, 5 },
-    { N_("saturday"),	tDAY, 6 },
-    { NULL }
-};
-
-/* Time units table. */
-static TABLE const UnitsTable[] = {
-    { N_("year"),		tMONTH_UNIT,	12 },
-    { N_("month"),		tMONTH_UNIT,	1 },
-    { N_("fortnight"),	tMINUTE_UNIT,	14 * 24 * 60 },
-    { N_("week"),		tMINUTE_UNIT,	7 * 24 * 60 },
-    { N_("day"),		tMINUTE_UNIT,	1 * 24 * 60 },
-    { N_("hour"),		tMINUTE_UNIT,	60 },
-    { N_("minute"),		tMINUTE_UNIT,	1 },
-    { N_("min"),		tMINUTE_UNIT,	1 },
-    { N_("second"),		tSEC_UNIT,	1 },
-    { N_("sec"),		tSEC_UNIT,	1 },
-    { NULL }
-};
-
-/* Assorted relative-time words. */
-static TABLE const OtherTable[] = {
-    { N_("tomorrow"),	tMINUTE_UNIT,	1 * 24 * 60 },
-    { N_("yesterday"),	tMINUTE_UNIT,	-1 * 24 * 60 },
-    { N_("today"),		tMINUTE_UNIT,	0 },
-    { N_("now"),		tMINUTE_UNIT,	0 },
-    { N_("last"),		tUNUMBER,	-1 },
-    { N_("this"),		tMINUTE_UNIT,	0 },
-    { N_("next"),		tUNUMBER,	2 },
-    { N_("first"),		tUNUMBER,	1 },
-/*  { N_("second"),		tUNUMBER,	2 }, */
-    { N_("third"),		tUNUMBER,	3 },
-    { N_("fourth"),		tUNUMBER,	4 },
-    { N_("fifth"),		tUNUMBER,	5 },
-    { N_("sixth"),		tUNUMBER,	6 },
-    { N_("seventh"),	tUNUMBER,	7 },
-    { N_("eighth"),		tUNUMBER,	8 },
-    { N_("ninth"),		tUNUMBER,	9 },
-    { N_("tenth"),		tUNUMBER,	10 },
-    { N_("eleventh"),	tUNUMBER,	11 },
-    { N_("twelfth"),	tUNUMBER,	12 },
-    { N_("ago"),		tAGO,	1 },
-    { NULL }
-};
-
-/* The timezone table. */
-/* Some of these are commented out because a time_t can't store a float. */
-static TABLE const TimezoneTable[] = {
-    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
-    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
-    { "utc",	tZONE,     HOUR( 0) },
-    { "wet",	tZONE,     HOUR( 0) },	/* Western European */
-    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
-    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */
-    { "at",	tZONE,     HOUR( 2) },	/* Azores */
-#if	0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */
-    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */
-#endif
-#if 0
-    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */
-    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */
-    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */
-#endif
-    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */
-    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */
-    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */
-    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */
-    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */
-    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */
-    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */
-    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */
-    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */
-    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */
-    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */
-    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */
-    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */
-    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
-    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
-    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
-    { "nt",	tZONE,     HOUR(11) },	/* Nome */
-    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
-    { "cet",	tZONE,     -HOUR(1) },	/* Central European */
-    { "met",	tZONE,     -HOUR(1) },	/* Middle European */
-    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */
-    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */
-    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */
-    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */
-    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
-    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
-    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
-    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
-#if 0
-    { "it",	tZONE,     -HOUR(3.5) },/* Iran */
-#endif
-    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
-    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
-#if 0
-    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */
-#endif
-    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */
-#if	0
-    /* For completeness.  NST is also Newfoundland Stanard, and SST is
-     * also Swedish Summer. */
-    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */
-    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */
-#endif	/* 0 */
-    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
-    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
-#if 0
-    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
-#endif
-    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
-    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
-#if 0
-    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */
-    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */
-#endif
-    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */
-    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */
-    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */
-    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */
-    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */
-    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */
-    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */
-    {  NULL  }
-};
-
-/* Military timezone table. */
-static TABLE const MilitaryTable[] = {
-    { "a",	tZONE,	HOUR(  1) },
-    { "b",	tZONE,	HOUR(  2) },
-    { "c",	tZONE,	HOUR(  3) },
-    { "d",	tZONE,	HOUR(  4) },
-    { "e",	tZONE,	HOUR(  5) },
-    { "f",	tZONE,	HOUR(  6) },
-    { "g",	tZONE,	HOUR(  7) },
-    { "h",	tZONE,	HOUR(  8) },
-    { "i",	tZONE,	HOUR(  9) },
-    { "k",	tZONE,	HOUR( 10) },
-    { "l",	tZONE,	HOUR( 11) },
-    { "m",	tZONE,	HOUR( 12) },
-    { "n",	tZONE,	HOUR(- 1) },
-    { "o",	tZONE,	HOUR(- 2) },
-    { "p",	tZONE,	HOUR(- 3) },
-    { "q",	tZONE,	HOUR(- 4) },
-    { "r",	tZONE,	HOUR(- 5) },
-    { "s",	tZONE,	HOUR(- 6) },
-    { "t",	tZONE,	HOUR(- 7) },
-    { "u",	tZONE,	HOUR(- 8) },
-    { "v",	tZONE,	HOUR(- 9) },
-    { "w",	tZONE,	HOUR(-10) },
-    { "x",	tZONE,	HOUR(-11) },
-    { "y",	tZONE,	HOUR(-12) },
-    { "z",	tZONE,	HOUR(  0) },
-    { NULL }
-};
-
-
-
-
-/* ARGSUSED */
-static int
-yyerror(s)
-    char	*s;
-{
-  return 0;
-}
-
-
-static time_t
-ToSeconds(Hours, Minutes, Seconds, Meridian)
-    time_t	Hours;
-    time_t	Minutes;
-    time_t	Seconds;
-    MERIDIAN	Meridian;
-{
-    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
-	return -1;
-    switch (Meridian) {
-    case MER24:
-	if (Hours < 0 || Hours > 23)
-	    return -1;
-	return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERam:
-	if (Hours < 1 || Hours > 12)
-	    return -1;
-	return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERpm:
-	if (Hours < 1 || Hours > 12)
-	    return -1;
-	return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
-    default:
-	abort ();
-    }
-    /* NOTREACHED */
-}
-
-
-static time_t
-Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode)
-    time_t	Month;
-    time_t	Day;
-    time_t	Year;
-    time_t	Hours;
-    time_t	Minutes;
-    time_t	Seconds;
-    MERIDIAN	Meridian;
-    DSTMODE	DSTmode;
-{
-    static int DaysInMonth[12] = {
-	31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-    };
-    time_t	tod;
-    time_t	Julian;
-    int		i;
-
-    if (Year < 0)
-	Year = -Year;
-    if (Year < 100)
-	Year += 1900;
-    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
-		    ? 29 : 28;
-    if (Year < EPOCH || Year > 1999
-     || Month < 1 || Month > 12
-     /* Lint fluff:  "conversion from long may lose accuracy" */
-     || Day < 1 || Day > DaysInMonth[(int)--Month])
-	return -1;
-
-    for (Julian = Day - 1, i = 0; i < Month; i++)
-	Julian += DaysInMonth[i];
-    for (i = EPOCH; i < Year; i++)
-	Julian += 365 + (i % 4 == 0);
-    Julian *= SECSPERDAY;
-    Julian += yyTimezone * 60L;
-    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
-	return -1;
-    Julian += tod;
-    if (DSTmode == DSTon
-     || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst))
-	Julian -= 60 * 60;
-    return Julian;
-}
-
-
-static time_t
-DSTcorrect(Start, Future)
-    time_t	Start;
-    time_t	Future;
-{
-    time_t	StartDay;
-    time_t	FutureDay;
-
-    StartDay = (localtime(&Start)->tm_hour + 1) % 24;
-    FutureDay = (localtime(&Future)->tm_hour + 1) % 24;
-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-}
-
-
-static time_t
-RelativeDate(Start, DayOrdinal, DayNumber)
-    time_t	Start;
-    time_t	DayOrdinal;
-    time_t	DayNumber;
-{
-    struct tm	*tm;
-    time_t	now;
-
-    now = Start;
-    tm = localtime(&now);
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-    return DSTcorrect(Start, now);
-}
-
-
-static time_t
-RelativeMonth(Start, RelMonth)
-    time_t	Start;
-    time_t	RelMonth;
-{
-    struct tm	*tm;
-    time_t	Month;
-    time_t	Year;
-
-    if (RelMonth == 0)
-	return 0;
-    tm = localtime(&Start);
-    Month = 12 * tm->tm_year + tm->tm_mon + RelMonth;
-    Year = Month / 12;
-    Month = Month % 12 + 1;
-    return DSTcorrect(Start,
-	    Convert(Month, (time_t)tm->tm_mday, Year,
-		(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
-		MER24, DSTmaybe));
-}
-
-
-static int
-LookupWord(buff)
-    char		*buff;
-{
-    register char	*p;
-    register char	*q;
-    register const TABLE	*tp;
-    int			i;
-    int			abbrev;
-
-    /* Make it lowercase. */
-    for (p = buff; *p; p++)
-	if (isupper(*p))
-	    *p = tolower(*p);
-
-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-	yylval.Meridian = MERam;
-	return tMERIDIAN;
-    }
-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-	yylval.Meridian = MERpm;
-	return tMERIDIAN;
-    }
-
-    /* See if we have an abbreviation for a month. */
-    if (strlen(buff) == 3)
-	abbrev = 1;
-    else if (strlen(buff) == 4 && buff[3] == '.') {
-	abbrev = 1;
-	buff[3] = '\0';
-    }
-    else
-	abbrev = 0;
-
-    for (tp = MonthDayTable; tp->name; tp++) {
-	if (abbrev) {
-	    if (strncmp(buff, tp->name, 3) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-	}
-	else if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-    }
-
-    for (tp = TimezoneTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    if (strcmp(buff, "dst") == 0) 
-	return tDST;
-
-    for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Strip off any plural and try the units table again. */
-    i = strlen(buff) - 1;
-    if (buff[i] == 's') {
-	buff[i] = '\0';
-	for (tp = UnitsTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-	buff[i] = 's';		/* Put back for "this" in OtherTable. */
-    }
-
-    for (tp = OtherTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Military timezones. */
-    if (buff[1] == '\0' && isalpha(*buff)) {
-	for (tp = MilitaryTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-    }
-
-    /* Drop out any periods and try the timezone table again. */
-    for (i = 0, p = q = buff; *q; q++)
-	if (*q != '.')
-	    *p++ = *q;
-	else
-	    i++;
-    *p = '\0';
-    if (i)
-	for (tp = TimezoneTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-
-    return tID;
-}
-
-
-static int
-yylex()
-{
-    register char	c;
-    register char	*p;
-    char		buff[20];
-    int			Count;
-    int			sign;
-
-    for ( ; ; ) {
-	while (isspace(*yyInput))
-	    yyInput++;
-
-	if (isdigit(c = *yyInput) || c == '-' || c == '+') {
-	    if (c == '-' || c == '+') {
-		sign = c == '-' ? -1 : 1;
-		if (!isdigit(*++yyInput))
-		    /* skip the '-' sign */
-		    continue;
-	    }
-	    else
-		sign = 0;
-	    for (yylval.Number = 0; isdigit(c = *yyInput++); )
-		yylval.Number = 10 * yylval.Number + c - '0';
-	    yyInput--;
-	    if (sign < 0)
-		yylval.Number = -yylval.Number;
-	    return sign ? tSNUMBER : tUNUMBER;
-	}
-	if (isalpha(c)) {
-	    for (p = buff; isalpha(c = *yyInput++) || c == '.'; )
-		if (p < &buff[sizeof buff - 1])
-		    *p++ = c;
-	    *p = '\0';
-	    yyInput--;
-	    return LookupWord(buff);
-	}
-	if (c != '(')
-	    return *yyInput++;
-	Count = 0;
-	do {
-	    c = *yyInput++;
-	    if (c == '\0')
-		return c;
-	    if (c == '(')
-		Count++;
-	    else if (c == ')')
-		Count--;
-	} while (Count > 0);
-    }
-}
-
-#define TM_YEAR_ORIGIN 1900
-
-/* Yield A - B, measured in seconds.  */
-static long
-difftm (a, b)
-     struct tm *a, *b;
-{
-  int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
-  int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
-  int days = (
-	      /* difference in day of year */
-	      a->tm_yday - b->tm_yday
-	      /* + intervening leap days */
-	      +  ((ay >> 2) - (by >> 2))
-	      -  (ay/100 - by/100)
-	      +  ((ay/100 >> 2) - (by/100 >> 2))
-	      /* + difference in years * 365 */
-	      +  (long)(ay-by) * 365
-	      );
-  return (60*(60*(24*days + (a->tm_hour - b->tm_hour))
-	      + (a->tm_min - b->tm_min))
-	  + (a->tm_sec - b->tm_sec));
-}
-
-time_t
-get_date(char *p, struct timeb *now);
-
-time_t
-get_date(p, now)
-    char		*p;
-    struct timeb	*now;
-{
-    struct tm		*tm, gmt;
-    struct timeb	ftz;
-    time_t		Start;
-    time_t		tod;
-    time_t nowtime;
-
-    yyInput = p;
-    if (now == NULL) {
-        now = &ftz;
-	(void)time (&nowtime);
-
-	if (! (tm = gmtime (&nowtime)))
-	    return -1;
-	gmt = *tm;	/* Make a copy, in case localtime modifies *tm.  */
-
-	if (! (tm = localtime (&nowtime)))
-	    return -1;
-	
-	ftz.timezone = difftm (&gmt, tm) / 60;
-	if(tm->tm_isdst)
-	    ftz.timezone += 60;
-    }
-    else
-    {
-	nowtime = now->time;
-    }
-
-    tm = localtime(&nowtime);
-    yyYear = tm->tm_year;
-    yyMonth = tm->tm_mon + 1;
-    yyDay = tm->tm_mday;
-    yyTimezone = now->timezone;
-    yyDSTmode = DSTmaybe;
-    yyHour = 0;
-    yyMinutes = 0;
-    yySeconds = 0;
-    yyMeridian = MER24;
-    yyRelSeconds = 0;
-    yyRelMonth = 0;
-    yyHaveDate = 0;
-    yyHaveDay = 0;
-    yyHaveRel = 0;
-    yyHaveTime = 0;
-    yyHaveZone = 0;
-
-    if (yyparse()
-     || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 || yyHaveDay > 1)
-	return -1;
-
-    if (yyHaveDate || yyHaveTime || yyHaveDay) {
-	Start = Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds,
-		    yyMeridian, yyDSTmode);
-	if (Start < 0)
-	    return -1;
-    }
-    else {
-	Start = nowtime;
-	if (!yyHaveRel)
-	    Start -= ((tm->tm_hour * 60L + tm->tm_min) * 60L) + tm->tm_sec;
-    }
-
-    Start += yyRelSeconds;
-    Start += RelativeMonth(Start, yyRelMonth);
-
-    if (yyHaveDay && !yyHaveDate) {
-	tod = RelativeDate(Start, yyDayOrdinal, yyDayNumber);
-	Start += tod;
-    }
-
-    /* Have to do *something* with a legitimate -1 so it's distinguishable
-     * from the error return value.  (Alternately could set errno on error.) */
-    return Start == -1 ? 0 : Start;
-}
-
-
-#if	defined(TEST)
-
-/* ARGSUSED */
-int
-main(ac, av)
-    int		ac;
-    char	*av[];
-{
-    char	buff[128];
-    time_t	d;
-
-    (void)printf("Enter date, or blank line to exit.\n\t> ");
-    (void)fflush(stdout);
-    while (gets(buff) && buff[0]) {
-	d = get_date(buff, (struct timeb *)NULL);
-	if (d == -1)
-	    (void)printf("Bad format - couldn't convert.\n");
-	else
-	    (void)printf("%s", ctime(&d));
-	(void)printf("\t> ");
-	(void)fflush(stdout);
-    }
-    exit(0);
-    /* NOTREACHED */
-}
-#endif	/* defined(TEST) */
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
deleted file mode 100644
index bf03383769..0000000000
--- a/calendar/gui/gncal-todo.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* To-do widget for gncal
- *
- * Copyright (C) 2000 The Free Software Foundation
- *
- * Author: Federico Mena <federico@helixcode.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include "event-editor.h"
-#include "gncal-todo.h"
-
-int todo_show_due_date = 0;
-int todo_show_priority = 0;
-int todo_show_time_remaining = 0;
-
-int todo_item_dstatus_highlight_overdue = 0;
-int todo_item_dstatus_highlight_due_today = 0;
-int todo_item_dstatus_highlight_not_due_yet = 0;
-
-
-char *todo_overdue_font_text;
-gint todo_current_sort_column = 0;
-gint todo_current_sort_type = GTK_SORT_ASCENDING;
-
-gboolean todo_style_changed =0;
-gboolean todo_list_autoresize = 1;
-gboolean todo_list_redraw_in_progess = 0;
-
-
-static void
-ok_button (GtkWidget *widget, GnomeDialog *dialog)
-{
-	CalComponent *comp;
-	CalClient *cal_client;
-	GnomeDateEdit *due_date;
-	GtkEditable *entry;
-	GtkSpinButton *priority;
-	GtkText *comment;
-	CalComponentText *text = g_new0 (CalComponentText, 1);
-	CalComponentDateTime date;
-	GSList *l;
-	gchar *t;
-	time_t d;
-	int p;
-
-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));
-
-	cal_client = (CalClient*) (gtk_object_get_data (GTK_OBJECT (dialog), "cal_client"));
-
-	/* Due date */
-	due_date = GNOME_DATE_EDIT (gtk_object_get_data(GTK_OBJECT(dialog), "due_date"));
-	d = gnome_date_edit_get_date (due_date);
-	date.value = g_new0 (struct icaltimetype, 1);
-	*date.value = icaltime_from_timet (d, 1, TRUE);
-	cal_component_set_dtend (comp, &date);
-
-	/* Summary */
-	entry = GTK_EDITABLE (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));
-	t = gtk_editable_get_chars (entry, 0, -1);
-	text->value = t;
-	cal_component_set_summary (comp, text);
-	g_free (t);
-
-	/* Priority */
-	priority = GTK_SPIN_BUTTON (gtk_object_get_data(GTK_OBJECT(dialog), "priority"));
-	p = gtk_spin_button_get_value_as_int (priority);
-	cal_component_set_priority (comp, &p);
-
-	/* Comment */
-	cal_component_get_comment_list (comp, &l);
-	comment = GTK_TEXT(gtk_object_get_data (GTK_OBJECT(dialog), "comment"));
-	t = gtk_editable_get_chars (entry, 0, -1);
-	text->value = t;
-	l = g_slist_append (l, text);
-	cal_component_set_comment_list (comp, l);
-	cal_component_free_text_list (l);
-
-	if (!cal_client_update_object (cal_client, comp))
-		g_message ("ok_button(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-cancel_button (GtkWidget *widget, GnomeDialog *dialog)
-{
-	CalComponent *comp;
-
-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static gint
-delete_event (GtkWidget *widget, GdkEvent *event, GnomeDialog *dialog)
-{
-	cancel_button (NULL, dialog);
-	return TRUE;
-}
-
-/* I've hacked this so we can use it separate from the rest of GncalTodo.
-   This whole file will go once we've got the new editor working. */
-void
-gncal_todo_edit (CalClient *client, CalComponent *comp)
-{
-	GtkWidget *dialog;
-	GtkWidget *hbox;
-	GtkWidget *due_box;
-	GtkWidget *due_label;
-	GtkWidget *due_entry;
-	GtkWidget *comment_box;
-	GtkWidget *comment_label;
-	GtkWidget *comment_text;
-	GtkWidget *comment_internal_box;
-	GtkWidget *comment_sep;
-	GtkWidget *w;
-	GtkWidget *pri_box;
-	GtkWidget *pri_label;
-	GtkWidget *pri_spin;
-	GtkObject *pri_adj;
-	GtkWidget *entry;
-	gboolean new;
-	CalComponentText text;
-	CalComponentDateTime date;
-	GSList *l;
-	time_t d;
-	gint *p;
-
-	new = (CAL_COMPONENT_NO_TYPE == cal_component_get_vtype (comp));
-	if (new)
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	dialog = gnome_dialog_new (new ? _("Create to-do item") : _("Edit to-do item"),
-				   GNOME_STOCK_BUTTON_OK,
-				   GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-#if 0
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog),
-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (todo->calendar))));
-#endif
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (hbox), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    hbox, FALSE, FALSE, 0);
-	gtk_widget_show (hbox);
-
-
-	due_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (due_box), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), due_box, FALSE, FALSE, 0);
-	gtk_widget_show (due_box);
-
-	pri_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (pri_box), 4);
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)->vbox), pri_box, FALSE, FALSE, 0);
-	gtk_widget_show (pri_box);
-
-	comment_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (comment_box), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), comment_box, FALSE, FALSE, 0);
-	gtk_widget_show (comment_box);
-
-	comment_internal_box = gtk_vbox_new(FALSE,2);
-	gtk_container_border_width (GTK_CONTAINER (comment_internal_box), 4);
-
-	gtk_box_pack_start (GTK_BOX (comment_box), comment_internal_box, TRUE, TRUE, 0);
-	gtk_widget_show (comment_internal_box);
-
-	w = gtk_label_new (_("Summary:"));
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	entry = gtk_entry_new ();
-	cal_component_get_summary (comp, &text);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), text.value);
-	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-	gtk_widget_show (entry);
-
-
-	due_label = gtk_label_new (_("Due Date:"));
-	gtk_box_pack_start (GTK_BOX (due_box), due_label, FALSE, FALSE, 0);
-	gtk_widget_show (due_label);
-
-	due_entry = gtk_entry_new ();
-	cal_component_get_dtend (comp, &date);
-	/* FIXME: Does GnomeDateEdit support no time set? */
-	if (date.value)
-	  d = icaltime_as_timet (*date.value);
-	else
-	  d = time (NULL);
-	due_entry = date_edit_new (d, TRUE);
-	gtk_box_pack_start (GTK_BOX (due_box), due_entry, TRUE, TRUE, 0);
-	gtk_widget_show (due_entry);
-
-	pri_label = gtk_label_new (_("Priority:"));
-	gtk_box_pack_start (GTK_BOX (pri_box), pri_label, FALSE, FALSE, 0);
-	gtk_widget_show (pri_label);
-
-	pri_adj = gtk_adjustment_new (5.0, 1.0, 9.0, 1.0, 3.0, 0.0);
-	pri_spin = gtk_spin_button_new (GTK_ADJUSTMENT(pri_adj), 0.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (pri_spin), TRUE);
-	gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (pri_spin), FALSE);
-	gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (pri_spin), FALSE);
-	cal_component_get_priority (comp, &p);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (pri_spin), (gfloat) *p);
-	gtk_box_pack_start (GTK_BOX (pri_box), pri_spin, FALSE, FALSE, 0);
-	gtk_widget_show (pri_spin);
-
-	comment_sep = gtk_hseparator_new ();
-	gtk_box_pack_start (GTK_BOX (comment_box), comment_sep, FALSE, FALSE, 0);
-	gtk_widget_show(comment_sep);
-
-	comment_label = gtk_label_new (_("Item Comments:"));
-	gtk_label_set_justify(GTK_LABEL(comment_label), GTK_JUSTIFY_LEFT);
-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_label, TRUE, TRUE, 0);
-	gtk_widget_show (comment_label);
-
-	comment_text = gtk_text_new (NULL, NULL);
-	gtk_text_set_editable (GTK_TEXT (comment_text), TRUE);
-	gtk_text_set_word_wrap( GTK_TEXT(comment_text), TRUE);
-	gtk_text_freeze(GTK_TEXT(comment_text));
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-	/* Need to handle multiple comments */
-	cal_component_get_comment_list (comp, &l);
-	if (l) {
-		CalComponentText text = *(CalComponentText*)l->data;
-
-		gtk_text_insert(GTK_TEXT(comment_text), NULL, NULL, NULL,
-				text.value, strlen(text.value));
-	}
-	cal_component_free_text_list (l);
-	gtk_text_thaw(GTK_TEXT(comment_text));
-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_text, FALSE, TRUE, 0);
-	gtk_widget_show (comment_text);
-
-	gtk_object_set_user_data (GTK_OBJECT (dialog), comp);
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	gtk_object_set_data (GTK_OBJECT (dialog), "cal_client", client);
-	gtk_object_set_data (GTK_OBJECT (dialog), "summary_entry", entry);
-	gtk_object_set_data (GTK_OBJECT (dialog), "due_date", due_entry);
-	gtk_object_set_data (GTK_OBJECT (dialog), "priority", pri_spin);
-	gtk_object_set_data (GTK_OBJECT (dialog), "comment", comment_text);
-
-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, (GtkSignalFunc) ok_button, dialog);
-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, (GtkSignalFunc) cancel_button, dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
-			    (GtkSignalFunc) delete_event,
-			    dialog);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE(entry));
-
-	gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_widget_show (dialog);
-	gtk_widget_grab_focus (entry);
-}
diff --git a/calendar/gui/gncal-todo.h b/calendar/gui/gncal-todo.h
deleted file mode 100644
index a48f8ce47d..0000000000
--- a/calendar/gui/gncal-todo.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* To-do widget for gncal
- *
- * Copyright (C) 2000 The Free Software Foundation
- *
- * Author: Federico Mena <federico@helixcode.com>
- */
-
-#ifndef GNCAL_TODO_H
-#define GNCAL_TODO_H
-
-#include <libgnome/gnome-defs.h>
-#include "gnome-cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-void gncal_todo_edit (CalClient *client, CalComponent *comp);
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
deleted file mode 100644
index 379bbfec95..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,2307 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GnomeCalendar widget
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <gnome.h>
-#include <gal/e-paned/e-hpaned.h>
-#include <gal/e-paned/e-vpaned.h>
-#include <cal-util/timeutil.h>
-#include "dialogs/alarm-notify-dialog.h"
-#include "alarm.h"
-#include "e-calendar-table.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "event-editor.h"
-#include "gnome-cal.h"
-#include "component-factory.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-
-
-
-/* These must match the page numbers in the GtkNotebook. */
-typedef enum {
-	VIEW_NOT_SET = -1,
-	VIEW_DAY = 0,
-	VIEW_WORK_WEEK,
-	VIEW_WEEK,
-	VIEW_MONTH
-} ViewType;
-
-/* States for the calendar loading and creation state machine */
-typedef enum {
-	LOAD_STATE_NOT_LOADED,
-	LOAD_STATE_WAIT_LOAD,
-	LOAD_STATE_WAIT_LOAD_BEFORE_CREATE,
-	LOAD_STATE_WAIT_CREATE,
-	LOAD_STATE_LOADED
-} LoadState;
-
-/* Private part of the GnomeCalendar structure */
-struct _GnomeCalendarPrivate {
-	CalClient   *client;
-
-	/* Loading state; we can be loading or creating a calendar */
-	LoadState load_state;
-
-	/* URI being loaded, NULL if we are not being loaded */
-	char *loading_uri;
-
-	/* Mapping of component UIDs to event editors */
-	GHashTable  *object_editor_hash;
-
-	/* This is the last selection explicitly selected by the user. We try
-	   to keep it the same when we switch views, but we may have to alter
-	   it depending on the view (e.g. the week views only select days, so
-	   any times are lost. */
-	time_t      selection_start_time;
-	time_t      selection_end_time;
-
-	/* Widgets */
-
-	GtkWidget   *hpane;
-	GtkWidget   *notebook;
-	GtkWidget   *vpane;
-	ECalendar   *date_navigator;
-	GtkWidget   *todo;
-
-	GtkWidget   *day_view;
-	GtkWidget   *work_week_view;
-	GtkWidget   *week_view;
-	GtkWidget   *month_view;
-
-	/* These are the toolbar radio buttons for switching views. */
-	GtkWidget   *day_button;
-	GtkWidget   *work_week_button;
-	GtkWidget   *week_button;
-	GtkWidget   *month_button;
-
-	/* This is the view currently shown. We use it to keep track of the
-	   positions of the panes. range_selected is TRUE if a range of dates
-	   was selected in the date navigator to show the view. */
-	ViewType current_view_type;
-	gboolean range_selected;
-
-	/* These are the saved positions of the panes. They are multiples of
-	   calendar month widths & heights in the date navigator, so that they
-	   will work OK after theme changes. */
-	gfloat	     hpane_pos;
-	gfloat	     vpane_pos;
-	gfloat	     hpane_pos_month_view;
-	gfloat	     vpane_pos_month_view;
-
-	/* The signal handler id for our GtkCalendar "day_selected" handler. */
-	guint	     day_selected_id;
-
-	/* Alarm ID for the midnight refresh function */
-	gpointer midnight_alarm_refresh_id;
-
-	/* UID->alarms hash */
-	GHashTable *alarms;
-};
-
-
-
-/* An entry in the UID->alarms hash table.  The UID key *is* the uid field in
- * this structure, so don't free it separately.
- */
-typedef struct {
-	char *uid;
-	GList *alarm_ids;
-} ObjectAlarms;
-
-
-
-static void gnome_calendar_class_init (GnomeCalendarClass *class);
-static void gnome_calendar_init (GnomeCalendar *gcal);
-static void gnome_calendar_destroy (GtkObject *object);
-
-static void gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 range_selected,
-						 gboolean	 focus);
-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);
-static void gnome_calendar_update_view_times (GnomeCalendar *gcal);
-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);
-
-static void gnome_calendar_on_date_navigator_style_set (GtkWidget *widget,
-							GtkStyle  *previous_style,
-							gpointer data);
-static void gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal);
-static void gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-							    GtkAllocation *allocation,
-							    gpointer data);
-static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-								 GnomeCalendar *gcal);
-static void gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-								GnomeCalendar    *gcal);
-static gboolean gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-						 GDate		*start_date,
-						 gint		*days_shown);
-
-
-static GtkVBoxClass *parent_class;
-
-static void setup_alarm (GnomeCalendar *cal, CalAlarmInstance *ai);
-
-
-
-GtkType
-gnome_calendar_get_type (void)
-{
-	static GtkType gnome_calendar_type = 0;
-
-	if (!gnome_calendar_type) {
-		static const GtkTypeInfo gnome_calendar_info = {
-			"GnomeCalendar",
-			sizeof (GnomeCalendar),
-			sizeof (GnomeCalendarClass),
-			(GtkClassInitFunc) gnome_calendar_class_init,
-			(GtkObjectInitFunc) gnome_calendar_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		gnome_calendar_type = gtk_type_unique (GTK_TYPE_VBOX, &gnome_calendar_info);
-	}
-
-	return gnome_calendar_type;
-}
-
-/* Class initialization function for the gnome calendar */
-static void
-gnome_calendar_class_init (GnomeCalendarClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_VBOX);
-
-	object_class->destroy = gnome_calendar_destroy;
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-	gchar *filename;
-
-	priv = gcal->priv;
-
-	/* The main HPaned, with the notebook of calendar views on the left
-	   and the ECalendar and ToDo list on the right. */
-	priv->hpane = e_hpaned_new ();
-	gtk_widget_show (priv->hpane);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 0);
-
-	/* The Notebook containing the 4 calendar views. */
-	priv->notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_widget_show (priv->notebook);
-	e_paned_pack1 (E_PANED (priv->hpane), priv->notebook, TRUE, TRUE);
-
-	/* The VPaned widget, to contain the GtkCalendar & ToDo list. */
-	priv->vpane = e_vpaned_new ();
-	gtk_widget_show (priv->vpane);
-	e_paned_pack2 (E_PANED (priv->hpane), priv->vpane, FALSE, TRUE);
-
-	/* The ECalendar. */
-	w = e_calendar_new ();
-	priv->date_navigator = E_CALENDAR (w);
-	gtk_widget_show (w);
-	e_paned_pack1 (E_PANED (priv->vpane), w, FALSE, TRUE);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator),
-			    "style_set",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),
-			    gcal);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_navigator),
-				  "size_allocate",
-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,
-				  gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,
-			    gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),
-			    gcal);
-
-	/* The ToDo list. */
-	priv->todo = e_calendar_table_new ();
-	e_paned_pack2 (E_PANED (priv->vpane), priv->todo, TRUE, TRUE);
-	gtk_widget_show (priv->todo);
-
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
-	/* The Day View. */
-	priv->day_view = e_day_view_new ();
-	e_day_view_set_calendar (E_DAY_VIEW (priv->day_view), gcal);
-	gtk_widget_show (priv->day_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->day_view, gtk_label_new (""));
-
-	/* The Work Week View. */
-	priv->work_week_view = e_day_view_new ();
-	e_day_view_set_work_week_view (E_DAY_VIEW (priv->work_week_view),
-				       TRUE);
-	e_day_view_set_days_shown (E_DAY_VIEW (priv->work_week_view), 5);
-	e_day_view_set_calendar (E_DAY_VIEW (priv->work_week_view), gcal);
-	gtk_widget_show (priv->work_week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->work_week_view, gtk_label_new (""));
-
-	/* The Week View. */
-	priv->week_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->week_view), gcal);
-	gtk_widget_show (priv->week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->week_view, gtk_label_new (""));
-
-	/* The Month View. */
-	priv->month_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->month_view), gcal);
-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE);
-	gtk_widget_show (priv->month_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->month_view, gtk_label_new (""));
-
-	gnome_calendar_update_config_settings (gcal, TRUE);
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-gnome_calendar_init (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = g_new0 (GnomeCalendarPrivate, 1);
-	gcal->priv = priv;
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	priv->object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->alarms = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->current_view_type = VIEW_NOT_SET;
-	priv->range_selected = FALSE;
-
-	priv->selection_start_time = time_day_begin (time (NULL));
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-
-	setup_widgets (gcal);
-}
-
-/* Used from g_hash_table_foreach(); frees an object alarms entry */
-static void
-free_object_alarms (gpointer key, gpointer value, gpointer data)
-{
-	ObjectAlarms *oa;
-
-	oa = value;
-
-	g_assert (oa->uid != NULL);
-	g_free (oa->uid);
-	oa->uid = NULL;
-
-	g_assert (oa->alarm_ids != NULL);
-	g_list_free (oa->alarm_ids);
-	oa->alarm_ids = NULL;
-
-	g_free (oa);
-}
-
-/* Used from g_hash_table_foreach(); frees an UID string */
-static void
-free_uid (gpointer key, gpointer value, gpointer data)
-{
-	char *uid;
-
-	uid = key;
-	g_free (uid);
-}
-
-static void
-gnome_calendar_destroy (GtkObject *object)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gchar *filename;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (object));
-
-	gcal = GNOME_CALENDAR (object);
-	priv = gcal->priv;
-
-	/* Save the TaskPad layout. */
-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);
-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv->todo), filename);
-	g_free (filename);
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	if (priv->loading_uri) {
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-	}
-
-	if (priv->client) {
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	g_hash_table_foreach (priv->alarms, free_object_alarms, NULL);
-	g_hash_table_destroy (priv->alarms);
-	priv->alarms = NULL;
-
-	g_hash_table_foreach (priv->object_editor_hash, free_uid, NULL);
-	g_hash_table_destroy (priv->object_editor_hash);
-	priv->object_editor_hash = NULL;
-
-	g_free (priv);
-	gcal->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static GtkWidget *
-get_current_page (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	return GTK_NOTEBOOK (priv->notebook)->cur_page->child;
-}
-
-char *
-gnome_calendar_get_current_view_name (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		return "dayview";
-	else if (page == priv->work_week_view)
-		return "workweekview";
-	else if (page == priv->week_view)
-		return "weekview";
-	else if (page == priv->month_view)
-		return "monthview";
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-void
-gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (new_time != -1);
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (new_time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-static void
-gnome_calendar_update_view_times (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		e_day_view_set_selected_time_range (E_DAY_VIEW (page),
-						    priv->selection_start_time,
-						    priv->selection_end_time);
-	} else if (page == priv->week_view || page == priv->month_view) {
-		e_week_view_set_selected_time_range (E_WEEK_VIEW (page),
-						     priv->selection_start_time,
-						     priv->selection_end_time);
-	} else {
-		g_warning ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *cp;
-	time_t start_time, end_time;
-
-	priv = gcal->priv;
-
-	cp = get_current_page (gcal);
-
-	start_time = priv->selection_start_time;
-	end_time = priv->selection_end_time;
-
-	if (cp == priv->day_view) {
-		start_time = time_add_day (start_time, direction);
-		end_time = time_add_day (end_time, direction);
-	} else if (cp == priv->work_week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->month_view) {
-		start_time = time_add_month (start_time, direction);
-		end_time = time_add_month (end_time, direction);
-	} else {
-		g_warning ("Weee!  Where did the penguin go?");
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-void
-gnome_calendar_next (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, 1);
-}
-
-void
-gnome_calendar_previous (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, -1);
-}
-
-void
-gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-	if (priv->day_button)
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->day_button), TRUE);
-	else
-		gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);
-}
-
-void
-gnome_calendar_goto_today (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_goto (gcal, time (NULL));
-
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-/* This sets which view is currently shown. It also updates the selection time
-   of the view so it shows the appropriate days. */
-void
-gnome_calendar_set_view		(GnomeCalendar	*gcal,
-				 char		*page_name,
-				 gboolean	 range_selected,
-				 gboolean	 focus)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (page_name != NULL);
-
-	gnome_calendar_set_view_internal (gcal, page_name, range_selected, focus);
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-/* This sets the view without changing the selection or updating the date
-   navigator. If a range of dates isn't selected it will also reset the number
-   of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks
-   for the month view). */
-static void
-gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-					 char		*page_name,
-					 gboolean	 range_selected,
-					 gboolean	 focus)
-{
-	GnomeCalendarPrivate *priv;
-	int view;
-	gboolean round_selection;
-	GtkWidget *focus_widget;
-
-	priv = gcal->priv;
-
-	round_selection = FALSE;
-
-	if (!strcmp (page_name, "dayview")) {
-		view = VIEW_DAY;
-		focus_widget = priv->day_view;
-
-		if (!range_selected)
-			e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1);
-	} else if (!strcmp (page_name, "workweekview")) {
-		view = VIEW_WORK_WEEK;
-		focus_widget = priv->work_week_view;
-	} else if (!strcmp (page_name, "weekview")) {
-		view = VIEW_WEEK;
-		focus_widget = priv->week_view;
-		round_selection = TRUE;
-	} else if (!strcmp (page_name, "monthview")) {
-		view = VIEW_MONTH;
-		focus_widget = priv->month_view;
-
-		if (!range_selected)
-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 5);
-		round_selection = TRUE;
-	} else {
-		g_warning ("Unknown calendar view: %s", page_name);
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->current_view_type = view;
-	priv->range_selected = range_selected;
-
-	calendar_config_set_default_view (view);
-
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), view);
-
-	if (focus)
-		gtk_widget_grab_focus (focus_widget);
-
-	gnome_calendar_set_pane_positions (gcal);
-
-	/* For the week & month views we want the selection in the date
-	   navigator to be rounded to the nearest week when the arrow buttons
-	   are pressed to move to the previous/next month. */
-	gtk_object_set (GTK_OBJECT (priv->date_navigator->calitem),
-			"round_selection_when_moving", round_selection,
-			NULL);
-}
-
-
-static void
-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint top_border, bottom_border, left_border, right_border;
-	gint col_width, row_height;
-	gfloat right_pane_width, top_pane_height;
-
-	priv = gcal->priv;
-
-	/* Get the size of the calendar month width & height. */
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	if (priv->current_view_type == VIEW_MONTH && !priv->range_selected) {
-		right_pane_width = priv->hpane_pos_month_view;
-		top_pane_height = priv->vpane_pos_month_view;
-	} else {
-		right_pane_width = priv->hpane_pos;
-		top_pane_height = priv->vpane_pos;
-	}
-
-	/* We add the borders before multiplying due to the way we are using
-	   the EPaned quantum feature. */
-	if (right_pane_width < 0.001)
-		right_pane_width = 0.0;
-	else
-		right_pane_width = (right_pane_width * (col_width + left_border + right_border)
-				    + 0.5);
-	if (top_pane_height < 0.001)
-		top_pane_height = 0.0;
-	else
-		top_pane_height = (top_pane_height * (row_height + top_border + bottom_border)
-				   + 0.5);
-
-	e_paned_set_position (E_PANED (priv->hpane), -1);
-	e_paned_set_position (E_PANED (priv->vpane), -1);
-
-	/* We add one to each dimension since we can't use 0. */
-
-	gtk_widget_set_usize (priv->vpane, right_pane_width + 1, -2);
-	gtk_widget_set_usize (GTK_WIDGET (priv->date_navigator), -2, top_pane_height + 1);
-}
-
-#if 0
-
-/* Sends a mail notification of an alarm trigger */
-static void
-mail_notification (char *mail_address, char *text, time_t app_time)
-{
-	pid_t pid;
-	int   p [2];
-	char *command;
-
-	pipe (p);
-	pid = fork ();
-	if (pid == 0){
-		int dev_null;
-
-		dev_null = open ("/dev/null", O_RDWR);
-		dup2 (p [0], 0);
-		dup2 (dev_null, 1);
-		dup2 (dev_null, 2);
-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",
-		       mail_address, NULL);
-		_exit (127);
-	}
-	command = g_strconcat ("To: ", mail_address, "\n",
-			       "Subject: ", _("Reminder of your appointment at "),
-			       ctime (&app_time), "\n\n", text, "\n", NULL);
-	write (p [1], command, strlen (command));
- 	close (p [1]);
-	close (p [0]);
-	g_free (command);
-}
-
-static int
-max_open_files (void)
-{
-        static int files;
-
-        if (files)
-                return files;
-
-        files = sysconf (_SC_OPEN_MAX);
-        if (files != -1)
-                return files;
-#ifdef OPEN_MAX
-        return files = OPEN_MAX;
-#else
-        return files = 256;
-#endif
-}
-
-/* Executes a program as a notification of an alarm trigger */
-static void
-program_notification (char *command, int close_standard)
-{
-	struct sigaction ignore, save_intr, save_quit;
-	int status = 0, i;
-	pid_t pid;
-
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-
-	sigaction (SIGINT, &ignore, &save_intr);
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	if ((pid = fork ()) < 0){
-		fprintf (stderr, "\n\nfork () = -1\n");
-		return;
-	}
-	if (pid == 0){
-		pid = fork ();
-		if (pid == 0){
-			const int top = max_open_files ();
-			sigaction (SIGINT,  &save_intr, NULL);
-			sigaction (SIGQUIT, &save_quit, NULL);
-
-			for (i = (close_standard ? 0 : 3); i < top; i++)
-				close (i);
-
-			/* FIXME: As an excercise to the reader, copy the
-			 * code from mc to setup shell properly instead of
-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.
-			 */
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-
-			_exit (127);
-		} else {
-			_exit (127);
-		}
-	}
-	wait (&status);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-}
-
-#endif
-
-/* Queues a snooze alarm */
-static void
-snooze (GnomeCalendar *gcal, CalComponent *comp, time_t occur, int snooze_mins, gboolean audio)
-{
-	time_t now, trigger;
-	struct tm tm;
-	CalAlarmInstance ai;
-
-	now = time (NULL);
-	tm = *localtime (&now);
-	tm.tm_min += snooze_mins;
-
-	trigger = mktime (&tm);
-	if (trigger == -1) {
-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");
-		return;
-	}
-
-#if 0
-	cal_component_get_uid (comp, &ai.uid);
-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;
-#endif
-	ai.trigger = trigger;
-	ai.occur = occur;
-
-	setup_alarm (gcal, &ai);
-}
-
-struct alarm_notify_closure {
-	GnomeCalendar *gcal;
-	CalComponent *comp;
-	time_t occur;
-};
-
-/* Callback used for the result of the alarm notification dialog */
-static void
-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct alarm_notify_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_CLOSE:
-		break;
-
-	case ALARM_NOTIFY_SNOOZE:
-		snooze (c->gcal, c->comp, c->occur, snooze_mins, FALSE);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		gnome_calendar_edit_object (c->gcal, c->comp);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-}
-
-/* Present a display notification of an alarm trigger */
-static void
-display_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	gboolean result;
-	struct alarm_notify_closure *c;
-
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	c = g_new (struct alarm_notify_closure, 1);
-	c->gcal = gcal;
-	c->comp = comp;
-	c->occur = occur;
-
-	result = alarm_notify_dialog (trigger, occur, comp, display_notification_cb, c);
-	if (!result) {
-		g_message ("display_notification(): could not display the alarm notification dialog");
-		g_free (c);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
-
-/* Present an audible notification of an alarm trigger */
-static void
-audio_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	g_message ("AUDIO NOTIFICATION!");
-	/* FIXME */
-}
-
-struct trigger_alarm_closure {
-	GnomeCalendar *gcal;
-	char *uid;
-	CalComponentAlarmAction type;
-	time_t occur;
-};
-
-/* Callback function used when an alarm is triggered */
-static void
-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	struct trigger_alarm_closure *c;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *uid;
-	ObjectAlarms *oa;
-   	GList *l;
-
-	c = data;
-	priv = c->gcal->priv;
-
-	/* Fetch the object */
-
-	status = cal_client_get_object (priv->client, c->uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Go on */
-		break;
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-	case CAL_CLIENT_GET_NOT_FOUND:
-		g_message ("trigger_alarm_cb(): syntax error in fetched object");
-		return;
-	}
-
-	g_assert (comp != NULL);
-
-	/* Present notification */
-
-	switch (c->type) {
-	case CAL_COMPONENT_ALARM_EMAIL:
-#if 0
-		g_assert (ico->malarm.enabled);
-		mail_notification (ico->malarm.data, ico->summary, c->occur);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-#if 0
-		g_assert (ico->palarm.enabled);
-		program_notification (ico->palarm.data, FALSE);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-#if 0
-		g_assert (ico->dalarm.enabled);
-#endif
-		display_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	case CAL_COMPONENT_ALARM_AUDIO:
-#if 0
-		g_assert (ico->aalarm.enabled);
-#endif
-		audio_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Remove the alarm from the hash table */
-	cal_component_get_uid (comp, &uid);
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	g_assert (oa != NULL);
-
-	l = g_list_find (oa->alarm_ids, alarm_id);
-	g_assert (l != NULL);
-
-	oa->alarm_ids = g_list_remove_link (oa->alarm_ids, l);
-	g_list_free_1 (l);
-
-	if (!oa->alarm_ids) {
-		g_hash_table_remove (priv->alarms, uid);
-		g_free (oa->uid);
-		g_free (oa);
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Frees a struct trigger_alarm_closure */
-static void
-free_trigger_alarm_closure (gpointer data)
-{
-	struct trigger_alarm_closure *c;
-
-	c = data;
-	g_free (c->uid);
-	g_free (c);
-}
-
-/* Queues the specified alarm */
-static void
-setup_alarm (GnomeCalendar *gcal, CalAlarmInstance *ai)
-{
-	GnomeCalendarPrivate *priv;
-	struct trigger_alarm_closure *c;
-	gpointer alarm;
-	ObjectAlarms *oa;
-
-	priv = gcal->priv;
-
-	c = g_new (struct trigger_alarm_closure, 1);
-	c->gcal = gcal;
-	c->uid = g_strdup (ai->uid);
-#if 0
-	c->type = ai->type;
-#endif
-	c->occur = ai->occur;
-
-	alarm = alarm_add (ai->trigger, trigger_alarm_cb, c, free_trigger_alarm_closure);
-	if (!alarm) {
-		g_message ("setup_alarm(): Could not set up alarm");
-		g_free (c->uid);
-		g_free (c);
-		return;
-	}
-
-	oa = g_hash_table_lookup (priv->alarms, ai->uid);
-	if (oa)
-		oa->alarm_ids = g_list_prepend (oa->alarm_ids, alarm);
-	else {
-		oa = g_new (ObjectAlarms, 1);
-		oa->uid = g_strdup (ai->uid);
-		oa->alarm_ids = g_list_prepend (NULL, alarm);
-
-		g_hash_table_insert (priv->alarms, oa->uid, oa);
-	}
-}
-
-static void load_alarms (GnomeCalendar *cal);
-
-/* Called nightly to refresh the day's alarms */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	GnomeCalendar *cal;
-	GnomeCalendarPrivate *priv;
-
-	cal = GNOME_CALENDAR (data);
-	priv = cal->priv;
-
-	priv->midnight_alarm_refresh_id = NULL;
-
-	load_alarms (cal);
-}
-
-/* Loads and queues the alarms from the current time up to midnight. */
-static void
-load_alarms (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	time_t now;
-	time_t end_of_day;
-	GList *alarms, *l;
-
-	priv = gcal->priv;
-
-	now = time (NULL);
-	end_of_day = time_day_end (now);
-
-	/* Queue alarms */
-
-	alarms = cal_client_get_alarms_in_range (priv->client, now, end_of_day);
-
-	for (l = alarms; l; l = l->next)
-		setup_alarm (gcal, l->data);
-
-	cal_alarm_instance_list_free (alarms);
-
-	/* Queue the midnight alarm refresh */
-
-	priv->midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL);
-	if (!priv->midnight_alarm_refresh_id) {
-		g_message ("load_alarms(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
-}
-
-/* Loads the initial data into the calendar; this should be called right after
- * the cal_loaded signal from the client is invoked.
- */
-static void
-initial_load (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	load_alarms (gcal);
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-/* Removes any queued alarms for the specified UID */
-static void
-remove_alarms_for_object (GnomeCalendar *gcal, const char *uid)
-{
-	GnomeCalendarPrivate *priv;
-	ObjectAlarms *oa;
-	GList *l;
-
-	priv = gcal->priv;
-
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	if (!oa)
-		return;
-
-	for (l = oa->alarm_ids; l; l = l->next) {
-		gpointer alarm_id;
-
-		alarm_id = l->data;
-		alarm_remove (alarm_id);
-	}
-
-	g_hash_table_remove (priv->alarms, uid);
-
-	g_free (oa->uid);
-	g_list_free (oa->alarm_ids);
-	g_free (oa);
-}
-
-/* Adds today's alarms for the specified object */
-static void
-add_alarms_for_object (GnomeCalendar *gcal, const char *uid)
-{
-	GnomeCalendarPrivate *priv;
-	GList *alarms;
-	gboolean result;
-	time_t now, end_of_day;
-	GList *l;
-
-	priv = gcal->priv;
-
-	now = time (NULL);
-	end_of_day = time_day_end (now);
-
-	result = cal_client_get_alarms_for_object (priv->client, uid, now, end_of_day, &alarms);
-	if (!result) {
-		/* FIXME: should we warn here, or is it OK if the object
-		 * disappeared in the meantime?
-		 */
-		return;
-	}
-
-	for (l = alarms; l; l = l->next)
-		setup_alarm (gcal, l->data);
-
-	cal_alarm_instance_list_free (alarms);
-}
-
-/* Displays an error to indicate that loading a calendar failed */
-static void
-load_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not load the calendar in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that creating a calendar failed */
-static void
-create_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not create a calendar in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that the specified URI method is not supported */
-static void
-method_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to load `%s' is not supported"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Callback from the calendar client when a calendar is loaded */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gboolean free_uri;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	g_assert (priv->load_state != LOAD_STATE_NOT_LOADED && priv->load_state != LOAD_STATE_LOADED);
-	g_assert (priv->loading_uri != NULL);
-
-	free_uri = TRUE;
-
-	switch (priv->load_state) {
-	case LOAD_STATE_WAIT_LOAD:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			load_error (gcal, priv->loading_uri);
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	case LOAD_STATE_WAIT_LOAD_BEFORE_CREATE:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_WAIT_CREATE;
-			free_uri = FALSE;
-
-			if (!cal_client_create_calendar (priv->client, priv->loading_uri)) {
-				priv->load_state = LOAD_STATE_NOT_LOADED;
-				free_uri = TRUE;
-				g_message ("cal_loaded_cb(): Could not issue the create request");
-			}
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	case LOAD_STATE_WAIT_CREATE:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			create_error (gcal, priv->loading_uri);
-		} else if (status == CAL_CLIENT_LOAD_IN_USE) {
-			/* Someone created the URI while we were issuing the
-			 * create request, so we just try to reload.
-			 */
-			priv->load_state = LOAD_STATE_WAIT_LOAD;
-			free_uri = FALSE;
-
-			if (!cal_client_load_calendar (priv->client, priv->loading_uri)) {
-				priv->load_state = LOAD_STATE_NOT_LOADED;
-				free_uri = TRUE;
-				g_message ("cal_loaded_cb(): Could not issue the load request");
-			}
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (free_uri) {
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-	}
-}
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	remove_alarms_for_object (gcal, uid);
-	add_alarms_for_object (gcal, uid);
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	remove_alarms_for_object (gcal, uid);
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-
-GtkWidget *
-gnome_calendar_construct (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint view;
-	gchar *page;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), gcal);
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->todo), priv->client);
-
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->day_view), priv->client);
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->work_week_view), priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->week_view), priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->month_view), priv->client);
-
-	view = calendar_config_get_default_view ();
-	switch (view) {
-	case 1:
-		page = "workweekview";
-		break;
-	case 2:
-		page = "weekview";
-		break;
-	case 3:
-		page = "monthview";
-		break;
-	default:
-		page = "dayview";
-		break;
-	}
-
-	gnome_calendar_set_view (gcal, page, FALSE, FALSE);
-
-	return GTK_WIDGET (gcal);
-}
-
-GtkWidget *
-gnome_calendar_new (void)
-{
-	GnomeCalendar *gcal;
-
-	gcal = gtk_type_new (gnome_calendar_get_type ());
-
-	if (!gnome_calendar_construct (gcal)) {
-		g_message ("gnome_calendar_new(): Could not construct the calendar GUI");
-		gtk_object_unref (GTK_OBJECT (gcal));
-		return NULL;
-	}
-
-	return GTK_WIDGET (gcal);
-}
-
-/**
- * gnome_calendar_get_cal_client:
- * @gcal: A calendar view.
- * 
- * Queries the calendar client interface object that a calendar view is using.
- * 
- * Return value: A calendar client interface object.
- **/
-CalClient *
-gnome_calendar_get_cal_client (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	return priv->client;
-}
-
-gboolean
-gnome_calendar_open (GnomeCalendar *gcal, char *file, GnomeCalendarOpenMode gcom)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (file != NULL, FALSE);
-
-	priv = gcal->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE);
-
-	g_assert (priv->loading_uri == NULL);
-
-	priv->loading_uri = g_strdup (file);
-
-	if (gcom == CALENDAR_OPEN)
-		priv->load_state = LOAD_STATE_WAIT_LOAD;
-	else if (gcom == CALENDAR_OPEN_OR_CREATE)
-		priv->load_state = LOAD_STATE_WAIT_LOAD_BEFORE_CREATE;
-	else {
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	if (!cal_client_load_calendar (priv->client, file)) {
-		priv->load_state = LOAD_STATE_NOT_LOADED;
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-#if 0
-
-static void
-stop_beeping (GtkObject* object, gpointer data)
-{
-	guint timer_tag, beep_tag;
-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));
-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));
-
-	if (beep_tag > 0) {
-		gtk_timeout_remove (beep_tag);
-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));
-	}
-	if (timer_tag > 0) {
-		gtk_timeout_remove (timer_tag);
-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));
-	}
-}
-
-static gint
-start_beeping (gpointer data)
-{
-	gdk_beep ();
-
-	return TRUE;
-}
-
-static gint
-timeout_beep (gpointer data)
-{
-	stop_beeping (data, NULL);
-	return FALSE;
-}
-
-void
-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)
-{
-	iCalObject *ico = data;
-	guint beep_tag, timer_tag;
-	int ret;
-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);
-	time_t now, diff;
-
-	if (&ico->aalarm == which){
-		time_t app = ico->aalarm.trigger + ico->aalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-
-		/* Idea: we need Snooze option :-) */
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);
-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);
-		if (enable_aalarm_timeout)
-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000,
-						     timeout_beep, w);
-		else
-			timer_tag = 0;
-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",
-				     GINT_TO_POINTER (timer_tag));
-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",
-				     GINT_TO_POINTER (beep_tag));
-		gtk_widget_ref (w);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			break;
-		}
-
-		gtk_widget_unref (w);
-		return;
-	}
-
-        if (&ico->palarm == which){
-		execute (ico->palarm.data, 0);
-		return;
-	}
-
-	if (&ico->malarm == which){
-		time_t app = ico->malarm.trigger + ico->malarm.offset;
-
-		mail_notify (ico->malarm.data, ico->summary, app);
-		return;
-	}
-
-	if (&ico->dalarm == which){
-		time_t app = ico->dalarm.trigger + ico->dalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		if (beep_on_display)
-			gdk_beep ();
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO,
-					   _("Ok"), snooze_button, NULL);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			break;
-		}
-
-		return;
-	}
-}
-
-#endif
-
-struct calendar_tag_closure
-{
-	ECalendarItem *calitem;
-	time_t start_time;
-	time_t end_time;
-};
-
-/* Marks the specified range in a GtkCalendar */
-static gboolean
-gnome_calendar_tag_calendar_cb (CalComponent *comp,
-				time_t istart,
-				time_t iend,
-				gpointer data)
-{
-	struct calendar_tag_closure *c = data;
-	time_t t;
-
-	t = time_day_begin (istart);
-
-	do {
-		struct tm tm;
-
-		tm = *localtime (&t);
-
-		e_calendar_item_mark_day (c->calitem, tm.tm_year + 1900,
-					  tm.tm_mon, tm.tm_mday,
-					  E_CALENDAR_ITEM_MARK_BOLD);
-
-		t = time_day_end (t);
-	} while (t < iend);
-
-	return TRUE;
-}
-
-/*
- * Tags the dates with appointments in a GtkCalendar based on the
- * GnomeCalendar contents
- */
-void
-gnome_calendar_tag_calendar (GnomeCalendar *gcal, ECalendar *ecal)
-{
-	GnomeCalendarPrivate *priv;
-	struct calendar_tag_closure c;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct tm start_tm = { 0 }, end_tm = { 0 };
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	e_calendar_item_clear_marks (ecal->calitem);
-
-	if (!cal_client_is_loaded (priv->client))
-		return;
-
-	e_calendar_item_get_date_range	(ecal->calitem,
-					 &start_year, &start_month, &start_day,
-					 &end_year, &end_month, &end_day);
-
-	start_tm.tm_year = start_year - 1900;
-	start_tm.tm_mon = start_month;
-	start_tm.tm_mday = start_day;
-	start_tm.tm_hour = 0;
-	start_tm.tm_min = 0;
-	start_tm.tm_sec = 0;
-	start_tm.tm_isdst = -1;
-
-	end_tm.tm_year = end_year - 1900;
-	end_tm.tm_mon = end_month;
-	end_tm.tm_mday = end_day;
-	end_tm.tm_hour = 0;
-	end_tm.tm_min = 0;
-	end_tm.tm_sec = 0;
-	end_tm.tm_isdst = -1;
-
-	c.calitem = ecal->calitem;
-	c.start_time = mktime (&start_tm);
-	c.end_time = mktime (&end_tm);
-
-	cal_client_generate_instances (priv->client, CALOBJ_TYPE_EVENT,
-				       c.start_time, c.end_time,
-				       gnome_calendar_tag_calendar_cb, &c);
-}
-
-
-/* Tells the calendar to reload all config settings.
-   If initializing is TRUE it sets the pane positions as well. (We don't
-   want to reset the pane positions after the user clicks 'Apply' in the
-   preferences dialog.) */
-void
-gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-				       gboolean	      initializing)
-{
-	GnomeCalendarPrivate *priv;
-	CalWeekdays working_days;
-	gint week_start_day, time_divisions;
-	gint start_hour, start_minute, end_hour, end_minute;
-	gboolean use_24_hour, show_event_end, compress_weekend;
-	gboolean dnav_show_week_no;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	working_days = calendar_config_get_working_days ();
-	/* CalWeekdays and EDayViewDays use the same bit-masks, so we can
-	   use the same value. */
-	e_day_view_set_working_days (E_DAY_VIEW (priv->day_view),
-				     (EDayViewDays) working_days);
-	e_day_view_set_working_days (E_DAY_VIEW (priv->work_week_view),
-				     (EDayViewDays) working_days);
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-	/* FIXME: Add support for these. */
-#if 0
-	e_day_view_set_week_start_day (E_DAY_VIEW (priv->day_view),
-				       week_start_day);
-	e_day_view_set_week_start_day (E_DAY_VIEW (priv->work_week_view),
-				       week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->week_view),
-					week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->month_view),
-					week_start_day);
-#endif
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv->date_navigator)->calitem),
-			       "week_start_day", (week_start_day + 6) % 7,
-			       NULL);
-
-	start_hour = calendar_config_get_day_start_hour ();
-	start_minute = calendar_config_get_day_start_minute ();
-	end_hour = calendar_config_get_day_end_hour ();
-	end_minute = calendar_config_get_day_end_minute ();
-	e_day_view_set_working_day (E_DAY_VIEW (priv->day_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-	e_day_view_set_working_day (E_DAY_VIEW (priv->work_week_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->day_view),
-				       use_24_hour);
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->work_week_view),
-				       use_24_hour);
-	/* FIXME: Add support for these. */
-#if 0
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->week_view),
-					use_24_hour);
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->month_view),
-					use_24_hour);
-#endif
-
-	time_divisions = calendar_config_get_time_divisions ();
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->day_view),
-				     time_divisions);
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->work_week_view),
-				     time_divisions);
-
-	show_event_end = calendar_config_get_show_event_end ();
-	/* FIXME: Add support for these. */
-#if 0
-	e_day_view_set_show_event_end (E_DAY_VIEW (priv->day_view),
-				       show_event_end);
-	e_day_view_set_show_event_end (E_DAY_VIEW (priv->work_week_view),
-				       show_event_end);
-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv->week_view),
-					show_event_end);
-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv->month_view),
-					show_event_end);
-#endif
-
-	compress_weekend = calendar_config_get_compress_weekend ();
-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv->month_view),
-					  compress_weekend);
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv->date_navigator)->calitem),
-			       "show_week_numbers", dnav_show_week_no,
-			       NULL);
-
-	if (initializing) {
-		priv->hpane_pos = calendar_config_get_hpane_pos ();
-		priv->vpane_pos = calendar_config_get_vpane_pos ();
-		priv->hpane_pos_month_view = calendar_config_get_month_hpane_pos ();
-		priv->vpane_pos_month_view = calendar_config_get_month_vpane_pos ();
-	} else {
-		gnome_calendar_update_paned_quanta (gcal);
-	}
-}
-
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* This is called when the day begin & end times, the AM/PM flag, or the
-   week_starts_on_monday flags are changed. */
-void
-gnome_calendar_time_format_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-#if 0
-	gtk_calendar_display_options (gcal->gtk_calendar,
-				      (week_starts_on_monday
-				       ? (gcal->gtk_calendar->display_flags
-					  | GTK_CALENDAR_WEEK_START_MONDAY)
-				       : (gcal->gtk_calendar->display_flags
-					  & ~GTK_CALENDAR_WEEK_START_MONDAY)));
-#endif
-}
-
-/* This is called when any of the color settings are changed.
-   FIXME: Need to update for the new views. */
-void
-gnome_calendar_colors_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-}
-
-void
-gnome_calendar_todo_properties_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-}
-
-
-
-
-void
-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-					time_t	       start_time,
-					time_t	       end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-/**
- * gnome_calendar_get_selected_time_range:
- * @gcal: A calendar view.
- * @start_time: Return value for the start of the time selection.
- * @end_time: Return value for the end of the time selection.
- * 
- * Queries the time selection range on the calendar view.
- **/
-void
-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-					time_t	 *start_time,
-					time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	if (start_time)
-		*start_time = priv->selection_start_time;
-
-	if (end_time)
-		*end_time = priv->selection_end_time;
-}
-
-
-/* Callback used when an event editor finishes editing an object */
-static void
-released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	g_hash_table_remove (priv->object_editor_hash, orig_uid);
-	g_free (orig_uid);
-}
-
-
-/* Callback used when an event editor dialog is closed */
-struct editor_closure
-{
-	GnomeCalendar *gcal;
-	char *uid;
-};
-
-static void
-editor_closed_cb (GtkWidget *widget, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	struct editor_closure *ec;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	g_print ("editor_closed_cb ()\n");
-
-	ec = (struct editor_closure *)data;
-	gcal = ec->gcal;
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, ec->uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	g_hash_table_remove (priv->object_editor_hash, orig_uid);
-	g_free (orig_uid);
-}
-
-void
-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp)
-{
-	GnomeCalendarPrivate *priv;
-	EventEditor *ee;
-	struct editor_closure *ec;
-	const char *uid;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (comp != NULL);
-
-	priv = gcal->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	ee = g_hash_table_lookup (priv->object_editor_hash, uid);
-	if (!ee) {
-		ec = g_new0 (struct editor_closure, 1);
-
-		ee = event_editor_new ();
-		if (!ee) {
-			g_message ("gnome_calendar_edit_object(): Could not create the event editor");
-			return;
-		}
-
-		ec->gcal = gcal;
-		ec->uid = g_strdup (uid);
-
-		g_hash_table_insert (priv->object_editor_hash, ec->uid, ee);
-
-		gtk_signal_connect (GTK_OBJECT (ee), "destroy",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    ec);
-
-		event_editor_set_cal_client (EVENT_EDITOR (ee), priv->client);
-		event_editor_set_event_object (EVENT_EDITOR (ee), comp);
-	}
-
-	event_editor_focus (ee);
-}
-
-/**
- * gnome_calendar_new_appointment:
- * @gcal: An Evolution calendar.
- *
- * Opens an event editor dialog for a new appointment.  The appointment's start
- * and end times are set to the currently selected time range in the calendar
- * views.
- **/
-void
-gnome_calendar_new_appointment (GnomeCalendar *gcal)
-{
-	CalComponent *comp;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	itt = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (gcal, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-}
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void
-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view)
-		e_day_view_get_selected_time_range (E_DAY_VIEW (page), start_time, end_time);
-	else if (page == priv->week_view || page == priv->month_view)
-		e_week_view_get_selected_time_range (E_WEEK_VIEW (page), start_time, end_time);
-	else {
-		g_message ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-
-
-/* This updates the month shown and the days selected in the calendar, if
-   necessary. */
-static void
-gnome_calendar_update_date_navigator (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date;
-	gint days_shown;
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (priv->date_navigator))
-		return;
-
-	if (gnome_calendar_get_days_shown (gcal, &start_date, &days_shown)) {
-		end_date = start_date;
-		g_date_add_days (&end_date, days_shown - 1);
-
-		e_calendar_item_set_selection (priv->date_navigator->calitem,
-					       &start_date, &end_date);
-	}
-}
-
-
-static gboolean
-gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-				 GDate		*start_date,
-				 gint		*days_shown)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		g_date_clear (start_date, 1);
-		g_date_set_time (start_date, E_DAY_VIEW (page)->lower);
-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (page));
-		return TRUE;
-	} else if (page == priv->week_view || page == priv->month_view) {
-		*start_date = E_WEEK_VIEW (page)->first_day_shown;
-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (page)))
-			*days_shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (page)) * 7;
-		else
-			*days_shown = 7;
-
-		return TRUE;
-	} else {
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-
-static void
-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-						    GnomeCalendar    *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date, new_start_date, new_end_date;
-	gint days_shown, new_days_shown;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gboolean starts_on_week_start_day;
-	struct tm tm;
-
-	priv = gcal->priv;
-
-	starts_on_week_start_day = FALSE;
-
-	if (!gnome_calendar_get_days_shown (gcal, &start_date, &days_shown))
-		return;
-
-	end_date = start_date;
-	g_date_add_days (&end_date, days_shown - 1);
-
-	e_calendar_item_get_selection (calitem, &new_start_date, &new_end_date);
-
-	/* If the selection hasn't changed just return. */
-	if (!g_date_compare (&start_date, &new_start_date)
-	    && !g_date_compare (&end_date, &new_end_date))
-		return;
-
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
-
-	/* FIXME: This assumes weeks start on Monday for now. */
-	if (g_date_weekday (&new_start_date) - 1 == 0)
-		starts_on_week_start_day = TRUE;
-
-	/* Switch views as appropriate, and change the number of days or weeks
-	   shown. */
-	if (new_days_shown > 9) {
-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view),
-					     (new_days_shown + 6) / 7);
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->month_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "monthview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else if (new_days_shown == 7 && starts_on_week_start_day) {
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->week_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "weekview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else {
-		start_year = g_date_year (&new_start_date);
-		start_month = g_date_month (&new_start_date) - 1;
-		start_day = g_date_day (&new_start_date);
-		end_year = g_date_year (&new_end_date);
-		end_month = g_date_month (&new_end_date) - 1;
-		end_day = g_date_day (&new_end_date);
-
-		tm.tm_year = start_year - 1900;
-		tm.tm_mon  = start_month;
-		tm.tm_mday = start_day;
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_start_time = mktime (&tm);
-
-		tm.tm_year = end_year - 1900;
-		tm.tm_mon  = end_month;
-		tm.tm_mday = end_day + 1; /* mktime() will normalize this. */
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_end_time = mktime (&tm);
-
-		e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), new_days_shown);
-		gnome_calendar_set_view (gcal, "dayview", TRUE, FALSE);
-	}
-
-	gnome_calendar_update_view_buttons (gcal);
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-						     GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_style_set (GtkWidget     *widget,
-					    GtkStyle      *previous_style,
-					    gpointer       data)
-{
-	gnome_calendar_update_paned_quanta (GNOME_CALENDAR (data));
-}
-
-
-static void
-gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-
-	priv = gcal->priv;
-
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	/* The EPaned quantum feature works better if we add on the calendar
-	   borders to the quantum size. Otherwise if you shrink the date
-	   navigator you get left with the border widths/heights which looks
-	   bad. EPaned should be more flexible really. */
-	col_width += left_border + right_border;
-	row_height += top_border + bottom_border;
-
-	/* We don't have to use the EPaned quantum feature. We could just let
-	   the calendar expand to fill the allocated space, showing as many
-	   months as will fit. But for that to work nicely the EPaned should
-	   resize the widgets as the bar is dragged. Otherwise the user has
-	   to mess around to get the number of months that they want. */
-#if 1
-	gtk_object_set (GTK_OBJECT (priv->hpane),
-			"quantum", (guint) col_width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (priv->vpane),
-			"quantum", (guint) row_height,
-			NULL);
-#endif
-
-	gnome_calendar_set_pane_positions (gcal);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-						GtkAllocation *allocation,
-						gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gint width, height, row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-	gfloat hpane_pos, vpane_pos;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	if (priv->current_view_type != VIEW_NOT_SET) {
-		e_calendar_get_border_size (priv->date_navigator,
-					    &top_border, &bottom_border,
-					    &left_border, &right_border);
-		gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-				"row_height", &row_height,
-				"column_width", &col_width,
-				NULL);
-
-		/* We subtract one from each dimension since we added 1 in
-		   gnome_calendar_set_view_internal(). */
-		width = allocation->width - 1;
-		height = allocation->height - 1;
-
-		/* We add the border sizes to work around the EPaned
-		   quantized feature. */
-		col_width += left_border + right_border;
-		row_height += top_border + bottom_border;
-
-		hpane_pos = (gfloat) width / col_width;
-		vpane_pos = (gfloat) height / row_height;
-
-		if (priv->current_view_type == VIEW_MONTH
-		    && !priv->range_selected) {
-			priv->hpane_pos_month_view = hpane_pos;
-			priv->vpane_pos_month_view = vpane_pos;
-			calendar_config_set_month_hpane_pos (hpane_pos);
-			calendar_config_set_month_vpane_pos (vpane_pos);
-		} else {
-			priv->hpane_pos = hpane_pos;
-			priv->vpane_pos = vpane_pos;
-			calendar_config_set_hpane_pos (hpane_pos);
-			calendar_config_set_vpane_pos (vpane_pos);
-		}
-	}
-}
-
-void
-gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-				 GtkWidget	*day_button,
-				 GtkWidget	*work_week_button,
-				 GtkWidget	*week_button,
-				 GtkWidget	*month_button)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (day_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (day_button));
-	g_return_if_fail (work_week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (work_week_button));
-	g_return_if_fail (week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (week_button));
-	g_return_if_fail (month_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (month_button));
-
-	priv = gcal->priv;
-
-	priv->day_button = day_button;
-	priv->work_week_button = work_week_button;
-	priv->week_button = week_button;
-	priv->month_button = month_button;
-}
-
-/* This makes the appropriate radio button in the toolbar active.  It blocks the
- * signals so that we can do a clean setup without affecting the views.
- */
-void
-gnome_calendar_update_view_buttons (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page, *button;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		button = priv->day_button;
-	else if (page == priv->work_week_view)
-		button = priv->work_week_button;
-	else if (page == priv->week_view)
-		button = priv->week_button;
-	else if (page == priv->month_view)
-		button = priv->month_button;
-	else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (button) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (button), gcal);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (button), gcal);
-	}
-}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index 2474e92bea..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * GnomeCalendar widget
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#ifndef GNOME_CALENDAR_APP_H
-#define GNOME_CALENDAR_APP_H
-
-#include <time.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo.h>
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\
-					GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
-
-typedef struct _GnomeCalendar GnomeCalendar;
-typedef struct _GnomeCalendarClass GnomeCalendarClass;
-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;
-
-struct _GnomeCalendar {
-	GtkVBox vbox;
-
-	/* Private data */
-	GnomeCalendarPrivate *priv;
-};
-
-struct _GnomeCalendarClass {
-	GtkVBoxClass parent_class;
-};
-
-
-typedef enum {
-	CALENDAR_OPEN,
-	CALENDAR_OPEN_OR_CREATE
-} GnomeCalendarOpenMode;
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);
-
-gboolean   gnome_calendar_open                  (GnomeCalendar *gcal,
-						 char *file,
-						 GnomeCalendarOpenMode gcom);
-/*
-int	   gnome_calendar_create		(GnomeCalendar *gcal,
-						 char *file);
-*/
-void       gnome_calendar_next             	(GnomeCalendar *gcal);
-void       gnome_calendar_previous         	(GnomeCalendar *gcal);
-void       gnome_calendar_goto             	(GnomeCalendar *gcal,
-						 time_t new_time);
-void       gnome_calendar_dayjump          	(GnomeCalendar *gcal,
-						 time_t time);
-/* Jumps to the current day */
-void       gnome_calendar_goto_today            (GnomeCalendar *gcal);
-void       gnome_calendar_tag_calendar          (GnomeCalendar *gcal,
-						 ECalendar     *ecal);
-char      *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
-void	   gnome_calendar_set_view		(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 reset_range_shown,
-						 gboolean	 focus);
-
-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-						   time_t	  start_time,
-						   time_t	  end_time);
-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-						   time_t	 *start_time,
-						   time_t	 *end_time);
-
-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,
-						 CalComponent  *comp);
-
-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Tells the calendar to reload all config settings. initializing should be
-   TRUE when we are setting the config settings for the first time. */
-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-						  gboolean	 initializing);
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* Notifies the calendar that the time format has changed and it must update
-   all its views */
-void	   gnome_calendar_time_format_changed	(GnomeCalendar *gcal);
-
-/* Notifies the calendar that the todo list properties have changed and its
-   time to update the views. */
-void	   gnome_calendar_colors_changed	(GnomeCalendar *gcal);
-
-/* Notifies the calendar that the todo list properties have changed and its
-   time to update the views. */
-void	   gnome_calendar_todo_properties_changed (GnomeCalendar *gcal);
-
-
-
-void	   gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-						 GtkWidget	*day_button,
-						 GtkWidget	*work_week_button,
-						 GtkWidget	*week_button,
-						 GtkWidget	*month_button);
-
-/* This makes the appropriate radio button in the toolbar active.
-   It sets the ignore_view_button_clicks flag so the "clicked" signal handlers
-   just return without doing anything. */
-void	   gnome_calendar_update_view_buttons	(GnomeCalendar	*gcal);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-cal.html b/calendar/gui/gnome-cal.html
deleted file mode 100644
index 5a7d0a537f..0000000000
--- a/calendar/gui/gnome-cal.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Some simple instructions on how to use the help browser -->
-<BODY>
-<!-- <TITLE>GNOME Calendar Documentation</TITLE> -->
-<H2> GNOME Calendar Documentation </H2>
-<p>
-The GNOME calendar program is the calendaring program of the GNOME
-system.  It uses the vCalendar standard for transfering calendar
-information (and is also the on-disk format used). 
-
-<p>
-
-<a name="cmdline">
-<h2>Command line options</h2>
-
-Several options are available on the command line, they are:
-<ul>
-	<li><tt>--events</tt> Displays the events for the date
-	specified (or today, if no date is specified).
-
-	<li><tt>--from DATE</tt> Define the beginning of the range for
-	the event display, or the startup day on the calenday views.
-	By default, the event will span the whole day specified in
-	DATE. 
-
-	<li><tt>--to DATE</tt> Define the range end for the event
-	display.  If this is not specified, it will default to the end
-	of the day specified by the <tt>--from</tt> option.
-
-	<li><tt>--file FILE</tt> Set the calendar to the FILE
-	specified on the command line. 
-
-	<li><tt>--todo</tt> Dumps the to-do values to standard output. 
-</ul>
-
-<p>
-
-DATE is interpreted as being in the local time- zone, unless a
-specific timezone is specified.  Examples of valid date specifications
-include: "1 month ago",  "2 hours ago",  "400000 seconds ago",  "last
-year", "last Monday",  "yesterday",  "a fortnight ago",  "3/31/92
-10:00:07 PST",  "January 23, 1987 10:05pm", "22:00 GMT".
-
-</BODY>
-
diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png
deleted file mode 100644
index e867ba90b2..0000000000
--- a/calendar/gui/gnome-calendar-conduit.png
+++ /dev/null
diff --git a/calendar/gui/gnome-month-item.c b/calendar/gui/gnome-month-item.c
deleted file mode 100644
index 58e393e4ee..0000000000
--- a/calendar/gui/gnome-month-item.c
+++ /dev/null
@@ -1,1246 +0,0 @@
-/* General-purpose monthly calendar canvas item for GNOME
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#include <config.h>
-#include <math.h>
-#include <time.h>
-#include <gnome.h>
-#include "gnome-month-item.h"
-
-
-#define DEFAULT_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*"
-
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the
- * Gregorian reformation.
- */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#define REFORMATION_DAY 639787		/* First day of the reformation, counted from 1 Jan 1 */
-#define MISSING_DAYS 11			/* They corrected out 11 days */
-#define THURSDAY 4			/* First day of reformation */
-#define SATURDAY 6			/* Offset value; 1 Jan 1 was a Saturday */
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-
-enum {
-	ARG_0,
-	ARG_YEAR,
-	ARG_MONTH,
-	ARG_X,
-	ARG_Y,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_ANCHOR,
-	ARG_HEAD_PADDING,
-	ARG_DAY_PADDING,
-	ARG_DAY_NAMES,
-	ARG_HEADING_HEIGHT,
-	ARG_HEADING_ANCHOR,
-	ARG_DAY_ANCHOR,
-	ARG_START_ON_MONDAY,
-	ARG_HEAD_FONT,
-	ARG_HEAD_FONTSET,
-	ARG_HEAD_FONT_GDK,
-	ARG_DAY_FONT,
-	ARG_DAY_FONTSET,
-	ARG_DAY_FONT_GDK,
-	ARG_HEAD_COLOR,
-	ARG_HEAD_COLOR_GDK,
-	ARG_OUTLINE_COLOR,
-	ARG_OUTLINE_COLOR_GDK,
-	ARG_DAY_BOX_COLOR,
-	ARG_DAY_BOX_COLOR_GDK,
-	ARG_DAY_COLOR,
-	ARG_DAY_COLOR_GDK
-};
-
-
-static void gnome_month_item_class_init (GnomeMonthItemClass *class);
-static void gnome_month_item_init       (GnomeMonthItem      *mitem);
-static void gnome_month_item_destroy    (GtkObject           *object);
-static void gnome_month_item_set_arg    (GtkObject           *object,
-					 GtkArg              *arg,
-					 guint                arg_id);
-static void gnome_month_item_get_arg    (GtkObject           *object,
-					 GtkArg              *arg,
-					 guint                arg_id);
-
-
-
-static GnomeCanvasGroupClass *parent_class;
-
-
-GtkType
-gnome_month_item_get_type (void)
-{
-	static GtkType month_item_type = 0;
-
-	if (!month_item_type) {
-		GtkTypeInfo month_item_info = {
-			"GnomeMonthItem",
-			sizeof (GnomeMonthItem),
-			sizeof (GnomeMonthItemClass),
-			(GtkClassInitFunc) gnome_month_item_class_init,
-			(GtkObjectInitFunc) gnome_month_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		month_item_type = gtk_type_unique (gnome_canvas_group_get_type (), &month_item_info);
-	}
-
-	return month_item_type;
-}
-
-static void
-gnome_month_item_class_init (GnomeMonthItemClass *class)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-
-	gtk_object_add_arg_type ("GnomeMonthItem::year", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_YEAR);
-	gtk_object_add_arg_type ("GnomeMonthItem::month", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_MONTH);
-	gtk_object_add_arg_type ("GnomeMonthItem::x", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X);
-	gtk_object_add_arg_type ("GnomeMonthItem::y", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y);
-	gtk_object_add_arg_type ("GnomeMonthItem::width", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("GnomeMonthItem::height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("GnomeMonthItem::anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEAD_PADDING);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_DAY_PADDING);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_names", GTK_TYPE_POINTER, GTK_ARG_WRITABLE, ARG_DAY_NAMES);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEADING_HEIGHT);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_HEADING_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_DAY_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::start_on_monday", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_START_ON_MONDAY);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONT);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONTSET);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_HEAD_FONT_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONT);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONTSET);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_DAY_FONT_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_HEAD_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_OUTLINE_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_OUTLINE_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_BOX_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_BOX_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_COLOR_GDK);
-
-	object_class->destroy = gnome_month_item_destroy;
-	object_class->set_arg = gnome_month_item_set_arg;
-	object_class->get_arg = gnome_month_item_get_arg;
-}
-
-/* Calculates the minimum heading height based on the heading font size and padding.  It also
- * calculates the minimum width of the month item based on the width of the headings.
- */
-static void
-check_heading_sizes (GnomeMonthItem *mitem)
-{
-	double m_height;
-	double m_width;
-	int width;
-	int max_width;
-	int i;
-
-	/* Calculate minimum height */
-
-	m_height = mitem->head_font->ascent + mitem->head_font->descent + 2 * mitem->head_padding;
-
-	if (mitem->head_height < m_height)
-		mitem->head_height = m_height;
-	
-	/* Go through each heading and remember the widest one */
-
-	max_width = 0;
-
-	for (i = 0; i < 7; i++) {
-		width = gdk_string_width (mitem->head_font, mitem->day_names[i]);
-		if (max_width < width)
-			max_width = width;
-	}
-
-	m_width = 7 * (max_width + 2 * mitem->head_padding);
-
-	if (mitem->width < m_width)
-		mitem->width = m_width;
-}
-
-/* Calculates the minimum width and height of the month item based on the day font size and padding.
- * Assumes that the minimum heading height has already been computed.
- */
-static void
-check_day_sizes (GnomeMonthItem *mitem)
-{
-	double m_height;
-	double m_width;
-	int width;
-	int max_width;
-	char buf[100];
-	int i;
-
-	/* Calculate minimum height */
-
-	m_height = mitem->head_height + 6 * (mitem->day_font->ascent + mitem->day_font->descent + 2 * mitem->day_padding);
-
-	if (mitem->height < m_height)
-		mitem->height = m_height;
-
-	/* Calculate minimum width */
-
-	max_width = 0;
-
-	for (i = 1; i < 32; i++) {
-		sprintf (buf, "%d", i);
-		width = gdk_string_width (mitem->day_font, buf);
-		if (max_width < width)
-			max_width = width;
-	}
-
-	m_width = 7 * (max_width + 2 * mitem->day_padding);
-
-	if (mitem->width < m_width)
-		mitem->width = m_width;
-}
-
-/* Calculates the minimum size of the month item based on the font sizes and paddings.  If the
- * current size of the month item is smaller than the required minimum size, this function will
- * change the size to the appropriate values.
- */
-static void
-check_sizes (GnomeMonthItem *mitem)
-{
-	check_heading_sizes (mitem);
-	check_day_sizes (mitem);
-}
-
-/* Recalculates the position of the toplevel calendar group based on the logical position and anchor */
-static void
-reanchor (GnomeMonthItem *mitem)
-{
-	double x, y;
-
-	x = mitem->x;
-	y = mitem->y;
-
-	switch (mitem->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= mitem->width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= mitem->width;
-		break;
-	}
-
-	switch (mitem->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= mitem->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= mitem->height;
-		break;
-	}
-
-	/* Explicitly use the canvas group class prefix since the month item class has x and y
-	 * arguments as well.
-	 */
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "GnomeCanvasGroup::x", x,
-			       "GnomeCanvasGroup::y", y,
-			       NULL);
-}
-
-/* Takes an anchor specification and the corners of a rectangle, and returns an anchored point with
- * respect to that rectangle.
- */
-static void
-get_label_anchor (GtkAnchorType anchor, double x1, double y1, double x2, double y2, double *x, double *y)
-{
-	switch (anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		*x = x1;
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		*x = (x1 + x2) / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		*x = x2;
-		break;
-	}
-
-	switch (anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		*y = y1;
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		*y = (y1 + y2) / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		*y = y2;
-		break;
-	}
-}
-
-/* Resets the position of the day name headings in the calendar */
-static void
-reshape_headings (GnomeMonthItem *mitem)
-{
-	double width;
-	int i;
-	double x, y;
-
-	width = mitem->width / 7;
-
-	for (i = 0; i < 7; i++) {
-		/* Group */
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i],
-				       "x", width * i,
-				       "y", 0.0,
-				       NULL);
-
-		/* Box */
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i],
-				       "x1", 0.0,
-				       "y1", 0.0,
-				       "x2", width,
-				       "y2", mitem->head_height,
-				       NULL);
-
-		/* Label */
-		get_label_anchor (mitem->head_anchor,
-				  mitem->head_padding,
-				  mitem->head_padding,
-				  width - mitem->head_padding,
-				  mitem->head_height - mitem->head_padding,
-				  &x, &y);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "x", x,
-				       "y", y,
-				       "anchor", mitem->head_anchor,
-				       NULL);
-	}
-}
-
-/* Resets the position of the days in the calendar */
-static void
-reshape_days (GnomeMonthItem *mitem)
-{
-	double width, height;
-	double x, y;
-	int row, col;
-	int i;
-
-	width = mitem->width / 7;
-	height = (mitem->height - mitem->head_height) / 6;
-
-	i = 0;
-
-	for (row = 0; row < 6; row++)
-		for (col = 0; col < 7; col++) {
-			/* Group */
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i],
-					       "x", width * col,
-					       "y", mitem->head_height + height * row,
-					       NULL);
-
-			/* Box */
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i],
-					       "x1", 0.0,
-					       "y1", 0.0,
-					       "x2", width,
-					       "y2", height,
-					       NULL);
-
-			/* Label */
-			get_label_anchor (mitem->day_anchor,
-					  mitem->day_padding,
-					  mitem->day_padding,
-					  width - mitem->day_padding,
-					  height - mitem->day_padding,
-					  &x, &y);
-
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-					       "x", x,
-					       "y", y,
-					       "anchor", mitem->day_anchor,
-					       NULL);
-
-			i++;
-		}
-}
-
-/* Changes the positions and resizes the items in the calendar to match the new size of the
- * calendar.
- */
-static void
-reshape (GnomeMonthItem *mitem)
-{
-	check_sizes (mitem);
-	reanchor (mitem);
-	reshape_headings (mitem);
-	reshape_days (mitem);
-}
-
-/* Sets the font for all the day headings */
-static void
-set_head_font (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "font_gdk", mitem->head_font,
-				       NULL);
-}
-
-/* Sets the color for all the headings */
-static void
-set_head_color (GnomeMonthItem *mitem)
-{
-	int i;
-	GdkColor outline;
-	GdkColor head;
-
-	outline.pixel = mitem->outline_pixel;
-	head.pixel = mitem->head_pixel;
-
-	for (i = 0; i < 7; i++) {
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i],
-				       "fill_color_gdk", &outline,
-				       NULL);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "fill_color_gdk", &head,
-				       NULL);
-	}
-}
-
-/* Creates the items for the day name headings */
-static void
-create_headings (GnomeMonthItem *mitem)
-{
-	int i;
-
-	/* Just create the items; they will be positioned and configured by a call to reshape() */
-
-	for (i = 0; i < 7; i++) {
-		/* Group */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),
-					       gnome_canvas_group_get_type (),
-					       NULL);
-
-		/* Box */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),
-					       gnome_canvas_rect_get_type (),
-					       NULL);
-
-		/* Label */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),
-					       gnome_canvas_text_get_type (),
-					       NULL);
-	}
-
-	set_head_font (mitem);
-	set_head_color (mitem);
-}
-
-/* Returns the number of leap years since year 1 up to (but not including) the specified year */
-static int
-leap_years_up_to (int year)
-{
-	return (year / 4					/* trivial leapness */
-		- ((year > 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */
-		+ ((year > 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */
-}
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-/* Returns the 1-based day number within the year of the specified date */
-static int
-day_in_year (int day, int month, int year)
-{
-	int is_leap, i;
-
-	is_leap = is_leap_year (year);
-
-	for (i = 0; i < month; i++)
-		day += days_in_month [is_leap][i];
-
-	return day;
-}
-
-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days
- * that were removed on the Gregorian reformation, it returns Thursday.
- */
-static int
-day_in_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + leap_years_up_to (year - 1) + day_in_year (day, month, year);
-
-	if (n < REFORMATION_DAY)
-		return (n - 1 + SATURDAY) % 7;
-
-	if (n >= (REFORMATION_DAY + MISSING_DAYS))
-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;
-
-	return THURSDAY;
-}
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int start_on_monday, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = days_in_month[is_leap_year (year)][month];
-	d_week = day_in_week (1, month, year);
-
-	if (start_on_monday)
-		d_week = (d_week + 6) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-/* Set the day numbers in the monthly calendar */
-static void
-set_days (GnomeMonthItem *mitem)
-{
-	int i;
-	int start, end;
-	char buf[100];
-
-	build_month (mitem->month, mitem->year, mitem->start_on_monday, mitem->day_numbers, &start, &end);
-
-	/* Clear days before start of month */
-
-	for (i = 0; i < start; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", NULL,
-				       NULL);
-
-	/* Set days of month */
-
-	for (; start <= end; start++, i++) {
-		sprintf (buf, "%d", mitem->day_numbers[start]);
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", buf,
-				       NULL);
-	}
-
-	/* Clear days after end of month */
-
-	for (; i < 42; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", NULL,
-				       NULL);
-}
-
-/* Sets the font for all the day numbers */
-static void
-set_day_font (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 42; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "font_gdk", mitem->day_font,
-				       NULL);
-}
-
-/* Sets the color for all the day items */
-static void
-set_day_color (GnomeMonthItem *mitem)
-{
-	int i;
-	GdkColor outline;
-	GdkColor day_box;
-	GdkColor day;
-
-	outline.pixel = mitem->outline_pixel;
-	day_box.pixel = mitem->day_box_pixel;
-	day.pixel = mitem->day_pixel;
-
-	for (i = 0; i < 42; i++) {
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i],
-				       "outline_color_gdk", &outline,
-				       "fill_color_gdk", &day_box,
-				       NULL);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "fill_color_gdk", &day,
-				       NULL);
-	}
-}
-
-/* Creates the items for the days */
-static void
-create_days (GnomeMonthItem *mitem)
-{
-	int i;
-
-	/* Just create the items; they will be positioned and configured by a call to reshape() */
-
-	for (i = 0; i < 42; i++) {
-		/* Group */
-		mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),
-					       gnome_canvas_group_get_type (),
-					       NULL);
-
-		/* Box */
-		mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i]),
-					       gnome_canvas_rect_get_type (),
-					       NULL);
-
-		/* Label */
-		mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i]),
-					       gnome_canvas_text_get_type (),
-					       NULL);
-	}
-
-	set_day_font (mitem);
-	set_day_color (mitem);
-	set_days (mitem);
-}
-
-/* Resets the text of the day name headings */
-static void
-set_day_names (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "text", mitem->day_names[mitem->start_on_monday ? ((i + 1) % 7) : i],
-				       NULL);
-}
-
-/* Creates all the canvas items that make up the calendar */
-static void
-create_items (GnomeMonthItem *mitem)
-{
-	mitem->items = g_new (GnomeCanvasItem *, GNOME_MONTH_ITEM_LAST);
-
-	create_headings (mitem);
-	create_days (mitem);
-
-	/* Initialize by default to three-letter day names */
-
-	mitem->day_names[0] = g_strdup (_("Sun"));
-	mitem->day_names[1] = g_strdup (_("Mon"));
-	mitem->day_names[2] = g_strdup (_("Tue"));
-	mitem->day_names[3] = g_strdup (_("Wed"));
-	mitem->day_names[4] = g_strdup (_("Thu"));
-	mitem->day_names[5] = g_strdup (_("Fri"));
-	mitem->day_names[6] = g_strdup (_("Sat"));
-	
-	set_day_names (mitem);
-	reshape (mitem);
-}
-
-static void
-gnome_month_item_init (GnomeMonthItem *mitem)
-{
-	time_t t;
-	struct tm tm;
-
-	/* Initialize to the current month by default */
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	mitem->year = tm.tm_year + 1900;
-	mitem->month = tm.tm_mon;
-
-	mitem->x = 0.0;
-	mitem->y = 0.0;
-	mitem->width = 150.0; /* not unreasonable defaults, I hope */
-	mitem->height = 100.0;
-	mitem->anchor = GTK_ANCHOR_NW;
-	mitem->head_padding = 0.0;
-	mitem->day_padding = 2.0;
-	mitem->head_height = 14.0;
-	mitem->head_anchor = GTK_ANCHOR_CENTER;
-	mitem->day_anchor = GTK_ANCHOR_CENTER;
-
-	/* Load the default fonts */
-
-	mitem->head_font = gdk_font_load (DEFAULT_FONT);
-	if (!mitem->head_font) {
-		mitem->head_font = gdk_font_load ("fixed");
-		g_assert (mitem->head_font != NULL);
-	}
-
-	mitem->day_font = gdk_font_load (DEFAULT_FONT);
-	if (!mitem->day_font) {
-		mitem->day_font = gdk_font_load ("fixed");
-		g_assert (mitem->day_font != NULL);
-	}
-}
-
-GnomeCanvasItem *
-gnome_month_item_new (GnomeCanvasGroup *parent)
-{
-	GnomeMonthItem *mitem;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CANVAS_GROUP (parent), NULL);
-
-	mitem = GNOME_MONTH_ITEM (gnome_canvas_item_new (parent,
-							 gnome_month_item_get_type (),
-							 NULL));
-
-	gnome_month_item_construct (mitem);
-
-	return GNOME_CANVAS_ITEM (mitem);
-}
-
-void
-gnome_month_item_construct (GnomeMonthItem *mitem)
-{
-	GdkColor color;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-
-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, "#d6d6d6d6d6d6", &color);
-	mitem->head_pixel = color.pixel;
-	mitem->day_box_pixel = color.pixel;
-
-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, "black", &color);
-	mitem->outline_pixel = color.pixel;
-	mitem->day_pixel = color.pixel;
-
-	create_items (mitem);
-}
-
-static void
-free_day_names (GnomeMonthItem *mitem)
-{
-	int i;
-
-	if (mitem->day_names[0])
-		for (i = 0; i < 7; i++)
-			g_free (mitem->day_names[i]);
-}
-
-static void
-gnome_month_item_destroy (GtkObject *object)
-{
-	GnomeMonthItem *mitem;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (object));
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	free_day_names (mitem);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Sets the color of the specified pixel value to that of the specified argument, which must be in
- * GdkColor format if format is TRUE, otherwise it must be in string format.
- */
-static void
-set_color_arg (GnomeMonthItem *mitem, gulong *pixel, GtkArg *arg, int gdk_format, int set_head, int set_day)
-{
-	GdkColor color;
-
-	if (gdk_format)
-		*pixel = ((GdkColor *) GTK_VALUE_BOXED (*arg))->pixel;
-	else {
-		if (gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, GTK_VALUE_STRING (*arg), &color))
-			*pixel = color.pixel;
-		else
-			*pixel = 0;
-	}
-
-	if (set_head)
-		set_head_color (mitem);
-
-	if (set_day)
-		set_day_color (mitem);
-}
-
-static void
-gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeMonthItem *mitem;
-	char **day_names;
-	int i;
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		mitem->year = GTK_VALUE_UINT (*arg);
-		set_days (mitem);
-		break;
-
-	case ARG_MONTH:
-		mitem->month = GTK_VALUE_UINT (*arg);
-		set_days (mitem);
-		break;
-
-	case ARG_X:
-		mitem->x = GTK_VALUE_DOUBLE (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_Y:
-		mitem->y = GTK_VALUE_DOUBLE (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_WIDTH:
-		mitem->width = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_HEIGHT:
-		mitem->height = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_ANCHOR:
-		mitem->anchor = GTK_VALUE_ENUM (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_HEAD_PADDING:
-		mitem->head_padding = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_PADDING:
-		mitem->day_padding = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_NAMES:
-		day_names = GTK_VALUE_POINTER (*arg);
-
-		/* First, check that none of the names is null */
-
-		for (i = 0; i < 7; i++)
-			if (!day_names[i]) {
-				g_warning ("Day number %d was NULL; day names cannot be NULL!", i);
-				return;
-			}
-
-		/* Set the new names */
-
-		free_day_names (mitem);
-		for (i = 0; i < 7; i++)
-			mitem->day_names[i] = g_strdup (day_names[i]);
-
-		set_day_names (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEADING_HEIGHT:
-		mitem->head_height = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_HEADING_ANCHOR:
-		mitem->head_anchor = GTK_VALUE_ENUM (*arg);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_ANCHOR:
-		mitem->day_anchor = GTK_VALUE_ENUM (*arg);
-		reshape (mitem);
-		break;
-
-	case ARG_START_ON_MONDAY:
-		mitem->start_on_monday = GTK_VALUE_BOOL (*arg);
-		set_day_names (mitem);
-		set_days (mitem);
-		break;
-
-	case ARG_HEAD_FONT:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = gdk_font_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->head_font) {
-			mitem->head_font = gdk_font_load ("fixed");
-			g_assert (mitem->head_font != NULL);
-		}
-
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_FONTSET:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->head_font) {
-			mitem->head_font =
-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");
-			g_assert (mitem->head_font != NULL);
-		}
-
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_FONT_GDK:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = GTK_VALUE_BOXED (*arg);
-		gdk_font_ref (mitem->head_font);
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONT:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = gdk_font_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->day_font) {
-			mitem->day_font = gdk_font_load ("fixed");
-			g_assert (mitem->day_font != NULL);
-		}
-
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONTSET:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->day_font) {
-			mitem->day_font =
-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");
-			g_assert (mitem->day_font != NULL);
-		}
-
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONT_GDK:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = GTK_VALUE_BOXED (*arg);
-		gdk_font_ref (mitem->day_font);
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_COLOR:
-		set_color_arg (mitem, &mitem->head_pixel, arg, FALSE, TRUE, FALSE);
-		break;
-
-	case ARG_HEAD_COLOR_GDK:
-		set_color_arg (mitem, &mitem->head_pixel, arg, TRUE, TRUE, FALSE);
-		break;
-
-	case ARG_OUTLINE_COLOR:
-		set_color_arg (mitem, &mitem->outline_pixel, arg, FALSE, TRUE, TRUE);
-		break;
-
-	case ARG_OUTLINE_COLOR_GDK:
-		set_color_arg (mitem, &mitem->outline_pixel, arg, TRUE, TRUE, TRUE);
-		break;
-
-	case ARG_DAY_BOX_COLOR:
-		set_color_arg (mitem, &mitem->day_box_pixel, arg, FALSE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_BOX_COLOR_GDK:
-		set_color_arg (mitem, &mitem->day_box_pixel, arg, TRUE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_COLOR:
-		set_color_arg (mitem, &mitem->day_pixel, arg, FALSE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_COLOR_GDK:
-		set_color_arg (mitem, &mitem->day_pixel, arg, TRUE, FALSE, TRUE);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Allocates a GdkColor structure filled with the specified pixel, and puts it into the specified
- * arg for returning it in the get_arg method.
- */
-static void
-get_color_arg (GnomeMonthItem *mitem, gulong pixel, GtkArg *arg)
-{
-	GdkColor *color;
-
-	color = g_new (GdkColor, 1);
-	color->pixel = pixel;
-	gdk_color_context_query_color (GNOME_CANVAS_ITEM (mitem)->canvas->cc, color);
-	GTK_VALUE_BOXED (*arg) = color;
-}
-
-static void
-gnome_month_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeMonthItem *mitem;
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		GTK_VALUE_UINT (*arg) = mitem->year;
-		break;
-
-	case ARG_MONTH:
-		GTK_VALUE_UINT (*arg) = mitem->month;
-		break;
-
-	case ARG_X:
-		GTK_VALUE_DOUBLE (*arg) = mitem->x;
-		break;
-
-	case ARG_Y:
-		GTK_VALUE_DOUBLE (*arg) = mitem->y;
-		break;
-
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = mitem->width;
-		break;
-
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = mitem->height;
-		break;
-
-	case ARG_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->anchor;
-		break;
-
-	case ARG_HEAD_PADDING:
-		GTK_VALUE_DOUBLE (*arg) = mitem->head_padding;
-		break;
-
-	case ARG_DAY_PADDING:
-		GTK_VALUE_DOUBLE (*arg) = mitem->day_padding;
-		break;
-
-	case ARG_HEADING_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = mitem->head_height;
-		break;
-
-	case ARG_HEADING_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->head_anchor;
-		break;
-
-	case ARG_DAY_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->day_anchor;
-		break;
-
-	case ARG_START_ON_MONDAY:
-		GTK_VALUE_BOOL (*arg) = mitem->start_on_monday;
-		break;
-
-	case ARG_HEAD_FONT_GDK:
-		GTK_VALUE_BOXED (*arg) = mitem->head_font;
-		break;
-
-	case ARG_DAY_FONT_GDK:
-		GTK_VALUE_BOXED (*arg) = mitem->day_font;
-		break;
-
-	case ARG_HEAD_COLOR_GDK:
-		get_color_arg (mitem, mitem->head_pixel, arg);
-		break;
-
-	case ARG_OUTLINE_COLOR_GDK:
-		get_color_arg (mitem, mitem->outline_pixel, arg);
-		break;
-
-	case ARG_DAY_BOX_COLOR_GDK:
-		get_color_arg (mitem, mitem->day_box_pixel, arg);
-		break;
-
-	case ARG_DAY_COLOR_GDK:
-		get_color_arg (mitem, mitem->day_pixel, arg);
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GnomeCanvasItem *
-gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num)
-{
-	g_return_val_if_fail (mitem != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), NULL);
-
-	return mitem->items[child_num];
-}
-
-int
-gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child)
-{
-	int i;
-
-	g_return_val_if_fail (mitem != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);
-	g_return_val_if_fail (child != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (child), -1);
-
-	for (i = 0; i < GNOME_MONTH_ITEM_LAST; i++)
-		if (mitem->items[i] == child)
-			return i;
-
-	return -1;
-}
-
-int
-gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num)
-{
-	g_return_val_if_fail (mitem != NULL, 0);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), 0);
-
-	if ((child_num >= GNOME_MONTH_ITEM_DAY_GROUP) && (child_num < GNOME_MONTH_ITEM_LAST)) {
-		child_num = (child_num - GNOME_MONTH_ITEM_DAY_GROUP) % 42;
-		return mitem->day_numbers[child_num];
-	} else
-		return 0;
-}
-
-int
-gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num)
-{
-	int i;
-
-	g_return_val_if_fail (mitem != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);
-	g_return_val_if_fail (day_num >= 1, -1);
-
-	/* Find first day of month */
-
-	for (i = 0; mitem->day_numbers[i] == 0; i++)
-		;
-
-	/* Find the specified day */
-
-	for (; (mitem->day_numbers[i] != 0) && (i < 42); i++)
-		if (mitem->day_numbers[i] == day_num)
-			return i;
-
-	/* Bail out */
-
-	return -1;
-}
diff --git a/calendar/gui/gnome-month-item.h b/calendar/gui/gnome-month-item.h
deleted file mode 100644
index 0ec4fd484c..0000000000
--- a/calendar/gui/gnome-month-item.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* General-purpose monthly calendar canvas item for GNOME
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#ifndef GNOME_MONTH_ITEM_H
-#define GNOME_MONTH_ITEM_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */
-#include <libgnomeui/gnome-canvas.h>
-
-
-BEGIN_GNOME_DECLS
-
-
-/* These values are used to identify the canvas items that make up a complete GnomeMonthItem, which
- * is made up of the following "pieces":
- *
- *	Headings line:
- *		- 7 GnomeCanvasGroups:
- *			Each group contains one box (GnomeCanvasRectangle) and one label
- *			(GnomeCanvasText)
- *
- *	Day slots:
- *		- 42 GnomeCanvasGroups:
- *			Each group contains one box (GnomeCanvasRectangle) and one label
- *			(GnomeCanvasText)
- *
- * The headings are organized from left to right.  The day slots are organized as a table in
- * row-major order.
- *
- * If you want to access the individual items of the GnomeMonthItem, you can use these numbers with
- * the gnome_month_item_num2child() function.  If you want to convert a number into the
- * corresponding GnomeCanvasItem, you can use the gnome_month_item_child2num() function.
- */
-typedef enum {
-	GNOME_MONTH_ITEM_HEAD_GROUP = 0,	/* 7 groups for headings */
-	GNOME_MONTH_ITEM_HEAD_BOX   = 7,	/* 7 boxes for headings */
-	GNOME_MONTH_ITEM_HEAD_LABEL = 14,	/* 7 labels for headings */
-	GNOME_MONTH_ITEM_DAY_GROUP  = 21,	/* 42 groups for days */
-	GNOME_MONTH_ITEM_DAY_BOX    = 63,	/* 42 boxes for days */
-	GNOME_MONTH_ITEM_DAY_LABEL  = 105,	/* 42 labels for days */
-	GNOME_MONTH_ITEM_LAST       = 147	/* total number of items */
-} GnomeMonthItemChild;
-
-/* The MonthItem canvas item defines a simple monthly calendar.  It is made out of a number of
- * canvas items, which can be accessed using the functions provided.  The monthly calendar is
- * anchored with respect to a point.  The following arguments are available:
- *
- * name			type		read/write	description
- * ------------------------------------------------------------------------------------------
- * year			uint		RW		Full year (1-9999)
- * month		uint		RW		Number of month (0-11)
- * x			double		RW		X position of anchor point
- * y			double		RW		Y position of anchor point
- * width		double		RW		Width of calendar in canvas units
- * height		double		RW		Height of calendar in canvas units
- * anchor		GtkAnchorType	RW		Anchor side for calendar
- * heading_padding	double		RW		Padding inside heading boxes
- * day_padding		double		RW		Padding inside day boxes
- * day_names		char **		W		Array of strings corresponding to the day names (sun-sat)
- * heading_height	double		RW		Height of headings bar in canvas units
- * heading_anchor	GtkAnchorType	RW		Anchor side for headings inside heading boxes
- * day_anchor		GtkAnchorType	RW		Anchor side for day numbers inside day boxes
- * start_on_monday	boolean		RW		Specifies whether the week starts on Monday or Sunday
- * heading_font		string		W		X logical font descriptor for the headings
- * heading_fontset     	string		W		X logical fontset descriptor for the headings
- * heading_font_gdk	GdkFont *	RW		Pointer to GdkFont for the headings
- * day_font		string		W		X logical font descriptor for the day numbers
- * day_fontset 		string		W		X logical fontset descriptor for the day numbers
- * day_font_gdk		GdkFont *	RW		Pointer to GdkFont for the day numbers
- * heading_color	string		W		X color specification for heading labels
- * heading_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for heading labels
- * outline_color	string		W		X color specification for outline (lines and fill of heading boxes)
- * outline_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for outline
- * day_box_color	string		W		X color specification for day boxes
- * day_box_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day boxes
- * day_color		string		W		X color specification for day number labels
- * day_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day number labels
- */
-
-#define GNOME_TYPE_MONTH_ITEM            (gnome_month_item_get_type ())
-#define GNOME_MONTH_ITEM(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_MONTH_ITEM, GnomeMonthItem))
-#define GNOME_MONTH_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MONTH_ITEM, GnomeMonthItemClass))
-#define GNOME_IS_MONTH_ITEM(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MONTH_ITEM))
-#define GNOME_IS_MONTH_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MONTH_ITEM))
-
-
-typedef struct _GnomeMonthItem GnomeMonthItem;
-typedef struct _GnomeMonthItemClass GnomeMonthItemClass;
-
-struct _GnomeMonthItem {
-	GnomeCanvasGroup group;
-
-	int year;			/* Year to show (full, no two-digit crap) */
-	int month;			/* Month to show (0-11) */
-
-	double x, y;			/* Position at anchor */
-	double width, height;		/* Size of calendar */
-	GtkAnchorType anchor;		/* Anchor side for calendar */
-
-	double head_padding;		/* Padding to use between heading lines and text */
-	double day_padding;		/* Padding to use between day number lines and text */
-
-	char *day_names[7];		/* Names to use for the day labels, starting from Sunday */
-
-	double head_height;		/* Height of the headings row */
-	GtkAnchorType head_anchor;	/* Anchor side for the heading labels */
-	GtkAnchorType day_anchor;	/* Anchor side for the day number labels */
-
-	GnomeCanvasItem **items;	/* All the items that make up the calendar */
-	int day_numbers[42];		/* The numbers of the days, as they are shown in the display */
-
-	GdkFont *head_font;		/* Font for the headings */
-	GdkFont *day_font;		/* Font for the day numbers */
-
-	gulong head_pixel;		/* Color for heading labels */
-	gulong outline_pixel;		/* Color for the outline (lines and heading boxes) */
-	gulong day_box_pixel;		/* Color for the day boxes */
-	gulong day_pixel;		/* Color for day number labels */
-
-	int start_on_monday : 1;	/* Start the week on Monday?  If false, then start from Sunday */
-};
-
-struct _GnomeMonthItemClass {
-	GnomeCanvasGroupClass parent_class;
-};
-
-
-/* Standard Gtk function */
-GtkType gnome_month_item_get_type (void);
-
-/* Creates a new month item with the specified group as parent */
-GnomeCanvasItem *gnome_month_item_new (GnomeCanvasGroup *parent);
-
-/* Constructor function useful for derived classes */
-void gnome_month_item_construct (GnomeMonthItem *mitem);
-
-/* Returns the child item defined by the child number (as specified on the GnomeMonthItemChild
- * enumeration above).
- */
-GnomeCanvasItem *gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num);
-
-/* Returns the number of the specified child item, as defined on the GnomeMonthItemChild enumeration
- * above.  If the specified object is not found, it returns -1.
- */
-int gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child);
-
-/* Returns the number of the day relevant to the specified child item.  Day numbers are 1-based.  If
- * the specified child is outside the range of displayed days, then it returns 0.
- */
-int gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num);
-
-/* Returns the index (0-41) of the specified date within the table of days.  If the day number is
- * invalid for the current monthly calendar, then -1 is returned.
- */
-int gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num);
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo
deleted file mode 100644
index c4b91b9dd8..0000000000
--- a/calendar/gui/gnomecal.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab"
-            type="factory"
-            location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Gnome/Calendar/Repository:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Calendar Repository"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"
-            type="exe"
-            location="gnomecal">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Calendar Server"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
deleted file mode 100644
index 07e75e5d3d..0000000000
--- a/calendar/gui/goto.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* Go to date dialog for gnomecal
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "gnome-month-item.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-
-static GtkWidget *goto_win;		/* The goto dialog window */
-static GnomeMonthItem *month_item;	/* The month item in the dialog */
-static GnomeCalendar *gnome_calendar;	/* The gnome calendar the dialog refers to */
-static int current_index;		/* The index of the day marked as current, or -1 if none */
-
-
-/* Updates the specified month item by marking it appropriately from the calendar the dialog refers
- * to.  Also marks the current day if appropriate.
- */
-static void
-update (void)
-{
-	GnomeCanvasItem *item;
-	time_t t;
-	struct tm tm;
-
-	unmark_month_item (month_item);
-	mark_month_item (month_item, gnome_calendar);
-
-	if (current_index != -1) {
-		item = gnome_month_item_num2child (month_item,
-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);
-		gnome_canvas_item_set (item,
-				       "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG),
-				       "fontset", NORMAL_DAY_FONTSET,
-				       NULL);
-		current_index = -1;
-	}
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	if (((tm.tm_year + 1900) == month_item->year) && (tm.tm_mon == month_item->month)) {
-		current_index = gnome_month_item_day2index (month_item, tm.tm_mday);
-		g_assert (current_index != -1);
-
-		item = gnome_month_item_num2child (month_item,
-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);
-		gnome_canvas_item_set (item,
-				       "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG),
-				       "fontset", CURRENT_DAY_FONTSET,
-				       NULL);
-	}
-}
-
-/* Callback used when the year adjustment is changed */
-static void
-year_changed (GtkAdjustment *adj, gpointer data)
-{
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "year", (int) adj->value,
-			       NULL);
-	update ();
-}
-
-/* Creates the year control with its adjustment */
-static GtkWidget *
-create_year (int year)
-{
-	GtkWidget *hbox;
-	GtkAdjustment *adj;
-	GtkWidget *w;
-
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-
-	w = gtk_label_new (_("Year:"));
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (year, 1900, 9999, 1, 10, 10));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    (GtkSignalFunc) year_changed,
-			    NULL);
-
-	w = gtk_spin_button_new (adj, 1.0, 0);
-	gtk_widget_set_usize (w, 60, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	return hbox;
-}
-
-/* Callback used when a month button is toggled */
-static void
-month_toggled (GtkToggleButton *toggle, gpointer data)
-{
-	if (!toggle->active)
-		return;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "month", GPOINTER_TO_INT (data),
-			       NULL);
-	update ();
-}
-
-/* Creates the months control */
-static GtkWidget *
-create_months (int month)
-{
-	time_t start_time;
-	GtkWidget *table;
-	GtkWidget *w;
-	GSList *group;
-	int i, row, col;
-	struct tm tm;
-	char buf[100];
-
-	gnome_calendar_get_selected_time_range (gnome_calendar, &start_time, NULL);
-
-	tm = *localtime (&start_time);
-
-	table = gtk_table_new (2, 6, TRUE);
-
-	group = NULL;
-
-	for (i = 0; i < 12; i++) {
-		row = i / 6;
-		col = i % 6;
-
-		tm.tm_mon = i;
-		strftime (buf, 100, "%b", &tm);
-
-		w = gtk_radio_button_new (group);
-		group = gtk_radio_button_group (GTK_RADIO_BUTTON (w));
-		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w), FALSE);
-
-		gtk_container_add (GTK_CONTAINER (w), gtk_label_new (buf));
-
-		if (i == month)
-			gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (w), TRUE);
-
-		gtk_signal_connect (GTK_OBJECT (w), "toggled",
-				    (GtkSignalFunc) month_toggled,
-				    GINT_TO_POINTER (i));
-		gtk_table_attach (GTK_TABLE (table), w,
-				  col, col + 1,
-				  row, row + 1,
-				  GTK_EXPAND | GTK_FILL,
-				  GTK_EXPAND | GTK_FILL,
-				  0, 0);
-		gtk_widget_show_all (w);
-	}
-
-	return table;
-}
-
-/* Sets the scrolling region of the canvas to the allocation size */
-static void
-set_scroll_region (GtkWidget *widget, GtkAllocation *allocation)
-{
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "width", (double) (allocation->width - 1),
-			       "height", (double) (allocation->height - 1),
-			       NULL);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),
-					0, 0,
-					allocation->width, allocation->height);
-}
-
-/* Event handler for day groups in the month item.  A button press makes the calendar jump to the
- * selected day and destroys the Go-to dialog box.
- */
-static gint
-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	int child_num, day;
-
-	child_num = gnome_month_item_child2num (month_item, item);
-	day = gnome_month_item_num2day (month_item, child_num);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if ((event->button.button == 1) && (day != 0)) {
-			gnome_calendar_goto (gnome_calendar,
-					     time_from_day (month_item->year, month_item->month, day));
-			gtk_widget_destroy (goto_win);
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-/* Creates the canvas with the month item for selecting days */
-static GtkWidget *
-create_days (int day, int month, int year)
-{
-	GtkWidget *canvas;
-	int i;
-	GnomeCanvasItem *day_group;
-
-	canvas = gnome_canvas_new ();
-	gtk_widget_set_usize (canvas, 150, 120);
-
-	month_item = GNOME_MONTH_ITEM (gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (canvas))));
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "month", month,
-			       "year", year,
-			       "start_on_monday", week_starts_on_monday,
-			       NULL);
-	colorify_month_item (month_item, default_color_func, NULL);
-	month_item_prepare_prelight (month_item, default_color_func, NULL);
-	update ();
-
-	/* Connect to size_allocate so that we can change the size of the month item and the
-	 * scrolling region appropriately.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    (GtkSignalFunc) set_scroll_region,
-			    NULL);
-
-	/* Bind the day groups to our event handler */
-
-	for (i = 0; i < 42; i++) {
-		day_group = gnome_month_item_num2child (month_item, i + GNOME_MONTH_ITEM_DAY_GROUP);
-		gtk_signal_connect (GTK_OBJECT (day_group), "event",
-				    (GtkSignalFunc) day_event,
-				    NULL);
-	}
-
-	return canvas;
-}
-
-static void
-goto_today (GtkWidget *widget, gpointer data)
-{
-	gnome_calendar_goto_today (gnome_calendar);
-	gtk_widget_destroy (goto_win);
-}
-
-/* Creates a "goto date" dialog and runs it */
-void
-goto_dialog (GnomeCalendar *gcal)
-{
-	time_t start_time;
-	GtkWidget *vbox;
-	GtkWidget *hbox;
-	GtkWidget *w;
-	GtkWidget *days;
-	struct tm tm;
-
-	gnome_calendar = gcal;
-	current_index = -1;
-
-	gnome_calendar_get_selected_time_range (gnome_calendar, &start_time, NULL);
-
-	tm = *localtime (&start_time);
-
-	goto_win = gnome_dialog_new (_("Go to date"),
-				     GNOME_STOCK_BUTTON_CANCEL,
-				     NULL);
-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),
-		 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-
-	
-	vbox = GNOME_DIALOG (goto_win)->vbox;
-
-	/* Instructions */
-
-	w = gtk_label_new (_("Please select the date you want to go to.\n"
-			     "When you click on a day, you will be taken\n"
-			     "to that date."));
-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Create month item before creating the year controls, since the
-	 * latter ones need the month_item to be created.
-	 */
-
-	days = create_days (tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
-
-	/* Year */
-
-	w = create_year (tm.tm_year + 1900);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Month */
-
-	w = create_months (tm.tm_mon);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Days (canvas with month item) */
-
-	gtk_box_pack_start (GTK_BOX (vbox), days, TRUE, TRUE, 0);
-	gtk_widget_show (days);
-
-	/* Today button */
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show (hbox);
-
-	w = gtk_button_new_with_label (_("Go to today"));
-	gtk_signal_connect (GTK_OBJECT (w), "clicked",
-			    (GtkSignalFunc) goto_today,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Run! */
-
-	gtk_window_set_modal (GTK_WINDOW (goto_win), TRUE);
-	gnome_dialog_set_close (GNOME_DIALOG (goto_win), TRUE);
-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),
-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gnome_calendar))));
-	gtk_widget_show (goto_win);
-}
diff --git a/calendar/gui/jump.xpm b/calendar/gui/jump.xpm
deleted file mode 100644
index d974142d9a..0000000000
--- a/calendar/gui/jump.xpm
+++ /dev/null
@@ -1,14 +0,0 @@
-/* XPM */
-static char * jump_xpm[] = {
-"16 8 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"................",
-".++++++++++++++.",
-".++++++++++++++.",
-".++..++..++..++.",
-".++..++..++..++.",
-".++++++++++++++.",
-".++++++++++++++.",
-"................"};
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index 95b9ddf64d..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <gal/widgets/e-cursors.h>
-#include "alarm.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-#include "component-factory.h"
-#include "control-factory.h"
-#include "e-itip-control.h"
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-
-int
-main (int argc, char **argv)
-{
-#ifdef ENABLE_NLS
-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain(PACKAGE);
-#endif
-	
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-#if 0
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-#endif
-
-	control_factory_init ();
-	component_factory_init ();
-	e_itip_control_factory_init ();
-
-	bonobo_main ();
-
-	calendar_config_write_on_exit ();
-
-	fprintf (stderr, "main(): Out of bonobo_main(), we are dying cleanly.  Have a nice day.\n");
-
-	return 0;
-}
diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
deleted file mode 100644
index 1b90d390dd..0000000000
--- a/calendar/gui/mark.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* Evolution calendar - Functions to mark calendars
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-/* Closure data */
-struct minfo
-{
-	GnomeMonthItem *mitem;
-	time_t start;
-	time_t end;
-};
-
-
-
-/* Frees the specified data when an object is destroyed */
-static void
-free_data (GtkObject *object, gpointer data)
-{
-	g_free (data);
-}
-
-/* If the array of "marked" attributes for the days in a a month item has not been created yet, this
- * function creates the array and clears it.  Otherwise, it just returns the existing array.
- */
-static char *
-get_attributes (GnomeMonthItem *mitem)
-{
-	char *attrs;
-
-	attrs = gtk_object_get_data (GTK_OBJECT (mitem), "day_mark_attributes");
-
-	if (!attrs) {
-		attrs = g_new0 (char, 42);
-		gtk_object_set_data (GTK_OBJECT (mitem), "day_mark_attributes", attrs);
-		gtk_signal_connect (GTK_OBJECT (mitem), "destroy",
-				    (GtkSignalFunc) free_data,
-				    attrs);
-	}
-
-	return attrs;
-}
-
-void
-colorify_month_item (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)
-{
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (func != NULL);
-
-	unmark_month_item (mitem);
-
-	/* We have to do this in several calls to gnome_canvas_item_set(), as color_spec_from_prop()
-	 * returns a pointer to a static string -- and we need several values.
-	 */
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "heading_color", (* func) (COLOR_PROP_HEADING_COLOR, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "outline_color", (* func) (COLOR_PROP_OUTLINE_COLOR, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "day_box_color", (* func) (COLOR_PROP_EMPTY_DAY_BG, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "day_color", (* func) (COLOR_PROP_DAY_FG, func_data),
-			       NULL);
-}
-
-/* In the month item, marks all the days that are touched by the specified time span.  Assumes that
- * the time span is completely contained within the month.  The array of day attributes is modified
- * accordingly.
- */
-static void
-mark_event_in_month (GnomeMonthItem *mitem, time_t start, time_t end)
-{
-	struct tm tm;
-	int day_index;
-
-	tm = *localtime (&start);
-
-	for (; start <= end; start += 60 * 60 * 24) {
-		mktime (&tm); /* normalize the time */
-
-		/* Figure out the day index that corresponds to this time */
-
-		day_index = gnome_month_item_day2index (mitem, tm.tm_mday);
-		g_assert (day_index >= 0);
-
-		/* Mark the day box */
-
-		mark_month_item_index (mitem, day_index, default_color_func, NULL);
-
-		/* Next day */
-
-		tm.tm_mday++;
-	}
-}
-
-static gboolean
-mark_month_item_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	struct minfo *mi = (struct minfo *)data;
-
-	mark_event_in_month (mi->mitem, MAX (istart, mi->start), MIN (iend, mi->end));
-
-	return TRUE;
-}
-
-void
-mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *gcal)
-{
-	CalClient *client;
-	struct minfo mi;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	mi.mitem = mitem;
-	mi.start = time_month_begin (time_from_day (mitem->year, mitem->month, 1));
-	mi.end = time_month_end (mi.start);
-	
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, mi.start, mi.end,
-				       mark_month_item_cb, &mi);
-}
-
-
-void
-mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data)
-{
-	char *attrs;
-	GnomeCanvasItem *item;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail ((index >= 0) && (index < 42));
-	g_return_if_fail (func != NULL);
-
-	attrs = get_attributes (mitem);
-
-	attrs[index] = TRUE;
-
-	item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + index);
-	gnome_canvas_item_set (item,
-			       "fill_color", (* func) (COLOR_PROP_MARK_DAY_BG, func_data),
-			       NULL);
-}
-
-void
-unmark_month_item (GnomeMonthItem *mitem)
-{
-	int i;
-	char *attrs;
-	GnomeCanvasItem *item;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-
-	attrs = get_attributes (mitem);
-
-	/* Find marked days and unmark them by turning off their marked attribute flag and changing
-	 * the color.
-	 */
-
-	for (i = 0; i < 42; i++)
-		if (attrs[i]) {
-			attrs[i] = FALSE;
-
-			item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + i);
-			gnome_canvas_item_set (item,
-					       "fill_color", color_spec_from_prop (COLOR_PROP_EMPTY_DAY_BG),
-					       NULL);
-		}
-}
-
-/* Handles EnterNotify and LeaveNotify events from the month item's day groups, and performs
- * appropriate prelighting.
- */
-static gint
-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	GnomeMonthItem *mitem;
-	GnomeCanvasItem *box;
-	int child_num, day;
-	GetColorFunc func;
-	gpointer func_data;
-	char *color;
-	char *attrs;
-
-	/* We only accept enters and leaves */
-
-	if (!((event->type == GDK_ENTER_NOTIFY) || (event->type == GDK_LEAVE_NOTIFY)))
-		return FALSE;
-
-	/* Get index information */
-
-	mitem = GNOME_MONTH_ITEM (data);
-	child_num = gnome_month_item_child2num (mitem, item);
-	day = gnome_month_item_num2day (mitem, child_num);
-
-	if (day == 0)
-		return FALSE; /* it was a day outside the month's range */
-
-	child_num -= GNOME_MONTH_ITEM_DAY_GROUP;
-	box = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + child_num);
-
-	/* Get colors */
-
-	func = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_func");
-	func_data = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_data");
-
-	/* Now actually set the proper color in the item */
-
-	switch (event->type) {
-	case GDK_ENTER_NOTIFY:
-		color = (* func) (COLOR_PROP_PRELIGHT_DAY_BG, func_data);
-		gnome_canvas_item_set (box,
-				       "fill_color", color,
-				       NULL);
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		attrs = get_attributes (mitem);
-		color = (* func) (attrs[child_num] ? COLOR_PROP_MARK_DAY_BG : COLOR_PROP_EMPTY_DAY_BG,
-				  func_data);
-		gnome_canvas_item_set (box,
-				       "fill_color", color,
-				       NULL);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return TRUE;
-}
-
-void
-month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)
-{
-	GnomeCanvasItem *day_group;
-	int i;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (func != NULL);
-
-	/* Store the function in the object data */
-
-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_func", func);
-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_data", func_data);
-
-	/* Connect the appropriate signals to perform prelighting */
-
-	for (i = 0; i < 42; i++) {
-		day_group = gnome_month_item_num2child (GNOME_MONTH_ITEM (mitem), GNOME_MONTH_ITEM_DAY_GROUP + i);
-		gtk_signal_connect (GTK_OBJECT (day_group), "event",
-				    (GtkSignalFunc) day_event,
-				    mitem);
-	}
-}
-
-char *
-default_color_func (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_prop (propnum);
-}
-
-
-
diff --git a/calendar/gui/mark.h b/calendar/gui/mark.h
deleted file mode 100644
index 76c82c580d..0000000000
--- a/calendar/gui/mark.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Evolution calendar - Functions to mark calendars
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef MARK_H
-#define MARK_H
-
-/*#include "calendar.h"*/
-#include "gnome-month-item.h"
-
-
-
-/* These are the fonts used for the montly calendars */
-
-#define HEADING_FONTSET         "-adobe-helvetica-medium-r-*-*-14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-medium-r-*-*-14-*-*-*-*-*-ksc5601.1987-0,*"
-#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,*"
-#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,*"
-#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,*"
-#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,*"
-#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,*"
-#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,*"
-#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,*"
-#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,*"
-
-
-/* Functions of this type are used by the marking functions to fetch color specifications.  Such
- * a function must return a color spec based on the property passed to it.
- */
-typedef char * (* GetColorFunc) (ColorProp propnum, gpointer data);
-
-
-/* Sets the user-configured colors and font for a month item.  It also tags the days as unmarked. */
-void colorify_month_item (GnomeMonthItem *month, GetColorFunc func, gpointer func_data);
-
-/* Takes a monthly calendar item and marks the days that have events
- * scheduled for them in the specified calendar.  It also highlights
- * the current day.
- */
-void mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *cal);
-
-/* Marks a day specified by index, not by day number */
-void mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data);
-
-/* Unmarks all the days in the specified month item */
-void unmark_month_item (GnomeMonthItem *mitem);
-
-/* Prepares a monthly calendar item to prelight when the mouse goes over the days. */
-
-void month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data);
-
-/* This is the default prelight function you can use for most puposes.  You can use NULL as the
- * func_data.
- */
-char *default_color_func (ColorProp prop_num, gpointer data);
-
-
-
-#endif
diff --git a/calendar/gui/monthview.xpm b/calendar/gui/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/calendar/gui/monthview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * monthview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #666666",
-"#	c #919191",
-"$	c #F2F1ED",
-"%	c #D8D8D4",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".%###################@. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/popup-menu.c b/calendar/gui/popup-menu.c
deleted file mode 100644
index 86821dcb4b..0000000000
--- a/calendar/gui/popup-menu.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "popup-menu.h"
-#include <gal/widgets/e-gui-utils.h>
-
-
-void
-popup_menu (struct menu_item *items, int nitems, GdkEventButton *event)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));
-
-	for (i = 0; i < nitems; i++) {
-		if (items[i].text) {
-			item = gtk_menu_item_new_with_label (_(items[i].text));
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    items[i].callback,
-					    items[i].data);
-			gtk_widget_set_sensitive (item, items[i].sensitive);
-		} else
-			item = gtk_menu_item_new ();
-
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
-}
diff --git a/calendar/gui/popup-menu.h b/calendar/gui/popup-menu.h
deleted file mode 100644
index a4590dbb98..0000000000
--- a/calendar/gui/popup-menu.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#ifndef POPUP_MENU_H
-#define POPUP_MENU_H
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtksignal.h>
-
-
-struct menu_item {
-	char *text;
-	GtkSignalFunc callback;
-	gpointer data;
-	int sensitive;
-};
-
-void popup_menu (struct menu_item *items, int nitems, GdkEventButton *event);
-
-
-#endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index 90d6161886..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <math.h>
-#include <gnome.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-copies.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-preview.h>
-#include <libgnomeprint/gnome-printer-dialog.h>
-#include <e-util/e-dialog-widgets.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "gnome-cal.h"
-#include "print.h"
-
-
-
-/* copied from gnome-month-item.c  this should be shared?? */
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the
- * Gregorian reformation.
- */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#define REFORMATION_DAY 639787		/* First day of the reformation, counted from 1 Jan 1 */
-#define MISSING_DAYS 11			/* They corrected out 11 days */
-#define THURSDAY 4			/* First day of reformation */
-#define SATURDAY 6			/* Offset value; 1 Jan 1 was a Saturday */
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-struct pdinfo
-{
-	GList *slots;
-};
-
-struct psinfo
-{
-	GList *events;
-};
-
-struct ptinfo
-{
-	GList *todos;
-};
-
-struct einfo
-{
-	char *text;
-	time_t start;
-	time_t end;
-	int count;
-};
-
-
-/* Returns the number of leap years since year 1 up to (but not including) the specified year */
-static int
-leap_years_up_to (int year)
-{
-	return (year / 4					/* trivial leapness */
-		- ((year > 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */
-		+ ((year > 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */
-}
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-/* Returns the 1-based day number within the year of the specified date */
-static int
-day_in_year (int day, int month, int year)
-{
-	int is_leap, i;
-
-	is_leap = is_leap_year (year);
-
-	for (i = 0; i < month; i++)
-		day += days_in_month [is_leap][i];
-
-	return day;
-}
-
-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days
- * that were removed on the Gregorian reformation, it returns Thursday.
- */
-static int
-day_in_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + leap_years_up_to (year - 1) + day_in_year (day, month, year);
-
-	if (n < REFORMATION_DAY)
-		return (n - 1 + SATURDAY) % 7;
-
-	if (n >= (REFORMATION_DAY + MISSING_DAYS))
-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;
-
-	return THURSDAY;
-}
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int start_on_monday, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = days_in_month[is_leap_year (year)][month];
-	d_week = day_in_week (1, month, year);
-
-	if (start_on_monday)
-		d_week = (d_week + 6) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-
-enum align_box {
-	ALIGN_LEFT=1,
-	ALIGN_RIGHT,
-	ALIGN_CENTRE,
-	ALIGN_BORDER= 1<<8
-};
-
-/* width = width of border, -'ve is no border
-   fillcolour = shade of fill, -'ve is no fill */
-static void
-print_border(GnomePrintContext *pc, double l, double r, double t, double b, double width, double fillcolour)
-{
-	int i;
-	gnome_print_gsave (pc);
-	if (fillcolour<0.0)
-		i=1;
-	else
-		i=0;
-	for (;i<2;i++) {
-		gnome_print_moveto(pc, l, t);
-		gnome_print_lineto(pc, l, b);
-		gnome_print_lineto(pc, r, b);
-		gnome_print_lineto(pc, r, t);
-		gnome_print_lineto(pc, l, t);
-		if (i==0) {
-			gnome_print_setrgbcolor(pc, fillcolour, fillcolour, fillcolour);
-			gnome_print_fill(pc);
-			if (width<0.0)
-				i=2;
-		} else {
-			gnome_print_setrgbcolor(pc, 0, 0, 0);
-			gnome_print_setlinewidth(pc, width);
-			gnome_print_stroke(pc);
-		}
-	}
-	gnome_print_grestore (pc);
-}
-
-/* outputs 1 line of aligned text in a box */
-static void
-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	double w, x;
-	gnome_print_gsave (pc);
-	w = gnome_font_get_width_string(font, text);
-	switch (align&3) {
-	default:
-	case ALIGN_LEFT:
-		x = l;
-		break;
-	case ALIGN_RIGHT:
-		x = l+(r-l)-w-2;
-		break;
-	case ALIGN_CENTRE:
-		x = l+((r-l)-w)/2;
-		break;
-	}
-	gnome_print_moveto(pc, x, t - gnome_font_get_size (font));
-	gnome_print_setfont(pc, font);
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	gnome_print_show(pc, text);
-	gnome_print_grestore (pc);
-}
-
-/* gets/frees the font for you, as a bold font */
-static void
-print_text_size(GnomePrintContext *pc, double size, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-	print_text(pc, font, text, align, l, r, t, b);
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-static void
-titled_box(GnomePrintContext *pc, const char *text, GnomeFont *font, enum align_box align, double *l, double *r, double *t, double *b, double linewidth)
-{
-	if (align&ALIGN_BORDER) {
-		gnome_print_gsave(pc);
-		print_border(pc, *l, *r, *t, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, linewidth, 0.9);
-		print_border(pc, *l, *r, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, *b, linewidth, -1.0);
-		gnome_print_grestore(pc);
-		*l+=2;
-		*r-=2;
-		*b+=2;
-	}
-	print_text(pc, font, text, align, *l, *r, *t, *b);
-	*t-=gnome_font_get_size(font)*1.4;
-}
-
-enum datefmt {
-	DATE_MONTH	= 1 << 0,
-	DATE_DAY	= 1 << 1,
-	DATE_DAYNAME	= 1 << 2,
-	DATE_YEAR	= 1 << 3
-};
-
-static char *days[] = {
-	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
-	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
-	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
-	N_("16th"), N_("17th"), N_("18th"), N_("19th"), N_("20th"),
-	N_("21st"), N_("22nd"), N_("23rd"), N_("24th"), N_("25th"),
-	N_("26th"), N_("27th"), N_("28th"), N_("29th"),	N_("30th"),
-	N_("31st")
-};
-
-/*
-  format the date 'nicely' and consistently for various headers
-*/
-static char *
-format_date(time_t time, int flags, char *buffer, int bufflen)
-{
-	char fmt[64];
-	struct tm tm;
-
-	tm = *localtime(&time);
-	fmt[0] = 0;
-	if (flags & DATE_DAYNAME) {
-		strcat(fmt, "%A");
-	}
-	if (flags & DATE_DAY) {
-		if (flags & DATE_DAYNAME)
-			strcat(fmt, " ");
-		strcat(fmt, gettext(days[tm.tm_mday-1]));
-	}
-	if (flags & DATE_MONTH) {
-		if (flags & (DATE_DAY|DATE_DAYNAME))
-			strcat(fmt, " ");
-		strcat(fmt, "%B");
-		if ((flags & (DATE_DAY|DATE_YEAR)) == (DATE_DAY|DATE_YEAR))
-			strcat(fmt, ",");
-	}
-	if (flags & DATE_YEAR) {
-		if (flags & (DATE_DAY|DATE_DAYNAME|DATE_MONTH))
-			strcat(fmt, " ");
-		strcat(fmt, "%Y");
-	}
-	strftime(buffer, bufflen, fmt, &tm);
-	return buffer;
-}
-
-
-/*
-  print out the month small, embolden any days with events.
-*/
-static void
-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal,
-		   time_t month, double left, double right, double top, double bottom,
-		   int titleflags, time_t greystart, time_t greyend, int bordertitle)
-{
-	CalClient *client;
-	GnomeFont *font, *font_bold, *font_normal;
-	time_t now, next;
-	int x, y;
-	int days[42];
-	int day;
-	char buf[100];
-	struct tm tm;
-	double xpad, ypad, size;
-	char *daynames[] = { _("Su"), _("Mo"), _("Tu"), _("We"), _("Th"), _("Fr"), _("Sa") };
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	xpad = (right-left)/7;
-	ypad = (top-bottom)/8.3;
-	if (xpad>ypad)
-		size=ypad;
-	else
-		size=xpad;
-
-	size = (xpad+ypad)/3.0;
-
-        tm = *localtime (&month);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);
-
-	/* build day-busy bits */
-	now = time_month_begin(month);
-
-	/* get title */
-	format_date(month, titleflags, buf, 100);
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 1, size*1.2); /* title font */
-	if (bordertitle)
-		print_border(pc,
-			     left, left+7*xpad, top, top-gnome_font_get_size(font)*1.3,
-			     1.0, 0.9);
-	print_text(pc, font, buf, ALIGN_CENTRE,
-		   left, left+7*xpad, top, top - gnome_font_get_size (font));
-	gtk_object_unref (GTK_OBJECT (font));
-
-	font_normal = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-	font_bold = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	for (x=0;x<7;x++) {
-		print_text(pc, font_bold, daynames[(week_starts_on_monday?x+1:x)%7], ALIGN_CENTRE,
-			   left+x*xpad, left+(x+1)*xpad, bottom+7*ypad, bottom+7*ypad-gnome_font_get_size(font_bold));
-	}
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				GList *uids;
-
-				sprintf(buf, "%d", day);
-
-				/* this is a slow messy way to do this ... but easy ... */
-				uids = cal_client_get_objects_in_range (client,
-									CALOBJ_TYPE_EVENT,
-									now, time_day_end (now));
-				font = uids ? font_bold : font_normal;
-				cal_obj_uid_list_free (uids);
-
-				next = time_add_day(now, 1);
-				if ((now>=greystart && now<greyend)
-				    || (greystart>=now && greystart<next)) {
-					print_border(pc,
-						     left+x*xpad+xpad*0.1,
-						     left+(x+1)*xpad+xpad*0.1,
-						     bottom+(5-y)*ypad+gnome_font_get_size(font)-ypad*0.15,
-						     bottom+(5-y)*ypad-ypad*0.15,
-						     -1.0, 0.75);
-				}
-				print_text(pc, font, buf, ALIGN_RIGHT,
-					   left+x*xpad, left+(x+1)*xpad, bottom+(5-y)*ypad+gnome_font_get_size(font), bottom+(5-y)*ypad);
-				now = next;
-			}
-		}
-	}
-	gtk_object_unref (GTK_OBJECT (font_normal));
-	gtk_object_unref (GTK_OBJECT (font_bold));
-}
-
-
-
-/* wraps text into the print context, not taking up more than its allowed space */
-static double
-bound_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
-	   double left, double right, double top, double bottom, double indent)
-{
-	double maxwidth = right-left;
-	double width;
-	const char *p;
-	char *wordstart;
-	int c;
-	char *outbuffer, *o, *outbuffendmarker;
-	int outbufflen;
-	int dump=0;
-	int first=1;
-
-	g_return_val_if_fail(text!=NULL, top);
-
-	if (top<bottom) {
-		/* too much to fit in appointment printout */
-		return top;
-	}
-
-	outbufflen = 1024;
-	outbuffer = g_malloc(outbufflen);
-	outbuffendmarker = outbuffer+outbufflen-2;
-
-	top -= gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	width=0;
-	p = text;
-	wordstart = outbuffer;
-	o = outbuffer;
-	while ((c=*p)) {
-		if (c=='\n') {
-			wordstart=o;
-			dump=1;
-		} else {
-			/* grow output buffer if required */
-			if (o>=outbuffendmarker) {
-				char *newbuf;
-				outbufflen*=2;
-				newbuf = g_realloc(outbuffer, outbufflen);
-				o = newbuf+(o-outbuffer);
-				wordstart = newbuf+(o-outbuffer);
-				outbuffer = newbuf;
-				outbuffendmarker = outbuffer+outbufflen-2;
-			}
-			*o++=c;
-			if (c==' ')
-				wordstart = o;
-			width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));
-			if (width>maxwidth)
-				dump=1;
-			else
-				dump=0;
-		}
-		if (dump) {
-			if (wordstart==outbuffer)
-				wordstart=o;
-			c=*wordstart;
-			*wordstart=0;
-			gnome_print_moveto(pc, left, top);
-			gnome_print_show(pc, outbuffer);
-			*wordstart=c;
-			memcpy(outbuffer, wordstart, o-wordstart);
-			width = gnome_font_get_width_string_n(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
-	return top;
-}
-
-/*
- * Print Day Details
- */
-static gboolean
-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	GList *l, *col = NULL;
-	struct pdinfo *pdi = (struct pdinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	for (l = pdi->slots; l; l = l->next) {
-		struct einfo *testei;
-
-		col = (GList *)l->data;
-		testei = (struct einfo *)col->data;
-
-		if (ei->start >= testei->end) {
-			col = g_list_prepend (col, ei);
-			l->data = col;
-			return TRUE;
-		}
-
-		testei->count++;
-		ei->count++;
-	}
-
-	col = NULL;
-	col = g_list_prepend (col, ei);
-	pdi->slots = g_list_append (pdi->slots, col);
-
-	return TRUE;
-}
-
-static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	struct pdinfo pdi;
-	time_t start, end;
-	GList *l;
-	int num_slots, i;
-	GnomeFont *font_hour, *font_minute, *font_summary;
-	double yinc, y, yend, x, xend;
-	double width=40, slot_width;
-	char buf[20];
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	yinc = (top-bottom)/24;
-
-	/* fill static detail */
-	font_hour = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/2);
-	font_minute = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/3);
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, yinc/3);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-	/* internal lines */
-	gnome_print_setlinewidth(pc, 0.0);
-	gnome_print_moveto(pc, left+width, bottom);
-	gnome_print_lineto(pc, left+width, top);
-	gnome_print_stroke (pc);
-
-	for (i=0;i<24;i++) {
-		y = top - yinc*(i+1);
-		print_border(pc, left+1, left+width-1, y, y+yinc-1, -1.0, 0.9);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-		/* the hour label/minute */
-		sprintf(buf, "%d", i);
-		print_text(pc, font_hour, buf, ALIGN_RIGHT, left, left+width/2, y+yinc, y);
-		switch(i) {
-		case 12: sprintf(buf, _("pm")); break;
-		case 0: sprintf(buf, _("am")); break;
-		default: sprintf(buf, "00"); break;
-		}
-		print_text(pc, font_minute, buf, ALIGN_LEFT, left+width/2, left+width/2, y+yinc, y);
-
-		/* internal lines */
-		gnome_print_moveto(pc, left+width, y);
-		gnome_print_lineto(pc, right, y);
-		gnome_print_stroke (pc);
-		gnome_print_moveto(pc, left+width/2, y+yinc/2);
-		gnome_print_lineto(pc, right, y+yinc/2);
-		gnome_print_stroke (pc);
-
-	}
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	pdi.slots = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_details_cb, &pdi);
-
-	num_slots = g_list_length (pdi.slots);
-	slot_width = (right-left-width)/num_slots;
-
-	for (i = num_slots, l = pdi.slots; l; i--, l = l->next) {
-		GList *e = (GList *)l->data;
-
-		for (; e; e = e->next) {
-			struct einfo *ei = (struct einfo *)e->data;
-
-			y = top - (top - bottom) * (ei->start - start) / (end - start) - 1;
-			yend = top - (top - bottom) * (ei->end - start) / (end - start) + 1;
-			x = left + width + slot_width * (num_slots - i);
-
-			if (num_slots > 0)
-				x++;
-
-			if (i == 0)
-				xend = x + (num_slots - ei->count) * slot_width - 2;
-			else
-				xend = x + slot_width - 2;
-
-			print_border (pc, x, xend, y, yend, 0.0, 0.9);
-
-			bound_text (pc, font_summary, ei->text, x, xend, y, yend, 0);
-
-			g_free (ei);
-		}
-		g_list_free (e);
-	}
-	g_list_free (pdi.slots);
-
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
-
-	gtk_object_unref (GTK_OBJECT (font_hour));
-	gtk_object_unref (GTK_OBJECT (font_minute));
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-/*
- * Print Day Summary
- */
-#if 0
-#define TIME_FMT "%X"
-#else
-#define TIME_FMT "%l:%M%p"
-#endif
-
-static gboolean
-print_day_summary_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	struct psinfo *psi = (struct psinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	psi->events = g_list_append (psi->events, ei);
-
-	return TRUE;
-}
-
-static void
-print_day_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom,
-		   double size, int totime, int titleformat)
-{
-	CalClient *client;
-	struct psinfo psi;
-	time_t start, end;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend, inc, incsmall;
-	char buf[100];
-	double margin;
-	struct tm tm;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	/* fill static detail */
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-
-	gnome_print_setfont (pc, font_summary);
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	tm = *localtime(&start);
-
-	format_date(start, titleformat, buf, 100);
-	titled_box (pc, buf, font_summary, ALIGN_RIGHT | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 0.0);
-
-	psi.events = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_summary_cb, &psi);
-	inc = size*0.3;
-	incsmall = size*0.2;
-
-	y = top-inc;
-	yend = bottom-incsmall;
-
-	/* do a good rough approximation of the 'widest' time */
-	tm.tm_year = 2000;
-	tm.tm_mon = 12;
-	tm.tm_mday = 22;
-	tm.tm_sec = 22;
-	tm.tm_min = 22;
-	tm.tm_hour = 23;
-	strftime(buf, 100, TIME_FMT, &tm);
-	margin = gnome_font_get_width_string(font_summary, buf);
-
-	for (l = psi.events; l; l = l->next) {
-		struct einfo *ei = (struct einfo *)l->data;
-
-		x = left + incsmall;
-		xend = right - inc;
-
-		if (y - gnome_font_get_size (font_summary) < bottom)
-			break;
-
-		tm = *localtime (&ei->start);
-		strftime (buf, 100, TIME_FMT, &tm);
-		gnome_print_moveto (pc, x + (margin
-					     - gnome_font_get_width_string (font_summary, buf)),
-				    y - gnome_font_get_size (font_summary));
-		gnome_print_show (pc, buf);
-
-		if (totime) {
-			tm = *localtime (&ei->end);
-			strftime (buf, 100, TIME_FMT, &tm);
-			gnome_print_moveto (pc,
-					    (x + margin + inc
-					     + (margin
-						- gnome_font_get_width_string (font_summary, buf))),
-					    y - gnome_font_get_size (font_summary));
-			gnome_print_show (pc, buf);
-
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin * 2 + inc * 2, xend,
-					y, yend, 0);
-		} else {
-			/* we also indent back after each time is printed */
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin + inc, xend,
-					y, yend, -margin + inc);
-		}
-
-		y += gnome_font_get_size (font_summary) - inc;
-
-		g_free (ei);
-	}
-	g_list_free (psi.events);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom)
-{
-	double y, l, r, t, b;
-	time_t now;
-	int i;
-
-	l = left;
-	r = (right-left)/2+left;
-	t = top;
-	y = (top-bottom)/3;
-	b = top-y;
-	now = time_week_begin(whence); /* returns sunday, we need monday */
-	now = time_add_day(now, 1);
-	for (i = 0; i < 7; i++) {
-		print_day_summary (pc, gcal, now, l, r, t, b,
-				   10, TRUE, DATE_DAY | DATE_DAYNAME | DATE_MONTH);
-		now = time_add_day (now, 1);
-		switch (i) {
-		case 5:
-			y /= 2.0;
-			b += y;
-		case 0:
-		case 1:
-		case 3:
-		case 4:
-			t -= y;
-			b -= y;
-			break;
-		case 2:
-			l = r;
-			r = right;
-			t = top;
-			b = t-y;
-			break;
-		case 6:
-			break;
-		}
-	}
-}
-
-static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom, int morerows)
-{
-	double y, x, l, r, t, b;
-	time_t now;
-	int xx, yy, rows, cols;
-
-	l = left;
-	t = top;
-	if (morerows) {
-		rows=4;
-		cols=3;
-	} else {
-		rows=3;
-		cols=4;
-	}
-	y = (top-bottom)/rows;
-	x = (right-left)/cols;
-	r = l+x;
-	b = top-y;
-	now = time_year_begin(whence);
-	for (yy = 0; yy < rows; yy++) {
-		t = top - y * yy;
-		b = t - y;
-		for (xx = 0; xx < cols; xx++) {
-			l = left + x * xx;
-			r = l + x;
-			print_month_small (pc, gcal, now,
-					   l + 8, r - 8, t - 8, b + 8, DATE_MONTH, 0, 0, TRUE);
-			now = time_add_month (now, 1);
-		}
-	}
-}
-
-static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		     double left, double right, double top, double bottom)
-{
-	time_t now, today;
-	int days[42];
-	int day;
-	struct tm tm;
-	int x, y;
-	char buf[100];
-	GnomeFont *font_days;
-
-	now = time_month_begin(whence);
-        tm = *localtime (&now);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);
-
-	/* a little margin */
-	top -= 4;
-
-	/* do day names ... */
-	font_days = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 10);
-	gnome_print_setfont(pc, font_days);
-	for (x=0;x<7;x++) {
-		today = time_add_day(now, days[6+x]);
-		format_date(today, DATE_DAYNAME, buf, 100);
-		print_text(pc, font_days, buf, ALIGN_CENTRE,
-			   (right-left)*x/7+left, (right-left)*(x+1)/7+left,
-			   top, top-gnome_font_get_size(font_days));
-	}
-	top -= gnome_font_get_size(font_days)*1.5;
-	gtk_object_unref (GTK_OBJECT (font_days));
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				print_day_summary (pc, gcal, now,
-						   (right-left)*x/7+left,
-						   (right-left)*(x+1)/7+left,
-						   top - (top-bottom)*y/6,
-						   top - (top-bottom)*(y+1)/6, 6, FALSE,
-						   day==1?(DATE_DAY|DATE_MONTH):DATE_DAY);
-				now = time_add_day(now, 1);
-			}
-		}
-	}
-}
-
-static void
-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t start, time_t end,
-		    double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, 10);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, _("Tasks"), font_summary,
-		    ALIGN_CENTRE | ALIGN_BORDER, &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_TODO);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-		CalComponentText summary;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing: the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("print_todo_details(): Syntax error while getting object `%s'",
-				   uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		cal_component_get_summary (comp, &summary);
-
-		if (!summary.value)
-			continue;
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		y = bound_text (pc, font_summary, summary.value, x + 2, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary);
-		gnome_print_moveto (pc, x, y - 3);
-		gnome_print_lineto (pc, xend, y - 3);
-		gnome_print_stroke (pc);
-		y -= 3;
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-#if 0
-
-static GnomePrintContext *
-print_context (int preview, char *paper)
-{
-	GtkWidget *toplevel, *canvas, *sw;
-	GnomePrinter *printer;
-	GnomePrintContext *pc;
-
-	if (preview) {
-		gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-		gtk_widget_push_visual (gdk_rgb_get_visual ());
-
-		toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_widget_set_usize (toplevel, 700, 700);
-		sw = gtk_scrolled_window_new (NULL, NULL);
-		canvas = gnome_canvas_new_aa ();
-		gtk_container_add (GTK_CONTAINER (toplevel), sw);
-		gtk_container_add (GTK_CONTAINER (sw), canvas);
-
-		gnome_canvas_set_pixels_per_unit((GnomeCanvas *)canvas, 1);
-
-		pc = gnome_print_preview_new ((GnomeCanvas *)canvas, paper);
-
-		gtk_widget_show_all (toplevel);
-
-		gtk_widget_pop_visual ();
-		gtk_widget_pop_colormap ();
-	} else {
-		printer = gnome_printer_dialog_new_modal ();
-
-		if (!printer)
-			return NULL;
-
-		pc = gnome_print_context_new_with_paper_size (printer, paper);
-	}
-
-	return pc;
-}
-
-#endif
-
-/* Value for the PrintView enum */
-static const int print_view_map[] = {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR,
-	-1
-};
-
-/* Creates the range selector widget for printing a calendar */
-static GtkWidget *
-range_selector_new (GtkWidget *dialog, time_t at, int *view)
-{
-	GtkWidget *box;
-	GtkWidget *radio;
-	GSList *group;
-	char text[1024];
-	char str1[512];
-	char str2[512];
-	struct tm tm;
-	time_t week_begin, week_end;
-	struct tm week_begin_tm, week_end_tm;
-
-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-
-	tm = *localtime (&at);
-
-	/* Day */
-
-	strftime (text, sizeof (text), _("Current day (%a %b %d %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (NULL, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Week */
-
-	week_begin = time_week_begin (at);
-	week_end = time_add_day (time_week_end (at), -1);
-
-	week_begin_tm = *localtime (&week_begin);
-	week_end_tm = *localtime (&week_end);
-
-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {
-		strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-		strftime (str2, sizeof (str2), _("%a %d %Y"), &week_end_tm);
-	} else {
-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {
-			strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		} else {
-			strftime (str1, sizeof (str1), _("%a %b %d %Y"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		}
-	}
-
-	g_snprintf (text, sizeof (text), _("Current week (%s - %s)"), str1, str2);
-
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Month */
-
-	strftime (text, sizeof (text), _("Current month (%b %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Year */
-
-	strftime (text, sizeof (text), _("Current year (%Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Select default */
-
-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);
-
-	gtk_widget_show_all (box);
-	return box;
-}
-
-void
-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view)
-{
-	GnomePrinter *printer;
-	GnomePrintMaster *gpm;
-	GnomePrintContext *pc;
-	int copies, collate;
-	const GnomePaper *paper_info;
-	double l, r, t, b, todo, header;
-	char buf[100];
-	time_t when;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	printer = NULL;
-	copies = 1;
-	collate = FALSE;
-
-	if (!preview) {
-		GtkWidget *gpd;
-		GtkWidget *range;
-		int view;
-
-		gpd = gnome_print_dialog_new (_("Print Calendar"),
-					      GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-
-		view = (int) default_view;
-		range = range_selector_new (gpd, at, &view);
-		gnome_print_dialog_construct_range_custom (GNOME_PRINT_DIALOG (gpd), range);
-
-		gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);
-
-		/* Run dialog */
-
-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {
-		case GNOME_PRINT_PRINT:
-			break;
-
-		case GNOME_PRINT_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gnome_dialog_close (GNOME_DIALOG (gpd));
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-		default_view = (PrintView) view;
-
-		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd), &copies, &collate);
-		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));
-
-		gnome_dialog_close (GNOME_DIALOG (gpd));
-	}
-
-	/* FIXME: allow configuration of paper size */
-
-	gpm = gnome_print_master_new ();
-
-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());
-	gnome_print_master_set_paper (gpm, paper_info);
-
-	if (printer)
-		gnome_print_master_set_printer (gpm, printer);
-
-	gnome_print_master_set_copies (gpm, copies, collate);
-
-	pc = gnome_print_master_get_context (gpm);
-
-	l = gnome_paper_lmargin (paper_info);
-	r = gnome_paper_pswidth (paper_info) - gnome_paper_rmargin (paper_info);
-	t = gnome_paper_psheight (paper_info) - gnome_paper_tmargin (paper_info);
-	b = gnome_paper_bmargin (paper_info);
-
-	/* depending on the view, do a different output */
-	switch (default_view) {
-	case PRINT_VIEW_DAY: {
-		int i, days = 1;
-
-		for (i = 0; i < days; i++) {
-			todo = ((r - l) / 5) * 4 + l;
-			header = t - 70;
-			print_todo_details (pc, gcal, 0, INT_MAX, todo, r, header, b);
-			print_day_details (pc, gcal, at, l, todo - 2.0, header, b);
-
-			print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-			print_month_small (pc, gcal, at, r - 190, r - 104, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, at, at, FALSE);
-			print_month_small (pc, gcal, time_add_month (at, 1), r - 90, r - 4, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-			format_date (at, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-			print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, todo, t - 3, header);
-
-			format_date (at, DATE_DAYNAME, buf, 100);
-			print_text_size (pc, 18, buf, ALIGN_LEFT, l + 3, todo, t - 27 - 4, header);
-			gnome_print_showpage (pc);
-			at = time_add_day (at, 1);
-		}
-		break;
-	}
-
-	case PRINT_VIEW_WEEK:
-		header = t - 70;
-		print_week_summary (pc, gcal, at, l, r, header, b);
-
-		/* more solid total outline */
-		print_border (pc, l, r, header, b, 1.0, -1.0);
-
-		/* header border */
-		print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-		when = time_week_begin (at);
-		when = time_add_day (when, 1);
-
-		print_month_small (pc, gcal, at, r - 90, r - 4, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1), r - 190, r - 104, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 4, header);
-
-		when = time_add_day (when, 6);
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 24 - 3, header);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_MONTH:
-		header = t - 70;
-		gnome_print_rotate (pc, 90);
-		gnome_print_translate (pc, 0, -gnome_paper_pswidth (paper_info));
-		/*print_month_summary(pc, cal, at, l, r, header, b);*/
-		print_month_summary (pc, gcal, at, b, t, r - 70, l);
-
-		print_border (pc, b, t, r, r - 72.0, 1.0, 0.9);
-
-		print_month_small (pc, gcal, time_add_month (at, 1),
-				   t - (t - b) / 7 + 2, t - 8, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1),
-				   b + 8, b + (t - b) / 7 - 2, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-		/* centered title */
-		format_date (at, DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_CENTRE, b + 3, t, r - 3, l);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_YEAR:
-#if 0
-		/* landscape */
-		gnome_print_rotate(pc, 90);
-		gnome_print_translate(pc, 0, -gnome_paper_pswidth(paper_info));
-		print_year_summary(pc, gcal, at, b, t, r-50, l, FALSE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, b+3, t, r-3, l);
-#else
-		/* portrait */
-		print_year_summary(pc, gcal, at, l, r, t-50, b, TRUE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, l+3, r, t-3, b);
-#endif
-		gnome_print_showpage(pc);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gnome_print_master_close (gpm);
-
-	if (preview) {
-		GnomePrintMasterPreview *gpmp;
-
-		gpmp = gnome_print_master_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (GTK_WIDGET (gpmp));
-	} else
-		gnome_print_master_print (gpm);
-
-	gtk_object_unref (GTK_OBJECT (gpm));
-}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
deleted file mode 100644
index e88c4a8e01..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef PRINT_H
-#define PRINT_H
-
-#include "gnome-cal.h"
-
-
-
-typedef enum {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR
-} PrintView;
-
-void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);
-
-
-
-#endif
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
deleted file mode 100644
index e7e75c6c9b..0000000000
--- a/calendar/gui/prop.c
+++ /dev/null
@@ -1,941 +0,0 @@
-/* Calendar properties dialog box
- *
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza <miguel@kernel.org>
- *          Federico Mena <federico@nuclecu.unam.mx>
- */
-#include <config.h>
-#ifdef HAVE_LANGINGO_H
-#include <langinfo.h>
-#else
-#include <locale.h>
-#endif
-#include <gnome.h>
-#include "gnome-cal.h"
-#include "gnome-month-item.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-/* These specify the page numbers in the preferences notebook */
-enum {
-	PROP_TIME_DISPLAY,
-	PROP_COLORS,
-	PROP_TODO,
-	PROP_ALARMS
-};
-
-static GtkWidget *prop_win;		/* The preferences dialog */
-
-/* Widgets for the time display page */
-
-static GtkWidget *time_format_12;	/* Radio button for 12-hour format */
-static GtkWidget *time_format_24;	/* Radio button for 24-hour format */
-static GtkWidget *start_on_sunday;	/* Check button for weeks starting on Sunday */
-static GtkWidget *start_on_monday;	/* Check button for weeks starting on Monday */
-static GtkWidget *start_omenu;		/* Option menu for start of day */
-static GtkWidget *end_omenu;		/* Option menu for end of day */
-static GtkWidget *start_items[24];	/* Menu items for start of day menu */
-static GtkWidget *end_items[24];	/* Menu items for end of day menu */
-
-/* Widgets for the colors page */
-
-static GtkWidget *color_pickers[COLOR_PROP_LAST];
-static GnomeCanvasItem *month_item;
-
-/* Widgets for the todo page */
-static GtkWidget *due_date_show_button;
-
-static GtkWidget *todo_item_time_remaining_show_button;
-
-static GtkWidget *todo_item_highlight_overdue;
-static GtkWidget *todo_item_highlight_not_due_yet;
-static GtkWidget *todo_item_highlight_due_today;
-
-static GtkWidget *priority_show_button;
-
-/* Widgets for the alarm page */
-static GtkWidget *enable_display_beep;
-static GtkWidget *to_cb;
-static GtkWidget *to_spin;
-static GtkWidget *snooze_cb;
-static GtkWidget *snooze_spin;
-
-/* prototypes */
-#if 0
-static void prop_apply_alarms (void);
-#endif
-static void create_alarm_page (void);
-static void to_cb_changed (GtkWidget* object, gpointer data);
-static void snooze_cb_changed (GtkWidget* object, gpointer data);
-
-GtkWidget* make_spin_button (int val, int low, int high);
-#if 0
-void ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm,
-		   enum AlarmType type, int y, gboolean sens,
-		   GtkSignalFunc dirty_func);
-void ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type);
-#endif
-
-/* Callback used when the property box is closed -- just sets the prop_win variable to null. */
-static int
-prop_cancel (void)
-{
-	prop_win = NULL;
-	return FALSE;
-}
-
-/* Returns the index of the active item in a menu */
-static int
-get_active_index (GtkWidget *menu)
-{
-	GtkWidget *active;
-
-	active = gtk_menu_get_active (GTK_MENU (menu));
-	return GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (active)));
-}
-
-/* Applies the settings in the time display page */
-static void
-prop_apply_time_display (void)
-{
-	/* Day begin/end */
-
-	day_begin = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));
-	day_end   = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));
-	gnome_config_set_int ("/calendar/Calendar/Day start", day_begin);
-	gnome_config_set_int ("/calendar/Calendar/Day end", day_end);
-
-	/* Time format */
-
-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)->active;
-	gnome_config_set_bool ("/calendar/Calendar/AM PM flag", am_pm_flag);
-
-	/* Week start */
-
-	week_starts_on_monday = GTK_TOGGLE_BUTTON (start_on_monday)->active;
-	gnome_config_set_bool ("/calendar/Calendar/Week starts on Monday", week_starts_on_monday);
-
-	gnome_config_sync ();
-	time_format_changed ();
-}
-
-/* Applies the settings in the colors page */
-static void
-prop_apply_colors (void)
-{
-	int i;
-	char *cspec;
-	gushort r, g, b;
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[i]), &r, &g, &b, NULL);
-		color_props[i].r = r;
-		color_props[i].g = g;
-		color_props[i].b = b;
-		
-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		gnome_config_set_string (color_props[i].key, cspec);
-	}
-
-	gnome_config_sync ();
-	colors_changed ();
-}
-/* Applies the settings in the todo page (FIX THIS IF ITS NOT WRITTEN) */
-static void
-prop_apply_todo(void) 
-{
-	todo_show_due_date = GTK_TOGGLE_BUTTON (due_date_show_button)->active;
-	
-	todo_item_dstatus_highlight_overdue = GTK_TOGGLE_BUTTON(todo_item_highlight_overdue)->active;
-	todo_item_dstatus_highlight_not_due_yet = GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet)->active;
-	todo_item_dstatus_highlight_due_today = GTK_TOGGLE_BUTTON(todo_item_highlight_due_today)->active;
-
-	todo_show_priority = GTK_TOGGLE_BUTTON (priority_show_button)->active;
-
-	todo_show_time_remaining = GTK_TOGGLE_BUTTON (todo_item_time_remaining_show_button)->active;
-
-	/* storing the values */
-
-	gnome_config_set_bool("/calendar/Todo/show_time_remain", todo_show_time_remaining);
-	gnome_config_set_bool("/calendar/Todo/highlight_overdue", todo_item_dstatus_highlight_overdue);
-	
-	gnome_config_set_bool("/calendar/Todo/highlight_due_today", todo_item_dstatus_highlight_due_today);
-	
-        gnome_config_set_bool("/calendar/Todo/highlight_not_due_yet", todo_item_dstatus_highlight_not_due_yet);
-	gnome_config_set_bool("/calendar/Todo/show_due_date", todo_show_due_date);
-	gnome_config_set_bool("/calendar/Todo/show_priority", todo_show_priority);
-	/* need to sync our config changes. */
-	gnome_config_sync ();
-
-	/* apply the current changes */
-	todo_properties_changed();
-}
-
-
-/* Callback used when the Apply button is clicked. */
-static void
-prop_apply (GtkWidget *w, int page)
-{
-	switch (page) {
-	case PROP_TIME_DISPLAY:
-		prop_apply_time_display ();
-		break;
-
-	case PROP_COLORS:
-		prop_apply_colors ();
-		break;
-
-	case PROP_TODO:
-	        prop_apply_todo ();
-		break;
-		
-	case PROP_ALARMS:
-#if 0
-		prop_apply_alarms ();
-#endif
-		break;
-
-	case -1:
-		break;
-
-	default:
-		g_warning ("We have a loose penguin!");
-		g_assert_not_reached ();
-	}
-}
-
-/* Notifies the property box that the data has changed */
-static void
-prop_changed (void)
-{
-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));
-}
-
-/* Builds and returns a two-element radio button group surrounded by a frame.  The radio buttons are
- * stored in the specified variables, and the first radio button's state is set according to the
- * specified flag value.  The buttons are connected to the prop_changed() function to update the property
- * box's dirty state.
- */
-static GtkWidget *
-build_two_radio_group (char *title,
-		       char *radio_1_title, GtkWidget **radio_1_widget,
-		       char *radio_2_title, GtkWidget **radio_2_widget,
-		       int radio_1_value)
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-
-	frame = gtk_frame_new (title);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	*radio_1_widget = gtk_radio_button_new_with_label (NULL, radio_1_title);
-	gtk_box_pack_start (GTK_BOX (vbox), *radio_1_widget, FALSE, FALSE, 0);
-	
-	*radio_2_widget = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (*radio_1_widget),
-								       radio_2_title);
-	gtk_box_pack_start (GTK_BOX (vbox), *radio_2_widget, FALSE, FALSE, 0);
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_1_widget), radio_1_value);
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_2_widget), !radio_1_value);
-
-	gtk_signal_connect (GTK_OBJECT (*radio_1_widget), "toggled",
-			    (GtkSignalFunc) prop_changed,
-			    NULL);
-
-	return frame;
-}
-
-/* Callback invoked when a menu item from the start/end time option menus is selected.  It adjusts
- * the other menu to the proper time, if needed.
- */
-static void
-hour_activated (GtkWidget *widget, gpointer data)
-{
-	int start, end;
-
-	if (data == start_omenu) {
-		/* Adjust the end menu */
-
-		start = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));
-		end = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));
-
-		if (end < start)
-			gtk_option_menu_set_history (GTK_OPTION_MENU (end_omenu), start);
-	} else if (data == end_omenu) {
-		/* Adjust the start menu */
-
-		end = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));
-		start = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));
-
-		if (start > end)
-			gtk_option_menu_set_history (GTK_OPTION_MENU (start_omenu), end);
-	} else
-		g_assert_not_reached ();
-
-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));
-}
-
-/* Builds an option menu of 24 hours */
-static GtkWidget *
-build_hours_menu (GtkWidget **items, int active)
-{
-	GtkWidget *omenu;
-	GtkWidget *menu;
-	int i;
-	char buf[100];
-	struct tm tm;
-	int am_pm_flag;
-
-	omenu = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)->active;
-
-	memset (&tm, 0, sizeof (tm));
-
-	for (i = 0; i < 24; i++) {
-		tm.tm_hour = i;
-		if (am_pm_flag)
-			strftime (buf, 100, "%I:%M %p", &tm);
-		else
-			strftime (buf, 100, "%H:%M", &tm);
-
-		items[i] = gtk_menu_item_new_with_label (buf);
-		gtk_object_set_user_data (GTK_OBJECT (items[i]), GINT_TO_POINTER (i));
-		gtk_signal_connect (GTK_OBJECT (items[i]), "activate",
-				    (GtkSignalFunc) hour_activated,
-				    omenu);
-
-		gtk_menu_append (GTK_MENU (menu), items[i]);
-		gtk_widget_show (items[i]);
-	}
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), active);
-	return omenu;
-}
-
-/* Creates the time display page in the preferences dialog */
-static void
-create_time_display_page (void)
-{
-	GtkWidget *table;
-	GtkWidget *vbox;
-	GtkWidget *frame;
-	GtkWidget *hbox2;
-	GtkWidget *hbox3;
-	GtkWidget *w;
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);
-	gtk_table_set_row_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), table,
-					gtk_label_new (_("Time display")));
-
-	/* Time format */
-
-	w = build_two_radio_group (_("Time format"),
-				   _("12-hour (AM/PM)"), &time_format_12,
-				   _("24-hour"), &time_format_24,
-				   am_pm_flag);
-	gtk_table_attach (GTK_TABLE (table), w,
-			  0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	/* Weeks start on */
-
-	w = build_two_radio_group (_("Weeks start on"),
-				   _("Sunday"), &start_on_sunday,
-				   _("Monday"), &start_on_monday,
-				   !week_starts_on_monday);
-	gtk_table_attach (GTK_TABLE (table), w,
-			  0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	/* Day range */
-
-	frame = gtk_frame_new (_("Day range"));
-	gtk_table_attach (GTK_TABLE (table), frame,
-			  1, 2, 0, 2,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	w = gtk_label_new (_("Please select the start and end hours you want\n"
-			     "to be displayed in the day view and week view.\n"
-			     "Times outside this range will not be displayed\n"
-			     "by default."));
-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-
-	hbox2 = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
-
-	/* Day start */
-
-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);
-
-	w = gtk_label_new (_("Day start:"));
-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);
-
-	start_omenu = build_hours_menu (start_items, day_begin);
-	gtk_box_pack_start (GTK_BOX (hbox3), start_omenu, FALSE, FALSE, 0);
-
-	/* Day end */
-
-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);
-
-	w = gtk_label_new (_("Day end:"));
-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);
-
-	end_omenu = build_hours_menu (end_items, day_end);
-	gtk_box_pack_start (GTK_BOX (hbox3), end_omenu, FALSE, FALSE, 0);
-}
-
-/* Called when the canvas for the month item is size allocated.  We use this to change the canvas'
- * scrolling region and the month item's size.
- */
-static void
-canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
-{
-	gnome_canvas_item_set (month_item,
-			       "width", (double) (allocation->width - 1),
-			       "height", (double) (allocation->height - 1),
-			       NULL);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),
-					0, 0,
-					allocation->width, allocation->height);
-}
-
-/* Returns a color spec based on the color pickers */
-static char *
-color_spec_from_picker (int num)
-{
-	gushort r, g, b;
-
-	gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[num]), &r, &g, &b, NULL);
-
-	return build_color_spec (r, g, b);
-}
-
-/* Callback used to query color information for the properties box */
-static char *
-fetch_color_spec (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_picker (propnum);
-}
-
-/* Marks fake event days in the month item sample */
-static void
-fake_mark_days (void)
-{
-	static int day_nums[] = { 1, 4, 8, 16, 17, 18, 20, 25, 28 }; /* some random days */
-	int first_day_index;
-	int i;
-
-	first_day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), 1);
-
-	for (i = 0; i < (sizeof (day_nums) / sizeof (day_nums[0])); i++)
-		mark_month_item_index (GNOME_MONTH_ITEM (month_item), first_day_index + day_nums[i] - 1,
-				       fetch_color_spec, NULL);
-}
-
-/* Switches the month item to the current date and highlights the current day's number */
-static void
-set_current_day (void)
-{
-	struct tm tm;
-	time_t t;
-	GnomeCanvasItem *item;
-	int day_index;
-
-	/* Set the date */
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	gnome_canvas_item_set (month_item,
-			       "year", tm.tm_year + 1900,
-			       "month", tm.tm_mon,
-			       NULL);
-
-	/* Highlight current day */
-
-	day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), tm.tm_mday);
-	item = gnome_month_item_num2child (GNOME_MONTH_ITEM (month_item), GNOME_MONTH_ITEM_DAY_LABEL + day_index);
-	gnome_canvas_item_set (item,
-			       "fill_color", color_spec_from_picker (COLOR_PROP_CURRENT_DAY_FG),
-			       "fontset", CURRENT_DAY_FONTSET,
-			       NULL);
-}
-
-/* This is the version of a color spec query function that is appropriate for the preferences dialog */
-static char *
-prop_color_func (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_picker (propnum);
-}
-
-/* Sets the colors of the month item to the current prerences */
-static void
-reconfigure_month (void)
-{
-	colorify_month_item (GNOME_MONTH_ITEM (month_item), prop_color_func, NULL);
-	fake_mark_days ();
-	set_current_day ();
-
-	/* Reset prelighting information */
-
-	month_item_prepare_prelight (GNOME_MONTH_ITEM (month_item), fetch_color_spec, NULL);
-}
-
-/* Callback used when a color is changed */
-static void
-color_set (void)
-{
-	reconfigure_month ();
-	prop_changed ();
-}
-
-/* Creates the colors page in the preferences dialog */
-static void
-create_colors_page (void)
-{
-	GtkWidget *frame;
-	GtkWidget *hbox;
-	GtkWidget *table;
-	GtkWidget *w;
-	int i;
-
-	frame = gtk_frame_new (_("Colors for display"));
-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,
-					gtk_label_new (_("Colors")));
-
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), hbox);
-
-	table = gtk_table_new (COLOR_PROP_LAST, 2, FALSE);
-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
-
-	/* Create the color pickers */
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		/* Label */
-
-		w = gtk_label_new (_(color_props[i].label));
-		gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
-		gtk_table_attach (GTK_TABLE (table), w,
-				  0, 1, i, i + 1,
-				  GTK_FILL, 0,
-				  0, 0);
-
-		/* Color picker */
-
-		color_pickers[i] = gnome_color_picker_new ();
-		gnome_color_picker_set_title (GNOME_COLOR_PICKER (color_pickers[i]), _(color_props[i].label));
-		gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (color_pickers[i]),
-					    color_props[i].r, color_props[i].g, color_props[i].b, 0);
-		gtk_table_attach (GTK_TABLE (table), color_pickers[i],
-				  1, 2, i, i + 1,
-				  0, 0,
-				  0, 0);
-		gtk_signal_connect (GTK_OBJECT (color_pickers[i]), "color_set",
-				    (GtkSignalFunc) color_set,
-				    NULL);
-	}
-
-	/* Create the sample calendar */
-
-	w = gnome_canvas_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-
-	month_item = gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (w)));
-	gnome_canvas_item_set (month_item,
-			       "start_on_monday", week_starts_on_monday,
-			       NULL);
-	reconfigure_month ();
-	
-	gtk_signal_connect (GTK_OBJECT (w), "size_allocate",
-			    canvas_size_allocate,
-			    NULL);
-
-}
-
-
-static void
-set_todo_page_options(void)
-{
-  
-  
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-todo_option_set (void)
-{
-	prop_changed ();
-	set_todo_page_options ();
-}
-
-/* Creates the colors page in the preferences dialog */
-static GtkWidget *
-build_list_options_frame(void) 
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-	frame = gtk_frame_new (_("Show on TODO List:"));
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	
-	due_date_show_button = gtk_check_button_new_with_label (_("Due Date"));
-	priority_show_button = gtk_check_button_new_with_label (_("Priority"));
-	todo_item_time_remaining_show_button = gtk_check_button_new_with_label (_("Time Until Due"));
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(due_date_show_button), todo_show_due_date);
-	gtk_signal_connect (GTK_OBJECT(due_date_show_button),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), due_date_show_button, FALSE, FALSE, 0);
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_time_remaining_show_button), todo_show_time_remaining);
-	gtk_signal_connect (GTK_OBJECT(todo_item_time_remaining_show_button),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_time_remaining_show_button, FALSE, FALSE, 0);
-
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(priority_show_button), todo_show_priority);
-	gtk_signal_connect (GTK_OBJECT(priority_show_button), 
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), priority_show_button, FALSE, FALSE, 0);
-	return frame;
-}
-static GtkWidget *
-build_style_list_options_frame(void) 
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-
-	frame = gtk_frame_new (_("To Do List style options:"));
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	
-	todo_item_highlight_overdue = gtk_check_button_new_with_label (_("Highlight overdue items"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_overdue),
-				     todo_item_dstatus_highlight_overdue);
-	todo_item_highlight_not_due_yet = gtk_check_button_new_with_label (_("Highlight not yet due items"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet),
-				     todo_item_dstatus_highlight_overdue);
-	todo_item_highlight_due_today = gtk_check_button_new_with_label (_("Highlight items due today"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_due_today),
-				     todo_item_dstatus_highlight_overdue);
-		
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_overdue),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_not_due_yet),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_due_today),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_overdue, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_due_today, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_not_due_yet, FALSE, FALSE, 0);
-	return frame;
-}
-static void
-create_todo_page (void)
-{
-	GtkWidget *frame;
-	GtkWidget *main_box;
-	GtkWidget *hbox;
-
-
-	frame = gtk_frame_new (_("To Do List Properties"));
-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,
-					gtk_label_new (_("To Do List")));
-
-	/* first vbox*/
-	main_box = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), main_box);
-
-	
-	/* first hbox*/
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (main_box), hbox);
-	
-	gtk_box_pack_start (GTK_BOX(hbox), build_list_options_frame(), FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(hbox), build_style_list_options_frame(), FALSE, FALSE, 0);
-	
- 	set_todo_page_options(); 
-}
-
-/* Creates and displays the preferences dialog for the whole application */
-void
-properties (GtkWidget *toplevel)
-{
-        static GnomeHelpMenuEntry help_entry = { NULL, "properties" };
-
-	help_entry.name = gnome_app_id;
-
-	if (prop_win)
-		return;
-
-	prop_win = gnome_property_box_new ();
-	gtk_window_set_title (GTK_WINDOW (prop_win), _("Preferences"));
-	gnome_dialog_set_parent (GNOME_DIALOG (prop_win),
-			 GTK_WINDOW (gtk_widget_get_toplevel (toplevel)));
-
-	create_time_display_page ();
-	create_colors_page ();
-	create_todo_page ();
-	create_alarm_page ();
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "destroy",
-			    (GtkSignalFunc) prop_cancel, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "delete_event",
-			    (GtkSignalFunc) prop_cancel, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "apply",
-			    (GtkSignalFunc) prop_apply, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "help",
-			    GTK_SIGNAL_FUNC (gnome_help_pbox_display),
-			    &help_entry);
-
-	gtk_widget_show_all (prop_win);
-}
-
-char *
-build_color_spec (int r, int g, int b)
-{
-	static char spec[100];
-
-	sprintf (spec, "#%04x%04x%04x", r, g, b);
-	return spec;
-}
-
-void
-parse_color_spec (char *spec, int *r, int *g, int *b)
-{
-	g_return_if_fail (spec != NULL);
-	g_return_if_fail (r != NULL);
-	g_return_if_fail (r != NULL);
-	g_return_if_fail (r != NULL);
-
-	if (sscanf (spec, "#%04x%04x%04x", r, g, b) != 3) {
-		g_warning ("Invalid color specification %s, returning black", spec);
-
-		*r = *g = *b = 0;
-	}
-}
-
-char *
-color_spec_from_prop (ColorProp propnum)
-{
-	return build_color_spec (color_props[propnum].r, color_props[propnum].g, color_props[propnum].b);
-}
-
-static void
-create_alarm_page (void)
-{
-	GtkWidget *main_box;
-	GtkWidget *default_frame;
-	GtkWidget *default_table;
-	GtkWidget *misc_frame;
-	GtkWidget *misc_box;
-	GtkWidget *box, *l;
-
-	main_box = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), 
-					main_box, gtk_label_new (_("Alarms")));
-
-	/* build miscellaneous box */
-	misc_frame = gtk_frame_new (_("Alarm Properties"));
-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), 
-					GNOME_PAD_SMALL);
-	misc_box = gtk_vbox_new (FALSE, GNOME_PAD);
-
-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (misc_frame), misc_box);
-
-	gtk_box_pack_start (GTK_BOX (main_box), misc_frame, FALSE, FALSE, 0);
-
-	enable_display_beep = gtk_check_button_new_with_label (_("Beep on display alarms"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_display_beep),
-				      beep_on_display);
-	gtk_box_pack_start (GTK_BOX (misc_box), enable_display_beep, FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (enable_display_beep), "toggled",
-			    (GtkSignalFunc) prop_changed,
-			    NULL);
-
-	/* audio timeout widgets */
-	box = gtk_hbox_new (FALSE, GNOME_PAD);
-	to_cb = gtk_check_button_new_with_label (_("Audio alarms timeout after"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (to_cb), 
-				      enable_aalarm_timeout);
-	gtk_signal_connect (GTK_OBJECT (to_cb), "toggled",
-			    (GtkSignalFunc) to_cb_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), to_cb, FALSE, FALSE, 0);
-	to_spin = make_spin_button (audio_alarm_timeout, 1, MAX_AALARM_TIMEOUT);
-	gtk_widget_set_sensitive (to_spin, enable_aalarm_timeout);
-	gtk_signal_connect (GTK_OBJECT (to_spin), "changed",
-			    (GtkSignalFunc) prop_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), to_spin, FALSE, FALSE, 0);
-	l = gtk_label_new (_(" seconds"));
-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);
-	
-	/* snooze widgets */
-	box = gtk_hbox_new (FALSE, GNOME_PAD);
-	snooze_cb = gtk_check_button_new_with_label (_("Enable snoozing for "));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (snooze_cb), 
-				      enable_snooze);
-	gtk_signal_connect (GTK_OBJECT (snooze_cb), "toggled",
-			    (GtkSignalFunc) snooze_cb_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), snooze_cb, FALSE, FALSE, 0);
-	snooze_spin = make_spin_button (snooze_secs, 1, MAX_SNOOZE_SECS);
-	gtk_widget_set_sensitive (snooze_spin, enable_snooze);
-	gtk_signal_connect (GTK_OBJECT (snooze_spin), "changed",
-			    (GtkSignalFunc) prop_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), snooze_spin, FALSE, FALSE, 0);
-	l = gtk_label_new (_(" seconds"));
-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);
-	
-	/* populate default frame/box */
-	default_frame = gtk_frame_new (_("Defaults"));
-	gtk_container_set_border_width (GTK_CONTAINER (default_frame), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (main_box), default_frame, FALSE, FALSE, 0);
-	default_table = gtk_table_new (1, 1, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (default_table), 4);
-	gtk_table_set_row_spacings (GTK_TABLE (default_table), 4);
-	gtk_table_set_col_spacings (GTK_TABLE (default_table), 4);
-	gtk_container_add (GTK_CONTAINER (default_frame), default_table);
-
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-	/*
-	ee_create_ae (GTK_TABLE (default_table), _("Display"), 
-		      &alarm_defaults [ALARM_DISPLAY], ALARM_DISPLAY, 1, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Audio"), 
-		      &alarm_defaults [ALARM_AUDIO], ALARM_AUDIO, 2, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Program"), 
-		      &alarm_defaults [ALARM_PROGRAM], ALARM_PROGRAM, 3, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Mail"), 
-		      &alarm_defaults [ALARM_MAIL], ALARM_MAIL, 4, 
-		      FALSE, prop_changed);
-	*/
-}
-	
-#if 0
-
-static void
-prop_store_alarm_default_values (CalendarAlarm* alarm)
-{
-  //	ee_store_alarm (alarm, alarm->type);
-
-	switch (alarm->type) {
-	case ALARM_DISPLAY:
-		gnome_config_push_prefix ("/calendar/alarms/def_disp_");
-		break;
-	case ALARM_AUDIO:
-		gnome_config_push_prefix ("/calendar/alarms/def_audio_");
-		break;
-	case ALARM_PROGRAM:
-		gnome_config_push_prefix ("/calendar/alarms/def_prog_");
-		break;
-	case ALARM_MAIL:
-		gnome_config_push_prefix ("/calendar/alarms/def_mail_");
-		break;
-	}
-	
-	gnome_config_set_int ("enabled", alarm->enabled);
-	gnome_config_set_int ("count", alarm->count);
-	gnome_config_set_int ("units", alarm->units);
-	if (alarm->data)
-		gnome_config_set_string ("data", alarm->data);
-	gnome_config_pop_prefix ();
-	gnome_config_sync ();
-}
-
-static void
-prop_apply_alarms ()
-{
-	int i;
-	for (i=0; i < 4; i++)
-		prop_store_alarm_default_values (&alarm_defaults [i]);
-
-	beep_on_display = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (enable_display_beep));
-	gnome_config_set_bool ("/calendar/alarms/beep_on_display", beep_on_display);
-	enable_aalarm_timeout = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));
-	gnome_config_set_bool ("/calendar/alarms/enable_audio_timeout", enable_aalarm_timeout);
-	audio_alarm_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (to_spin));
-	gnome_config_set_int ("/calendar/alarms/audio_alarm_timeout", audio_alarm_timeout);
-	enable_snooze = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));
-	gnome_config_set_bool ("/calendar/alarms/enable_snooze", enable_snooze);
-	snooze_secs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (snooze_spin));
-	gnome_config_set_int ("/calendar/alarms/snooze_secs", snooze_secs);
-
-	gnome_config_sync();
-}
-#endif
-
-static void
-to_cb_changed (GtkWidget *object, gpointer data)
-{
-	gboolean active = 
-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));
-	gtk_widget_set_sensitive (to_spin, active);
-	prop_changed ();
-}
-	
-static void
-snooze_cb_changed (GtkWidget *object, gpointer data)
-{
-	gboolean active =
-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));
-	gtk_widget_set_sensitive (snooze_spin, active);
-	prop_changed ();
-}
-
-
diff --git a/calendar/gui/recur.xpm b/calendar/gui/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/calendar/gui/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/calendar/gui/task-assigned-to.xpm b/calendar/gui/task-assigned-to.xpm
deleted file mode 100644
index 082be648bb..0000000000
--- a/calendar/gui/task-assigned-to.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_to_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #ABCCAB",
-"*	c #768E76",
-"=	c #5E705E",
-"-	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+#########$.  ",
-" .+%%%%%%%..$.  ",
-" .+#######.&..  ",
-" .+%%......&&.  ",
-" .+##.&&&&&&&&. ",
-" .+%%.&*&*&*&*&.",
-" .+##.========. ",
-" .+%%......==.  ",
-" .+#######.=..  ",
-" .+%%%%%%%..$.  ",
-" .-$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-assigned.xpm b/calendar/gui/task-assigned.xpm
deleted file mode 100644
index 9a66304103..0000000000
--- a/calendar/gui/task-assigned.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #FFCC66",
-"*	c #CC9933",
-"=	c #996600",
-"-	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+##..#####$.  ",
-" .+%%.&.%%%%$.  ",
-"......&&.###$.  ",
-".&&&&&&&&.%%$.  ",
-".&*&*&*&*&.#$.  ",
-".========.#%$.  ",
-"......==.###$.  ",
-" .###.=.#%%%$.  ",
-" .+##..#####$.  ",
-" .+%%##%%%%%$.  ",
-" .-$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-recurring.xpm b/calendar/gui/task-recurring.xpm
deleted file mode 100644
index 29b78d84c7..0000000000
--- a/calendar/gui/task-recurring.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * task_recurring_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/calendar/gui/task.xpm b/calendar/gui/task.xpm
deleted file mode 100644
index 84f5cf5e65..0000000000
--- a/calendar/gui/task.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * task_xpm[] = {
-"16 16 13 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #993333",
-"*	c #660000",
-"=	c #999999",
-"-	c #666666",
-";	c #663333",
-">	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#######&*$.  ",
-" .+%%%%%%&*=$.  ",
-" .+#&=##&*-#$.  ",
-" .+%&&%&*=#%$.  ",
-" .+#;&&*-=##$.  ",
-" .+%-&*-=%%%$.  ",
-" .+#=--=####$.  ",
-" .+%%%%%%%%%$.  ",
-" .>$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/test.vcf b/calendar/gui/test.vcf
deleted file mode 100644
index bfe93b3c14..0000000000
--- a/calendar/gui/test.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/test2.vcf b/calendar/gui/test2.vcf
deleted file mode 100644
index 6446507989..0000000000
--- a/calendar/gui/test2.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 8469308861
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308862
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308863
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893834
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893835
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 8469308866
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893837
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893838
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/topic.dat b/calendar/gui/topic.dat
deleted file mode 100644
index edc7813b26..0000000000
--- a/calendar/gui/topic.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-cal.html		Manual
-gnome-cal.html#cmdline  Command line options 
\ No newline at end of file
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index a9a0d50c7c..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-canvas-text.h>
-#include <libgnome/gnome-i18n.h>
-#include "weekday-picker.h"
-
-
-
-#define PADDING 2
-
-/* Private part of the WeekdayPicker structure */
-struct _WeekdayPickerPrivate {
-	/* Selected days; see weekday_picker_set_days() */
-	guint8 day_mask;
-
-	/* Metrics */
-	int font_ascent, font_descent;
-	int max_letter_width;
-
-	/* Components */
-	GnomeCanvasItem *boxes[7];
-	GnomeCanvasItem *labels[7];
-
-	/* Whether the week starts on Monday or Sunday */
-	guint week_starts_on_monday : 1;
-};
-
-
-
-static void weekday_picker_class_init (WeekdayPickerClass *class);
-static void weekday_picker_init (WeekdayPicker *wp);
-static void weekday_picker_finalize (GtkObject *object);
-
-static void weekday_picker_realize (GtkWidget *widget);
-static void weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style);
-
-static GnomeCanvasClass *parent_class;
-
-
-
-/**
- * weekday_picker_get_type:
- * 
- * Registers the #WeekdayPicker class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #WeekdayPicker class.
- **/
-GtkType
-weekday_picker_get_type (void)
-{
-	static GtkType weekday_picker_type = 0;
-
-	if (!weekday_picker_type) {
-		static const GtkTypeInfo weekday_picker_info = {
-			"WeekdayPicker",
-			sizeof (WeekdayPicker),
-			sizeof (WeekdayPickerClass),
-			(GtkClassInitFunc) weekday_picker_class_init,
-			(GtkObjectInitFunc) weekday_picker_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		weekday_picker_type = gtk_type_unique (GNOME_TYPE_CANVAS, &weekday_picker_info);
-	}
-
-	return weekday_picker_type;
-}
-
-/* Class initialization function for the weekday picker */
-static void
-weekday_picker_class_init (WeekdayPickerClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (GNOME_TYPE_CANVAS);
-
-	object_class->finalize = weekday_picker_finalize;
-
-	widget_class->realize = weekday_picker_realize;
-	widget_class->size_request = weekday_picker_size_request;
-	widget_class->size_allocate = weekday_picker_size_allocate;
-	widget_class->style_set = weekday_picker_style_set;
-}
-
-/* Event handler for the day items */
-static gint
-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int i;
-	guint8 day_mask;
-
-	wp = WEEKDAY_PICKER (data);
-	priv = wp->priv;
-
-	if (!(event->type == GDK_BUTTON_PRESS && event->button.button == 1))
-		return FALSE;
-
-	/* Find which box was clicked */
-
-	for (i = 0; i < 7; i++)
-		if (priv->boxes[i] == item || priv->labels[i] == item)
-			break;
-
-	g_assert (i != 7);
-
-	/* Turn on that day */
-
-	if (priv->week_starts_on_monday) {
-		if (i == 6)
-			i = 0;
-		else
-			i++;
-	}
-
-	if (priv->day_mask & (0x1 << i))
-		day_mask = priv->day_mask & ~(0x1 << i);
-	else
-		day_mask = priv->day_mask | (0x1 << i);
-
-	weekday_picker_set_days (wp, day_mask);
-
-	return TRUE;
-}
-
-
-/* Creates the canvas items for the weekday picker.  The items are empty until
- * they are configured elsewhere.
- */
-static void
-create_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GnomeCanvasGroup *parent;
-	int i;
-
-	priv = wp->priv;
-
-	parent = gnome_canvas_root (GNOME_CANVAS (wp));
-
-	for (i = 0; i < 7; i++) {
-		priv->boxes[i] = gnome_canvas_item_new (parent,
-							GNOME_TYPE_CANVAS_RECT,
-							NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->boxes[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-
-		priv->labels[i] = gnome_canvas_item_new (parent,
-							 GNOME_TYPE_CANVAS_TEXT,
-							 NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->labels[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-
-	}
-}
-
-/* Object initialization function for the weekday picker */
-static void
-weekday_picker_init (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	priv = g_new0 (WeekdayPickerPrivate, 1);
-
-	wp->priv = priv;
-
-	create_items (wp);
-}
-
-/* Finalize handler for the weekday picker */
-static void
-weekday_picker_finalize (GtkObject *object)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (object));
-
-	wp = WEEKDAY_PICKER (object);
-	priv = wp->priv;
-
-	g_free (priv);
-	wp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-colorize_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GdkColor *outline;
-	GdkColor *fill, *sel_fill;
-	GdkColor *text_fill, *sel_text_fill;
-	int i;
-
-	priv = wp->priv;
-
-	outline = &GTK_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
-
-	fill = &GTK_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
-	text_fill = &GTK_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
-
-	sel_fill = &GTK_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
-	sel_text_fill = &GTK_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
-
-	if (priv->week_starts_on_monday) {
-		GdkColor *f, *t;
-
-		for (i = 1; i < 7; i++) {
-			if (priv->day_mask & (0x1 << i)) {
-				f = sel_fill;
-				t = sel_text_fill;
-			} else {
-				f = fill;
-				t = text_fill;
-			}
-
-			gnome_canvas_item_set (priv->boxes[i - 1],
-					       "fill_color_gdk", f,
-					       "outline_color_gdk", outline,
-					       NULL);
-
-			gnome_canvas_item_set (priv->labels[i - 1],
-					       "fill_color_gdk", t,
-					       NULL);
-		}
-
-		if (priv->day_mask & (0x1 << 0)) {
-			f = sel_fill;
-			t = sel_text_fill;
-		} else {
-			f = fill;
-			t = text_fill;
-		}
-		
-		gnome_canvas_item_set (priv->boxes[6],
-				       "fill_color_gdk", f,
-				       "outline_color_gdk", outline,
-				       NULL);
-
-		gnome_canvas_item_set (priv->labels[6],
-				       "fill_color_gdk", t,
-				       NULL);
-	} else {
-		GdkColor *f, *t;
-
-		for (i = 0; i < 7; i++) {
-			if (priv->day_mask & (0x1 << i)) {
-				f = sel_fill;
-				t = sel_text_fill;
-			} else {
-				f = fill;
-				t = text_fill;
-			}
-
-			gnome_canvas_item_set (priv->boxes[i],
-					       "fill_color_gdk", f,
-					       "outline_color_gdk", outline,
-					       NULL);
-
-			gnome_canvas_item_set (priv->labels[i],
-					       "fill_color_gdk", t,
-					       NULL);
-		}
-	}
-}
-
-/* Configures the items in the weekday picker by setting their attributes. */
-static void
-configure_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	int width, height;
-	int box_width;
-	const char *str;
-	int i;
-
-	priv = wp->priv;
-
-	width = GTK_WIDGET (wp)->allocation.width;
-	height = GTK_WIDGET (wp)->allocation.height;
-
-	box_width = (width - 1) / 7;
-
-	if (priv->week_starts_on_monday)
-		str = _("MTWTFSS");
-	else
-		str = _("SMTWTFS");
-
-	for (i = 0; i < 7; i++) {
-		char *c;
-
-		gnome_canvas_item_set (priv->boxes[i],
-				       "x1", (double) (i * box_width),
-				       "y1", (double) 0,
-				       "x2", (double) ((i + 1) * box_width),
-				       "y2", (double) (height - 1),
-				       "width_pixels", 0,
-				       NULL);
-
-		c = g_strndup (str + i, 1);
-		gnome_canvas_item_set (priv->labels[i],
-				       "text", c,
-				       "font_gdk", GTK_WIDGET (wp)->style->font,
-				       "x", (double) (i * box_width) + box_width / 2.0,
-				       "y", (double) (1 + PADDING),
-				       "anchor", GTK_ANCHOR_N,
-				       NULL);
-		g_free (c);
-	}
-
-	colorize_items (wp);
-}
-
-/* Realize handler for the weekday picker */
-static void
-weekday_picker_realize (GtkWidget *widget)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	configure_items (wp);
-}
-
-/* Size_request handler for the weekday picker */
-static void
-weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	requisition->width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
-	requisition->height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2);
-}
-
-/* Size_allocate handler for the weekday picker */
-static void
-weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (wp),
-					0, 0, allocation->width, allocation->height);
-
-	configure_items (wp);
-}
-
-/* Style_set handler for the weekday picker */
-static void
-weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int max_width;
-	const char *str;
-	int i, len;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	priv->font_ascent = widget->style->font->ascent;
-	priv->font_descent = widget->style->font->descent;
-
-	max_width = 0;
-
-	str = _("SMTWTFS");
-	len = strlen (str);
-
-	for (i = 0; i < len; i++) {
-		int w;
-
-		w = gdk_char_measure (widget->style->font, str[i]);
-		if (w > max_width)
-			max_width = w;
-	}
-
-	priv->max_letter_width = max_width;
-
-	configure_items (wp);
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style);
-}
-
-
-
-/**
- * weekday_picker_new:
- * @void: 
- * 
- * Creates a new weekday picker widget.
- * 
- * Return value: A newly-created weekday picker.
- **/
-GtkWidget *
-weekday_picker_new (void)
-{
-	return gtk_type_new (TYPE_WEEKDAY_PICKER);
-}
-
-/**
- * weekday_picker_set_days:
- * @wp: A weekday picker.
- * @day_mask: Bitmask with the days to be selected.
- * 
- * Sets the days that are selected in a weekday picker.  In the @day_mask,
- * Sunday is bit 0, Monday is bit 1, etc.
- **/
-void
-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-
-	priv->day_mask = day_mask;
-	colorize_items (wp);
-}
-
-/**
- * weekday_picker_get_days:
- * @wp: A weekday picker.
- * 
- * Queries the days that are selected in a weekday picker.
- * 
- * Return value: Bit mask of selected days.  Sunday is bit 0, Monday is bit 1,
- * etc.
- **/
-guint8
-weekday_picker_get_days (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, 0);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);
-
-	priv = wp->priv;
-	return priv->day_mask;
-}
-
-/**
- * weekday_picker_set_week_starts_on_monday:
- * @wp: A weekday picker.
- * @on_monday: Whether weeks start on Monday.
- * 
- * Sets whether a weekday picker should display weeks as starting on monday.
- * The default setting is to make Sunday the first day of the week.
- **/
-void
-weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-	priv->week_starts_on_monday = on_monday ? TRUE : FALSE;
-
-	configure_items (wp);
-}
-
-/**
- * weekday_picker_get_week_starts_on_monday:
- * @wp: A weekday picker.
- * 
- * Queries whether a weekday picker is set to show weeks as starting on Monday.
- * 
- * Return value: TRUE if weeks start on monday, FALSE if on Sunday.
- **/
-gboolean
-weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, FALSE);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), FALSE);
-
-	priv = wp->priv;
-	return priv->week_starts_on_monday;
-}
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
deleted file mode 100644
index df053a1f6f..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef WEEKDAY_PICKER_H
-#define WEEKDAY_PICKER_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())
-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\
-					WeekdayPickerClass))
-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))
-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
-
-typedef struct _WeekdayPicker WeekdayPicker;
-typedef struct _WeekdayPickerClass WeekdayPickerClass;
-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;
-
-struct _WeekdayPicker {
-	GnomeCanvas canvas;
-
-	/* Private data */
-	WeekdayPickerPrivate *priv;
-};
-
-struct _WeekdayPickerClass {
-	GnomeCanvasClass parent_class;
-};
-
-GtkType weekday_picker_get_type (void);
-
-GtkWidget *weekday_picker_new (void);
-
-void weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask);
-guint8 weekday_picker_get_days (WeekdayPicker *wp);
-
-void weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday);
-gboolean weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/weekview.xpm b/calendar/gui/weekview.xpm
deleted file mode 100644
index 869b9e722a..0000000000
--- a/calendar/gui/weekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * weekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #F2F1ED",
-"$	c #919191",
-"%	c #666666",
-"....................... ",
-".++++++++++@++++++++++. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$$$$$$$$$$$. ",
-".+#########$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".@$$$$$$$$$%$$$$$$$$$%. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/workweekview.xpm b/calendar/gui/workweekview.xpm
deleted file mode 100644
index 35cceedbdc..0000000000
--- a/calendar/gui/workweekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * workweekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #B5B4AF",
-"$	c #666666",
-"%	c #F2F1ED",
-"....................... ",
-".++++@+++@+++@+++@++++. ",
-".+###$###$###$###$###$. ",
-".+###$###$###$###$###$. ",
-".@$$$$$$$$$$$$$$$$$$$$. ",
-".++++#+++#+++#+++#+++#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".@###$###$###$###$####. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/yearview.xpm b/calendar/gui/yearview.xpm
deleted file mode 100644
index 0d4fa4135b..0000000000
--- a/calendar/gui/yearview.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * yearview_xpm[] = {
-"24 24 17 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F2F1ED",
-"#	c #AAA9A6",
-"$	c #D7D6D2",
-"%	c #92918E",
-"&	c #B7B6B3",
-"*	c #CBCAC6",
-"=	c #919191",
-"-	c #888785",
-";	c #B6B6B2",
-">	c #888884",
-",	c #C1C1BD",
-"'	c #A7A6A3",
-")	c #D8D8D4",
-"!	c #666666",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@#$%&*@@@@@@@=. ",
-".+@@@@@@@-;>,'@@@@@@@=. ",
-".+====================. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".)===================!. ",
-"....................... ",
-"                        "};
diff --git a/calendar/idl/.cvsignore b/calendar/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am
deleted file mode 100644
index ec6b4e45f0..0000000000
--- a/calendar/idl/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA = 			\
-	evolution-calendar.idl
-
-EXTRA_DIST =		\
-	$(idl_DATA)
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
deleted file mode 100644
index ab80ff8702..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Evolution calendar interface
- *
- * Copyright (C) 2000 Eskil Heyn Olsen
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#ifndef _EVOLUTION_CALENDAR_IDL_
-#define _EVOLUTION_CALENDAR_IDL_
-
-#include <Bonobo.idl>
-
-module Evolution {
-
-module Calendar {
-	/* A calendar object (event/todo/journal/etc), represented as an
-	 * iCalendar string.
-	 */
-	typedef string CalObj;
-
-	/* An unique identifier for a calendar object */
-	typedef string CalObjUID;
-
-	/* Sequence of unique identifiers */
-	typedef sequence<CalObjUID> CalObjUIDSeq;
-
-	/* Flags for getting UID sequences */
-	typedef long CalObjType;
-	const CalObjType TYPE_EVENT   = 1 << 0;
-	const CalObjType TYPE_TODO    = 1 << 1;
-	const CalObjType TYPE_JOURNAL = 1 << 2;
-	const CalObjType TYPE_ANY     = 0x07;
-
-	/* Types of object changes made */
-	typedef long CalObjChangeType;
-	const CalObjChangeType UPDATED = 1 << 0;
-	const CalObjChangeType REMOVED = 1 << 1;
-	
-	/* Types of alarms */
-	enum AlarmType {
-		MAIL,
-		PROGRAM,
-		DISPLAY,
-		AUDIO
-	};
-
-	/* Used to store a time_t */
-	typedef unsigned long Time_t;
-
-	/* An instance of a calendar object that actually occurs.  These are
-	 * "virtual" objects in that they are used to represent instances of
-	 * recurring events and alarms.  "Real" objects just contain the
-	 * information required to figure out the times at which they recur or
-	 * trigger.
-	 */
-	struct CalObjInstance {
-		CalObjUID uid;
-		Time_t start;
-		Time_t end;
-	};
-
-	typedef sequence<CalObjInstance> CalObjInstanceSeq;
-
-	/* An object change */
-	struct CalObjChange {
-		CalObjUID uid;
-		CalObjChangeType type;
-	};
-
-	/* An alarm trigger instance */
-	struct CalAlarmInstance {
-		CalObjUID uid;
-		AlarmType type;
-		Time_t trigger;
-		Time_t occur;
-	};
-
-	typedef sequence<CalAlarmInstance> CalAlarmInstanceSeq;
-
-	typedef sequence<CalObjChange> CalObjChangeSeq;
-
-	interface Listener;
-
-	/* Calendar client interface */
-	interface Cal : Bonobo::Unknown {
-		exception NotFound {};
-		exception InvalidRange {};
-		exception InvalidObject {};
-
-		/* A calendar is identified by its URI */
-		readonly attribute string uri;
-
-		/* Gets the number of objects of the specified types */
-		long get_n_objects (in CalObjType type);
-
-		/* Gets an object based on its URI */
-		CalObj get_object (in CalObjUID uid)
-			raises (NotFound);
-
-		/* Gets a list of UIDs based on object type */
-		CalObjUIDSeq get_uids (in CalObjType type);
-
-		/* Gets a list of UIDs that changed based on object type */
-		CalObjChangeSeq get_changed_uids (in CalObjType type, in Time_t since);
-
-		/* Gets a list of objects that occur or recur in the specified time range */
-		CalObjUIDSeq get_objects_in_range (in CalObjType type, 
-						   in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets the objects whose alarms trigger in the specified time
-		 * range.
-		 */
-		CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets the alarms for the specified object that trigger in the
-		 * specified time range.
-		 */
-		CalAlarmInstanceSeq get_alarms_for_object (in CalObjUID uid,
-							   in Time_t start, in Time_t end)
-			raises (NotFound, InvalidRange);
-
-
-		/* Updates an object by adding it if it does not exist or by
-		 * changing an existing one.
-		 */
-		void update_object (in CalObjUID uid, in CalObj calobj)
-			raises (InvalidObject);
-
-		/* Removes an object */
-		void remove_object (in CalObjUID uid)
-			raises (NotFound);
-	};
-
-	/* Listener for changes in a calendar */
-	interface Listener : Bonobo::Unknown {
-		/* Return status when loading a calendar; we need better error reporting */
-		enum LoadStatus {
-			SUCCESS,		/* All OK */
-			ERROR,			/* Generic error */
-			IN_USE,			/* Requested create while a calendar
-						 * with the same URI was in use.
-						 */
-			METHOD_NOT_SUPPORTED	/* A method handler is not registered */
-		};
-
-		/* Called from a CalFactory when a calendar is initially loaded
-		 * or created.  The listener must remember the cal object.
-		 */
-		void cal_loaded (in LoadStatus status, in Cal cal);
-
-		/* Called from a Calendar when an object is added or changed */
-		void obj_updated (in CalObjUID uid);
-
-		/* Called from a Calendar when an object is removed */
-		void obj_removed (in CalObjUID uid);
-	};
-
-	/* A calendar factory, can load and create calendars */
-	interface CalFactory : Bonobo::Unknown {
-		exception NilListener {};
-
-		/* Load a calendar from an URI */
-		void load (in string uri, in Listener listener)
-			raises (NilListener);
-
-		/* Create a new calendar at the specified URI */
-		void create (in string uri, in Listener listener)
-			raises (NilListener);
-	};
-};
-
-};
-
-#endif
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
deleted file mode 100644
index ac51a554db..0000000000
--- a/calendar/pcs/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-.pure
-*.la
-*.lo
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
deleted file mode 100644
index 5ca12eff6e..0000000000
--- a/calendar/pcs/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"wombat-pcs\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-noinst_LIBRARIES = libpcs.a
-
-libpcs_a_SOURCES =		\
-	$(CORBA_GENERATED)	\
-	cal.c			\
-	cal.h			\
-	cal-backend.c		\
-	cal-backend.h		\
-	cal-backend-file.c	\
-	cal-backend-file.h	\
-	cal-common.h		\
-	cal-factory.c		\
-	cal-factory.h		\
-	job.c			\
-	job.h
-
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
deleted file mode 100644
index 715e1e70bc..0000000000
--- a/calendar/pcs/cal-backend-file.c
+++ /dev/null
@@ -1,1099 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-util/cal-recur.h"
-#include "cal-backend-file.h"
-
-
-
-/* Private part of the CalBackendFile structure */
-struct _CalBackendFilePrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* List of Cal objects with their listeners */
-	GList *clients;
-
-	/* Toplevel VCALENDAR component */
-	icalcomponent *icalcomp;
-
-	/* All the CalComponent objects in the calendar, hashed by UID.  The
-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not
-	 * copied, so don't free it when you remove an object from the hash
-	 * table.
-	 */
-	GHashTable *comp_uid_hash;
-
-	/* All event, to-do, and journal components in the calendar; they are
-	 * here just for easy access (i.e. so that you don't have to iterate
-	 * over the comp_uid_hash).  If you need *all* the components in the
-	 * calendar, iterate over the hash instead.
-	 */
-	GList *events;
-	GList *todos;
-	GList *journals;
-
-	/* Idle handler for saving the calendar when it is dirty */
-	guint idle_id;
-};
-
-
-
-static void cal_backend_file_class_init (CalBackendFileClass *class);
-static void cal_backend_file_init (CalBackendFile *cbfile);
-static void cal_backend_file_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_file_get_uri (CalBackend *backend);
-static void cal_backend_file_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendLoadStatus cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri);
-static void cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri);
-
-static int cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type);
-static char *cal_backend_file_get_object (CalBackend *backend, const char *uid);
-static CalObjType cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);
-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-						     time_t start, time_t end);
-static GList *cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);
-static gboolean cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-							time_t start, time_t end,
-							GList **alarms);
-static gboolean cal_backend_file_update_object (CalBackend *backend, const char *uid,
-					       const char *calobj);
-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);
-
-static CalBackendClass *parent_class;
-
-
-
-/**
- * cal_backend_file_get_type:
- * @void: 
- * 
- * Registers the #CalBackendFile class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalBackendFile class.
- **/
-GtkType
-cal_backend_file_get_type (void)
-{
-	static GtkType cal_backend_file_type = 0;
-
-	if (!cal_backend_file_type) {
-		static const GtkTypeInfo cal_backend_file_info = {
-			"CalBackendFile",
-			sizeof (CalBackendFile),
-			sizeof (CalBackendFileClass),
-			(GtkClassInitFunc) cal_backend_file_class_init,
-			(GtkObjectInitFunc) cal_backend_file_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &cal_backend_file_info);
-	}
-
-	return cal_backend_file_type;
-}
-
-/* Class initialization function for the file backend */
-static void
-cal_backend_file_class_init (CalBackendFileClass *class)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) class;
-	backend_class = (CalBackendClass *) class;
-
-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_file_destroy;
-
-	backend_class->get_uri = cal_backend_file_get_uri;
-	backend_class->add_cal = cal_backend_file_add_cal;
-	backend_class->load = cal_backend_file_load;
-	backend_class->create = cal_backend_file_create;
-	backend_class->get_n_objects = cal_backend_file_get_n_objects;
-	backend_class->get_object = cal_backend_file_get_object;
-	backend_class->get_type_by_uid = cal_backend_file_get_type_by_uid;
-	backend_class->get_uids = cal_backend_file_get_uids;
-	backend_class->get_objects_in_range = cal_backend_file_get_objects_in_range;
-	backend_class->get_alarms_in_range = cal_backend_file_get_alarms_in_range;
-	backend_class->get_alarms_for_object = cal_backend_file_get_alarms_for_object;
-	backend_class->update_object = cal_backend_file_update_object;
-	backend_class->remove_object = cal_backend_file_remove_object;
-}
-
-/* Object initialization function for the file backend */
-static void
-cal_backend_file_init (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = g_new0 (CalBackendFilePrivate, 1);
-	cbfile->priv = priv;
-}
-
-/* g_hash_table_foreach() callback to destroy a CalComponent */
-static void
-free_cal_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-
-	comp = CAL_COMPONENT (value);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Saves the calendar data */
-static void
-save (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GnomeVFSFileSize out;
-	gchar *tmp;
-	char *buf;
-	
-	priv = cbfile->priv;
-	g_assert (priv->uri != NULL);
-	g_assert (priv->icalcomp != NULL);
-
-	/* Make a backup copy of the file if it exists */
-	tmp = gnome_vfs_uri_to_string (priv->uri, GNOME_VFS_URI_HIDE_NONE);
-	if (tmp) {
-		GnomeVFSURI *backup_uri;
-		gchar *backup_uristr;
-		
-		backup_uristr = g_strconcat (tmp, "~", NULL);
-		backup_uri = gnome_vfs_uri_new (backup_uristr);
-		
-		result = gnome_vfs_move_uri (priv->uri, backup_uri, TRUE);
-		gnome_vfs_uri_unref (backup_uri);
-		
-		g_free (tmp);
-		g_free (backup_uristr);
-	}
-	
-	/* Now write the new file out */
-	result = gnome_vfs_create_uri (&handle, priv->uri, 
-				       GNOME_VFS_OPEN_WRITE,
-				       FALSE, 0666);
-	
-	if (result != GNOME_VFS_OK)
-		goto error;
-	
-	buf = icalcomponent_as_ical_string (priv->icalcomp);
-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
-
-	if (result != GNOME_VFS_OK)
-		goto error;
-
-	gnome_vfs_close (handle);
-
-	return;
-	
- error:
-	g_warning ("Error writing calendar file.");
-	return;
-}
-
-/* Destroy handler for the file backend */
-static void
-cal_backend_file_destroy (GtkObject *object)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));
-
-	cbfile = CAL_BACKEND_FILE (object);
-	priv = cbfile->priv;
-
-	g_assert (priv->clients == NULL);
-
-	/* Save if necessary */
-
-	if (priv->idle_id != 0) {
-		save (cbfile);
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
-
-	/* Clean up */
-
-	if (priv->uri) {
-		gnome_vfs_uri_unref (priv->uri);
-		priv->uri = NULL;
-	}
-
-	if (priv->comp_uid_hash) {
-		g_hash_table_foreach (priv->comp_uid_hash, 
-				      free_cal_component, NULL);
-		g_hash_table_destroy (priv->comp_uid_hash);
-		priv->comp_uid_hash = NULL;
-	}
-
-	g_list_free (priv->events);
-	g_list_free (priv->todos);
-	g_list_free (priv->journals);
-
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = NULL;
-
-	if (priv->icalcomp) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-
-	g_free (priv);
-	cbfile->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Looks up a component by its UID on the backend's component hash table */
-static CalComponent *
-lookup_component (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	priv = cbfile->priv;
-
-	comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-
-	return comp;
-}
-
-
-
-/* Calendar backend methods */
-
-/* Get_uri handler for the file backend */
-static GnomeVFSURI *
-cal_backend_file_get_uri (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->uri != NULL);
-
-	return priv->uri;
-}
-
-/* Callback used when a Cal is destroyed */
-static void
-cal_destroy_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *lcal;
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	cal = CAL (object);
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	/* Find the cal in the list of clients */
-
-	for (l = priv->clients; l; l = l->next) {
-		lcal = CAL (l->data);
-
-		if (lcal == cal)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	priv->clients = g_list_remove_link (priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!priv->clients)
-		cal_backend_last_client_gone (CAL_BACKEND (cbfile));
-}
-
-/* Add_cal handler for the file backend */
-static void
-cal_backend_file_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp != NULL);
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	/* We do not keep a reference to the Cal since the calendar user agent
-	 * owns it.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (cal), "destroy",
-			    GTK_SIGNAL_FUNC (cal_destroy_cb),
-			    backend);
-
-	priv->clients = g_list_prepend (priv->clients, cal);
-}
-
-/* Idle handler; we save the calendar since it is dirty */
-static gboolean
-save_idle (gpointer data)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	save (cbfile);
-
-	priv->idle_id = 0;
-	return FALSE;
-}
-
-/* Marks the file backend as dirty and queues a save operation */
-static void
-mark_dirty (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	if (priv->idle_id != 0)
-		return;
-
-	priv->idle_id = g_idle_add (save_idle, cbfile);
-}
-
-/* Checks if the specified component has a duplicated UID and if so changes it */
-static void
-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *old_comp;
-	const char *uid;
-	char *new_uid;
-
-	priv = cbfile->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	old_comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-	if (!old_comp)
-		return; /* Everything is fine */
-
-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);
-
-	new_uid = cal_component_gen_uid ();
-	cal_component_set_uid (comp, new_uid);
-	g_free (new_uid);
-
-	/* FIXME: I think we need to reset the SEQUENCE property and reset the
-	 * CREATED/DTSTAMP/LAST-MODIFIED.
-	 */
-
-	mark_dirty (cbfile);
-}
-
-/* Tries to add an icalcomponent to the file backend.  We only store the objects
- * of the types we support; all others just remain in the toplevel component so
- * that we don't lose them.
- */
-static void
-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)
-{
-	CalBackendFilePrivate *priv;
-	GList **list;
-	const char *uid;
-	
-	priv = cbfile->priv;
-
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* Ensure that the UID is unique; some broken implementations spit
-	 * components with duplicated UIDs.
-	 */
-	check_dup_uid (cbfile, comp);
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_insert (priv->comp_uid_hash, (char *)uid, comp);
-
-	*list = g_list_prepend (*list, comp);
-
-	/* Put the object in the toplevel component if required */
-
-	if (add_to_toplevel) {
-		icalcomponent *icalcomp;
-
-		icalcomp = cal_component_get_icalcomponent (comp);
-		g_assert (icalcomp != NULL);
-
-		icalcomponent_add_component (priv->icalcomp, icalcomp);
-	}
-}
-
-/* Removes a component from the backend's hash and lists.  Does not perform
- * notification on the clients.  Also removes the component from the toplevel
- * icalcomponent.
- */
-static void
-remove_component (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	const char *uid;
-	GList **list, *l;
-
-	priv = cbfile->priv;
-
-	/* Remove the icalcomp from the toplevel */
-
-	icalcomp = cal_component_get_icalcomponent (comp);
-	g_assert (icalcomp != NULL);
-
-	icalcomponent_remove_component (priv->icalcomp, icalcomp);
-
-	/* Remove it from our mapping */
-
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_remove (priv->comp_uid_hash, uid);
-	
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-                /* Make the compiler shut up. */
-	        list = NULL;
-		g_assert_not_reached ();
-	}
-
-	l = g_list_find (*list, comp);
-	g_assert (l != NULL);
-
-	*list = g_list_remove_link (*list, l);
-	g_list_free_1 (l);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Scans the toplevel VCALENDAR component and stores the objects it finds */
-static void
-scan_vcalendar (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-
-	priv = cbfile->priv;
-	g_assert (priv->icalcomp != NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	for (icalcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_ANY_COMPONENT);
-	     icalcomp;
-	     icalcomp = icalcomponent_get_next_component (priv->icalcomp, ICAL_ANY_COMPONENT)) {
-		icalcomponent_kind kind;
-		CalComponent *comp;
-
-		kind = icalcomponent_isa (icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, icalcomp))
-			continue;
-
-		add_component (cbfile, comp, FALSE);
-	}
-}
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line (char *s, size_t size, void *data)
-{
-	FILE *file;
-
-	file = data;
-	return fgets (s, size, file);
-}
-
-/* Load handler for the file backend */
-static CalBackendLoadStatus
-cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	char *str_uri;
-	FILE *file;
-	icalparser *parser;
-	icalcomponent *icalcomp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp == NULL, CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);
-
-	if (!gnome_vfs_uri_is_local (uri))
-		return CAL_BACKEND_LOAD_ERROR;
-
-	str_uri = gnome_vfs_uri_to_string (uri,
-					   (GNOME_VFS_URI_HIDE_USER_NAME
-					    | GNOME_VFS_URI_HIDE_PASSWORD
-					    | GNOME_VFS_URI_HIDE_HOST_NAME
-					    | GNOME_VFS_URI_HIDE_HOST_PORT
-					    | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));
-
-	/* Load! */
-	file = fopen (str_uri, "r");
-	g_free (str_uri);
-
-	if (!file)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, file);
-
-	icalcomp = icalparser_parse (parser, get_line);
-	icalparser_free (parser);
-
-	if (fclose (file) != 0)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	if (!icalcomp)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	/* FIXME: should we try to demangle XROOT components and individual
-         * components as well?
-	 */
-
-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	priv->icalcomp = icalcomp;
-
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	scan_vcalendar (cbfile);
-
-	/* Clean up */
-	if (priv->uri)
-		gnome_vfs_uri_unref (priv->uri);
-	
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	return CAL_BACKEND_LOAD_SUCCESS;
-}
-
-/* Create handler for the file backend */
-static void
-cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalproperty *prop;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp == NULL);
-	g_return_if_fail (uri != NULL);
-
-	/* Create the new calendar information */
-
-	g_assert (priv->icalcomp == NULL);
-	priv->icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-
-	/* RFC 2445, section 4.7.1 */
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.3 */
-	prop = icalproperty_new_prodid ("-//Helix Code//NONSGML Evolution Calendar//EN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.4 */
-	prop = icalproperty_new_version ("2.0");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* Create our internal data */
-
-	g_assert (priv->comp_uid_hash == NULL);
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* Clean up */
-	if (priv->uri)
-		gnome_vfs_uri_unref (priv->uri);
-	
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	mark_dirty (cbfile);
-}
-
-/* Get_n_objects handler for the file backend */
-static int
-cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	int n;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, -1);
-
-	n = 0;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		n += g_list_length (priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		n += g_list_length (priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		n += g_list_length (priv->journals);
-
-	return n;
-}
-
-/* Get_object handler for the file backend */
-static char *
-cal_backend_file_get_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	comp = lookup_component (cbfile, uid);
-
-	if (!comp)
-		return NULL;
-
-	return cal_component_get_as_string (comp);
-}
-
-static CalObjType
-cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	CalComponentVType type;
-	
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return CAL_COMPONENT_NO_TYPE;
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return CALOBJ_TYPE_EVENT;
-	case CAL_COMPONENT_TODO:
-		return CALOBJ_TYPE_TODO;
-	case CAL_COMPONENT_JOURNAL:
-		return CALOBJ_TYPE_JOURNAL;
-	default:
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/* Builds a list of UIDs from a list of CalComponent objects */
-static void
-build_uids_list (GList **list, GList *components)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		const char *uid;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_component_get_uid (comp, &uid);
-		*list = g_list_prepend (*list, g_strdup (uid));
-	}
-}
-
-/* Get_uids handler for the file backend */
-static GList *
-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *list;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	list = NULL;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		build_uids_list (&list, priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		build_uids_list (&list, priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		build_uids_list (&list, priv->journals);
-
-	return list;
-}
-
-/* Callback used from cal_recur_generate_instances(); adds the component's UID
- * to our hash table.
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	/* We only care that the component's UID is listed in the hash table;
-	 * that's why we only allow generation of one instance (i.e. return
-	 * FALSE every time).
-	 */
-
-	cal_component_get_uid (comp, &uid);
-
-	old_uid = g_hash_table_lookup (uid_hash, uid);
-	if (old_uid)
-		return FALSE;
-
-	g_hash_table_insert (uid_hash, (char *) uid, NULL);
-	return FALSE;
-}
-
-/* Populates a hash table with the UIDs of the components that occur or recur
- * within a specific time range.
- */
-static void
-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash);
-	}
-}
-
-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */
-static void
-add_uid_to_list (gpointer key, gpointer value, gpointer data)
-{
-	GList **list;
-	const char *uid;
-	char *uid_copy;
-
-	list = data;
-
-	uid = key;
-	uid_copy = g_strdup (uid);
-
-	*list = g_list_prepend (*list, uid_copy);
-}
-
-/* Get_objects_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-				       time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *event_list;
-	GHashTable *uid_hash;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (type & CALOBJ_TYPE_EVENT)
-		get_instances_in_range (uid_hash, priv->events, start, end);
-
-	if (type & CALOBJ_TYPE_TODO)
-		get_instances_in_range (uid_hash, priv->todos, start, end);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		get_instances_in_range (uid_hash, priv->journals, start, end);
-
-	event_list = NULL;
-	g_hash_table_foreach (uid_hash, add_uid_to_list, &event_list);
-	g_hash_table_destroy (uid_hash);
-
-	return event_list;
-}
-
-/* Get_alarms_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* FIXME: have to deal with an unknown number of alarms; we can't just
-	 * do the same thing as in cal-backend-imc.
-	 */
-	return NULL;
-}
-
-/* Get_alarms_for_object handler for the file backend */
-static gboolean
-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-					time_t start, time_t end,
-					GList **alarms)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	/* FIXME */
-
-	*alarms = NULL;
-	return FALSE;
-}
-
-/* Notifies a backend's clients that an object was updated */
-static void
-notify_update (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_update (cal, uid);
-	}
-}
-
-/* Notifies a backend's clients that an object was removed */
-static void
-notify_remove (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_remove (cal, uid);
-	}
-}
-
-/* Update_object handler for the file backend */
-static gboolean
-cal_backend_file_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-	CalComponent *old_comp;
-	CalComponent *comp;
-	const char *comp_uid;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	/* Pull the component from the string and ensure that it is sane */
-
-	icalcomp = icalparser_parse_string ((char *) calobj);
-
-	if (!icalcomp)
-		return FALSE;
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT)) {
-		/* We don't support this type of component */
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	/* Check the UID for sanity's sake */
-
-	cal_component_get_uid (comp, &comp_uid);
-
-	if (strcmp (uid, comp_uid) != 0) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return FALSE;
-	}
-
-	/* Update the component */
-
-	old_comp = lookup_component (cbfile, uid);
-
-	if (old_comp)
-		remove_component (cbfile, old_comp);
-
-	add_component (cbfile, comp, TRUE);
-
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_update (cbfile, comp_uid);
-
-	return TRUE;
-}
-
-/* Remove_object handler for the file backend */
-static gboolean
-cal_backend_file_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return FALSE;
-
-	remove_component (cbfile, comp);
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_remove (cbfile, uid);
-
-	return TRUE;
-}
-
diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h
deleted file mode 100644
index 376790751c..0000000000
--- a/calendar/pcs/cal-backend-file.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_FILE_H
-#define CAL_BACKEND_FILE_H
-
-#include <libgnome/gnome-defs.h>
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())
-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\
-					  CalBackendFile))
-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\
-					  CalBackendFileClass))
-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))
-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))
-
-typedef struct _CalBackendFile CalBackendFile;
-typedef struct _CalBackendFileClass CalBackendFileClass;
-
-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;
-
-struct _CalBackendFile {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendFilePrivate *priv;
-};
-
-struct _CalBackendFileClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_file_get_type (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
deleted file mode 100644
index b2b16b2c9e..0000000000
--- a/calendar/pcs/cal-backend.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/parserInternals.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "cal-backend.h"
-#include "libversit/vcc.h"
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_backend_class_init (CalBackendClass *class);
-static void cal_backend_init (CalBackend *backend);
-static void cal_backend_destroy (GtkObject *object);
-static gboolean cal_backend_log_sync (CalBackend *backend);
-static GHashTable *cal_backend_get_log_entries (CalBackend *backend, 
-						CalObjType type,
-						time_t since);
-
-static GtkObjectClass *parent_class;
-
-static guint cal_backend_signals[LAST_SIGNAL];
-
-#define CLASS(backend) (CAL_BACKEND_CLASS (GTK_OBJECT (backend)->klass))
-
-
-
-/**
- * cal_backend_get_type:
- * @void:
- *
- * Registers the #CalBackend class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalBackend class.
- **/
-GtkType
-cal_backend_get_type (void)
-{
-	static GtkType cal_backend_type = 0;
-
-	if (!cal_backend_type) {
-		static const GtkTypeInfo cal_backend_info = {
-			"CalBackend",
-			sizeof (CalBackend),
-			sizeof (CalBackendClass),
-			(GtkClassInitFunc) cal_backend_class_init,
-			(GtkObjectInitFunc) cal_backend_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_type =
-			gtk_type_unique (GTK_TYPE_OBJECT, &cal_backend_info);
-	}
-
-	return cal_backend_type;
-}
-
-/* Class initialization function for the calendar backend */
-static void
-cal_backend_class_init (CalBackendClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_backend_destroy;
-
-	cal_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);
-}
-
-/* Per instance initialization function */
-static void
-cal_backend_init (CalBackend *backend)
-{
-	backend->uri = NULL;
-	backend->entries = NULL;
-	backend->timer = -1;
-}
-
-static void
-cal_backend_destroy (GtkObject *object)
-{
-	CalBackend *backend;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (object));
-
-	backend = CAL_BACKEND (object);
-
-	if (backend->timer != -1) {
-		gtk_timeout_remove (backend->timer);
-		backend->timer = -1;
-	}
-
- 	if (backend->uri) {
-		cal_backend_log_sync (backend);
-		gnome_vfs_uri_unref (backend->uri);
-	}
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/**
- * cal_backend_get_uri:
- * @backend: A calendar backend.
- *
- * Queries the URI of a calendar backend, which must already have a loaded
- * calendar.
- *
- * Return value: The URI where the calendar is stored.
- **/
-GnomeVFSURI *
-cal_backend_get_uri (CalBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-static void
-cal_backend_set_uri (CalBackend *backend, GnomeVFSURI *uri)
-{
-	if (backend->uri)
-		gnome_vfs_uri_unref (backend->uri);
-
-	if (backend->timer != -1)
-		gtk_timeout_remove (backend->timer);
-
-
-	gnome_vfs_uri_ref (uri);
-	backend->uri = uri;
-	backend->timer = gtk_timeout_add (60000, 
-					  (GtkFunction)cal_backend_log_sync, 
-					  backend);
-}
-
-/**
- * cal_backend_add_cal:
- * @backend: A calendar backend.
- * @cal: A calendar client interface object.
- *
- * Adds a calendar client interface object to a calendar @backend.
- * The calendar backend must already have a loaded calendar.
- **/
-void
-cal_backend_add_cal (CalBackend *backend, Cal *cal)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_assert (CLASS (backend)->add_cal != NULL);
-	(* CLASS (backend)->add_cal) (backend, cal);
-}
-
-/**
- * cal_backend_load:
- * @backend: A calendar backend.
- * @uri: URI that contains the calendar data.
- *
- * Loads a calendar backend with data from a calendar stored at the specified
- * URI.
- *
- * Return value: An operation status code.
- **/
-CalBackendLoadStatus
-cal_backend_load (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendLoadStatus result;
-
-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);
-
-	g_assert (CLASS (backend)->load != NULL);
-	result =  (* CLASS (backend)->load) (backend, uri);
-
-	/* Remember the URI for saving the log file in the same dir and add
-	 * a timeout handler so for saving pending entries sometimes */
-	if (result == CAL_BACKEND_LOAD_SUCCESS)
-		cal_backend_set_uri (backend, uri);
-	
-	return result;
-}
-
-/**
- * cal_backend_create:
- * @backend: A calendar backend.
- * @uri: URI that will contain the calendar data.
- *
- * Creates a new empty calendar in a calendar backend.
- **/
-void
-cal_backend_create (CalBackend *backend, GnomeVFSURI *uri)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-	g_return_if_fail (uri != NULL);
-
-	g_assert (CLASS (backend)->create != NULL);
-	(* CLASS (backend)->create) (backend, uri);
-
-	/* Remember the URI for saving the log file in the same dir and add
-	 * a timeout handler so for saving pending entries sometimes */
-	cal_backend_set_uri (backend, uri);
-}
-
-/**
- * cal_backend_get_n_objects:
- * @backend: A calendar backend.
- * @type: Types of objects that will be included in the count.
- * 
- * Queries the number of calendar objects of a particular type.
- * 
- * Return value: Number of objects of the specified @type.
- **/
-int
-cal_backend_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, -1);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), -1);
-
-	g_assert (CLASS (backend)->get_n_objects != NULL);
-	return (* CLASS (backend)->get_n_objects) (backend, type);
-}
-
-/**
- * cal_backend_get_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- *
- * Queries a calendar backend for a calendar object based on its unique
- * identifier.
- *
- * Return value: The string representation of a complete calendar wrapping the
- * the sought object, or NULL if no object had the specified UID.  A complete
- * calendar is returned because you also need the timezone data.
- **/
-char *
-cal_backend_get_object (CalBackend *backend, const char *uid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_object != NULL);
-	return (* CLASS (backend)->get_object) (backend, uid);
-}
-
-/**
- * cal_backend_get_uids:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- *
- * Builds a list of unique identifiers corresponding to calendar objects whose
- * type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.  The list should be
- * freed using the cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_uids (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uids != NULL);
-	return (* CLASS (backend)->get_uids) (backend, type);
-}
-
-
-static void
-cal_backend_foreach_changed (gpointer key, gpointer value, gpointer data) 
-{
-	GList **list = data;
-	
-	*list = g_list_append (*list, value);
-}
-
-/**
- * cal_backend_get_changed_uids:
- * @backend: 
- * @type: 
- * @since: 
- * 
- * 
- * 
- * Return value: 
- **/
-GList *
-cal_backend_get_changed_uids (CalBackend *backend, CalObjType type, time_t since) 
-{
-	GHashTable *hash;
-	GList *uids = NULL;
-	
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	hash = cal_backend_get_log_entries (backend, type, since);
-
-	if (hash)
-		g_hash_table_foreach (hash, cal_backend_foreach_changed, &uids);
-	
-	return uids;
-}
-
-
-/**
- * cal_backend_get_objects_in_range:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Builds a list of unique identifiers corresponding to calendar objects of the
- * specified type that occur or recur within the specified time range.
- * 
- * Return value: A list of UID strings.  The list should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-				  time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_objects_in_range != NULL);
-	return (* CLASS (backend)->get_objects_in_range) (backend, type, start, end);
-}
-
-/**
- * cal_backend_get_alarms_in_range:
- * @backend: A calendar backend.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Builds a sorted list of the alarms that trigger in the specified time range.
- * 
- * Return value: A list of #CalAlarmInstance structures, sorted by trigger time.
- **/
-GList *
-cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_in_range != NULL);
-	return (* CLASS (backend)->get_alarms_in_range) (backend, start, end);
-}
-
-/**
- * cal_backend_get_alarms_for_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the list of alarm instances.
- * 
- * Builds a sorted list of the alarms of the specified event that trigger in a
- * particular time range.
- * 
- * Return value: TRUE on success, FALSE if the object was not found.
- **/
-gboolean
-cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-				   time_t start, time_t end,
-				   GList **alarms)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	g_assert (CLASS (backend)->get_alarms_for_object != NULL);
-	return (* CLASS (backend)->get_alarms_for_object) (backend, uid, start, end, alarms);
-}
-
-/* Internal logging stuff */
-typedef enum {
-	CAL_BACKEND_UPDATED,
-	CAL_BACKEND_REMOVED
-} CalBackendLogEntryType;
-
-typedef struct {
-	char *uid;
-	CalObjType type;
-	
-	CalBackendLogEntryType event_type;
-
-	time_t time_stamp;
-} CalBackendLogEntry;
-
-typedef struct {
-	CalObjType type;
-	time_t since;
-
-	gboolean in_valid_timestamp;
-	
-	GHashTable *hash;
-} CalBackendParseState;
-
-static gchar *
-cal_backend_log_name (GnomeVFSURI *uri)
-{	
-	const gchar *path;
-	gchar *filename;
-	
-	path = gnome_vfs_uri_get_path (uri);
-	filename = g_strdup_printf ("%s.log.xml", path);
-
-	return filename;
-}
-
-static void
-cal_backend_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-cal_backend_log_entry (CalBackend *backend, 
-		       const char *uid,
-		       CalObjType cot,
-		       CalBackendLogEntryType type)
-{
-	CalBackendLogEntry *entry = g_new0 (CalBackendLogEntry, 1);
-	
-	g_assert (CLASS (backend)->get_type_by_uid != NULL);
-
-	/* Only log todos and events */
-	if (cot != CALOBJ_TYPE_EVENT && cot != CALOBJ_TYPE_TODO)
-		return;
-
-	entry = g_new0 (CalBackendLogEntry, 1);
-	entry->uid = g_strdup (uid);
-	entry->type = cot;
-	entry->event_type = type;	
-	entry->time_stamp = time (NULL);
-
-	/* Append so they get stored in chronological order */
-	backend->entries = g_slist_append (backend->entries, entry);
-}
-
-static gboolean
-cal_backend_log_sync (CalBackend *backend)
-{	
-	xmlDocPtr doc;
-	xmlNodePtr tnode;
-	gchar *filename;
-	GSList *l;
-	int ret;
-	time_t start_time = (time_t) - 1;
-	time_t end_time = (time_t) - 1;
-
-	g_return_val_if_fail (backend->uri != NULL, FALSE);
-	
-	if (backend->entries == NULL)
-		return TRUE;
-	
-	filename = cal_backend_log_name (backend->uri);
-	
-	doc = xmlParseFile (filename);
-	if (doc == NULL) {
-		/* Create the document */
-		doc = xmlNewDoc ("1.0");
-		if (doc == NULL) {
-			g_warning ("Log file could not be created\n");
-			return FALSE;
-		}
-		
-		
-		doc->root = xmlNewDocNode(doc, NULL, "CalendarLog", NULL);
-	}
-
-	tnode = xmlNewChild (doc->root, NULL, "timestamp", NULL);
-	for (l = backend->entries; l != NULL; l = l->next) {
-		xmlNodePtr node;
-		CalBackendLogEntry *entry;
-		
-		entry = (CalBackendLogEntry *)l->data;
-		node = xmlNewChild (tnode, NULL, "status", NULL);
-
-		xmlSetProp (node, "uid", entry->uid);
-		
-		switch (entry->type) {
-		case CALOBJ_TYPE_EVENT:
-			xmlSetProp (node, "type", "event");
-			break;
-		case CALOBJ_TYPE_TODO:
-			xmlSetProp (node, "type", "todo");
-			break;
-		default:
-		}
-
-		switch (entry->event_type) {
-		case (CAL_BACKEND_UPDATED):
-			xmlSetProp (node, "operation", "updated");
-			break;
-		case (CAL_BACKEND_REMOVED):
-			xmlSetProp (node, "operation", "removed");
-			break;
-		}
-
-		if (start_time == (time_t) - 1 
-		    || entry->time_stamp < start_time)
-			start_time = entry->time_stamp;
-
-		if (end_time == (time_t) - 1 
-		    || entry->time_stamp > end_time)
-			end_time = entry->time_stamp;
-
-		g_free (entry);
-	}
-	cal_backend_set_node_timet (tnode, "start", start_time);
-	cal_backend_set_node_timet (tnode, "end", end_time);
-
-	g_slist_free (backend->entries);
-	backend->entries = NULL;
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Log file could not be saved\n");
-		return FALSE;
-	}
-	
-	xmlFreeDoc (doc);
-
-	g_free (filename);
-
-	return TRUE;
-}
-
-static void
-cal_backend_log_sax_start_element (CalBackendParseState *state, const CHAR *name, 
-				   const CHAR **attrs)
-{
-	if (!strcmp (name, "timestamp")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "start")) {
-				time_t start = (time_t)strtoul (*val, NULL, 0);
-				
-				if (start >= state->since) 
-					state->in_valid_timestamp = TRUE;
-				break;
-			}	
-			attrs = ++val;
-		}		
-	}
-
-	if (state->in_valid_timestamp && !strcmp (name, "status")) {
-		CalObjChange *coc = g_new0 (CalObjChange, 1);
-		CalObjType cot = 0;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				coc->uid = g_strdup (*val);
-			
-			if (!strcmp (*attrs, "type")) {
-				if (!strcmp (*val, "event"))
-					cot = CALOBJ_TYPE_EVENT;
-				else if (!strcmp (*val, "todo"))
-					cot = CALOBJ_TYPE_TODO;
-			}
-
-			if (!strcmp (*attrs, "operation")) {
-				if (!strcmp (*val, "updated"))
-					coc->type = CALOBJ_UPDATED;
-				else if (!strcmp (*val, "removed"))
-					coc->type = CALOBJ_REMOVED;
-			}
-			
-			attrs = ++val;
-		}
-
-		if (state->type == CALOBJ_TYPE_ANY || state->type == cot)
-			g_hash_table_insert (state->hash, coc->uid, coc);
-	}
-}
-
-static void
-cal_backend_log_sax_end_element (CalBackendParseState *state, const CHAR *name)
-{
-	if (!strcmp (name, "timestamp")) {
-		state->in_valid_timestamp = FALSE;
-	}
-}
-
-static GHashTable *
-cal_backend_get_log_entries (CalBackend *backend, CalObjType type, time_t since)
-{
-	xmlSAXHandler handler;
-	CalBackendParseState state;
-	GHashTable *hash;
-	char *filename;
-
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (backend->uri != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	if (!cal_backend_log_sync (backend))
-		return NULL;
-
-	memset (&handler, 0, sizeof (xmlSAXHandler));
-	handler.startElement = (startElementSAXFunc)cal_backend_log_sax_start_element;
-	handler.endElement = (endElementSAXFunc)cal_backend_log_sax_end_element;
-
-	hash = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	state.type = type;
-	state.since = since;
-	state.in_valid_timestamp = FALSE;
-	state.hash = hash;
-
-	filename = cal_backend_log_name (backend->uri);	
-	if (xmlSAXUserParseFile (&handler, &state, filename) < 0)
-		return NULL;
-	
-	return hash;
-}
-
-/**
- * cal_backend_update_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to update.
- * @calobj: String representation of the new calendar object.
- * 
- * Updates an object in a calendar backend.  It will replace any existing
- * object that has the same UID as the specified one.  The backend will in
- * turn notify all of its clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an invalid object or one
- * with an unsupported type.
- **/
-gboolean
-cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalObjType cot;
-	gboolean result;
-	
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	g_assert (CLASS (backend)->update_object != NULL);
-	result =  (* CLASS (backend)->update_object) (backend, uid, calobj);
-
-	if (result) {
-		cot = (* CLASS (backend)->get_type_by_uid) (backend, uid);
-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_UPDATED);
-	}
-	
-	return result;
-}
-
-/**
- * cal_backend_remove_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to remove.
- * 
- * Removes an object in a calendar backend.  The backend will notify all of its
- * clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an UID for an object
- * that does not exist in the backend.
- **/
-gboolean
-cal_backend_remove_object (CalBackend *backend, const char *uid)
-{
-	CalObjType cot;
-	gboolean result;
-
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	g_assert (CLASS (backend)->remove_object != NULL);
-	cot = (* CLASS (backend)->get_type_by_uid) (backend, uid);
-	result = (* CLASS (backend)->remove_object) (backend, uid);
-
-	if (result)
-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_REMOVED);
-
-	return result;
-}
-
-/**
- * cal_backend_last_client_gone:
- * @backend: A calendar backend.
- * 
- * Emits the "last_client_gone" signal of a calendar backend.  This function is
- * to be used only by backend implementations.
- **/
-void
-cal_backend_last_client_gone (CalBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[LAST_CLIENT_GONE]);
-}
-
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
deleted file mode 100644
index 44262c10ca..0000000000
--- a/calendar/pcs/cal-backend.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_H
-#define CAL_BACKEND_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <cal-util/cal-util.h>
-#include <cal-util/cal-component.h>
-#include "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-#include "cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_TYPE            (cal_backend_get_type ())
-#define CAL_BACKEND(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_TYPE, CalBackend))
-#define CAL_BACKEND_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_TYPE,		\
-				     CalBackendClass))
-#define IS_CAL_BACKEND(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_TYPE))
-#define IS_CAL_BACKEND_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_TYPE))
-
-/* Load status values */
-typedef enum {
-	CAL_BACKEND_LOAD_SUCCESS,	/* Loading OK */
-	CAL_BACKEND_LOAD_ERROR		/* We need better error reporting in libversit */
-} CalBackendLoadStatus;
-
-struct _CalBackend {
-	GtkObject object;
-
-	GnomeVFSURI *uri;
-	GSList *entries;
-	guint timer;
-};
-
-struct _CalBackendClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_client_gone) (CalBackend *backend);
-
-	/* Virtual methods */
-	GnomeVFSURI *(* get_uri) (CalBackend *backend);
-	void (* add_cal) (CalBackend *backend, Cal *cal);
-	CalBackendLoadStatus (* load) (CalBackend *backend, GnomeVFSURI *uri);
-	void (* create) (CalBackend *backend, GnomeVFSURI *uri);
-
-	int (* get_n_objects) (CalBackend *backend, CalObjType type);
-	char *(* get_object) (CalBackend *backend, const char *uid);
-	CalObjType(* get_type_by_uid) (CalBackend *backend, const char *uid);
-	GList *(* get_uids) (CalBackend *backend, CalObjType type);
-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-	GList *(* get_alarms_in_range) (CalBackend *backend, time_t start, time_t end);
-	gboolean (* get_alarms_for_object) (CalBackend *backend, const char *uid,
-					    time_t start, time_t end,
-					    GList **alarms);
-	gboolean (* update_object) (CalBackend *backend, const char *uid, const char *calobj);
-	gboolean (* remove_object) (CalBackend *backend, const char *uid);
-};
-
-GtkType cal_backend_get_type (void);
-
-GnomeVFSURI *cal_backend_get_uri (CalBackend *backend);
-
-void cal_backend_add_cal (CalBackend *backend, Cal *cal);
-
-CalBackendLoadStatus cal_backend_load (CalBackend *backend, GnomeVFSURI *uri);
-
-void cal_backend_create (CalBackend *backend, GnomeVFSURI *uri);
-
-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);
-
-char *cal_backend_get_object (CalBackend *backend, const char *uid);
-
-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);
-
-GList *cal_backend_get_changed_uids (CalBackend *backend, CalObjType type, time_t since);
-
-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-
-GList *cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);
-
-gboolean cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-					    time_t start, time_t end,
-					    GList **alarms);
-
-
-gboolean cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj);
-
-gboolean cal_backend_remove_object (CalBackend *backend, const char *uid);
-
-void cal_backend_last_client_gone (CalBackend *backend);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h
deleted file mode 100644
index e51ddf1bdd..0000000000
--- a/calendar/pcs/cal-common.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar server - common declarations
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMMON_H
-#define CAL_COMMON_H
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-typedef struct _CalBackend CalBackend;
-typedef struct _CalBackendClass CalBackendClass;
-
-typedef struct _Cal Cal;
-typedef struct _CalClass CalClass;
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
deleted file mode 100644
index a67f8b777f..0000000000
--- a/calendar/pcs/cal-factory.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <gtk/gtksignal.h>
-#include "cal.h"
-#include "cal-backend.h"
-#include "cal-factory.h"
-#include "job.h"
-
-
-
-/* Private part of the CalFactory structure */
-struct _CalFactoryPrivate {
-	/* Hash table from URI method strings to GtkType * for backend class types */
-	GHashTable *methods;
-
-	/* Hash table from GnomeVFSURI structures to CalBackend objects */
-	GHashTable *backends;
-};
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CALENDAR_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_factory_class_init (CalFactoryClass *class);
-static void cal_factory_init (CalFactory *factory);
-static void cal_factory_destroy (GtkObject *object);
-
-static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;
-
-static BonoboObjectClass *parent_class;
-
-static guint cal_factory_signals[LAST_SIGNAL];
-
-
-
-/**
- * cal_factory_get_type:
- * @void:
- *
- * Registers the #CalFactory class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalFactory class.
- **/
-GtkType
-cal_factory_get_type (void)
-{
-	static GtkType cal_factory_type = 0;
-
-	if (!cal_factory_type) {
-		static const GtkTypeInfo cal_factory_info = {
-			"CalFactory",
-			sizeof (CalFactory),
-			sizeof (CalFactoryClass),
-			(GtkClassInitFunc) cal_factory_class_init,
-			(GtkObjectInitFunc) cal_factory_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_factory_type = gtk_type_unique (bonobo_object_get_type (), &cal_factory_info);
-	}
-
-	return cal_factory_type;
-}
-
-/* CORBA class initialization function for the calendar factory */
-static void
-init_cal_factory_corba_class (void)
-{
-	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();
-}
-
-/* Class initialization function for the calendar factory */
-static void
-cal_factory_class_init (CalFactoryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	cal_factory_signals[LAST_CALENDAR_GONE] =
-		gtk_signal_new ("last_calendar_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalFactoryClass, last_calendar_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_factory_destroy;
-
-	init_cal_factory_corba_class ();
-}
-
-/* Object initialization function for the calendar factory */
-static void
-cal_factory_init (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	priv = g_new0 (CalFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->methods = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->backends = g_hash_table_new (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-}
-
-/* Frees a method/GtkType * pair from the methods hash table */
-static void
-free_method (gpointer key, gpointer value, gpointer data)
-{
-	char *method;
-	GtkType *type;
-
-	method = key;
-	type = value;
-
-	g_free (method);
-	g_free (type);
-}
-
-/* Frees a uri/backend pair from the backends hash table */
-static void
-free_backend (gpointer key, gpointer value, gpointer data)
-{
-	GnomeVFSURI *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	gnome_vfs_uri_unref (uri);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_factory_destroy (GtkObject *object)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (object));
-
-	factory = CAL_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->methods, free_method, NULL);
-	g_hash_table_destroy (priv->methods);
-	priv->methods = NULL;
-
-	/* Should we assert that there are no more backends? */
-
-	g_hash_table_foreach (priv->backends, free_backend, NULL);
-	g_hash_table_destroy (priv->backends);
-	priv->backends = NULL;
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Loading and creating calendars */
-
-/* Job data */
-typedef struct {
-	CalFactory *factory;
-	char *uri;
-	Evolution_Calendar_Listener listener;
-} LoadCreateJobData;
-
-/* Queues a load or create request */
-static void
-queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener,
-		       JobFunc func)
-{
-	LoadCreateJobData *jd;
-	CORBA_Environment ev;
-	Evolution_Calendar_Listener listener_copy;
-	gboolean result;
-
-	g_assert (uri != NULL);
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("queue_load_create_job(): could not see if the listener was NIL");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result) {
-		g_message ("queue_load_create_job(): cannot operate on a NIL listener!");
-		return;
-	}
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("queue_load_create_job(): could not duplicate the listener");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	jd = g_new (LoadCreateJobData, 1);
-	jd->factory = factory;
-	jd->uri = g_strdup (uri);
-	jd->listener = listener_copy;
-
-	job_add (func, jd);
-}
-
-/* Looks up a calendar backend in a factory's hash table of uri->cal */
-static CalBackend *
-lookup_backend (CalFactory *factory, GnomeVFSURI *uri)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = g_hash_table_lookup (priv->backends, uri);
-	return backend;
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (CalBackend *backend, gpointer data)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	GnomeVFSURI *uri;
-	gpointer orig_key;
-	gboolean result;
-	GnomeVFSURI *orig_uri;
-
-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");
-
-	factory = CAL_FACTORY (data);
-	priv = factory->priv;
-
-	/* Remove the backend from the hash table */
-
-	uri = cal_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (priv->backends, uri, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (priv->backends, orig_uri);
-	gnome_vfs_uri_unref (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (priv->backends) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), cal_factory_signals[LAST_CALENDAR_GONE]);
-}
-
-/* Adds a backend to the calendar factory's hash table */
-static void
-add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend)
-{
-	CalFactoryPrivate *priv;
-
-	priv = factory->priv;
-
-	gnome_vfs_uri_ref (uri);
-	g_hash_table_insert (priv->backends, uri, backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    GTK_SIGNAL_FUNC (backend_last_client_gone_cb),
-			    factory);
-}
-
-/* Tries to launch a backend for the method of the specified URI.  If there is
- * no such method registered in the factory, it sends the listener the
- * MethodNotSupported error code.
- */
-static CalBackend *
-launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	char *method;
-	GtkType *type;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	/* FIXME: add an accessor function to gnome-vfs */
-	method = uri->method_string;
-
-	type = g_hash_table_lookup (priv->methods, method);
-
-	if (!type) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (
-			listener,
-			Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("launch_backend_for_uri(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = gtk_type_new (*type);
-	if (!backend)
-		g_message ("launch_backend_for_uri(): could not launch the backend");
-
-	return backend;
-}
-
-/* Loads a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-	CalBackendLoadStatus status;
-	CORBA_Environment ev;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uri, listener);
-	if (!backend)
-		return NULL;
-
-	status = cal_backend_load (backend, uri);
-
-	switch (status) {
-	case CAL_BACKEND_LOAD_SUCCESS:
-		add_backend (factory, uri, backend);
-		return backend;
-
-	case CAL_BACKEND_LOAD_ERROR:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("load_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Creates a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uri, listener);
-	if (!backend)
-		return NULL;
-
-	cal_backend_create (backend, uri);
-
-	/* FIXME: add error reporting to cal_backend_create() */
-#if 0
-	{
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-	}
-#endif
-
-	add_backend (factory, uri, backend);
-
-	return backend;
-}
-
-/* Adds a listener to a calendar backend by creating a calendar client interface
- * object.
- */
-static void
-add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calendar_Listener listener)
-{
-	Cal *cal;
-	CORBA_Environment ev;
-
-	cal = cal_new (backend, listener);
-	if (!cal) {
-		g_message ("add_calendar_client(): could not create the calendar client interface");
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("add_calendar_client(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	cal_backend_add_cal (backend, cal);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_cal_loaded (listener,
-						Evolution_Calendar_Listener_SUCCESS,
-						bonobo_object_corba_objref (BONOBO_OBJECT (cal)),
-						&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("add_calendar_client(): could not notify the listener");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Job handler for the load calendar command */
-static void
-load_fn (gpointer data)
-{
-	LoadCreateJobData *jd;
-	CalFactory *factory;
-	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("load_fn(): Could not notify the listener!");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Look up the backend and create it if needed */
-
-	backend = lookup_backend (factory, uri);
-
-	if (!backend)
-		backend = load_backend (factory, uri, listener);
-
-	gnome_vfs_uri_unref (uri);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Job handler for the create calendar command */
-static void
-create_fn (gpointer data)
-{
-	LoadCreateJobData *jd;
-	CalFactory *factory;
-	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): Could not notify the listener!");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Check that the backend is not in use */
-
-	backend = lookup_backend (factory, uri);
-
-	if (backend) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_IN_USE,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Create the backend */
-
-	backend = create_backend (factory, uri, listener);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
-	gnome_vfs_uri_unref (uri);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("create_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* CalFactory::load method */
-static void
-CalFactory_load (PortableServer_Servant servant,
-		 const CORBA_char *uri,
-		 Evolution_Calendar_Listener listener,
-		 CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	CORBA_Environment ev2;
-	gboolean result;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	CORBA_exception_init (&ev2);
-	result = CORBA_Object_is_nil (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION || result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-
-		CORBA_exception_free (&ev2);
-		return;
-	}
-	CORBA_exception_free (&ev2);
-
-	queue_load_create_job (factory, uri, listener, load_fn);
-}
-
-/* CalFactory::create method */
-static void
-CalFactory_create (PortableServer_Servant servant,
-		   const CORBA_char *uri,
-		   Evolution_Calendar_Listener listener,
-		   CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	queue_load_create_job (factory, uri, listener, create_fn);
-}
-
-/**
- * cal_factory_get_epv:
- * @void:
- *
- * Creates an EPV for the CalFactory CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_CalFactory__epv *
-cal_factory_get_epv (void)
-{
-	POA_Evolution_Calendar_CalFactory__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1);
-	epv->load = CalFactory_load;
-	epv->create = CalFactory_create;
-
-	return epv;
-}
-
-
-
-/**
- * cal_factory_construct:
- * @factory: A calendar factory.
- * @corba_factory: CORBA object for the calendar factory.
- *
- * Constructs a calendar factory by binding the corresponding CORBA object to
- * it.
- *
- * Return value: The same object as the @factory argument.
- **/
-CalFactory *
-cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_factory);
-	return factory;
-}
-
-/**
- * cal_factory_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar factory @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_CalFactory
-cal_factory_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_CalFactory *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_factory_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_factory_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_factory_new:
- * @void:
- *
- * Creates a new #CalFactory object.
- *
- * Return value: A newly-created #CalFactory, or NULL if its corresponding CORBA
- * object could not be created.
- **/
-CalFactory *
-cal_factory_new (void)
-{
-	CalFactory *factory;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalFactory corba_factory;
-	gboolean retval;
-
-	factory = gtk_type_new (CAL_FACTORY_TYPE);
-
-	corba_factory = cal_factory_corba_object_create (BONOBO_OBJECT (factory));
-
-	CORBA_exception_init (&ev);
-	retval = CORBA_Object_is_nil (corba_factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION || retval) {
-		g_message ("cal_factory_new(): could not create the CORBA factory");
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_factory_construct (factory, corba_factory);
-}
-
-/* Returns the lowercase version of a string */
-static char *
-str_tolower (const char *s)
-{
-	char *str;
-	unsigned char *p;
-
-	str = g_strdup (s);
-	for (p = str; *p; p++)
-		if (isalpha (*p))
-			*p = tolower (*p);
-
-	return str;
-}
-
-/**
- * cal_factory_register_method:
- * @factory: A calendar factory.
- * @method: Method for the URI, i.e. "http", "file", etc.
- * @backend_type: Class type of the backend to create for this @method.
- * 
- * Registers the type of a #CalBackend subclass that will be used to handle URIs
- * with a particular method.  When the factory is asked to load a particular
- * URI, it will look in its list of registered methods and create a backend of
- * the appropriate type.
- **/
-void
-cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type)
-{
-	CalFactoryPrivate *priv;
-	GtkType *type;
-	char *method_str;
-
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (factory));
-	g_return_if_fail (method != NULL);
-	g_return_if_fail (backend_type != 0);
-	g_return_if_fail (gtk_type_is_a (backend_type, CAL_BACKEND_TYPE));
-
-	priv = factory->priv;
-
-	method_str = str_tolower (method);
-
-	type = g_hash_table_lookup (priv->methods, method_str);
-	if (type) {
-		g_message ("cal_factory_register_method(): Method `%s' already registered!",
-			   method_str);
-		g_free (method_str);
-		return;
-	}
-
-	type = g_new (GtkType, 1);
-	*type = backend_type;
-
-	g_hash_table_insert (priv->methods, method_str, type);
-}
-
-/**
- * cal_factory_get_n_backends:
- * @factory: A calendar factory.
- * 
- * Queries the number of running calendar backends in a calendar factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-cal_factory_get_n_backends (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), -1);
-
-	priv = factory->priv;
-	return g_hash_table_size (priv->backends);
-}
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
deleted file mode 100644
index 9405a05ef8..0000000000
--- a/calendar/pcs/cal-factory.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_FACTORY_H
-#define CAL_FACTORY_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-
-#include "calendar/pcs/evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_FACTORY_TYPE            (cal_factory_get_type ())
-#define CAL_FACTORY(obj)            (GTK_CHECK_CAST ((obj), CAL_FACTORY_TYPE, CalFactory))
-#define CAL_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_FACTORY_TYPE,		\
-				     CalFactoryClass))
-#define IS_CAL_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), CAL_FACTORY_TYPE))
-#define IS_CAL_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_FACTORY_TYPE))
-
-typedef struct _CalFactory CalFactory;
-typedef struct _CalFactoryClass CalFactoryClass;
-
-typedef struct _CalFactoryPrivate CalFactoryPrivate;
-
-struct _CalFactory {
-	BonoboObject object;
-
-	/* Private data */
-	CalFactoryPrivate *priv;
-};
-
-struct _CalFactoryClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_calendar_gone) (CalFactory *factory);
-};
-
-GtkType cal_factory_get_type (void);
-
-CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory);
-Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
-
-CalFactory *cal_factory_new (void);
-
-void cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type);
-
-int cal_factory_get_n_backends (CalFactory *factory);
-
-POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
deleted file mode 100644
index 35d98abd64..0000000000
--- a/calendar/pcs/cal.c
+++ /dev/null
@@ -1,766 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "cal.h"
-#include "cal-backend.h"
-
-
-
-/* Private part of the Cal structure */
-struct _CalPrivate {
-	/* Our backend */
-	CalBackend *backend;
-
-	/* Listener on the client we notify */
-	Evolution_Calendar_Listener listener;
-};
-
-
-
-static void cal_class_init (CalClass *class);
-static void cal_init (Cal *cal);
-static void cal_destroy (GtkObject *object);
-
-static POA_Evolution_Calendar_Cal__vepv cal_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_get_type:
- * @void:
- *
- * Registers the #Cal class if necessary, and returns the type ID associated to
- * it.
- *
- * Return value: The type ID of the #Cal class.
- **/
-GtkType
-cal_get_type (void)
-{
-	static GtkType cal_type = 0;
-
-	if (!cal_type) {
-		static const GtkTypeInfo cal_info = {
-			"Cal",
-			sizeof (Cal),
-			sizeof (CalClass),
-			(GtkClassInitFunc) cal_class_init,
-			(GtkObjectInitFunc) cal_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &cal_info);
-	}
-
-	return cal_type;
-}
-
-/* CORBA class initialzation function for the calendar */
-static void
-init_cal_corba_class (void)
-{
-	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv ();
-}
-
-/* Class initialization function for the calendar */
-static void
-cal_class_init (CalClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
-
-	object_class->destroy = cal_destroy;
-
-	init_cal_corba_class ();
-}
-
-/* Object initialization function for the calendar */
-static void
-cal_init (Cal *cal)
-{
-	CalPrivate *priv;
-
-	priv = g_new0 (CalPrivate, 1);
-	cal->priv = priv;
-
-	priv->listener = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_destroy (GtkObject *object)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL (object));
-
-	cal = CAL (object);
-	priv = cal->priv;
-
-	priv->backend = NULL;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_destroy(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Cal::get_uri method */
-static CORBA_char *
-Cal_get_uri (PortableServer_Servant servant,
-	     CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GnomeVFSURI *uri;
-	char *str_uri;
-	CORBA_char *str_uri_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	uri = cal_backend_get_uri (priv->backend);
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	str_uri_copy = CORBA_string_dup (str_uri);
-	g_free (str_uri);
-
-	return str_uri_copy;
-}
-
-/* Converts a calendar object type from its CORBA representation to our own
- * representation.
- */
-static CalObjType
-uncorba_obj_type (Evolution_Calendar_CalObjType type)
-{
-	return (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
-		| ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
-		| ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
-}
-
-/* Cal::get_n_objects method */
-static CORBA_long
-Cal_get_n_objects (PortableServer_Servant servant,
-		   Evolution_Calendar_CalObjType type,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	int n;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	n = cal_backend_get_n_objects (priv->backend, t);
-	return n;
-}
-
-/* Cal::get_object method */
-static Evolution_Calendar_CalObj
-Cal_get_object (PortableServer_Servant servant,
-		const Evolution_Calendar_CalObjUID uid,
-		CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	char *calobj;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	calobj = cal_backend_get_object (priv->backend, uid);
-
-	if (calobj) {
-		CORBA_char *calobj_copy;
-
-		calobj_copy = CORBA_string_dup (calobj);
-		g_free (calobj);
-		return calobj_copy;
-	} else {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-	}
-}
-
-static Evolution_Calendar_CalObjUIDSeq *
-build_uid_seq (GList *uids)
-{
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *l;
-	int n, i;
-
-	n = g_list_length (uids);
-
-	seq = Evolution_Calendar_CalObjUIDSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjUID_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = uids; l; i++, l = l->next) {
-		char *uid;
-
-		uid = l->data;
-		seq->_buffer[i] = CORBA_string_dup (uid);
-	}
-
-	return seq;
-}
-
-/* Cal::get_uids method */
-static Evolution_Calendar_CalObjUIDSeq *
-Cal_get_uids (PortableServer_Servant servant,
-	      Evolution_Calendar_CalObjType type,
-	      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *uids;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-
-	uids = cal_backend_get_uids (priv->backend, t);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-static Evolution_Calendar_CalObjChangeSeq *
-build_change_seq (GList *changes)
-{
-	GList *l;
-	int n, i;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-
-	n = g_list_length (changes);
-
-	seq = Evolution_Calendar_CalObjChangeSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjChange_allocbuf (n);
-
-	/* Fill the sequence */
-	for (i = 0, l = changes; l; i++, l = l->next) {
-		CalObjChange *c;
-		Evolution_Calendar_CalObjChange *corba_c;
-
-		c = l->data;
-		corba_c = &seq->_buffer[i];
-
-		corba_c->uid = CORBA_string_dup (c->uid);
-		corba_c->type = c->type;
-	}
-
-	return seq;
-}
-
-/* Cal::get_changed_uids method */
-static Evolution_Calendar_CalObjChangeSeq *
-Cal_get_changed_uids (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjType type,
-		      Evolution_Calendar_Time_t since,
-		      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *changes;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-	int t;
-	time_t s;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	s = (time_t) since;
-	
-	changes = cal_backend_get_changed_uids (priv->backend, t, s);
-	seq = build_change_seq (changes);
-
-	cal_obj_change_list_free (changes);
-
-	return seq;
-}
-
-/* Cal::get_objects_in_range method */
-static Evolution_Calendar_CalObjUIDSeq *
-Cal_get_objects_in_range (PortableServer_Servant servant,
-			  Evolution_Calendar_CalObjType type,
-			  Evolution_Calendar_Time_t start,
-			  Evolution_Calendar_Time_t end,
-			  CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	uids = cal_backend_get_objects_in_range (priv->backend, t, t_start, t_end);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-#if 0
-/* Translates an enum AlarmType to its CORBA representation */
-static Evolution_Calendar_AlarmType
-corba_alarm_type (enum AlarmType type)
-{
-	switch (type) {
-	case ALARM_MAIL:
-		return Evolution_Calendar_MAIL;
-
-	case ALARM_PROGRAM:
-		return Evolution_Calendar_PROGRAM;
-
-	case ALARM_DISPLAY:
-		return Evolution_Calendar_DISPLAY;
-
-	case ALARM_AUDIO:
-		return Evolution_Calendar_AUDIO;
-
-	default:
-		g_assert_not_reached ();
-		return Evolution_Calendar_DISPLAY;
-	}
-}
-#endif
-
-/* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-build_alarm_instance_seq (GList *alarms)
-{
-	GList *l;
-	int n, i;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-
-	n = g_list_length (alarms);
-
-	seq = Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = alarms; l; i++, l = l->next) {
-		CalAlarmInstance *ai;
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
-
-		ai = l->data;
-		corba_ai = &seq->_buffer[i];
-
-		corba_ai->uid = CORBA_string_dup (ai->uid);
-#if 0
-		corba_ai->type = corba_alarm_type (ai->type);
-#endif
-		corba_ai->trigger = ai->trigger;
-		corba_ai->occur = ai->occur;
-	}
-
-	return seq;
-}
-
-/* Cal::get_alarms_in_range method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-Cal_get_alarms_in_range (PortableServer_Servant servant,
-			 Evolution_Calendar_Time_t start,
-			 Evolution_Calendar_Time_t end,
-			 CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	/* Figure out the list and allocate the sequence */
-
-	alarms = cal_backend_get_alarms_in_range (priv->backend, t_start, t_end);
-	seq = build_alarm_instance_seq (alarms);
-	cal_alarm_instance_list_free (alarms);
-
-	return seq;
-}
-
-/* Cal::get_alarms_for_object method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-Cal_get_alarms_for_object (PortableServer_Servant servant,
-			   const Evolution_Calendar_CalObjUID uid,
-			   Evolution_Calendar_Time_t start,
-			   Evolution_Calendar_Time_t end,
-			   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-	gboolean result;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	result = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &alarms);
-	if (!result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-	}
-
-	seq = build_alarm_instance_seq (alarms);
-	cal_alarm_instance_list_free (alarms);
-
-	return seq;
-}
-
-/* Cal::update_object method */
-static void
-Cal_update_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
-		   const Evolution_Calendar_CalObj calobj,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_update_object (priv->backend, uid, calobj))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidObject,
-				     NULL);
-}
-
-/* Cal::remove_object method */
-static void
-Cal_remove_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_remove_object (priv->backend, uid))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-}
-
-/**
- * cal_get_epv:
- * @void:
- *
- * Creates an EPV for the Cal CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_Cal__epv *
-cal_get_epv (void)
-{
-	POA_Evolution_Calendar_Cal__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1);
-	epv->_get_uri = Cal_get_uri;
-	epv->get_n_objects = Cal_get_n_objects;
-	epv->get_object = Cal_get_object;
-	epv->get_uids = Cal_get_uids;
-	epv->get_changed_uids = Cal_get_changed_uids;
-	epv->get_objects_in_range = Cal_get_objects_in_range;
-	epv->get_alarms_in_range = Cal_get_alarms_in_range;
-	epv->get_alarms_for_object = Cal_get_alarms_for_object;
-	epv->update_object = Cal_update_object;
-	epv->remove_object = Cal_remove_object;
-
-	return epv;
-}
-
-
-
-/**
- * cal_construct:
- * @cal: A calendar client interface.
- * @corba_cal: CORBA object for the calendar.
- * @backend: Calendar backend that this @cal presents an interface to.
- * @listener: Calendar listener for notification.
- *
- * Constructs a calendar client interface object by binding the corresponding
- * CORBA object to it.  The calendar interface is bound to the specified
- * @backend, and will notify the @listener about changes to the calendar.
- *
- * Return value: The same object as the @cal argument.
- **/
-Cal *
-cal_construct (Cal *cal,
-	       Evolution_Calendar_Cal corba_cal,
-	       CalBackend *backend,
-	       Evolution_Calendar_Listener listener)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (cal != NULL, NULL);
-	g_return_val_if_fail (IS_CAL (cal), NULL);
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	priv = cal->priv;
-
-	CORBA_exception_init (&ev);
-	priv->listener = CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_construct: could not duplicate the listener");
-		priv->listener = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	priv->backend = backend;
-
-	bonobo_object_construct (BONOBO_OBJECT (cal), corba_cal);
-	return cal;
-}
-
-/**
- * cal_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar client interface @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_Cal
-cal_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_Cal *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_new:
- * @backend: A calendar backend.
- * @listener: A calendar listener.
- *
- * Creates a new calendar client interface object and binds it to the specified
- * @backend and @listener objects.
- *
- * Return value: A newly-created #Cal calendar client interface object, or NULL
- * if its corresponding CORBA object could not be created.
- **/
-Cal *
-cal_new (CalBackend *backend, Evolution_Calendar_Listener listener)
-{
-	Cal *cal, *retval;
-	Evolution_Calendar_Cal corba_cal;
-	CORBA_Environment ev;
-	gboolean ret;
-
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	cal = CAL (gtk_type_new (CAL_TYPE));
-	corba_cal = cal_corba_object_create (BONOBO_OBJECT (cal));
-
-	CORBA_exception_init (&ev);
-	ret = CORBA_Object_is_nil ((CORBA_Object) corba_cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || ret) {
-		g_message ("cal_new(): could not create the CORBA object");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	retval = cal_construct (cal, corba_cal, backend, listener);
-	if (!retval) {
-		g_message ("cal_new(): could not construct the calendar client interface");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		return NULL;
-	}
-
-	return retval;
-}
-
-/**
- * cal_notify_update:
- * @cal: A calendar client interface.
- * @uid: UID of object that was updated.
- * 
- * Notifies a listener attached to a calendar client interface object about an
- * update to a calendar object.
- **/
-void
-cal_notify_update (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_update(): could not notify the listener "
-			   "about an updated object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_notify_remove:
- * @cal: A calendar client interface.
- * @uid: UID of object that was removed.
- * 
- * Notifies a listener attached to a calendar client interface object about a
- * calendar object that was removed.
- **/
-void
-cal_notify_remove (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_remove(): could not notify the listener "
-			   "about a removed object");
-
-	CORBA_exception_free (&ev);
-}
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
deleted file mode 100644
index 2b17278573..0000000000
--- a/calendar/pcs/cal.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_H
-#define CAL_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_TYPE            (cal_get_type ())
-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))
-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
-
-typedef struct _CalPrivate CalPrivate;
-
-struct _Cal {
-	BonoboObject object;
-
-	/* Private data */
-	CalPrivate *priv;
-};
-
-struct _CalClass {
-	BonoboObjectClass parent_class;
-};
-
-GtkType cal_get_type (void);
-
-Cal *cal_construct (Cal *cal,
-		    Evolution_Calendar_Cal corba_cal,
-		    CalBackend *backend,
-		    Evolution_Calendar_Listener listener);
-Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
-
-Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener);
-
-void cal_notify_update (Cal *cal, const char *uid);
-void cal_notify_remove (Cal *cal, const char *uid);
-
-POA_Evolution_Calendar_Cal__epv *cal_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/job.c b/calendar/pcs/job.c
deleted file mode 100644
index d97df6d883..0000000000
--- a/calendar/pcs/job.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "job.h"
-
-
-
-/* The job list */
-
-typedef struct {
-	JobFunc func;
-	gpointer data;
-} Job;
-
-static GSList *jobs_head;
-static GSList *jobs_tail;
-
-static guint jobs_idle_id;
-
-
-
-/* Runs a job and dequeues it */
-static gboolean
-run_job (gpointer data)
-{
-	Job *job;
-	GSList *l;
-
-	g_assert (jobs_head != NULL);
-
-	job = jobs_head->data;
-	(* job->func) (job->data);
-	g_free (job);
-
-	l = jobs_head;
-	jobs_head = g_slist_remove_link (jobs_head, jobs_head);
-	g_slist_free_1 (l);
-
-	if (!jobs_head) {
-		jobs_tail = NULL;
-		jobs_idle_id = 0;
-		return FALSE;
-	} else
-		return TRUE;
-}
-
-/**
- * job_add:
- * @func: Function to run the job.
- * @data: Data to pass to @function.
- * 
- * Adds a job to the queue.  The job will automatically be run asynchronously.
- **/
-void
-job_add (JobFunc func, gpointer data)
-{
-	Job *job;
-
-	g_return_if_fail (func != NULL);
-
-	job = g_new (Job, 1);
-	job->func = func;
-	job->data = data;
-
-	if (!jobs_head) {
-		g_assert (jobs_tail == NULL);
-		g_assert (jobs_idle_id == 0);
-
-		jobs_head = g_slist_append (NULL, job);
-		jobs_tail = jobs_head;
-
-		jobs_idle_id = g_idle_add (run_job, NULL);
-	} else {
-		g_assert (jobs_tail != NULL);
-		g_assert (jobs_idle_id != 0);
-
-		jobs_tail = g_slist_append (jobs_tail, job)->next;
-	}
-}
diff --git a/calendar/pcs/job.h b/calendar/pcs/job.h
deleted file mode 100644
index c9bce24dd4..0000000000
--- a/calendar/pcs/job.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef JOB_H
-#define JOB_H
-
-#include <glib.h>
-
-
-
-typedef void (* JobFunc) (gpointer data);
-
-void job_add (JobFunc func, gpointer data);
-
-
-
-#endif
diff --git a/camel/.cvsignore b/camel/.cvsignore
deleted file mode 100644
index 521f6065df..0000000000
--- a/camel/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-temp-test
diff --git a/camel/CODING.STYLE b/camel/CODING.STYLE
deleted file mode 100644
index 58e9c68bbe..0000000000
--- a/camel/CODING.STYLE
+++ /dev/null
@@ -1,19 +0,0 @@
-Note to hackers
----------------
-
-When hacking on camel (and on the gnome mailer in general), 
-be sure to follow the same coding style as the initial authors.
-Please read the file HACKING in gnumeric and follow the
-general guidelines explained in it.
-
-Please take a look at camel source files and try to exactly
-imitate the coding style. We are perfectly aware that this
-is not the best and unique style, but it is absolutely
-mandatory that Camel is homogeneous.  If you find the current
-coding style to have some weaknesses, please contact the
-authors to discuss this matter.
-
-Thanks.
-
-	Bertrand.
-
diff --git a/camel/ChangeLog b/camel/ChangeLog
deleted file mode 100644
index 1c413b0ab0..0000000000
--- a/camel/ChangeLog
+++ /dev/null
@@ -1,7150 +0,0 @@
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* camel-mime-utils.c (header_msgid_generate): new function,
-	generates simple message/content id
-
-2000-11-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Set the
-	preface/postface from the parser into the multipart object.
-
-	* camel-multipart.c (camel_multipart_set_postface): Function to
-	set the postface text on a multipart.
-	(camel_multipart_set_preface): Similarly for preface text.
-
-	* camel-mime-parser.c (folder_scan_content): If we scan until a
-	boundary, then we do not include the \n that starts the boundary
-	line in the content.
-	(struct _header_scan_stack): Added a ByteArray to store the
-	multipart pre/post-text as we're scanning.
-	(folder_pull_part): Free pre/posttext if they are allocated.
-	(folder_scan_step): Build into the pre/posttext arrays as we
-	encounter data.
-	(camel_mime_parser_preface): REturn the multipart preface text, if
-	there is any scanned.
-	(camel_mime_parser_postface): Likewise for postface text.
-	(byte_array_to_string): helper function for above.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Change
-	the from line to be "\nFrom ..." always, so no need to
-	check/append a \n to messages.
-	(mbox_append_message): Open the output stream with append mode
-	[assuming this is more efficient than seeking to the end]
-	And dont prepend \n  on the From line if its the first in the
-	mbox.
-	(mbox_append_message): Pass the offset of the real start of the
-	"From " line when we perform the update (which may != 'seek')
-
-	* camel-mime-filter-charset.c (complete): Removed the terminating
-	NUL 'fix'.
-
-	* camel-stream-filter.c (do_read): Added some debug.
-	(do_flush): And here.
-	(do_write): And here too.
-	(do_write): ARGH!!! ARGH!  Ok, so the filter stream was writing a
-	different number of bytes than the requester was asking it to
-	write (because of filtering, of course!).  So instead of returning
-	the true number of written bytes, we'll return what they asked us
-	to write - unless there is an error in which case we return -1.
-
-	* camel-mime-utils.c (base64_encode_close): Sigh, forgot to make
-	it unsigned.  I think this is actually a gcc bug as (48 >> 2)
-	somehow ended up negative, when it obviously should not, even if
-	the data load was signed.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c: Undo my incorrect fix - I misunderstood danw -
-	sorry!
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_expunge):
-	Unbreak this.
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): If show_pass, then base64 the
-	password before writing it to the output string.
-	(camel_url_new): Assume password has been base64 encoded and
-	decode accordingly.
-
-2000-11-03  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Add an "url_flags" field to CamelProvider.
-	Move the CAMEL_SERVICE_URL_* defines here and remove the SERVICE_
-	part of the name.
-
-	* camel-service.h: Remove CAMEL_SERVICE_URL_* flags and
-	service->url_flags field.
-
-	* camel-service.c (check_url, get_path): Get URL flags from
-	service->provider, update for changed flag names.
-
-	* providers/*/camel-*-provider.c: Add URL flags to provider
-	structures.
-
-	* providers/*/camel-*-{store,transport}.c, camel-remote-store.c:
-	Remove service->url_flags initialization.
-
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Quote
-	foldernames when sending to the IMAP server because the folder
-	name might contain spaces.
-
-2000-11-02  Not Zed  <NotZed@HelixCode.com>
-
-	* Merged in camel-incremental-branch.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Remove old
-	subbed folders from hash table after freeing them.
-
-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Deal
-	correctly with namespace == ""
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* camel-charset-map.c, camel-charset-map-private.h: synced all charsets
-	with ones found in libunicode. Just include more "iso/*.h" and rebuild
-	...private.h with this.
-	
-2000-10-31  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (service_disconnect): Add a new argument, clean,
-	that says whether or not to try to disconnect cleanly.
-
-	* camel-remote-store.c (remote_send_string, remote_send_stream,
-	remote_recv_line): disconnect uncleanly on failure to prevent
-	infinite loops when providers would normally send commands from
-	disconnect(). Remove some unneeded CamelException goo.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_disconnect): 
-	* providers/pop3/camel-pop3-store.c (pop3_disconnect): 
-	* providers/nntp/camel-nntp-store.c (nntp_store_disconnect):
-	* providers/imap/camel-imap-store.c (imap_disconnect): Don't send
-	QUIT/LOGOUT if !clean.
-
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-auth.c: New file with code for IMAP
-	authentication mechanisms. (Currently just krb4, and without
-	integrity/privacy protection).
-
-	* providers/imap/Makefile.am: Add camel-imap-auth.[ch] and krb4
-	CFLAGS/LDFLAGS
-
-	* providers/imap/camel-imap-store.c (connect_to_server): Split out
-	from imap_connect. Just does the basic connect and CAPABILITY
-	check. Redo the CAPABILITY code more robustly.
-	(query_auth_types_connected): Do this right rather than punting to
-	query_auth_types_generic. Check for KERBEROS_V4 if compiled with
-	krb4 support.
-	(query_auth_types_generic): Mention KERBEROS_V4 if compiled with
-	krb4 support.
-	(imap_connect): Use connect_to_server().
-
-	* camel-mime-utils.c (base64_encode_step, base64_encode_close):
-	Take an additional argument, "break_lines", saying whether or not
-	to add '\n's to the output.
-
-	* camel-multipart.c (set_boundary): 
-	* camel-mime-filter-basic.c (filter, complete): Update for base64
-	api change.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	Improved IMAP namespace handling: leave the namespace in the
-	folder names rather than constantly prepending it and stripping it
-	off. Also some subscription fixes.
-
-	* camel-store.c (camel_folder_info_build): Fix for the case where
-	@top isn't in @folders.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Add
-	a "short_name" argument rather than figuring it out ourselves.
-	(imap_get_full_name): Implementation of CamelFolder::get_full_name
-	that strips off namespace so the user doesn't have to see it.
-	(imap_append_message, imap_copy_message_to, imap_move_message_to):
-	Use folder->full_name rather than calling
-	camel_imap_store_get_folder_path.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Update this: make @flags a bitmask and @sep a char rather than a
-	string. Make all of the out arguments optional. Handle literals in
-	the server response.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Do a better
-	job of getting the correct dir_sep for the namespace we're using.
-	Construct a base_url here that will be used by get_folder_info.
-	(camel_imap_store_folder_path): Removed
-	(imap_folder_exists): Add an argument to return the short name of
-	the folder (parsed out of the LIST response). Update for
-	imap_parse_list_response change.
-	(get_folder): Update for the various other changes.
-	(get_folder_info): Update for the various other changes. Be more
-	consistent about the returned layout: put everything underneath
-	the "namespace" directory, including INBOX, even if it doesn't
-	belong there. Don't destroy the list of subscribed folders until
-	we've actually gotten the new list.
-	(folder_subscribed, subscribe_folder, unsubscribe_folder): Use
-	folder_name directly rather than camel_imap_store_folder_Path.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Update
-	for folder name changes.
-
-2000-10-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Remove md5-utils.h include since it's not part of Camel
-	any more.
-
-	* camel-charset-map.c: Kill some warnings.
-
-	* providers/nntp/camel-nntp-grouplist.c
-	(camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save):
-	Clean up warnings about time_t casts.
-
-	* providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h
-	include.
-
-	* providers/pop3/camel-pop3-store.c: Undefine the "_" macro
-	defined by krb4's des.h when compiling with krb support.
-	Fix md5-utils.h include.
-
-2000-10-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_param_list_format_append): Only quote
-	Content-type parameters when the quoting is mandatory, and deal
-	with embedded quotes/backslashes when quoting.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* providers/pop3/Makefile.am: Tidy up build
-
-	* providers/smtp/Makefile.am: ditto	
-	
-	* Makefile.am:  Move md5-utils.[hc] to e-util because the 
-	addressbook is going to use md5 hashes for pilot syncing.
-	Maybe the calendar conduits as well because this is a good idea
-	Chris had.
-
-2000-10-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* camel-exceptions-list.def: Add newline to kill warnings.
-	
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Fix folder
-	listing code infinite loop.
-
-	* camel-store.h: Add a "parent" field to CamelFolderInfo.
-
-	* camel-store.c (camel_folder_info_build): Deal with "parent"
-	(camel_store_folder_subscribed, camel_store_subscribe_folder,
-	camel_store_unsubscribe_folder): Add g_return_if_fails checking
-	that the folder supports subscriptions.
-
-	* providers/imap/camel-imap-store.c (folder_subscribed,
-	subscribe_folder, unsubscribe_folder): Remove "+ 1"s since the
-	mail subscribe UI won't prepend / to the folder names now.
-	(get_folder_info): Clear the "parent" field of the folderinfos
-	when removing an empty top level.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_folder_subscribed,
-	nntp_store_subscribe_folder, nntp_store_unsubscribe_folder):
-	Remove "+ 1"s since the mail subscribe UI won't prepend / to the
-	folder names now.
-
-2000-10-24  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/imap/camel-imap-store.h: add subscribed_folders.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):
-	fill in vtable entries for subscription functions.
-	(camel_imap_store_finalize): new function, so we can free up our
-	subscribed_folders hashtable.
-	(camel_imap_store_init): set CAMEL_STORE_SUBSCRIPTIONS in the
-	CamelStore flags, and create our subscribed_folders hashtable.
-	(camel_imap_store_get_type): camel_imap_store_finalize is our
-	finalize function.
-	(get_folder_info): if we're looking at subscribed_only, clear out
-	the subscribed_folders hashtable, use LSUB instead of LIST, and
-	insert folder paths (prepended by their namespace if there is one)
-	into subscribed_folders.  INBOX subscription support needs work,
-	since we always show it, regardless of it's subscribed state.
-	(folder_subscribed): new function.  just look up the folder_path
-	in the hashtable.
-	(subscribe_folder): new function.  use the imap SUBSCRIBE command,
-	and if successful add it to the hashtable.
-	(unsubscribe_folder): new function.  use the imap UNSUBSCRIBE
-	command, and if successful remove it from the hashtable.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Fill in the
-	message_count and unread_message_count flags (if !fast).
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-object.h: #include gnome-i18n.h (and gnome-defs.h since
-	the former depends on it.)
-
-	* *: Add lots of _() and N_().
-
-2000-10-23  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add
-	camel-nntp-types.h.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix a
-	"how could this have been working before" memory overrun bug
-	found by Vlad.
-
-	* camel-op-queue.[ch], camel-thread-proxy.[ch]: These should have
-	gone away a long time ago.
-
-2000-10-20  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): re-enable the nntp provider.
-
-2000-10-20  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (build_folder_info): add
-	function to build a tree from the nntp group names (using '.' as a
-	heirarchy separator.)  #ifdefed INFO_AS_TREE only.
-	(build_folder_info_from_grouplist): if INFO_AS_TREE is selected,
-	call build_folder_info instead of appending a new CamelFolderInfo
-	to our list.
-	(ensure_news_dir_exists): use e_mkdir_hier instead of failing if a
-	parent directory (~/evolution/news generally) isn't there.
-
-2000-10-19  Chris Toshok  <toshok@helixcode.com>
-
-	* camel-folder-search.c: #include <sys/types.h> before <regex.h>
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):
-	Fix a bug with "INBOX" (or anything else with NIL hierarchy
-	separator) as the namespace.
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Emit
-	message_changed and folder_changed as appropriate.
-
-2000-10-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_refresh_info): Update comment here
-	so refresh_info isn't just for reconnects any more. Make the
-	default implementation a no-op rather than an error.
-
-	* providers/nntp/camel-nntp-folder.c: Move refresh_info impl into
-	camel_nntp_folder_new, since it would have leaked memory and not
-	done anything useful if it was called later.
-
-	* providers/mbox/camel-mbox-folder.c: Remove no-longer-necessary
-	refresh_info impl.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Update imap_folder->exists, but don't actually load the new
-	messages. This is a temporary workaround to deal with the IMAP
-	provider stealing the message list focus at annoying times.
-	(imap_copy_message_to, imap_move_message_to): Emit a
-	folder_changed by hand, for now.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
-	`camel-imap-stream.h'.
-
-	* Makefile.am (libcamelinclude_HEADERS): Add `camel-charset-map.h'
-	and `camel-charset-map-private.h'.
-
-2000-10-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_description): The correct
-	fix this time - the description should be encoded here and not in
-	the camel-medium layer.
-
-2000-10-30  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder.c (camel_folder_change_info_add_update): Fixed the
-	changeset logic, which was completely wrong.
-
-2000-10-27  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (quoted_encode_step): Removed is_blank() stuff.
-	(header_decode_init): When we set the 'space' bit, dont clear all
-	the others.
-	(quoted_encode): Put back the safemask.  Yes we totally need it,
-	see rfc 2047 section 5, parts (1) and (3).
-	(CHARS_PSPECIAL): Remove '=' and '_' from the list of allowed
-	characters (this is an allowed list, not a not-allowed list, like
-	the ESPECIAL).
-	(camel_mime_special_table): Updated for fixes to definitions.
-	(CHARS_ESPECIAL): Added '_' to list of characters that should be
-	encoded.
-
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
-	Use the new camel_folder_change_info_* stuff to build the update
-	diff, rather than doing it ourselves.
-
-	* camel-folder.c (camel_folder_change_info_add_source): Add a
-	'source' list, used to create change lists.
-	(camel_folder_change_info_add_source_list): Add a list of uid's,
-	convenience function.
-	(camel_folder_change_info_add_update): Add a uid to the list of
-	uid's in the new updated list.
-	(camel_folder_change_info_add_update_list): Add a bunch of uid's
-	at once for the same purpose.
-	(camel_folder_change_info_build_diff): Take the source list, the
-	update list, and find the differences, building on the added or
-	removed list as appropriate.
-
-2000-10-20  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (removed_uids): REnamed from
-	add_uid.
-	(camel_mbox_summary_update): Oops, fix the reversed logic for
-	determining the uid changesets.
-
-	* camel-folder.c (message_changed): Oops, we want to change the
-	uid, not add it.
-
-2000-10-19  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Added a
-	change list argument, and add expunged uid's to it.
-
-	* providers/mh/camel-mh-folder.c (mh_init): Setup the change list.
-	(mh_finalize): And free it.
-	(mh_sync): Track changes, and send a folder_changed signal as
-	appropriate.
-	(mh_expunge): Likewise.
-	(mh_append_message): Add the new uid to the change list and
-	trigger a folder_changed event.
-
-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):
-	Setup a mbox list of changes structure.
-	(mbox_finalize): And free it.
-	(mbox_expunge): Include the change list with the folder_changed
-	event, and clear it off.
-	(mbox_sync): And the same for when we are just syncing the folder.
-	(mbox_append_message): And do the same here, after we've updated
-	the folder.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): Use gmtime_r to get the time
-	thread-safely.
-	(camel_mbox_summary_sync): Added a changeinfo argument.  Add any
-	removed or changed messages to the changelists as appropriate.
-	(camel_mbox_summary_update): Added a changeinfo argument.
-	Genereate a list of added/removed uid's based on the difference
-	before and after rebuilding the summary.
-
-	* camel-folder.c (camel_folder_change_info_new):
-	(camel_folder_change_info_add_uid): 
-	(change_info_add_uid): 
-	(camel_folder_change_info_remove_uid): 
-	(camel_folder_change_info_change_uid): 
-	(change_info_clear): 
-	(camel_folder_change_info_clear): 
-	(camel_folder_change_info_free):
-	(change_info_cat): 
-	(camel_folder_change_info_cat):  Bunch of utility functions for
-	working with change info lists.
-	(camel_folder_init): Init the change info list.
-	(camel_folder_finalize): And free it.
-	(thaw): Changed to pass through a list of changes, or to get the
-	changed message uids from the camelfolderchangeinfo struct, and
-	reset it.
-	(folder_changed): Add the changed lists to the frozen change list
-	if we are frozen.
-	(message_changed): Add the message to the changed list if we are
-	in the frozen state.
-
-	* camel-folder.h (CamelFolderChangeInfo): New structure to hold
-	information for the folder_changed event.
-
-2000-10-18  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-filter-charset.c (complete): Put a zero at the start
-	of the outbuf.
-
-2000-10-18  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (add_header): No, we must not encode the
-	headers here.  These interfaces ARE raw interfaces as they are
-	defined in camel_medium.  Also removed a bogus/meaningless FIXME.
-	(set_header): Likewise here, we must not.
-	(process_header): Removed another bogus comment.
-
-	* camel-object.c (shared_is_of_type): Comment out the spitting of
-	a big warning when we're trying to determine types from code.
-
-	* providers/mbox/camel-mbox-summary.c
-	(message_info_new_from_parser): Only call ibex funcitons if we
-	have an index.
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_add): Only
-	call ibex functions if we have an index.
-	(remove_summary): Likewise.
-	(camel_mh_summary_check): Likewise.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder):
-	get_folder -> flags argument.
-
-	* providers/vee/camel-vee-store.c (vee_get_folder): create->flags.
-
-	* providers/pop3/camel-pop3-store.c (get_folder): Changed create
-	-> flags.
-
-	* providers/imap/camel-imap-store.c (get_folder): Added flags
-	argument.
-
-	* providers/mh/camel-mh-folder.c (camel_mh_folder_new): Added
-	flags argument, and fixed code appropriately.
-
-	* providers/mh/camel-mh-store.c (get_folder): Added flags argument.
-
-	* camel-folder-search.c (message_body_contains): Perform a regex
-	match on the contents of messages.  This wont quite work yet as
-	message contents are encoded when written to a stream.
-	(build_match_regex): Converts a number of strings into a regex
-	matching pattern, escaping special chars.
-	(match_message): match a single message from a folder, by uid.
-	Slow.
-	(search_body_contains): Changed to support matching where no index
-	is supplied.  Matches are performed by retrieving message
-	contents, etc.
-	() WTF?  camel should not be including any widget headers.
-	
-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):
-	Added flags argument.
-	(mbox_refresh_info): Changed into a NOP, the refresh info code
-	moved into the new function.
-	(camel_mbox_folder_new): If we have an index requested, build one,
-	otherwise, remove an old one, or just dont do anything.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Changed create
-	to flags, changed code to suit.
-
-	* camel-store.c (camel_store_get_folder): Changed create to flags.
-	(get_folder_internal): And here.
-	(get_folder): And here too.
-
-	* camel-store.h (camel_store_get_folder): Change the create
-	argument to be a flags argument.
-
-2000-10-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Remove
-	cached info at the end of the summary when the folder shrinks
-	between sessions. Also remove an untrue comment.
-	(camel_imap_folder_new): Move the summary creation to after the
-	folder selection again, since it depends on the uidvalidity
-	having been set.
-
-	* providers/imap/camel-imap-store.c (get_folder): Fix up
-	summary_file to not include the namespace twice.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (set_header): Encode the header value.
-	(add_header): Same.
-
-2000-10-17  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter.c: Added some malloc check debugging stuff.
-
-	* camel-mime-parser.c
-	(struct _header_scan_state): Removed top_part, top_start, and
-	pending.  I can't even remember why they were there, and they're
-	not used anymore.
-
-	* camel-mime-filter-basic.c (filter): Forgot to up the space here
-	too.
-
-2000-10-14  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (complete): Ok, so we hit a fixme, 3x
-	just wasn't enough for some sequences.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(imap_read_response): Don't imap_next_word(respbuf + 2), instead
-	use imap_next_word(respbuf) or else we'll skip over the second
-	token.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(camel_imap_response_extract): Don't free 'resp' as it doesn't
-	point to the beginning of the allocated data, instead free
-	response->untagged->pdata[i]. Also, if '*resp' is equal to a space
-	character, then set resp = imap_next_word (resp) rather than
-	expecting resp++ to work (there's a list broken IMAP daemons that
-	like to put extra spaces between tokens).
-	(imap_read_response): Don't expect 'respbuf+2' to be where the
-	untagged number response to start (see above fix for an
-	explanation).
-
-2000-10-16  Chris Toshok  <toshok@helixcode.com>
-
-	* camel-service.c (get_path): when using the construct (flags &
-	CAMEL_SERVICE_URL_NEED_*) make sure to do ((flags &
-	CAMEL_SERVICE_URL_NEED_*) == CAMEL_SERVICE_URL_NEED_*)
-	(check_url): same.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Only send
-	the LOGOUT command if the store is connected.
-	(imap_connect): Set the 'connected' state to TRUE when we
-	successfully connect.
-	(get_folder_info): if (!topfi), 'topfi' was allocated but then
-	'fi' was set. I think Dan meant to set topfi since fi is an
-	uninitialized value at this point.
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Check
-	for the untagged BYE response and set the 'connected' state to
-	FALSE if we receive the BYE response. Return NULL if we get a BYE
-	response.
-
-2000-10-16  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Deal with
-	the possibility of not getting a LIST response back for the top
-	level.
-
-2000-10-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Simple subclass of
-	CamelFolderSummary that also keeps a UIDVALIDITY value (and
-	doesn't, for the moment, build content info).
-
-	* providers/imap/camel-imap-folder.c:
-	(various): Use a CamelImapSummary to store/fetch summary info.
-	(camel_imap_folder_new): Take a path to a file to use for the
-	summary. Set the folder's permanent_flags correctly according to
-	the server response. Read in the summary (checking the
-	UIDVALIDITY) and update it if it's out of date.
-	(imap_refresh_info): Just fetch UIDs and flags. If the UIDs all
-	match, update the flags as needed and be done with it. Otherwise,
-	delete messages that have been expunged from the server and fetch
-	full summary info for any new messages.
-	(imap_sync): Save the summary to disk.
-	(imap_update_summary): Renamed from imap_get_summary_internal. Can
-	now be told to get summary for only a subset of messages. Use
-	camel-mime-utils functions rather than rolling our own header
-	parsing.
-	(imap_get_message_info_internal): Merged into imap_update_summary.
-	(imap_set_message_flags): Don't marked the message FOLDER_FLAGGED
-	if we're not actually changing the value of any of the flags.
-	(camel_imap_folder_changed): Deal with EXISTS rather than RECENT.
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Call
-	camel_session_get_storage_path and save the value.
-	(get_folder): Create a local directory to store summary
-	information and pass a summary file name to camel_imap_folder_new.
-	Don't call camel_folder_refresh_info from here any more since
-	camel_imap_folder_new does it again.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Add a
-	special case to this to make it possible to get the repsonses from
-	a SELECT and still have store->current_folder be updated
-	correctly.
-	(imap_read_response): parse EXISTS rather than RECENT
-
-	* camel-session.c (camel_session_get_storage_path): Use
-	e_mkdir_hier.
-
-	* camel-folder-summary.c (camel_folder_summary_remove_index): New
-	function.
-
-	* camel-mime-utils.c (header_raw_append_parse): fix this.
-	(camel-mime-parser.c doesn't use this code because of the MEMPOOL
-	optimization, so nothing was ever actually calling it before.)
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.h (struct _CamelMimePart): Removed
-	temp_message_buffer, and content_input_stream fields which seem to
-	have come from nowhere, and are unused.
-
-	* camel-mime-utils.c: Added a note about touching this file.
-	Nobody is to touch it without asking me first.  That goes for you
-	too Jeff.
-	(header_decode_text): In what way is this broken?
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Fix camel_summary_* function rename
-	(imap_get_message_info_internal): Likewise.
-
-	* camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.
-
-	* camel-folder-summary.c (camel_summary_format_address): Uh, why
-	do we encode and then decode here ... sigh.  This is not the way
-	to fix this.
-	(camel_folder_summary_format_address): Renamed to a proper name,
-	this was only supposed to be a private function.
-	(camel_folder_summary_format_string): Likewise.  Oh i see why it
-	was made public, code reuse by cut & paste.  Joy.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.
-	(nntp_store_subscribe_folder): same.
-	(nntp_store_folder_subscribed): same.
-
-2000-10-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): Quote
-	the mailbox name as it may contain spaces.
-	(imap_copy_message_to): Same.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): fill in message_count and
-	unread_message_count properly.
-
-	* providers/nntp/camel-nntp-newsrc.h: reformat.
-
-	* providers/nntp/camel-nntp-grouplist.c
-	(camel_nntp_get_grouplist_from_file): remove spew.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_get_num_articles_read): new function.
-	(camel_nntp_newsrc_group_get_highest_article_read): robustification.
-
-2000-10-10  Joe Shaw  <joe@helixcode.com>
-
-	* providers/imap/camel-imap-store.c 
-	(parse_list_response_as_folder_info): Check before dereferencing the
-	sep pointer.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* camel-*.c: teach camel about "its" vs. "it's"
-
-2000-10-09  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (finalize): write out the
-	newsrc.
-	(nntp_store_get_name): if @brief, just return host.
-
-	* providers/nntp/camel-nntp-newsrc.c: robustification and bug
-	fixes.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_summary_format_address): Decode
-	the resulting string.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-grouplist.c: new file.
-
-	* providers/nntp/camel-nntp-grouplist.h: new file.
-
-	* providers/nntp/camel-nntp-types.h: new file.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode): Fix so that we don't encode
-	every single char in the word. Also, do we need a safemask? I
-	don't see why we would.
-	(header_encode_string): Don't strip off the last char!!
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add
-	camel-nntp-grouplist.h
-	(libcamelnntp_la_SOURCES): add camel-nntp-grouplist.c
-
-	* providers/nntp/camel-nntp-provider.c: add our own hash functions
-	for nntp urls.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_is_subscribed): new function.
-	(camel_nntp_newsrc_subscribe_group): new function.
-	(camel_nntp_newsrc_unsubscribe_group): new function.
-
-	* providers/nntp/camel-nntp-newsrc.h: add prototypes for
-	_group_is_subscribed, _subscribe_group, and _unsubscribe_group.
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): new function.
-	(nntp_store_get_folder_info): add subscribed_only_parameter.  if
-	it's FALSE, load the grouplist and call
-	build_folder_info_from_grouplist.
-	(nntp_store_folder_subscribed): implement.
-	(nntp_store_subscribe_folder): implement.
-	(nntp_store_unsubscribe_folder): implement.
-	(camel_nntp_store_init): add CAMEL_STORE_SUBSCRIPTIONS to the
-	store's flags.
-
-	* providers/mh/camel-mh-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/mbox/camel-mbox-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* camel-store.c (camel_store_supports_subscriptions): new function.
-	(camel_store_folder_subscribed): new function.
-	(camel_store_subscribe_folder): new function.
-	(camel_store_unsubscribe_folder): new function.
-
-	* camel-store.h: add prototypes and virtual functions for the
-	subscribe implementation.  also, add a subscribed_only argument to
-	camel_store_get_folder_info.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): Encode
-	the name part of the address and don't quote the name.
-	(header_decode_text): Rewrote from scratch, the old code was badly
-	broken.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use the
-	camel_address_encode function again.
-	(camel_mime_message_set_from): Same.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode_step): Modified to not encode
-	space chars in the middle of a line.
-	(isblank): New macro if we're not on a system with the GNU isblank
-	extension.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Reversed my
-	changes, don't header_encode_phrase - it generates broken headers.
-	(camel_mime_message_set_reply_to): Same.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):
-	revert to old method (only use XOVER if OVER is supported.)
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_overview_fmt): handle the case where the
-	OVER extension isn't listed but LIST OVERVIEW.FMT works (again,
-	INN 2.2).  enable the OVER extension in this case.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): return a
-	gboolean so we can tell if this command worked.  we can't key off
-	the OVER extension being present because at least one server (INN
-	2.2) doesn't report the OVER extension but implements the XOVER
-	command.  This could of course just be because I'm a loser for
-	thinking they were related in the first place.
-	(camel_nntp_get_headers): always try XOVER first, and if it fails
-	revert to the slow method.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a case where
-	a variable was free'd and then possibly used in an error message.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-provider.c
-	(camel_provider_module_init): news: -> nntp:.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):
-	use "nntp:" instead of "news:" since "news:" urls aren't supposed
-	to have host/user/port info in them.  also, if there's a user
-	defined in the url, put it in the urls for our folders.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate):
-	borrow some code from the imap provider to query the user for
-	their password, and pass the user/passwd to nntp.  be extra
-	paranoid and zero out the password before freeing it.
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_init): add
-	ALLOW_USER/ALLOW_PASSWORD/ALLOW_AUTH to the url flags.
-	(nntp_store_query_auth_types_generic): return our list of
-	auth_types.
-	(nntp_store_query_auth_types_connected): broken, return same as in
-	query_auth_types_generic.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): IMAP4
-	(pre-rev1) doesn't support the 'LIST "" ""' idiom, so don't use
-	it. Just assume the dir_sep is '/'. Shrug.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use
-	header_encode_phrase instead.
-	(camel_mime_message_set_from): Same.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_content_type_is): Handle the case
-	where ct != NULL, but type and subtype are, and also match that
-	against text/plain.
-
-	* camel-folder-summary.c: Bump summary file version.
-	(message_info_save): Save the size from the messageinfo.
-	(message_info_load): Load the size from the summary file.
-	(message_info_load): Fixed up the time_t saving/loading.  There
-	was a reason the warning was left there ... obviously nobody could
-	read the comment "/* warnings, leave them here */", why do i even
-	bother.
-	(camel_folder_summary_decode_time_t): Decode a time_t value from
-	the summary file.
-	(camel_folder_summary_encode_time_t): Encode a time_t value to the
-	summary file.
-
-2000-10-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Quote
-	the mailbox name when sending a SELECT request otherwise mailboxes
-	with spaces in their names will cause problems.
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): encode
-	before setting.
-	(camel_mime_message_set_from): Same.
-
-2000-10-03  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c: New file containing
-	camel_imap_command and friends. Major camel_imap_command rewrite
-	to remove duplicated code, make the parsing of literals be
-	more safe/correct, deal with RECENT/EXPUNGE responses more
-	consistently, and make it possible to implement the AUTHENTICATE
-	command.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): New
-	function, to parse an IMAP "nstring".
-
-	* providers/imap/camel-imap-store.c: Move command stuff to
-	camel-imap-command.c. Update for camel_imap_command changes.
-
-	* providers/imap/camel-imap-folder.c: Update for
-	camel_imap_command changes.
-	(imap_append_message): CRLF filter the message before sending it.
-
-	* providers/imap/Makefile.am: Add camel-imap-command.[ch], remove
-	camel-imap-stream.[ch] for now.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_has_8bit_parts): New
-	convenience function to determine if there are any 8bit mime parts
-	in a mime message.
-	(camel_mime_message_encode_8bit_parts): New convenience function
-	to recursively reencode all 8bit mime parts to either
-	quoted-printable or base64 depending on which would be the best
-	encoding for that part.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the mime
-	message contains 8bit parts and the server doesn't support 8bit
-	transfers, reencode those parts before proceding with the send.
-	(smtp_mail): If the mime message contains 8bit parts and the
-	server supports the 8BITMIME extension to SMTP, notify the server
-	that we'll be sending it 8bit mime parts.
-	(_send_to): Find out if the message contains 8bit parts.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Use the
-	CamelInternetAddress parser.
-	(smtp_get_email_addr_from_text): deprecated.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Remove default_ports.
-
-	* camel-remote-store.c (remote_connect): Get default_port from
-	CamelRemoteStore rather than CamelProvider.
-
-	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize
-	CamelRemoteStore::default_port
-
-	* providers/*/camel-*-provider.c: Remove default_ports.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove
-	camel_folder_{get,free}_subfolder_info, as we want to be able to
-	scan the whole subfolder tree without having to open any folders,
-	so this needs to be in CamelStore. Remove can_hold_folders and
-	can_hold_messages flags; things that don't hold messages are no
-	longer considered CamelFolders.
-
-	* camel-folder-summary.[ch]: Remove CamelFolderInfo stuff.
-
-	* camel-store.[ch]: Add camel_store_{get,free}_folder_info, as
-	well as camel_store_free_folder_info_full and ..._nop for default
-	implementations, and camel_folder_info_free and
-	camel_folder_info_build as convenience functions. Turn
-	CamelFolderInfo into a tree structure and also add an "url"
-	member.
-
-	* providers/*/camel-*-folder.c: Remove subfolder_info and can_hold
-	stuff.
-	* providers/*/camel-*-store.c: Add folder_info stuff.
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Free the
-	summary elements with camel_message_info_free, not
-	camel_folder_info_free. Oops.
-
-	* providers/imap/camel-imap-utils.c: const poison
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Fixed some memory leaks.
-	(camel_smtp_transport_init): Initialize supports_8bit to FALSE.
-	(smtp_helo): If server supports 8bit, set supports_8bit to TRUE.
-
-	* camel-transport.h (struct _CamelTransport): Added variable
-	gboolean supports_8bit (we'll need this eventually? - see bugzilla
-	bug #53)
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): Ugh, no wonder people were
-	getting illegal seek warnings *sigh*. I guess I can only blame
-	myself for this one though :-(
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Don't send the
-	recipient data through smtp_get_email_addr_from_text - this is a
-	complete waste. In fact, we don't want to have to use that
-	function ever.
-
-	* camel-internet-address.c, camel-address.c: Added some gtk-doc
-	comments.
-	
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-mime-utils.c (header_encode_string): Make sure to add the
-	space char after an encoded word when the encoding is iso-8859-1.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): When
-	getting a literal string response, don't include the \r\n after
-	the closing } (as in: "... {798}\r\n...")
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Same.
-
-2000-09-28  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_fold): New function to fold headers.
-
-2000-09-27  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): If we had an empty
-	header, then it must be end of the headers too.
-	(folder_scan_init): No we dont need to init the outbuf with a nul
-	terminator.
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): New
-	function to reset the uid to a higher value.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	"something failed (yo!)" what sort of crap is this?  Fixed all the
-	indenting again, what wanker keeps running stuff through indent?
-	(message_info_new): Check the uid we loaded off the disk, if it
-	existed already, assign a new one.  If it didn't then make sure
-	the nextuid is higher.
-
-	* camel-charset-map.c: New file, used to build a large unicode
-	decoding mapping table, and use it to determine what is the
-	lowest charset a given word can be encoded with.  Uses tables from
-	libunicode's source.
-
-	* camel-internet-address.c (internet_encode): Use
-	header_phrase_encode to properly encode the fullname, as required.
-	refixed indenting.  Who keeps doing that?
-	(camel_internet_address_find_address): Changed fatal return/warnings
-	into assertions.
-
-	* camel-mime-utils.c (header_raw_append_parse): Check : explicitly
-	(removed from is_fieldname() macro).
-	(camel_mime_special_table): Changed to short, so we can represent
-	more bit types.
-	(quoted_encode): Take a mask of the safe chars for this encoding.
-	(header_address_decode): Removed a #warning that makes no sense
-	anymore.
-	(header_decode_date): Fixed the 'broken date' parser code, if it
-	ever decoded it it just threw away the result.
-	(header_encode_string): Use better charset matching for encoding
-	strings as well.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Save
-	the index if we do a sync.
-	(camel_mh_summary_check): Save the index here too.  Probably.
-
-2000-09-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Return untagged data in a GPtrArray rather than a string, since it
-	saves processing time and is much easier to deal with for several
-	commands. Update for camel_imap_folder_changed change.
-	(camel_imap_fetch_command): Update for camel_imap_folder_changed
-	change.
-	(imap_connect, imap_folder_exists): Update for
-	camel_imap_command_extended change.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal,
-	imap_get_subfolder_info_internal, imap_search_by_expression):
-	Update for camel_imap_command_extended change.
-
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	camel_imap_fetch_command here now to get around the
-	camel_imap_command_extended change.
-
-	(camel_imap_folder_changed): turn expunged into a GArray of ints
-	rather than a GPtrArray of strings representing ints.
-
-2000-09-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Quote the folder name as it may
-	contain spaces.
-	(imap_get_subfolder_info_internal): Same.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): Do
-	proper unquoting for folder names.
-	(func_get_current_date): Implemented.
-
-	* providers/imap/camel-imap-store.c
-	(imap_folder_exists): Quote the folder name as it may have spaces.
-	(imap_create): Same.
-	(check_current_folder): Same.
-
-2000-09-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): The root folder's name is "",
-	not the namespace.
-	(camel_imap_folder_new): constify folder_name.
-
-	* providers/imap/camel-imap-store.c (get_folder): Create the
-	folder with folder_name, not folder_path.
-	(camel_imap_command_preliminary): Don't free cmdid here.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_create_flag_list): New
-	function to convert Camel flags to an IMAP flag_list.
-	(imap_parse_flag_list): Contrariwise.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_*): Make
-	the @ret arg actually optional, as (mostly) documented.
-	(various): Don't pass "&result" to camel_imap_command_* if we're
-	just going to immediately free it. Don't record status if we're
-	not going to look at it.
-
-	* providers/imap/camel-imap-folder.c: Likewise.
-	(imap_summary_free): Use camel_folder_info_free.
-	(imap_sync): Use imap_create_flag_list. Clear
-	CAMEL_MESSAGE_FOLDER_FLAGGED after syncing so we don't keep
-	re-syncing.
-	(imap_append_message): Use imap_create_flag_list. Don't leak the
-	memstream if the append fails.
-	(imap_move_message_to): Use camel_folder_delete_message rather
-	than doing it by hand.
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	imap_parse_flag_list and header_raw_clear.
-	(camel_imap_folder_changed): Use camel_message_info_free.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_name): INBOX is
-	case-insensitive.
-	(get_root_folder_name): Make the root folder "" rather than "/".
-	(get_folder): Update for root folder name change.
-	(camel_imap_store_get_toplevel_dir): Removed. (Unused, unneeded.)
-	(camel_imap_store_folder_path): New function to turn a Camel
-	folder name into the corresponding namespaced IMAP path.
-	(imap_folder_exists): Make this take a store and a path rather
-	than a folder.
-	(imap_create): Likewise
-	(get_folder): Update for camel_imap_store_folder_path and other
-	changes.
-	(check_current_folder): Likewise.
-
-	* providers/imap/camel-imap-folder.c: Change a bunch of CamelStore
-	variables to CamelImapStore (and add a few more) to prevent excess
-	gratuitous casting. Use camel_imap_store_folder_path where
-	appropriate.
-	(camel_imap_folder_new): Update for root folder name change.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the
-	linewrap filter to achieve full RFC0821 compliance.
-
-	* camel-mime-filter-linewrap.[c,h]: New mime-filter to word-wrap.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): When encoding the
-	internet address, quote the name as the name may have commas or
-	any other token which may later confuse our address parser.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): Fix the case where INBOX
-	isn't returned in the folder listing.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: (init): Removed
-	(camel_folder_init, camel_folder_construct): New object init
-	function and public object constructor to replace the old init
-	method in a more Gtk-like fashion.
-
-	(get_parent_folder, camel_folder_get_parent_folder): Removed. No
-	CamelFolder subclass was ever setting the parent_folder member, no
-	code has ever needed to look at it, and fixing it would actually
-	be pretty hard.
-
-	(get_subfolder_info, camel_folder_get_subfolder_info): Renamed
-	from ..._names. Deals in CamelFolderInfo now.
-	(free_subfolder_info, camel_folder_free_subfolder_info): Likewise.
-
-	(get_subfolder, camel_folder_get_subfolder): Removed.
-	CamelFolderInfo contains the subfolder's full name, so this is
-	unnecessary now, and removing it lets us get rid of the
-	CamelFolder separator member, which is needed for the default
-	implementation of this function, but not otherwise needed for most
-	providers.
-
-	Also, lots of code style fixes.
-
-	* providers/*: Update CamelFolder subclasses for changes, although
-	none of them fill in the message counts in the CamelFolderInfo
-	yet.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-search.h,
-	camel-remote-store.c, providers/imap/camel-imap-folder.c,
-	providers/imap/camel-imap-store.c: Fixed the #include lines to
-	deal properly with gal.
-
-2000-09-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.h: update CamelFolderInfo
-	* camel-folder-summary.c (camel_folder_info_free): New function to
-	free the contents of a CamelFolderInfo
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* camel.c (camel_init): Set camel_verbose_debug to TRUE if
-	CAMEL_VERBOSE_DEBUG is set in the environment.
-
-	* camel-remote-store.c (remote_send_line, remote_recv_line): only
-	log if camel_verbose_debug is TRUE.
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Don't use
-	dir_sep as top-level directory, use "/".
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of
-	unused variable.
-
-2000-09-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Don't look at
-	the response of the command. camel_imap_command_extended()
-	processes EXPUNGE responses itself, so if we do it here too we
-	remove twice as many summary items as we should.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Rewrote
-	to take a third argument (gboolean *selectable) so that we can
-	find out if the folder is selectable or not as we look to see if
-	it exists. Also, don't use EXAMINE because that will not work on
-	non-selectable folders, so use LIST instead.
-	(get_folder): Check to see if the folder exists even vefore
-	calling imap_create as this will save time. If the folder does
-	exist, find out if it's selectable. Moved the call to refresh_info
-	here.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Check for a
-	NULL summary.
-	(camel_imap_folder_new): Don't call refresh_info here - call it in
-	get_folder() because we don't know if this folder even exists on
-	the server yet! And even if it does, we don't know if it can hold
-	messages or not yet.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is
-	> 0 before calling camel_mime_filter_filter otherwise we will get
-	a segfault if the filter calls iconv().
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c,
-	providers/nntp/camel-nntp-auth.h: Fixed a warning.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_get_storage_path): Make this not
-	leak.
-	
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_new): Make this take a path to a
-	directory that Camel can use for its own nefarious purposes.
-	(camel_session_get_storage_path): New function to return a path
-	that a service can use for its own nefarious sub-purposes.
-
-	* camel-service.c (camel_service_get_path): New method (and
-	useful default implementation) to get a (relative) pathname
-	corresponding to the service.
-
-2000-09-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Make KPOP
-	work again.
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_get_received_date):
-	Implemented (someone added these to camel-mime-message.h but never
-	implemented them!!) - though it may not be right.
-	(camel_mime_message_get_sent_date): Same.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_get_filename): If a MIME part
-	has no Content-Disposition, but does have a "name" on the
-	Content-Type, return that as the filename.
-	(process_header): strstrip the Content-Description
-
-2000-09-05  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): care about
-	response code.
-	(get_HEAD_headers): same.
-	(camel_nntp_get_headers): same.
-
-	* providers/nntp/camel-nntp-store.h: get rid of
-	CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): take CamelException arg and
-	pass along to camel_nntp_command.
-	(camel_nntp_store_get_overview_fmt): same.
-	(nntp_store_connect): convert to using constants in
-	camel-nntp-resp-codes.h
-	(nntp_store_get_folder): make use of camel_nntp_folder_new.
-	(camel_nntp_command_send_recv): new function to deal with auth
-	challenge.
-	(camel_nntp_command): split out most of this function into
-	camel_nntp_command_send_recv.  also, return the actual response
-	code instead of CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-resp-codes.h: new file.
-
-	* providers/nntp/camel-nntp-folder.h: prototype for
-	camel_nntp_folder_new.
-
-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): new
-	convenience function.
-	(nntp_folder_get_message): care more about the actual response
-	code.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-auth.c.
-	(libcamelnntpinclude_HEADERS): add camel-nntp-auth.h.
-
-	* providers/nntp/camel-nntp-auth.h: new file.
-
-	* providers/nntp/camel-nntp-auth.c: new file.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Don't free the
-	result on error; the exception will have the relevant info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Check for
-	exceptions here.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Check the exception
-	on the refresh_folders call.
-
-	* providers/imap/camel-imap-store.h: Clean up some now-unused fields.
-
-	* camel.c (camel_init): Call unicode_init again, now that libunicode
-	will not initialize itself twice.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-search (search_header_contains): Use e_utf8_strstrcase
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed some unused
-	functions.
-
-2000-09-01  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): Initialize
-	the statically-allocated CamelException so that it doesn't contain
-	junk data that camel_exception_set() may try to free.
-	(camel_nntp_store_get_extensions): Same.
-	(camel_nntp_store_get_overview_fmt): Same.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Typo
-	fix (if (*ret) -> if (ret)).
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the
-	port # back to what was specified ASAP, so that the hash of
-	the URL doesn't change (which causes a failure in
-	service_cache_remove that leads to a segfault).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Clear the 
-	exception after a failed LOGIN so that it doesn't pass through
-	to the upper level and make mail think that the login failed.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): As above.
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_get_type):
-	Implement POP3 with the CamelRemoteStore now.
-	(connect_to_server): Hack this a bit to get KPOP to work. Obey
-	the new connection semantics of the remote store (implicitly).
-	(query_auth_types_connected): Clear exceptions after attempts
-	to connect; the code at the bottom will catch hard errors.
-	Use camel_service_connect.
-	(camel_pop3_command): Take a CamelException; now, when an error
-	occurs, ret is set to NULL and the exception passes back the
-	appropriate information.
-	(pop3_get_response): Same as above.
-	(pop3_try_authenticate): Give camel_pop3_command its exception
-	and handle it properly.
-	(pop3_connect): Call the parent classfuncs. Don't disconnect
-	on error (done for us).
-
-	* providers/pop3/camel-pop3-folder.c: Obey the camel_pop3_command
-	semantics.
-
-	* camel-remote-store.c (remote_query_auth_types_connected): Don't
-	warn; just return NULL.
-	(remote_query_auth_types_generic): Same.
-	(remote_send_string): Filter out passwords in debugging output.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Also
-	set the ALLOW_AUTH flag.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Same.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_class_init):
-	remove get_folder_name.
-	(nntp_store_get_folder_name): remove.
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-mime-part.c (write_to-stream): Use filter only if we have one
-	
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):
-	use camel_remote_store_recv_line to build message.  also, free our
-	buffer so we don't leak like mad.
-
-	* providers/nntp/camel-nntp-store.c:
-	(camel_nntp_store_get_additional_data) remove.
-	(camel_nntp_store_get_extensions): use
-	camel_remote_store_recv_line.
-	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on
-	_get_additional_data anymore since it's easier to parse without.
-	(camel_nntp_command): use camel_remote_store_send_string and
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the
-	parent class now.  remove istream/ostream since CamelRemoteStore
-	takes care of that for us.  also remove the prototype for
-	camel_nntp_store_get_additional_data.
-
-	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):
-	make sure to clear dirty bit.
-	(camel_nntp_newsrc_read_for_server): don't worry about continually
-	trying to open the file - if it fails we just return an
-	unpopulated .newsrc file.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_read_for_server): make this a bit more robust.
-	try to create an empty .newsrc file for the server if we can't
-	open it for reading.  also, don't allocate everything until we've
-	opened the file.
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): make use
-	of our overview field indices.
-	(camel_nntp_get_headers): only call get_OVER_headers if the
-	extension is present.  warn if it's not - since get_HEAD_headers
-	needs work before it works.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): new function - query the server
-	for it's extensions.
-	(camel_nntp_store_get_overview_fmt): new function - query the
-	server for the overview format and build our table of the indices
-	we care about.  support the "full" suffix on fields.
-	(nntp_store_connect): call camel_nntp_store_get_extensions and
-	camel_nntp_store_get_overview_fmt.
-
-	* providers/nntp/camel-nntp-store.h: add codes for extensions
-	found on news.mozilla.org.  only one that we care about is OVER.
-	also, add CamelNNTPOverField and an enum of the overview fields
-	that we care about.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp):
-	Reimplemented. It should now work correctly for most possible
-	VFolder rules.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Don't save any exceptions caused by camel_imap_folder_changed
-	(camel_imap_fetch_command): Same.
-	
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Using a new way of calculating the first recent message that seems
-	more accurate. Also added code to make sure we don't accidently
-	add a duplicate summary.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Use the proper type
-	checking function to check for text types.
-	(write_to_stream): If we have a charset on a text type that
-	isn't us-ascii or utf-8, then we need to reencode it, so add a
-	filter to do that too.
-	(write_to_stream): Fix some warnings/use the right constructor,
-	oops.
-	(write_to_stream): Rearrange the logic so it always does charset
-	conversion, and not just if we have a qp/base64 block.
-
-	* camel-mime-utils.c (append_latin1): New function - even though
-	its broken, we'll assume mailers send latin1 headers instead of
-	us-ascii.  We just have to encode high chars into utf-8.
-	(header_decode_text): Call append_latin1 for appending unencoded
-	text segments.
-	(append_latin1): Do an additional mask for account for c's
-	undefined behaviour for sign extension whilst shifting right.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_fetch_command):
-	Rewrote to ignore strings that look like server responses until it
-	is sure that it has finished reading the literal string response.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c (remote_send_string): Don't wrap printed
-	strings in quotes, makes things messy
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message): Updated
-	to use the camel_imap_fetch_command
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to use
-	camel_imap_fetch_command
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	No longer handles FETCH requests so no longer needs to be
-	concerned with checking to make sure that server responses are
-	valid (they have to be).
-	(camel_imap_fetch_command): New convenience function that handles
-	all FETCH requests
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* camel-remote-store.c (remote_connect): Unify with remote_post_connect.
-	(remote_disconnect): Unify with remote_pre_disconnect.
-	(camel_remote_store_class_init): Don't use the post_connect and
-	pre_disconnect classfuncs anymore ; they weren't especially useful.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Use this again
-	instead of implementing post_connect.
-	(imap_disconnect): Analogous to above.
-
-	* camel-session.c (camel_session_get_service_connected): New function.
-	Like camel_session_get_service() but also connects to the service
-	if needed. camel_session_get_{store,transport} (defined in the header)
-	used this now, preventing annoying when-to-connect problems.
-
-	* camel-service.c (camel_service_new): Revert to the old behavior
-	of not connecting until told to do so. Otherwise doing auth
-	testing correctly is really hard.
-	(camel_service_connect): Fix behavior here (set the connected
-	flag).
-	(camel_service_disconnect): Unset the connected flag.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: General cleanup / moving
-	stuff around to make things easier to follow.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c: Prevent exceptions from being overwritten
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Beautified
-	(imap_get_subfolder_names_internal): Removed old code as the
-	replacement code has now been tested and proven to work
-
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed old code that will
-	never be needed again
-
-	* providers/imap/camel-imap-store.c: Removed old code for
-	try_connect - will never need this code
-	(slurp_response): Update to make sure we aren't falsely detecting
-	EXPUNGE flags
-
-2000-08-29  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_connect): Uncomment this.
-	(camel_service_disconnect): Same.
-
-	* camel-remote-store.[ch]: New files. Abstract remote storages
-	(IMAP, POP3, NNTP) and hides the lower-level networky stuff.
-	
-	* camel-service.c (camel_service_new): Take an extra argument, the
-	provider that created us, cause it's useful.
-	(camel_service_finalize): Unref our new provider member.
-
-	* camel-session.c (camel_session_get_service): Pass the proper number of
-	arguments to camel_service_new().
-
-	* camel-imap-store.c: Massive update: 1) use the CamelRemoteService to
-	make our life Very Easy (TM). 2) Change the semantics of all 
-	camel_imap_command* functions to take exceptions, centralize tons of
-	duplicate code, and use the handy RemoteStore utility functions
-
-	* camel-imap-folder.c: Use the new semantics of camel_imap_command*
-
-	* camel-imap-stream.c: Same.
-	
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Updated to check for EXPUNGE notifications
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Updated to account for messages which have been expunged (now
-	takes a new arg, a GPtrArray of message id's that have been
-	expunged)
-	(imap_expunge): Updated (we may want to just use the code in
-	folder_changed now instead of doing our own summary
-	expunging...but that can be fixed later)
-	(imap_append_message): Updated.
-	(imap_copy_message_to): Updated.
-	(imap_move_message_to): Updated.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_refresh_info): New member function,
-	refresh_info, used for rereading folder state after its state has
-	somehow become unknown. Tries to preserve last-known status of
-	messages.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_refresh_info): Implement
-	::refresh_info (split up ::init)
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Call ::refresh_info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Call
-	::refresh_info once initialized.
-	(imap_refresh_info): New member function; reads the summary from
-	the server (used to be in camel_imap_folder_new; split out).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Set
-	CamelService::connected a little early so that 
-	camel_imap_command won't try to connect while already
-	connnecting.
-	(camel_imap_command*): Try to connect if not connected already.
-	
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Same as above.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Same
-	as above.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set 
-	CamelService::connected a little early so that
-	camel_pop3_command won't try to connect while already
-	connecting
-	(connect_to_server): Same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_refresh_info): Same
-	as above.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed the
-	hack around quoted string responses - should now handle them
-	according to the specifications in the RFC
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to
-	match the code currently used in camel-imap-folder.c
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Never ever free `tmpname' as it comes from `alloca()'!
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_text): Use `g_free()', not
-	`free()', to free `decword'.
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* camel.c (camel_init): Don't call unicode_init; code in e-util
-	will do it, and if unicode_init is called twice, you get an
-	infinite loop when looking up nonexistant encodings (patch
-	has been submitted to libunicode's maintainer).
-	
-	* camel-provider.h: Add a new field, default_ports, which
-	helps the configuration code guess about how to make CamelURL's
-	from providers.
-	
-	* providers/*/camel-*-provider.c: Specify default ports.
-
-2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If the url path is "/" and
-	the folder path is "/", just LIST "" "*" (this should fix some
-	cyrus imapd problems). Also, INBOX is case insensitive so use
-	g_strcasecmp
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-summary.c (summary_build_content_info):
-	Use UTF-8 as default
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):
-	Use UTF-8 as default
-	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8
-	
-2000-08-17  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): Close index
-	on exit.
-
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): put
-	commas between addresses.
-
-2000-08-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_protocol_get_summary_specifier): use BODY.PEEK, not BODY, so
-	we don't set the message \Seen.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c: Fixed a small warning.
-
-2000-08-22  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Connect automatically if the
-	URL is not empty.
-	(finalize): Disconnect automatically if connected.
-	(camel_service_query_auth_types): Split	into two functions; one to
-	be called if we're connected to an actual server (_connected), one
-	to be called if we're just gauging the general authtypes supported
-	(_generic).
-	(is_connected): Remove.
-
-	* camel-store.c (camel_store_get_folder): Don't connect explicitly to
-	the service.
-
-	* providers/nntp/camel-nntp-store.c (query_auth_types_generic): Split
-	the query_auth_types function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-	
-	* providers/pop3/camel-pop3-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/imap/camel-imap-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types_generic): Split
-	the query_auth_types (dummy, in this case) function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-	
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_subfolder_names):
-	Make sure newsrc is not null
-	(nntp_folder_get_subfolder_names): ditto
-
-	* providers/nntp/camel-nntp-newsrc.c 
-	(camel_nntp_newsrc_get_subscribed_group_names): Programming check
-	for newsrc == NULL
-	(camel_nntp_newsrc_get_all_group_names): ditto
-	(camel_nntp_newsrc_write_to_file): ditto
-	(camel_nntp_newsrc_write): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): 
-	Make sure respbuffer is not null before manipulating it.
-	If it is null, return CAMEL_NNTP_FAIL and a decent error
-	message.
-	
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): If the name is "" we
-	weren't outputting anything; output the address at least.
-
-2000-08-16  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): Fix a leak when
-	name = "". It's a single-byte leak, but it's the little things
-	that count.
-
-	* camel-object.c (camel_type_lock_up): Don't leave the type
-	system locked when a bad unlock happens.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a leak.
-
-2000-08-15  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_copy_message_to): Typo fix.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder-search.c (search_get_sent_date): New search function;
-	returns the time_t when the message was sent.
-	(search_get_receive_date): Same for when it was received.
-	(search_get_current_date): Gets the current time for use with the
-	above two. Is this in the right place?
-
-	* camel-folder-search.h: Add the new functions above to the class.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): Add
-	camel-nntp-utils.h
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): do a strcasecmp rather than
-	just a strcmp when checking if a folder is "INBOX", since it is
-	a case-insensitive name.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Don't assume the FETCH results will come back in the order they
-	were requested.
-	(imap_get_subfolder_names_internal): Add "INBOX" to the list as
-	g_malloc'ed memory, not a static string.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Now takes a char * parameter
-	rather than a stream
-	(camel_imap_command_continuation_with_stream): Same function as
-	above but takes a stream parameter instead
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	camel_imap_command_continuation_with_stream
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): New
-	function to do one round of attempted authentication.
-	(pop3_connect): Move a bunch of code out into
-	pop3_try_authenticate and fix some bugs in the edge cases.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): No longer
-	calls try_connect() to get authtypes
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Changed param order a bit and
-	fixed some logic
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	the new multi-transactional convenience functions
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_preliminary): New convenience function for
-	multi-transactional commands (opening request)
-	(camel_imap_command_continuation): New convenience function for
-	multi-transactional commands (followup data)
-
-2000-08-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mh/camel-mh-folder.c: Fixed a warning.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(camel_nntp_folder_class_init): remove get_name and get_full_name
-	assignments, since the camel-folder.c implementation does what we
-	need.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use g_get_home_dir, since
-	evolution_dir isn't available in the providers.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (thaw): Fix a bug where the message_changed
-	signal wasn't being emitted.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):
-	Implement.
-	(mh_get_message_user_tag): Implement.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_user_tag):
-	(mbox_set_message_user_tag): Implement.
-
-	* camel-folder.c (move_message_to): Yay so lets fix an already
-	fixed fix, again.
-	(copy_message_to): and here too ... update for api change to append().
-	And removed another warning.
-	(camel_folder_set_message_user_tag): Routine to set message tags.
-	(camel_folder_get_message_user_tag): And accessor.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-summary.c, camel-medium.c,
-	camel-mime-filter-charset.c, camel-mime-filter.c,
-	camel-mime-filter.h, camel-mime-message.c, camel-mime-parser.c,
-	camel-mime-part-utils.c, camel-mime-part.c, camel-mime-utils.c,
-	camel-movemail.c, camel-multipart.c, camel-object.c,
-	camel-stream-mem.c, providers/mbox/camel-mbox-folder.c,
-	providers/mbox/camel-mbox-summary.c,
-	providers/mh/camel-mh-folder.c,
-	providers/smtp/camel-smtp-transport.c: Fixed some warnings.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Free
-	the search properly.
-	(vee_folder_build): And here too.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	If we go over the max number of messages, don't keep requesting
-	new message summaries, just break.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): A better way to
-	compress leading whitespace.  The code is probably invalid anyway,
-	I dont think it will work across buffer boundaries.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): And
-	write out proper format From lines here too.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): New function to build a more
-	compatible mbox "From " line.
-	(camel_mbox_summary_sync): Write From lines in the proper format.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-store.c (get_folder): Remove warnin g.
-
-	* providers/mbox/camel-mbox-store.c (xrename): Kill some warnings
-	with constification.
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Fixed
-	for append api change.  Eek this routine seriously wastes memory.
-
-	* providers/mh/camel-mh-folder.c (mh_search_free): Impelemnt.
-	(mh_append_message): Fix for api change, and include user flags
-	and tags in new message.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Fix
-	for search api change.
-
-	* camel-folder.c (camel_folder_search_free): New function for
-	freeing search results.
-	(search_free): Changed my mind, implement a default that actually
-	does something.  Free as to the old interface.
-	(camel_folder_append_message): Changed to accept a
-	camelmessageinfo rather than flags, which just doesn't have enough
-	info in it.
-	(copy_message_to): Change for append_message api change.
-	(move_message_to): Likewise.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_free):
-	Implement.
-	(mbox_append_message): Fix for api change, and also copy user
-	flags/tags across to new summary.
-
-	* camel-folder-search.c (search_user_tag): A search expression
-	that returns the current use flag by name.
-	(camel_folder_search_free_result): New function to free the result
-	of a search.
-
-	* camel-folder-summary.c: Bump summary version.
-	(message_info_new): 
-	(message_info_load): 
-	(message_info_save): 
-	(camel_message_info_dup_to): 
-	(camel_message_info_free): Added support for arbitrary tag/value
-	pairs (CamelTag's).
-	(camel_tag_get): 
-	(camel_tag_set):
-	(camel_tag_list_size):
-	(camel_tag_list_free): Operations for working with CamelTags.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.c (camel_store_get_folder): Connect beforehand, if
-	necessary.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Default
-	the dir_sep to "/" so that certain functions can safely assume that
-	dir_sep is valid (at least, nonnull).
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): Get rid of an unused variable.
-
-	* providers/nntp/Makefile.am (INCLUDES): Fix includes so that we
-	don't use installed headers anymore.  [I copied this over from the
-	IMAP provider, that does not seem to have this problem.]
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Reorder search result in summary order if we searched with a
-	summary.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-uid-cache.c: New code to keep an on-disk cache of what
-	UIDs have been seen in a folder.
-
-	* camel-provider.h: Add new flags CAMEL_PROVIDER_IS_SOURCE (mail
-	can arrive in it by non-Camel means) and CAMEL_PROVIDER_IS_STORAGE
-	(you can work with mail directly without needing to copy it local).
-
-	* providers/*/camel-*-provider.c: Add flags as needed: imap and
-	mbox are SOURCE and STORAGE. mh and nntp are just STORAGE, pop3 is
-	just SOURCE.
-
-	* camel-mime-message.c (process_header): Add another subject
-	g_strstrip that fejj's earlier commit missed.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* camel-provider.h: Remove some GTK stuff that I missed.
-
-	* providers/imap/camel-imap-store.c (imap_noop): Turn this
-	back on with the new timeout interface in CamelSession.
-
-	* camel-session.[ch] (camel_session_register_timeout): New
-	interface for Camel to register timeouts. Basically the
-	GTK timeout interface is copied. We do this because Camel isn't
-	allowed to use GTK anymore.
-	
-2000-08-07  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Only retry
-	another uid if we had a name clash, otherwise fail.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If we are trying to get a
-	subfolder listing of the root folder, always make sure INBOX is
-	there...
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): 
-	Check for NIL as a directory separator.
-
-2000-08-07  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am: Reorder the INCLUDES to pull
-	in the camel headers from the local source tree before
-	the ones in $(includedir). This was causing compile problems
-	because the installed, Gtk-based camel-object.h was included
-	before the uninstall Camel-based one.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Strip
-	all \n's from the expression
-
-	* string-utils.c (strip): New convenience function to strip
-	occurences of a single char from a string
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Do a
-	g_strstrip on the subject so we can stop getting those annoying
-	leading spaces
-
-2000-08-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep): Fix this to not require
-	NULL-termination of the array.
-
-2000-08-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): If we fail to
-	get a dir_sep, then supply the default of "/".
-	(get_folder): Undo changes by Peter
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Prevent a coredump
-	when get_folder()ing from a store with dir_sep = NULL.
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.h: Include camel-object.h. Ettore said this wasn't
-	compiling.
-
-2000-08-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-url.c (camel_url_set_protocol): 
-	(camel_url_set_host): 
-	(camel_url_set_path): 
-	(camel_url_set_port): Url editing functions.
-
-2000-08-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_set_message_flags): 
-	(pop3_sync): Indexes into the flags array are message_number minus
-	1, not just message_number.
-
-	* providers/pop3/camel-pop3-store.c: add a debugging macro for
-	doing protocol tracing.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only
-	call imap_get_summary_internal if the folder can hold messages
-
-	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): 
-	Initialize the service_cache for the news/nntp providers
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am (INCLUDES): Add -I$(top_srcdir) to
-	pull in libibex/ibex.h
-
-2000-08-02  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Expunge
-	from the end, so the index isn't messed up when you remove a
-	message.
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Fix a bug
-	where it would never open an output file/uid.
-
-	* providers/mbox/camel-mbox-store.c (rename_folder):
-	Implementation for mbox as well.
-
-	* camel-store.c (camel_store_rename_folder): New method to rename folders.
-	(rename_folder): Default implementation.
-
-	* providers/mh/camel-mh-store.c (delete_folder): Implement this.
-	(rename_folder): Implement a rename operation.
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* providers/MH: Kill this. It doesn't have any code to do anything
-	the new mh provider doesn't do better.
-
-	* providers/Makefile.am: Remove reference to MH subdir, and
-	promote nntp to fully-supported status, since it does compile and
-	all.
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Trim
-	trailing space from the subject. I've now seen replies from two
-	different people that tricked the threading code by (a) not having
-	References/In-Reply-To, and (b) adding an extra space to the end
-	of the subject line so the subject-based threading fails too. Who
-	writes these broken mailers anyway?
-
-2000-08-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): When forced
-	to use the IP, place it in square brackets.
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New and
-	improved sexp parser. An honest try at using e-sexp is wrapped in
-	a #ifdef at the bottom of the file but is currently not used
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	We want to do a UID SEARCH so we get UIDs back instead of sequence
-	numbers
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh: New mh provider implementation.
-
-	* providers/Makefile.am (SUBDIRS): Added mh provider.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info_internal): 
-	Some IMAP servers don't wrap the UID in ()'s so don't depend on that
-	(imap_get_summary_internal): Same
-
-	* providers/imap/camel-imap-utils.c (free_sexp_node): Oops, forgot to
-	free node->function - not good.
-
-2000-07-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Add
-	a NULL to the matches pointer array so that g_strfreev knows where
-	the end is.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New
-	convenience function to translate a Camel sexp into the equivalent
-	IMAP sexp.
-
-	* providers/imap/camel-imap-store.c: More places now use
-	imap_next_word
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Implemented initial version (this may or may not work quite right)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Make sure
-	the third word/token (whatever) is "EXPUNGE" and not something
-	else like "EXISTS" or "RECENT". When removing the message from
-	the summary also make sure to free that data to avoid leakage.
-	Also make sure to subtract 1 from the 'id' since IMAP starts
-	at 1 and our summary starts at 0 :-)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c (camel_imap_status): Cleaned
-	up a bit, now uses imap_next_word()
-	(camel_imap_command_extended): Now uses imap_next_word(). When
-	checking for RECENT, allow the first digit of the recent-count
-	be between 0 and 9 inclusive instead of exclusive.
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Optimized.
-	No longer will it need to reload the summary as it now instead
-	removes the appropriate message summaries from the cache.
-	(camel_imap_folder_changed): If recent == 0 then return. If 
-	recent < 0 then just emit the folder_changed signal, don't reload
-	summaries.
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Get message count when STATUS
-	is not available.
-	(imap_init): folder->has_search_capability is required for IMAP so
-	should always be set to TRUE (is currently being set to FALSE as
-	I've not yet implemented SEARCH support).
-	(camel_imap_folder_changed): Seem to have fixed my optimization
-	hack
-
-2000-07-28  Jon K Hellan  <hellan@acm.org>
-
-	* providers/imap/camel-imap-store.h (CamelImapServerLevel): New
-	enum.
-	(CamelImapStore): Added server_level and has_status_capability
-	members.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Detect
-	IMAP4REV1, IMAP4 and STATUS in capability response.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Use STATUS only if server
-	supports it. TODO: Get message count when STATUS not supported.
-	(imap_get_message, imap_get_summary_internal,
-	imap_get_message_info_internal): Handle IMAP4 as well.
-	(imap_protocol_get_summary_specifier): New function: Make a data
-	item specifier for the header lines we need, appropriate to the
-	server level.
-
-2000-07-27  Peter Williams <peterw@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_lwsp): More
-	checks for end of string.
-
-	* providers/imap/camel-imap-store.c:
-	(imap_command_extended): Free the elements of our
-	array (huge mem leak)
-
-	* providers/imap/camel-imap-folder.c:
-	(summary_get_internal): Same as above.
-	
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Fixed my routine to only fetch new headers, my IDs were off by 1
-	on the high end, so when it would fetch the last newly arrived
-	message it would fail and end up fetching all of the summaries
-	because of the corruption.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): If the path doesn't begin
-	with a / and there is a host, prepend a / to the path.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/Makefile.am: Added camel-imap-utils.[c,h]
-	
-	* providers/imap/camel-imap-utils.[c,h]: Utilities for parsing
-	server responses for use in both camel-imap-store.c and
-	camel-imap-folder.c
-	
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Free all the pointers in the headers array.
-	(imap_get_subfolder_names_internal): Updated to use
-	imap_parse_list_response
-	(imap_parse_subfolder_list): Removed in favor of
-	imap_parse_list_response
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Free all the pointers in the data array.
-	(imap_connect): Updated to use imap_parse_list_response and fixed
-	a leak
-	(folder_is_selectable): Updated.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Now
-	uses a hash table for looking up message info rather than a linear
-	search :)
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* providers/*/Makefile.am: Don't specify SUBDIRS =
-	[nothing]. Messes up distcheck.
-	
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-mime-parser.c (folder_scan_init): Initialize
-	outbuf to be "" -- it's not guaranteed to be zeroed.
-	
-	* camel-mime-utils.c (header_references_decode): Return
-	if the header is NULL -> or "" <-. Don't do our stupid
-	mailer trick if we point to \0.
-	(header_decode_quoted_string): Don't rip past end of 
-	string!
-	
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c (movemail_external): routine to call an
-	external movemail program.
-	(camel_movemail): Nuke return value, use movemail_external when
-	available and useful, and don't delete "dest" on errors, since
-	it might have started non-empty.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): Should now always prepend a '/'
-	before the path if it doesn't already exist.
-
-	* providers/imap/camel-imap-folder.c: Fixed a few compiler warnings
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Fixed the
-	real problem that Peter was running into.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.c (write_to_stream): Don't add a Mime-Version
-	header to a message that already has one.
-
-	* camel-internet-address.c (internet_encode): Don't put <>s around
-	addresses with no name part.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Set 
-	imap_folder->summary to NULL after calling imap_summary_free,
-	so we don't get stuck with a junk summary pointer. Should
-	we free it at all?
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Optimized to try and get the new message headers without reloading
-	the entire summary from scratch.
-	(imap_get_summary_internal): Will now sync() before attempting to
-	reload the summary so that flags are set in the reloaded summary
-	as well.
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Updated to give
-	special attention to the root folder.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): Updated to handle the root
-	folder
-	(imap_get_message_count_internal): return 0 if folder can't hold
-	messages
-	(camel_imap_folder_new): Change so that root folder gets special
-	attention and always gets can_hold_messages set to FALSE
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods that
-	work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_uids,
-	get_summary, get_subfolder_names. Turn camel_folder_delete_message
-	into a macro. (Mostly a pull-up from the camel-async branch.)
-
-	* providers/{imap,mbox,nntp,pop3,vee}: Update for CamelFolder
-	changes
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Updated
-	to port easily to the new Camel API
-	(imap_init): Don't SELECT INBOX, we don't need to do that
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	Initialize the summary and subfolder listing.
-	(imap_summary_free): Now takes a GPtrArray arg rather than a 
-	CamelImapFolder as it increases it's usefullness for free()'ing
-	temporary summaries.
-	(imap_get_message_count_internal): A new convenience function for
-	getting the actual message count on a server to be used by 
-	imap_get_summary_internal)
-	(imap_get_message_count): Since the Camel API is on the move again, 
-	the future version of this function will not be able to make a
-	call to the store, it must only access previously fetched data (thus 
-	the creation of the _internal function)
-	(imap_get_subfolder_names_internal): Again, because the future version
-	of imap_get_subfolder_names will not take an exception, we must rename
-	this function which will be called by camel_imap_folder_new()
-	(imap_get_subfolder_names): We now return the previously collected
-	subfolder listing that the _internal function fetched previously
-	(imap_get_summary_internal): Again, same idea as the previous _internal
-	functions...
-	(imap_get_summary): Again... now returns a previously aquired summary
-
-	* providers/imap/camel-imap-store.c (imap_noop): This will hopefully
-	prevent the imap store from disconnecting.
-	(imap_connect): Modified to add a gtk timeout event that will call
-	imap_noop() every 10 minutes (we may want to change this time value)
-	(imap_disconnect): Modified to remove the NOOP timeout event from the
-	store.
-	(camel_imap_command_extended): Commented out the code that would try
-	and detect if the store was disconnected and then reconnect if it was
-	needed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which
-	was not used, and not implemented by any provider.
-
-	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid
-	non-implementation.
-
-	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,
-	camel-marshal-utils.[ch]: Bye bye bye.
-
-	* Makefile.am: remove reference to camel-arg-collector.c
-
-2000-07-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Made it a
-	little more forgiving. Also set current_folder to NULL as there is
-	no selected folder after a disconnect.
-	(stream_is_alive): Detects whether or not a socket is "alive"
-	(camel_imap_command_extended): Use stream_is_alive() to aid in the
-	detection of a disconnected state.
-
-2000-07-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Clear
-	CamelExceptions when appropriate (eg when folder is marked as
-	\NoSelect). Still needs some cleanup and perhaps Dan will have a
-	better way of doing this as this seems like a messy way of
-	handling this.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Took out
-	some debug statements as they are no longer needed.
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_subfolder_names):
-	Updated to not strip out subfolders that are marked as \NoSelect
-	because this will be correctly handled in store->get_folder from
-	now on.
-
-	* providers/imap/camel-imap-store.c (folder_is_selectable): New
-	convenience function for use in get_folder().
-	(parse_list_response): Now takes a char **flags argument which is
-	needed by folder_is_selectable().
-	(imap_connect): Updated to reflect changes to
-	parse_list_response().
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated with
-	some of the same fixes I've made to camel-imap-folder.c like
-	recalculating message part lengths.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Rewrote the code to check for "* %d RECENT". Still needs to be
-	modified, but should no longer cause an infinite loop by detecting
-	mis-detecting RECENT messages.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary):
-	(imap_get_message_info): Oops. Fix UID parser to allow 0 and 9 to
-	be in the range of valid UID chars.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_object_unref): Add a new global mutex
-	'refcount' held when refcounting operations occur.
-
-2000-07-19  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): Correct the recursiveness;
-	the locklevel is stored as a private, so each thread has its own
-	idea of the locklevel. Thus one thread can relock, but a different
-	one will think that it's a level 0 and try to lock the type_system
-	mutex.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: General cleanup working
-	towards getting Actions->Expunge working correctly.
-
-	* providers/imap/camel-imap-store.c
-	(cammel_imap_command_extended): Added code to look for "* %d
-	RECENT" and to emit the folder_changed signal if there are any
-	recent messages. Note: this is a hack and needs to be rewritten
-	badly.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): If the
-	folder's message count is not the same as the number of summaries,
-	free the old summary and create a new summary.
-
-2000-07-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(camel_imap_folder_class_init): Added in
-	imap_[g,s]et_message_user_flag() methods
-	(imap_get_message_info): Rewrote to use the more efficient way of
-	downloading summary information and also added a UID comparison so
-	that if the UID requested doesn't match the UID received, it
-	returns NULL.  FIXME: When the mailer gets NULL when it requested
-	message info, it seems that it displays a row for that message and
-	when you try and select the blank row, it segfaults.
-
-	* providers/imap/camel-imap-store.c (get_folder): Oops, this
-	should not be checking against "/", it should be checking against
-	dir_sep.
-
-	* providers/imap/camel-imap-folder.c (imap_parse_subfolder_line):
-	Updated to trim out the leading namespace.
-	(imap_get_subfolder_names): Let the subfolder parser trim the
-	namespace off the folder name.
-
-2000-07-17  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): New function; the
-	Camel type_system lock is now fakey-recursive, being controlled
-	by a semaphore that goes up and down and is protected by another
-	lock. Theoretically all we need is the lock on the semaphore,
-	but this we catch exceptions "better" (by deadlocking).
-	(camel_type_lock_down): Corresponding to above.
-	(all functions): s,G_LOCK,camel_type_lock_up, etc.
-
-2000-07-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Send a
-	"LOGOUT" command.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Hacks to
-	get IMAP code to work with CommunigatePro and MS Exchange (and any
-	other servers that send back a UID at the end of each FETCH inside
-	of the main body of the message part).
-	(imap_sync): Un-#if 0 the code that sets the flags on the IMAP
-	server for messages that have changed. Oops, don't mask with
-	DELETED to find out if the message has been answered ;-)
-	(imap_expunge): sync before expunging.
-
-2000-07-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed.
-	(imap_connect): Moved service_class->connect() to the point right
-	after a connection is established with the server rather than
-	waiting until the end of the function.
-	(camel_imap_command): Updated the documentation comment
-	(camel_imap_command_extended): Before sending a command, first
-	check to make sure we are connected; if we aren't, then reconnect.
-	Don't strncmp() command with "SELECT" as it's redundant.
-
-	* providers/imap/camel-imap-folder.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed. Also s/camel_imap_command/camel_imap_command_extended as
-	I will probably be doing away with camel_imap_command() or at least
-	only using it for LOGIN and similar commands where the server won't
-	notify us of any recent messages.
-
-2000-07-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	One last fix to get rid of hard-coded "/" directory separators
-
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c : Implement 'events', which are suspiciously
-	like signals except without all the marshalling baggage, and
-	with quasi-thread-safety.
-	(camel_object_class_declare_event): New func.
-	(camel_object_hook_event): Ditto.
-	(camel_object_trigger_event): Ditto.
-	(obj_class_init): Declare the "finalize" event.
-	(obj_class_finalize): Free the hashtable of events->preps
-	(obj_finalize): Free the hashtable of events->hooklists
-	(camel_object_unref): Trigger the finalize event (ourselves,
-	to prevent massively unpleasant looping things.)
-	
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-object.c (make_global_classfuncs): Change to return
-	a CamelObjectClass. Change parents to a GSList and free it
-	when done.
-	(camel_object_new): Don't allocate a classfuncs for every object;
-	merely give it a reference to the global_classfuncs. Convert
-	parents to a GSList and free it when done.
-	(camel_object_unref): Don't free the classfuncs. Free the parents
-	list, which is changed to a GSList.
-
-2000-07-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* string-utils.c (string_unquote): New convenience function
-	to unquote a string if it's encapsulated by "'s
-	
-	* providers/imap/camel-imap-folder.c:
-	* providers/imap/camel-imap-store.c: Made the necessary changes
-	to stop using hard coded directory separators.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	If the summary is for a smaller mbox, and rebuilding from the
-	last-known end position fails, try rebuilding from the beginning.
-	Deals with the case where the user edits the mbox and makes it
-	bigger, without adding new messages.
-
-2000-07-13  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c: Rewritten to not be based on GtkObject,
-	but a tiny threadsafe ripoff thereof. Objects still cannot
-	be shared across threads, but ref/unref/destroy/new/etc
-	will work. Signals are not implemented because doing it
-	robustly would be a major pain in the butt, but class
-	functions are. There's a small demonstration that it doesn't
-	crash in ./temp-test.c: build it with ./make-test.sh.
-	* camel-stream.c, camel-seekable-stream.c, camel-stream-mem.c:
-	moved over to CamelObject. Proof of concept: two levels of
-	subclass and class functions, all working without coredumps.
-	To port to CamelObject:
-	- s,GTK_,CAMEL_,g in the cast checks
-	- s,gtk_type_new,camel_object_new,g
-	- s,GtkType,CamelType,g
-	- Change get_type function over to camel_type_declare
-	- instead of hooking to finalize function, it goes into the
-	  type declaration.
-	- remove signals.
-	- instead of GTK_OBJECT(so)->klass, CAMEL_OBJECT_GET_CLASS(so)
-	- s,gtk_type_class,camel_type_get_global_classfuncs,g
-	- don't chain finalize handlers; it will be done for you
-	
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: If a SELECT fails, set
-	imap_store->current_folder to NULL so a SELECT is forced before
-	any message/folder operations are requested. Also, because some
-	users don't use a namespace, make sure that if the url->path is 
-	"/" we don't use it when creating the folder_path.
-	(camel_imap_command[_extended]): Since we allow the passing of
-	a NULL folder which we can use to bypass a forced SELECT, no need
-	to check for the individual commands that don't require a folder
-	to be selected.
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: Updated to use CAMEL_IMAP_OK, 
-	CAMEL_IMAP_NO, CAMEL_IMAP_BAD, and CAMEL_IMAP_FAIL rather than the 
-	ones copied from the POP3 provider. 
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Oops.
-	If the number of messages in the folder is 0, don't fetch
-	summaries 1 thru 0, just return an empty summary.
-	(imap_copy_message_to): Fixed to use message UID and also send
-	the source folder as an arg to camel_imap_command rather than NULL.
-	(imap_move_message_to): Same.
-	(imap_init): If SELECT is successful, we need to set the current
-	folder to the one selected, this was causing problems with move/copy
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags
-	parallel to the _NEED_* flags, and make the _NEED_* flags imply
-	the _ALLOW_* ones.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): imap
-	urls ALLOW_PATH
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): New
-	and improved approach to fetching an entire folder summary
-	that should be much much faster than the old way as it gets
-	the entire folder summary in 1 shot rather than requesting
-	message by message. As with the last update, this version
-	also only fetches the minimum number of header fields.
-	(imap_get_summary): Oops, forgot to free the temp 
-	GPtrArray *headers
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Don't
-	fetch the entire RFC822 header, just fetch the fields we want.
-	(imap_get_message_info): Same.
-
-2000-07-13  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (camel_mime_filter_basic_new_type):
-	Reset filter on setup.
-	(reset): When resetting qp encoding, set the state to -1, instead
-	of 0.
-
-	* camel-mime-utils.c (quoted_encode_step): Actually count the
-	characters output sofar (it never counted any).  Bunch of other
-	fixes.
-	(quoted_encode_close): Also flush out final character, if there's
-	one.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Chris forgot to add #include <e-util/e-util.h> to the source files
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Fixed Peter's 
-	fix, we don't want to send a string to a %d.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, providers/imap/camel-imap-store.c:
-	Changed from strstrcase to e_strstrcase.
-
-	* string-utils.c, string-utils.h: Removed strstrcase (in favor of
-	e_strstrcase in e-util/e-util.c.)
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): get the article num out of our
-	uid and mark it read in the newsrc.
-	(nntp_folder_get_message): get the message id out of the uid to
-	fetch the article.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): the uid
-	is now <article-num>,<messageid>
-	(get_HEAD_headers): same.
-
-	* camel-mime-parser.c (folder_scan_step): go to HSCAN_MESSAGE
-	state when ct->subtype is "news" as well as "rfc822".  this makes
-	attachments of type "message/news" display properly.
-
-2000-07-12  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep,
-	camel_folder_free_shallow, camel_folder_free_nop): Useful default
-	implementations for free_{uids,subfolder_names,summary}.
-	(free_subfolder_names, free_uids): Make these g_warning-ing
-	default implementations.
-
-	* providers/*/camel-*-folder.c: Use the new functions where
-	appropriate, remove duplicated code.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): Check for
-	NULL parameters when setting the exception so as to not crash on
-	Solaris (can't handle a %s passed NULL).
-	(imap_connect): Same.
-	
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message): Use
-	mbox_set_message_flags () instead of setting the flags by hand. This
-	fixes the problem of the "message_changed" signal not being emitted
-	at the correct time.
-
-	* providers/imap/camel-imap-folder.c: "folder_changed" signals should
-	pass a third argument (which is ignored).
-
-	* camel-folder.c: Undo gtk signal emits done in set_flags and 
-	expunge.
-	(move_message_to): 
-	(copy_message_to): Create info as a const CamelMessageInfo
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am: don't add test-newsrc to the build
-	since it needs libcamel (which isn't built at the time test-newsrc
-	needs linking.)
-
-	* providers/nntp/camel-nntp-utils.c (get_HEAD_headers): fill in
-	MessageInfo->message_id.
-	(get_XOVER_headers): same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init): move
-	summary loading here.
-	(nntp_folder_sync): summary/newsrc changes should be stored here.
-	put a comment to that effect.
-	(nntp_folder_set_message_flags): don't save the newsrc here.
-	(nntp_folder_get_uids): use g_ptr_array_index instead of the
-	cast/addition.
-	(nntp_folder_get_summary): no need to check if we should generate
-	the summary here.  already done.
-	(nntp_folder_get_message_info): implement.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use evolution_dir instead of
-	computing it ourselves.
-	(nntp_store_disconnect): call camel_nntp_newsrc_write.
-	(ensure_news_dir_exists): new function to create the news/<news
-	server> subdir.
-	(camel_nntp_store_class_init): hook up connect/disconnect and
-	finalize.
-	(nntp_store_connect): if ensure_news_dir_exists fails throw an
-	exception.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_set_message_flags): Emit a message_changed
-	signal once the flags are set on the message.
-	(camel_folder_set_user_flag): Ditto.
-	(camel_folder_expunge): Emit a folder_changed if no exception.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-stream.c: Use size_t and ssize_t for read/write methods
-	
-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): 
-	Updated to emit the message_changed signal.
-	(imap_delete_message): Updated to use imap_set_message_flags ().
-	(imap_move_message_to): Updated to use imap_set_message_flags ()
-	and to emit the folder_changed signal on the destination folder.
-	(imap_copy_message_to): Updated to emit the folder_changed signal 
-	on the destination folder.
-	(imap_append_message): Updated to emit the folder_changed signal 
-	on the destination folder.
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_append_message): Now takes a
-	flags argument to specify the flags to be set on the message
-	since we might not necessarily want the flags to be wiped clean.
-	(move_message_to):
-	(copy_message_to): Updated to send a flags argument to 
-	append_message (); currently sends the original message's flags.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	* providers/imap/camel-imap-folder.c (imap_append_message): 
-	Updated.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods
-	that work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_message_uid,
-	get_uids, get_summary, get_subfolder_names. Turn
-	camel_folder_delete_message into a macro.
-
-	* providers/{mbox,pop3,vee}: Update for CamelFolder changes
-
-	* providers/Makefile.am: Disable imap and nntp for now
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression): 
-	This shouldn't return NULL, it should return g_ptr_array_new ()
-	so the mailer gets what it expects.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_decode_string): 
-	Oops, an unsigned integer can never be < 0
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Initialize a variable to make this not crash again. And fix a bug
-	so it actually does something.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c: Cleaned up a bunch of compile warnings
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee: kill more debugging messages
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_unread_message_count): 
-	* providers/vee/camel-vee-folder.c (vee_get_unread_message_count): 
-	* providers/imap/camel-imap-folder.c (imap_get_unread_message_count):
-	Implemented.
-
-	* camel-folder.c (camel_folder_get_unread_message_count): New
-	convenience function to allow the mailer to query the number
-	of unread messages in a folder (for displaying message stats
-	in a folder tree?).
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_dup): New function to copy
-	a header_references structure.
-
-	* camel-folder-summary.c (camel_message_info_dup_to): New function
-	to (deep) copy the data from one CamelMessageInfo into another.
-	(camel_message_info_free): And free the data.
-
-	* providers/vee/camel-vee-folder.c (vee_sync): Implement. (empty).
-	(vee_search_by_expression): belatedly update for
-	camel_folder_search change.
-	(vee_folder_build): belatedly update for camel_folder_search
-	change. Use camel_message_info_dup_to and camel_message_info_free
-	(in particular, so that we get message_id and references info so
-	vfolders can be threaded).
-	(vee_folder_build_folder): Ditto.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-store.c: Update to reflect past changes
-	in the Camel API. Use gtk macro casts wherever possible and use glib's
-	memory functions instead of standard c's (since they are not 
-	compatable)
-
-	* providers/smtp/camel-smtp-transport.c: 
-	* providers/imap/camel-imap-store.c: Wrap debug print statements
-	in a macro
-
-	* providers/imap/camel-imap-stream.c (stream_read): Make sure
-	that we get up to and including the last \n of the mime part.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Make sure
-	that we get up to and including the last \n of the mime part.
-	Wrap debug print statements in a macro.
-
-	* providers/imap/camel-imap-stream.c (stream_read): Only cache
-	the important data (aka the mime part requested and no extra
-	server response stuff)
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Work around
-	In-Reply-To's with unquoted punctuation. So many broken mailers.
-
-	* camel-folder.c (camel_folder_search_by_expression): Make this
-	return a GPtrArray rather than a GList.
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	* providers/nntp/camel-nntp-folder.c (nntp_search_by_expression):
-	Update to return a GPtrArray rather than a GList.
-
-2000-07-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (esmtp_get_authtypes): 
-	Fixed the parser to actually work
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Make this deal
-	with the full RFC822 References/In-Reply-To format rather than
-	just the more-nicely-behaved RFC1036 version. (Needed to parse
-	In-Reply-To headers with extra junk in them.)
-
-2000-07-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Parse for
-	more header information to allow message threading in IMAP.
-	(imap_get_message_info): Same.
-
-	* camel-folder-summary.c: Renamed summary_format_* to
-	camel_summary_format_* and moved them into public scope.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Oops. Don't
-	pass port # as a string in the error code (if it fails to connect).
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Changed
-	over to camel_imap_command_extended as that was the source of the
-	problems - apparently appending replies with more than just 1 line.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-search.c (search_header_contains): make header
-	matching case-insensitive
-
-	* camel-folder-summary.c:
-	* camel-session.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-summary.c: Remove some non-error case
-	debugging-type messages.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that
-	we get rid of a ton of debugging messages.
-
-2000-07-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.h: Added prototype for uudecode_step
-
-	* camel-mime-utils.c (uudecode_step): Cleaned up some junk that
-	should have been cleaned up when debugging printf's were taken out.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Update the X-Evolution: header even if the in-memory UID and the
-	saved UID are not the same.  Otherwise mboxes with clashing UIDs
-	can never be fixed.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_add_from_parser): Add the message to the
-	summary before doing any ibex stuff.  In fact, this might also
-	have the side effect of reassigning the UID so it needs to be done
-	before we start using the UID.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Add
-	debugging message to keep track of the UIDs we add.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c: Add "Cc" to summary and bump summary
-	version number.
-
-	* camel-folder-search.c (search_header_contains): make "Cc" a
-	searchable header.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_next_uid_string):
-	New.
-	(camel_folder_summary_add): Use
-	`camel_folder_summary_next_uid_string()' instead of recomputing
-	the UID manually here.
-	(camel_folder_summary_add_from_parser): Likewise.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): Removed.
-
-2000-07-03  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Parse In-Reply-To
-	with header_references_decode, not header_msgid_decode.
-
-	* camel-mime-message.c (camel_mime_message_class_init): message
-	headers are case-insensitive.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fix a
-	bug in error-setting code.
-	(pop3_connect): Don't re-prompt for password in the KPOP case.
-	(pop3_get_response): New function, split out from
-	camel_pop3_command.
-	(connect_to_server): Use pop3_get_response to parse the greeting
-	message, and error out appropriately if it's -ERR.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_freeze, camel_folder_thaw): New
-	functions to freeze and thaw a folder (to prevent message/folder
-	changed signals in the middle of a long series of operations).
-	(camel_folder_class_init): Change signals to GTK_RUN_FIRST.
-	(message_changed, folder_changed): Add default implementations
-	that stop the emission and record info for later if the folder is
-	frozen.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_sync): leftover fixes
-	from the close->sync change: don't destroy the ibex, summary, and
-	search when syncing.
-	(append_message): emit "folder_changed" on a successful append.
-
-2000-07-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (uudecode_step): A rather complex uudecoder
-	written in the spirit of Zucchi-ness, is it up to par? Only the 
-	Z-man can tell us :-)
-
-2000-07-01  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_get_name): New method, to return
-	an end-user-friendly name corresponding to a service. (eg, "POP
-	service for danw on trna.helixcode.com").
-
-	* providers/imap/camel-imap-store.c,
-	providers/mbox/camel-mbox-store.c,
-	providers/nntp/camel-nntp-store.c,
-	providers/pop3/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail-transport.c,
-	providers/smtp/camel-smtp-transport.c: Implement.
-
-	* providers/imap/Makefile.am: remove unneeded
-	libcamelimap_la_LDADD.
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): fix the
-	CAPA-parsing code to not get into an infinite loop.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed
-	the bug that would sometimes leave part of the server response
-	tacked on to the end of the message.
-
-	* camel-folder.c: Renamed _by_uid methods. Since we no longer
-	have get-by-number methods, no need to have the _by_uid 
-	extensions. 
-	(get_message_by_uid): Renamed to get_message
-	(delete_message_by_uid): Renamed to delete_message
-	(summary_get_by_uid): Renamed to get_message_info
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/pop3/camel-pop3-folder.c:
-	* providers/imap/camel-imap-folder.c:
-	* providers/vee/camel-vee-folder.c: Updated to reflect
-	camel-folder changes.
-
-2000-06-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_copy_message_to): New function, to
-	copy a message from one folder to another. The default
-	implementation just uses append_message, but providers can 
-	implement more efficient versions for use when both folders are on 
-	the same store.
-
-	* broken-date-parser.[c,h]: Utilities for parsing broken
-	date strings.
-	
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): 
-	(imap_copy_message_to): Implemented.
-
-	* camel-mime-utils.c (header_decode_date): Wrote some code to try
-	and un-mangle broken date formats and then parse that new string 
-	instead.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_move_message_to): New function, to
-	move a message from one folder to another. The default
-	implementation just uses append_message and delete_message, but
-	providers can implement more efficient versions for use when both
-	folders are on the same store.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Should now
-	print a meaningful error message when it doesn't succeed
-
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Changed to
-	keep prompting user for a valid password until it either
-	authenticates or until Canceled by the user.
-	(camel_imap_command_extended): Improved speed (replaced the
-	g_strjoinv call with a faster implementation)
-
-	* providers/pop3/camel-pop3-store.c 
-	(camel_pop3_command_get_additional_data): Fixed.
-	(pop3_connect): Changed to keep prompting the user for a
-	password until it either works or until Canceled by the user.
-
-	* providers/mbox/camel-mbox-summary.c: General cleanup
-	(camel_mbox_summary_sync): Fixed a memory leak and added
-	CamelException handling.
-
-	* providers/mbox/camel-mbox-store.c (delete_folder): Fixed a 
-	memory leak
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	Default 'off_t seek' to -1 so as to make sure it's initialized
-	before it's used in the case of a bad stat() call.
-	(mbox_sync): Updated
-	(mbox_expunge): Updated
-
-2000-06-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Move the 
-	CAPABILITY command here so we don't have to keep checking
-	each time we open a folder.
-	(camel_imap_command_extended): If we are doing an EXAMINE,
-	don't bother doing a SELECT first.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Update so
-	folder->has_search_capability depends on the parent IMAP store
-	(since this is really dependant on the IMAP implementation and
-	not the folder)
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Don't close the filter
-	stream when done with it (this causes the source stream to close);
-	Instead, just flush it when done.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* camel-folder-search.c (search_header_contains): Make header
-	search 'to' match 'to', and not 'from', small typo, fixes #317.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Added debugging
-	information.
-
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: 
-	* providers/imap/camel-imap-folder.c: Improved folder parsing.
-	Not specifying a namespace should no longer list the entire
-	filesystem.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/.cvsignore: ignore test-newsrc
-
-	* providers/nntp/camel-nntp-store.c,
-	providers/nntp/camel-nntp-store.h,
-	providers/nntp/camel-nntp-folder.c,
-	providers/nntp/camel-nntp-folder.h,
-	providers/nntp/camel-nntp-utils.c: Bring the nntp provider up to a
-	state where it builds and is usable with the current camel.  there
-	are still warts (semi-broken .newsrc file handling, and a lack of
-	a subscribe ui -- in fact no way to add a new server, really), but
-	it'll display news messages.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-newsrc.c
-	(libcamelnntpinclude_HEADERS): add camel-nntp-newsrc.h
-	also, add test-newsrc stuff.
-	
-	* providers/nntp/test-newsrc.c: new file that tests the newsrc
-	stuff by parsing and regurgitating a .newsrc file for a particular
-	server.
-
-	* providers/nntp/camel-nntp-newsrc.c,
-	providers/nntp/camel-nntp-newsrc.h: new files, initial support for .newsrc files.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_count): 
-	Oops. Now appends the namespace to the folder before querying
-	for the number of messages.
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): New
-	convenience function for use by imap_create().
-	(get_folder): If folder is specified as "/", we really want
-	"INBOX".
-
-	* providers/sendmail/camel-sendmail-provider.c:
-	* providers/vee/camel-vee-provider.c:
-	* providers/smtp/camel-smtp-provider.c:
-	* providers/mbox/camel-mbox-provider.c:
-	* providers/pop3/camel-pop3-provider.c:
-	* providers/imap/camel-imap-provider.c: Updated
-	
-	* camel-session.c: Moved service_cache hash table into the
-	providers.
-	(service_cache_remove): Updated.
-	(camel_session_get_service): Updated.
-
-	* camel-url.c (camel_url_hash): Took out the hashing of
-	url->passwd. We don't want this anymore.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Took out
-	references to 'namespace'
-	(camel_imap_folder_init): Same
-
-	* providers/imap/camel-imap-folder.h: No more namespace. We are
-	instead going to use url->path as the namespace.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_create): Modified to
-	use the "namespace" (url->path) if it exists.
-
-	* providers/imap/camel-imap-folder.c (imap_delete_message_by_uid):
-	Now just sets the deleted flag on the summary rather than speaking 
-	directly to the IMAP server. This is both faster and cleaner.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Fix dumb
-	bug.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	We are getting mail in IMAP now!! whoo-hoo!. Stripped out the 
-	filtering so messages may have some dot-stuffing, but the 
-	filtering can always be added back in later when we know it 
-	works and isn't the problem.
-
-2000-06-21  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Use the basename
-	of the mailbox so we don't get pathnames like ~/evolution/inbox///movemail.ibex
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Set date_received
-	based on the first (most recent) "Received" header.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): flush the filter stream
-	before unreffing it, so it will camel_mime_filter_complete.
-
-	* camel-stream-filter.c (camel_stream_filter_class_init): Fix a
-	braino so camel_stream_flush works here.
-
-	* camel-stream-mem.c (stream_seek): Fix a bug that resulted in
-	large attachments being silently dropped.
-
-	* providers/pop3/camel-pop3-store.c
-	(camel_pop3_command_get_additional_data): Don't use g_strjoinv
-	here, since it is O(n^2) on the length of the output string, and
-	we can do O(n).
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): add a CRLF decoder
-	after the QP/B64 decoder if it's text.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Only
-	fetch the summary if the folder summary doesn't already exist.
-	When the summary *does* exist, start fetching from 1, not 0.
-	(imap_free_summary): Don't do anything here.
-	(imap_finalize): Free the summary here instead of in
-	imap_free_summary().
-	(imap_set_message_flags): Implemented
-	(imap_sync): Added code to set flags on messages that have had
-	their flags changed (however I #if'd it out until we are more
-	confidant in the IMAP code :)
-	(imap_summary_get_by_uid): Now parese flags correctly.
-	(imap_get_summary): Now parese flags correctly. Also correctly
-	parses the UID correctly.
-
-	* camel-url.c (check_equal): No need to check s1 if s2 is NULL
-	(camel_url_equal): Don't check the passwd component of the url.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_add): mark the
-	message info with CAMEL_MESSAGE_FOLDER_FLAGGED if we change the
-	uid, so the folder will know that it's dirty.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended): 
-	Now returns the last line of data that the server sends back as
-	well. This is needed for commands like SELECT (like Peter pointed
-	out).
-	(camel_imap_command): No longer checks for SELECT (no need)
-
-	* providers/imap/camel-imap-folder.c: Added namespace stuff
-	which we will need later on...
-	(imap_parse_subfolder_line): Convenience function for use in
-	get_subfolder_names()
-	(imap_get_subfolder_names): Updated. Also changed it to use LIST
-	instead of LSUB (temporary change).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init): Set
-	summary equal to NULL.
-	(imap_get_summary): Store the summary in the ImapFolder
-	(imap_summary_get_by_uid): If we have a summary cache in the
-	ImapFolder, first check to see if that message info is in the
-	cached summary first, if not fetch it directly from the IMAP
-	server and append it to the summary cache.
-	(imap_get_message_flags): Don't free the message info that we get
-	back from summary_get_by_uid as we don't want to be corrupting our
-	cached summary.
-
-2000-06-19  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command{,_extended}): When
-	SELECT'ing a folder for an IMAP command, use _extended to grab the entire
-	response (before we just used camel_imap_command and missed the OK codes)
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_get_by_uid): 
-	Now gets the message flags as it should.
-	(imap_get_summary): Same as imap_summary_get_by_uid
-	(imap_get_permanent_flags): Return the permanent flags stored
-	on the folder.
-	(imap_get_message_flags): Return message flags associated with
-	given uid. Note: we may want to somehow cache summary info so
-	that we don't have to keep querying the IMAP provider in
-	imap_summary_get_by_uid().
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_free_summary): We were
-	leaking memory - but not anymore!
-	(imap_get_summary): We now get the UIDs and the beginnings of the
-	code to get the message flags as well.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): Don't copy newlines
-	into the parsed header text, and turn any number of tabs and
-	spaces after a newline into a single space.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_init): Should now
-	correctly do CAPABILITY.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Add some debugging printfs
-	when rebulding summary to help figure out why people's summaries
-	are always being rebuilt.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Began to implement, need to get information on how to
-	deconstruct @expression into an IMAP search expression and
-	parse the results.
-	(imap_init): Now queries the IMAP provider for CAPABILITY to
-	determine if SEARCH is implemented or not.
-
-	* providers/imap/imap.c: Removed - no longer a need to have
-	this as an example for anyone interesting to help mecode IMAP
-	support.
-	
-2000-06-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Added code
-	to expunge if called for (still need to finish coding this).
-	(imap_get_uids): Implemented.
-	(imap_get_summary): Found a way to get the date
-	(imap_summary_get_by_uid): Same.
-	(imap_free_summary): Implemented.
-
-	* string-utils.c (strstrcase): Fixed a compile warning
-
-	* providers/imap/camel-imap-summary.c: Removed - we don't
-	need a CamelImapSummary structure.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	Move flag handling from CamelMimeMessage to CamelFolder. This
-	simplifies several flag-handling pieces of code in the mailer, and
-	lets you change a message's flags without having to fetch the
-	message body. It also means that fully-constructed
-	CamelMimeMessages are now essentially constant, which will help
-	simplify locking issues later since it means two threads
-	interested in the same message can just work with separate copies
-	of it.
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed flags
-	and user_flags (moved to summary). Removed expunged and
-	message_number which were unused. Removed message_uid and folder
-	which are no longer needed in the new scheme.
-	(struct CamelMimeMessageClass): Removed message_changed signal and
-	get/set_message_number methods.
-
-	* camel-mime-message.c: Updates for CamelMimeMessage changes.
-	(camel_mime_message_get/set_flags,
-	camel_mime_message_get/set_user_flag): Replaced with methods in
-	CamelFolder.
-	(camel_flag_get, camel_flag_set, camel_flag_list_size,
-	camel_flag_list_free): Moved verbatim to camel-folder-summary.c
-	
-	* camel-folder.c (camel_folder_get/set_message_flags,
-	camel_folder_get/set_message_user_flag): New methods (and
-	corresponding useless default implementations)
-	(camel_folder_class_init): add a message_changed signal
-
-	* camel-folder-summary.c (camel_flag_get, camel_flag_set,
-	camel_flag_list_size, camel_flag_list_free): Moved here from
-	camel-mime-message.c
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Removed.
-	(mbox_get_message_flags, mbox_set_message_flags,
-	mbox_get_message_user_flag, mbox_set_message_user_flag): Tweak
-	summary bits as appropriate. (Functionality moved here from
-	message_changed.)
-	(mbox_get_message_by_uid): Update for CamelMimeMessage changes
-	(less stuff to initialize).
-
-	* providers/imap/camel-imap-folder.c (message_changed): Remove
-	this. It was just copied from the mbox provider and doesn't deal
-	with the real IMAP flag stuff anyway. (So there's currently no
-	flag support in the IMAP provider.)
-	(imap_get_message_by_uid): Update for CamelMimeMessage changes.
-
-	* providers/vee/camel-vee-folder.c: (message_changed): Remove old
-	one. Add a new one to listen for message_changed on each folder
-	and re-emit message_changed signals that correspond to messages in
-	the vfolder.
-	(vee_get/set_message_flags, vee_get/set_message_user_flag): Proxy
-	flag setting to the underlying real messages.
-	(vee_append_message): Removed for now; there's no way to translate
-	this into the new CamelMimeMessage/CamelFolder scheme, but (a)
-	there's also no code which would ever call it and (b) we're
-	probably going want a better interface than append_message for
-	message drag and drop to work anyway. To be revisited.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): 
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): 
-	* camel-folder-summary.c (summary_build_content_info): 
-	KLUDGE! Since neither ETable nor GtkHTML supports UTF-8 yet,
-	output ISO-8859-1 instead, so Ettore can read his Italian mail. :)
-	This will be reverted later.
-
-2000-06-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Started to 
-	implement - may want to use ENVELOPE instead of BODY.PEEK[HEADER]
-	(imap_summary_get_by_uid): Started to code, I've got to find a way to 
-	get the date in time_t format and also get the flags
-
-	* string-utils.c (strstrcase): Added this convenience function - I
-	know about strcasestr() but it's not portable.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c: Remove camel_service_connect_with_url. (URLs
-	must be specified when the service is requested from the session,
-	so that there can only ever be one service for any URL.)
-
-	* camel-folder.c: (camel_folder_open, camel_folder_is_open,
-	camel_folder_get_mode): Kill. Folders are now always open, and
-	handle "closing" sorts of operations at sync or finalize time.
-	(camel_folder_sync): renamed from camel_folder_close. Syncs state
-	to the store but doesn't necessarily close/disconnect.
-
-	* providers/*/camel-*-folder.c: Merge "open" methods into "init"
-	methods. Rename close to sync and update appropriately.
-
-	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open
-	and camel_imap_store_close, which should not have been copied from
-	the POP provider (where the exist to work around limitations of
-	the POP protocol).
-
-	* providers/mbox/camel-mbox-summary.c: fix a bug. (don't expunge
-	deleted messages if called with expunge == FALSE)
-	
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Check
-	server for various interesting extensions.
-
-	* providers/pop3/camel-pop3-folder.c (get_uids): If the server
-	supports UIDL, use real UIDs rather than fake ones.
-	(etc): Map uids back to numbers appropriately
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to
-	previous change: make sure the "seek" variable ends up with the
-	value it should.
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	summary mtime as well as size.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): if the
-	mbox doesn't end with a '\n', write one before appending the new
-	message.
-
-2000-06-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-crlf.c (filter): Updated the encoder to allocate 
-	more memory (since we are also now adding dots). Also updated the
-	decoder as we have found that it sometimes passes the end of the 
-	buffer.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the
-	filter code (we already filter in 
-	camel_pop3_command_get_additional_data)
-
-	* camel-folder.c (init): Updated: a separator is now a char* rather 
-	than a single char because IMAP can have a string for a directory 
-	separator. Also, since IMAP does not begin with a directory separator,
-	there is a new argument (path_begins_with_sep) which decides if a 
-	directory should begin with a directory separator.
-
-	* providers/imap/camel-imap-store.c (imap_create): Since, on connect,
-	Camel tries to create INBOX (which already exists on every IMAP 
-	provider) we can return TRUE when the folder name is "INBOX".
-
-	* providers/vee/camel-vee-folder.c (vee_init): Updated.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Updated.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Updated.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Renamed from camel_mbox_summary_expunge. Takes a gboolean saying
-	whether to expunge or just sync the mbox file. Change some
-	g_errors to g_warning so we don't abort. Make the quick
-	X-Evolution updating code lseek around correctly. Update the
-	mbox mtime in the summary file even in the quick case.
-
-	* providers/mbox/camel-mbox-summary.h: make
-	CAMEL_MESSAGE_FOLDER_NOXEV not conflict with
-	CAMEL_MESSAGE_FOLDER_FLAGGED defined in camel-mime-message.h
-
-	* providers/mbox/camel-mbox-folder.c (mbox_close): call
-	camel_mbox_summary_sync to save flag state if not expunging.
-	(mbox_expunge): Update for camel_mbox_summary_expunge rename.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_open): 
-	(camel_imap_store_close): Added.
-	(camel_imap_command_extended): Fixed a segfault and updated
-	to use camel_imap_status()
-	(camel_imap_command): Updated to use camel_imap_status()
-	(camel_imap_status): New convenience function for parsing
-	the return status of an IMAP command
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	Works like the POP fetch code, should work temporarily until
-	we get around to coding it the way it "Should Be".
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Now uses
-	the camel-mime-filter-crlf decoder when retrieving messages.
-
-	* camel-mime-filter-smtp.c: Deprecated.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Updated to use
-	camel-mime-filter-crlf with my 'dot' extension in place of
-	camel-mime-filter-smtp
-
-	* camel-mime-part.c (write_to_stream): Updated to reflect changes
-	made to camel-mime-filter-crlf.c
-
-	* camel-mime-filter-crlf.c (filter): Modified to be able to
-	encode/decode dots ("\n.\n"<->"\n..\n"). Also fixed the decoder
-	so that it should no longer get caught in an infinite loop.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/*/Makefile.am: don't pass a second (incorrect) -rpath
-	in addition to the (correct) one automatically provided by
-	automake.
-
-	* camel-mime-filter-crlf.c: New filter to do CRLF<->LF conversion.
-	(Currently only tested in the LF->CRLF direction.)
-
-	* camel-mime-part.c (write_to_stream): if content-type is text,
-	and it's QP or B64 encoded, pass through the CRLF filter before
-	the other filter to satisfy the "canonical encoding" rules in the
-	MIME spec.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_query_authenticator): Add another
-	argument, "mode", which can be CAMEL_AUTHENTICATOR_ASK or
-	CAMEL_AUTHENTICATOR_TELL, so callers can get the app to un-cache
-	bad info.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): uncache the
-	password if it doesn't work.
-
-2000-06-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to reflect
-	changes made in camel-imap-store.c
-
-	* providers/imap/camel-imap-store.c (imap_create): No longer checks to
-	make sure a folder doesn't already exists (as this is no longer needed)
-	(camel_imap_command): Now takes a CamelFolder argument so it can detect
-	whether or not it needs to SELECT a folder or not
-	(camel_imap_command_extended): Same.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Will now always
-	send EHLO first, if that fails it will fall back on HELO.
-	(esmtp_get_authtypes): Should now correctly parse authtypes.
-
-2000-06-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Now builds (not that it's worth
-	much yet).
-	
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Now uses the 
-	correct cast to a CamelImapMessageInfo structure (should get rid of 
-	compile warnings).
-
-	* providers/imap/Makefile.am: Added rules to build 
-	camel-imap-stream
-	
-	* providers/imap/camel-imap-store.c (get_folder): Update.
-	Moved imap_create here.
-
-	* providers/imap/camel-imap-folder.c (delete_messages): Remove.
-	(imap_create): Removed.
-	(imap_delete): Removed.
-	(imap_exists): Removed.
-
-	* providers/imap/camel-imap-stream.h: Added typedef's for the stream
-
-	* providers/imap/camel-imap-stream.c: Modified to build cleanly
-
-2000-06-07  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_msgid_decode_internal): Properly
-	dereference warning/debug messages.
-	(header_references_decode): Check we actually have msgid stuff
-	before trying to decode it ...
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-imap-stream.[c,h]: Removed
-
-	* providers/imap/camel-imap-stream.[c,h]: Relocated to this
-	location
-
-	* providers/imap/camel-imap-summary.c: Added
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exists, create, delete. A CamelFolder
-	now always references an existing folder. Remove delete_messages
-	too since it wasn't being used. Add a "create" flag to
-	get_subfolder saying whether or not to create the subfolder if it
-	doesn't yet exist.
-
-	* camel-store.c (camel_store_get_folder): Add a "create" flag to
-	say whether or not to create the folder if it doesn't yet exist.
-	(camel_store_delete_folder): New method, moved from CamelFolder.
-	(cache_folder, uncache_folder): Fix up a bit.
-	(get_folder_name): Explain what this is for.
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/mbox/camel-mbox-store.c: Update. Remove support for
-	hierarchical folders to simplify this for now, since we're not
-	using it, and it's not completely clear how they should work in an
-	ELocalStorage world. Needs to be revisited.
-
-	* providers/pop3/camel-pop3-folder.c (delete_messages): Remove.
-	* providers/pop3/camel-pop3-store.c (get_folder): Update.
-
-	* providers/vee/camel-vee-folder.c (exists): Remove.
-	* providers/vee/camel-vee-store.c (vee_get_folder): Update.
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-*.[c,h]: Started on getting 
-	imap to build cleanly (tho some work has not been completed
-	so it still won't build until camel-imap-summary is finished
-	along with a few methods in camel-imap-folder)
-
-	* camel-stream.[c,h]: Changed the read and write method prototypes
-	to return an ssize_t type rather than an int and also changed
-	the 'number of bytes' to read or write to a size_t type
-
-	* camel-stream-fs.c: same as above
-
-	* camel-stream-mem.c: again, same as above
-
-	* camel-stream-buffer.c: same
-
-	* camel-imap-stream.[c,h]: Added this new stream, cache's previously 
-	read data so each successive call will instead read from the cache
-	
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_disposition): fix
-	typo/braino (set "Content-Disposition", not "Content-Description")
-	(camel_mime_part_set_filename): const poison
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (base64_encode_step): Ick, damn signs!  Fix a
-	bug with sign extended bytes.
-
-	* camel-mime-filter-smtp.c (filter): Changed layout/logic slightly
-	(to match From filter)
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-smtp.c (filter): Fixed the filter so that it 
-	wouldn't insert garbage under certain conditions.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Don't ref the services in the cache.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Rearanged where debug
-	fprintf statements we placed so that any data the server sends 
-	back is printed out before an exception is set and the function
-	returns.
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_decode_date): If we get a funny
-	result, just throw it out.  Basically a fix for the one true
-	broken TradeClient.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (message_info_free): Free
-	references/messsage id.
-	(message_info_save): Save them.
-	(message_info_load): Load them.
-	(message_info_new): And get them from the new message.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped for new changes.
-
-	* camel-folder-summary.h: Added references and messageid to
-	summary.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Ref and unref objects in the service cache
-	properly.
-
-	* camel-store.c: Ref the folder when returning it using
-	lookup_folder.  Used the folder's full name for the key for the
-	folder cache since that's used to uncache it.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	Fun with purify.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): free msg on
-	success as well as failure.
-	(camel_pop3_command_get_additional_data): free buf after reading
-	the last line (".").
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): free
-	body data after creating the memstream from it (which will copy
-	the data).
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): free summary
-	and index paths.
-
-	* camel-data-wrapper.c (finalize): unref the stream, if it exists.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (construct_from_parser): For a message part,
-	set the default content-type to message/rfc822.  Maybe needs to be
-	done for multiparts too?
-
-2000-05-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Typo in assersion.
-
-	* camel-mime-parser.c (folder_scan_step): Use a default type of
-	message/rfc822 for multipart/digest.  Bug Z192.
-	(folder_scan_drop_step): Remove warning.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Init
-	filter_from to NULL, for exception case.
-	(mbox_get_message_by_uid): Cast off_t to long int for diagnostics.
-
-	* camel-url.c (camel_url_hash): Hash funciton for using camel
-	url's as hash keys.
-	(camel_url_equal): equal function for same.
-
-	* camel-session.c (camel_session_finalise): Free cached services.
-	(camel_session_init): Init service cache.
-	(service_cache_remove): destroy callback to remove a service from
-	the cache.
-
-	* camel-store.c (get_folder_internal): Remove the extra ref of the
-	folder.  That seems the right behaviour ...?
-	(camel_store_get_type): Doh, actually call store init, so the
-	cache works.
-	(cache_folder): strdup the folder name!  no wonder it never found
-	it again.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: Implemented a few more
-	methods like imap_append and 1 or 2 others
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-store.c (camel_store_init): Move it to here.  If this
-	level is going to maintain it, it should set it up.  Lets see what
-	caching folders breaks :(
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont
-	init folder cache here.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Make sure we copy messages which are
-	still intact to the new folder.
-	(camel_mbox_summary_expunge): Update the frompos as well when
-	moving the content.
-	(camel_mbox_summary_expunge): Remove some debug, and dont offset
-	frompos?
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the
-	searched folder is open before trying to search it.
-	(message_changed): Track changes to the source message in the
-	summary.
-	(folder_changed): Track folder changes, re-query the folder that
-	changed, and cascade the changed event as well.
-	(camel_vee_folder_finalise): Free subfolder and subfolder summary.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Fix up some glib
-	precondition stuff. Try to set the URL in camel_service_new before
-	checking whether or not it's "empty" so that you can successfully
-	set "sendmail:" as a URL.
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Add a domain field to CamelProvider, to say
-	what kind of data it provides.
-
-	* providers/imap/camel-imap-provider.c: 
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: Set domain to "mail".
-
-	* providers/nntp/camel-nntp-provider.c: Set domain to "news".
-
-	* providers/vee/camel-vee-provider.c: Set domain to "vfolder". (So
-	it doesn't end up being listed as a potential mail source in the
-	mail config wizard.)
-
-	* providers/pop3/camel-pop3-store.c: Split apart password and APOP
-	auth, since some servers seem to do both, but don't really.
-	(connect_to_server): Renamed from try_connect. Now actually does
-	the connection up to the point of checking the greeting for APOP
-	support.
-	(query_auth_types): Return APOP, if appropriate. Call
-	pop3_disconnect after connect_to_server since we don't really want
-	to be connected.
-	(pop3_connect): Use connect_to_server rather than duplicating
-	code. Fix a one-byte buffer overrun in the APOP code.
-	(pop3_disconnect): Make this able to clean up after a partial
-	connect.
-	(connect_to_server): Remove port number from error message since
-	it's not terribly useful and we were getting it from the wrong
-	place anyway.
-
-	* camel-mime-utils.c (header_address_list_format_append): Use
-	`foo@bar' rather than `"" <foo@bar>' for email addresses with no
-	name component.
-
-2000-05-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: Removed 
-	camel_imap_command_get_additional_data() as it was
-	completely useless, replaced with 
-	camel_imap_command_extended() which may eventually replace
-	camel_imap_command() as well.
-
-	* providers/imap/camel-imap-store.h: Modified to reflect
-	changes made to camel-imap-store.c
-
-	* providers/imap/camel-imap-folder.c: Wrote the first of many
-	methods: camel_imap_init(), imap_open(), imap_expunge(), 
-	imap_get_message_count(), and imap_get_subfolder_names()
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (camel_multipart_init): Don't set a default
-	boundary. Require the caller to do that.
-	(set_boundary): if boundary is NULL, generate a "random" boundary.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Add a call to
-	camel_multipart_set_boundary after creating a new multipart.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (try_connect): Removed
-	Exception code - Pop doesn't seem to set exceptions
-
-	* providers/imap/camel-imap-folder.c: Initial code, mostly
-	just a template for future code
-
-	* providers/imap/imap.[c,h]: Source code from my personal
-	mailer - for reference only!
-
-2000-05-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Replace simple
-	data wrapper here too, oops.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-simple-data-wrapper again.  Less code to maintain == better
-	code.
-	
-	* camel-data-wrapper.c (construct_from_stream): Fixes for bug
-	where text attachments dont work.  Made data-wrapper concrete for
-	the second time.
-
-2000-05-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder):
-	Update the vfolder details for a single folder.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Took out code
-	that had been there to reconnect to the server if it was not
-	already connected - Mailer code was fixed so that this should not
-	be needed.
-
-	* providers/imap/camel-imap-store.[c,h]: Initial code.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Re-add camel-simple-data-wrapper.h, which was removed
-	for some reason.
-
-2000-05-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.[c,h]: Moved global
-	variables into struct CamelSmtpTransport to make SMTP
-	thread-safe
-
-	* providers/imap/camel-imap-*.h: Stolen from Mbox. Rough structure
-	for Imap.
-	
-2000-05-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap: Added some initial code to the camel tree
-	for IMAPv4
-
-	* providers/imap/.cvsignore: Added to repository
-
-	* providers/smtp/camel-smtp-transport.c: Added debug fprintf's
-	so that testers can provide more information. Tested with simple
-	messages and a reply to the hello@helixcode.com default message
-	but should really be tested more.
-	(smtp_data): Fixed to use data_wrapper_write_to_stream.
-
-	* camel-mime-filter-smtp.c (filter): Modified to escape all lines
-	beginning with a '.' and to place a \r before each \n if one did
-	not previously exist. Removed code to escape "From " as it was
-	found to not be needed for SMTP.
-
-2000-05-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Fixed the 
-	filtered stream. Fixes for stream changes, updated to use 
-	camel-mime-filter-smtp.
-
-	* Makefile.am: Added camel-mime-filter-smtp.c
-	
-	* camel-mime-filter-smtp.[c,h]: Added to camel tree
-	Smtp filter used to change \n into \r\n, escape lone dots,
-	and escape "From "'s.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* camel-simple-data-wrapper.c (construct_from_stream): If we
-	already have been constructed, unref our content.
-	(write_to_stream): Check we've been constructued, and change for
-	stream api changes.
-
-	* camel-mime-parser.c: Removed exception stuff.
-
-	* md5-utils.c (md5_get_digest_from_stream): repaired.
-
-	* camel-mime-message.c: Remove exception from write_to_stream, and
-	fix, and fix formatting.
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Fix for stream changes.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes
-	for stream changes.
-
-	* providers/mbox/camel-mbox-folder.c, and elsewhere, fix all
-	stream api changes.
-	(mbox_append_message): Use stream_close() now its back.
-	(mbox_append_message): unref the from filter.
-
-	* camel-stream-mem.c: And here.
-
-	* camel-stream-fs.[ch]: Here too.
-
-	* camel-stream-filter.c: Likewise.  This is getting tedious.
-
-	* camel-stream-buffer.c (stream_write): Fix a few little problems.
-	(stream_close): Reimplement.
-	(camel_stream_buffer_read_line): Slightly more efficient version,
-	that also only allocates the right amount of memory for strings.
-
-	* camel-seekable-substream.c: Likewise.
-
-	* camel-seekable-stream.[ch]: Remove exceptions, fix formatting,
-	changes for stream (re)fixes.  set_bounds returns an error.
-
-	* camel-stream.[ch]: Remove exceptions.  Make flush and reset return
-	an error code, repair all the screwed up formatting, and put back
-	close.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): And here.
-
-	* camel-mime-part.c (camel_mime_part_set_content): And this too.
-	(write_to_stream): Fixed for stream changes.
-
-	* camel.h: Fixed.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Implement.  Performs an intersection of the two searches.
-	(camel_vee_folder_finalise): Unref search folders.
-	(vee_append_message): Implement append.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: remove message_number_capability and require uid
-	capatibility.
-	(camel_folder_list_subfolders, camel_folder_get_uid_list,
-	camel_folder_get_subfolder_info, camel_folder_get_message_info):
-	removed
-	(camel_folder_get_subfolder_names,
-	camel_folder_free_subfolder_names): new subfolder interfaces.
-	(camel_folder_get_uids, camel_folder_free_uids): new uid
-	interfaces
-	(camel_folder_get_summary, camel_folder_free_summary): new summary
-	interfaces
-
-	* providers/mbox/camel-mbox-folder.c,
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/vee/camel-vee-folder.c: Update for changes
-
-	* providers/pop3/camel-pop3-folder.c: Implement get_uids, update
-	for other changes.
-
-2000-05-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c: Guess!
-
-	* camel-folder-search.c (search_user_flag): Implement user_flag
-	search term.
-
-	* camel-folder-search.h: Added user_flag search capability
-	(user-flag "blah")
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Set USER flag in
-	permanent flags for the folder.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove unused async open/close and
-	copy_message_to functions.
-	Rename functions without initial _. Fix glib preconditions and
-	gtk-doc comments.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-data-wrapper.c: remove get/set_output_stream operations.
-	They're redundant with write_to_stream, and CamelMimePart and
-	CamelMimeMessage only implement the latter, meaning that trying to
-	get_output_stream on a CamelMimeMessage that was built from pieces
-	rather than being parsed from a stream doesn't work. Anything that
-	uses get_output_stream can be rewritten to use write_to_stream, so
-	we'll standardize on that.
-	(camel_data_wrapper_new): remove this: CamelDataWrapper is
-	supposed to be an abstract class.
-	(write_to_stream): remove default implementation. (Moved to
-	CamelSimpleDataWrapper)
-	
-	* camel-simple-data-wrapper.c: resurrect, although it's not really
-	the same thing it was before. A simple data wrapper, which is
-	backed by a CamelStream.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Use
-	construct_from_stream rather than set_output_stream.
-	(camel_mime_part_construct_content_from_parser): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-
-	* camel-mime-part.c (camel_mime_part_set_content): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-	
-
-2000-05-17  Darin Adler  <darin@eazel.com>
-
-	* camel-folder-summary.c: (message_info_load):
-	Quick fix to get it to compile. I hope I don't get into trouble.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Don't include the no-longer-distributed
-	possibly-to-be-removed headers.
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): fix an off-by-one error in
-	address parsing
-	(smtp_data): use camel_data_wrapper_get_output_stream rather than
-	data_wrapper->output_stream
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Snoop
-	changes to user flags on the message into the summary as well.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_init):
-	Changed version init to include the parent class version info
-	(i.e. add it not overwrite it).
-
-	* camel-folder-summary.c (message_info_new): Initialise user_flags
-	to empty.
-	(message_info_load): And load user flags.
-	(message_info_save): And save user flags.
-	(message_info_free): And free them.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.
-
-	* camel-folder-summary.h: Added user-flags to summary.
-
-	* camel-mime-message.c (camel_mime_message_set_user_flag): Dont
-	use a hashtable for user flags.
-	(camel_mime_message_get_user_flag): And changed here too.
-	(camel_flag_get): New interface to get a flag from a flag
-	list.  Flag lists are easier to work with than hash tables, and
-	save memory too.
-	(camel_flag_set): And set.
-	(camel_flag_list_free): And free.
-	(free_key_only): Discard.
-	(finalize): Remove the flag list.
-
-2000-05-17  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): Error
-	checking on gethostbyaddr() eliminating a possible segfault.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message_by_uid):
-	Implement.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* camel-movemail.c (camel_movemail): Open the destination with
-	O_APPEND, so we dont blow away a partially transferred mbox.
-	(camel_movemail): Loop if we get errno=INTR, and not fail.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	the summarised file size, if everything went ok.
-	(camel_mbox_summary_expunge): Clear header flags after updating.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/nntp/camel-nntp-folder.h:
-	* providers/nntp/camel-nntp-provider.c: 
-	* providers/nntp/camel-nntp-store.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-utils.h: 
-	get things working with new camel summary stuff.
-
-	* providers/nntp/camel-nntp-summary.c: 
-	* providers/nntp/camel-nntp-summary.h: 
-	removed files since camel-folder-summary does all we need.
-
-2000-05-15  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: Added some preliminary
-	AUTH support.
-
-2000-05-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.h: Remove camel_folder_get_summary, which no longer
-	exists.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: remove some cruft that we're not currently using.
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): Change
-	to match prototype (size_t vs unsigned int) so it works on 64-bit
-	machines. Noted by msw.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Indicate
-	the summary changed also.
-
-2000-05-11  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): 
-	Updated to more closely comply with RFC 821 standards
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Unref the filter after
-	adding it to the filtering stream.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_finalise): Free the folder path.
-	(camel_mbox_summary_update): Also save summary when done.
-	(camel_mbox_summary_expunge): Unindex items when deleting them.
-	(camel_mbox_summary_expunge): Save the index as well as the
-	summary.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free the
-	summary path.
-	(camel_folder_summary_touch): New function, indicate the summary
-	info changed.
-	(camel_folder_summary_remove): Dirty here.
-
-	* camel-internet-address.c (internet_decode): Free multiple entry
-	addresses properly.
-
-	* camel-mime-utils.c (header_decode_mailbox): Plugged another
-	memleak, free text after converting it.
-	(header_decode_addrspec): More leaks plugged.
-
-	* camel-mime-message.c (finalize): Free message_uid.
-	(finalize): Free the recipients hashtable.
-
-2000-05-11    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free
-	summary items and charset filters.
-
-2000-05-10    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Don't
-	free stuff in p, after we've free'd p.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref
-	the stream we created for appending.
-
-2000-05-10  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (camel_smtp_transport_class_init):
-	Added initialization for service_class
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (write_to_stream): fix a stupid typo. Thank
-	you, C.
-
-	* camel-mime-part.c (write_to_stream): don't ref the stream before
-	wrapper a filter around it, since nothing will ever unref it.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and
-	camel-thread-proxy.h.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Bleah. Can't fsync a pipe. As a quick kludge, just don't
-	stream_flush it. The right fix will require bringing back
-	stream_close though.
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-	* camel-internet-address.[c,h]: Undid my changes (moved
-	struct _address back into came-internet-address.c)
-	* providers/smtp/camel-smtp-transport.c: (_send): changed
-	from using it's own address manipulation (using struct _address)
-	to using camel_internet_address_get(). Also some format changes
-	to keep consistant with the rest of Camel
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* camel-internet-address.[c,h]: Moved struct _address from
-	camel-internet-address.c to camel-internet-address.h
-	(hopefully this doesn't break anything...)
-	* providers/smtp/camel-smtp-transport.c: (_send): now
-	populates the recipient list with To, Cc, and Bcc addresses.
-	Should now be able to use this module.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	one more refcounting fix I missed before.
-
-2000-05-08  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: no longer frees memory it
-	shouldn't, updated to reflect camel-stream changes involving
-	CamelException (perhaps it should use a different CamelException
-	variable than is passed to the camel smtp module?)
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream.c (camel_stream_read, camel_stream_write,
-	camel_stream_flush, camel_stream_reset, camel_stream_printf,
-	camel_stream_write_to_stream): Use CamelException to signal
-	failure.
-	(camel_stream_write_strings): Remove. camel_stream_printf is more
-	useful in most of the places that used this.
-	(camel_stream_write_string): Change from macro to function to
-	prevent problems with double-evaluation.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek,
-	camel_seekable_stream_set_bounds): Use CamelException.
-	(reset): Update.
-
-	* camel-seekable-substream.c, camel-stream-buffer.c,
-	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:
-	Update.
-
-	* camel-stream-fs.c: Remove the virtual init functions and move
-	the code into the creator functions. Add CamelExceptions to
-	creation functions that could fail.
-
-	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use
-	CamelException.
-	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c
-	(write_to_stream): Update.
-
-	* camel-mime-parser.c: add an exception to the mime parser private
-	data and pass that to stream functions as needed.
-	
-	* gmime-content-field.c, md5-utils.c: Update (badly) for stream
-	changes.
-	
-	* camel-exception.h (camel_exception_is_set): convenience macro.
-
-	* providers/Makefile.am: disable SMTP for now
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass
-	CamelException to the functions that now need it. Check the
-	exception after calling camel_stream_flush, and fail if it fails.
-	(mbox_get_message_by_uid): More updates.
-
-	* providers/pop/camel-pop3-folder.c,
-	providers/pop/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail/transport.c: Update.
-
-
-2000-05-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (process_header): Format From and Reply-To
-	to at least a decoded string.  Should probably store them as an
-	camelinternetaddress.
-
-	* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
-	
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
-	Return status.
-	(camel_mbox_summary_expunge): Force an update of the summary
-	before we do anything.
-	(camel_mbox_summary_expunge): Build new xev line in xevnew, and
-	free that, and consify xev.
-	(camel_mbox_summary_load): If we are rebuilding from scratch, make
-	sure we clear the summary content.
-
-	* camel-stream-filter.c (do_close): We NEED a stream close.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	Make camel not leak like a sieve.
-
-	* camel-object.c: New subclass of GtkObject which is now the base
-	of the Camel object hierarchy. Currently the only difference
-	between CamelObject and GtkObject is that CamelObjects don't start
-	out floating.
-
-	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on
-	using <camel/foo.h> in header files rather than <foo.h>, "foo.h",
-	or "camel/foo.h". Remove some unneeded includes.
-
-	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,
-	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,
-	camel-mime-parser.c, camel-service.c, camel-session.c,
-	camel-stream.c: These are now subclasses of CamelObject.
-
-	* camel-data-wrapper.c (set_output_stream):
-	* camel-medium.c (set_content_object):
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds):
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid): 
-	remove gtk_object_sink calls.
-
-	* camel-stream-buffer.c (init_vbuf): 
-	* camel-stream-filter.c (camel_stream_filter_new_with_stream):
-	ref the original stream.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): unref
-	the filters when finalizing.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser,
-	camel_mime_part_construct_content_from_parser):
-	* camel-mime-part.c (camel_mime_part_set_content): Unref objects
-	that are created only to be handed off to other objects. If
-	they're going to be needed later, they will have been additionally
-	ref'ed by the object that needs them.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	unref the message stream after creating the data from it.
-
-	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,
-	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,
-	since its semantics are dubious (what happens when you close a
-	stream other people still have references on?).
-
-	* providers/nntp/camel-nntp-store.c:
-	* providers/smtp/camel-smtp-transport.c:
-	* providers/pop3/camel-pop3-store.c:
-	replace camel_stream_close calls with gtk_object_unref.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/sendmail/camel-sendmail-transport.c:
-	replace camel_stream_close with camel_stream_flush +
-	gtk_object_unref
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): A machine
-	which serves neither POP nor KPOP is not a POP server.
-
-	* providers/smtp/camel-smtp-provider.c: Note in the description
-	that this provider is not yet tested.
-
-2000-05-08    <notzed@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Free the filter stream when
-	done.
-
-	* camel-mime-parser.c (folder_seek): Make sure we add the \n
-	terminal when we seek as well (frob!).
-
-	* camel-mime-utils.c (header_decode_addrspec): Plug minor memleak.
-
-	* camel-mime-part.c (finalize): Free header tables once finished.
-
-	* camel-folder-summary.c (camel_folder_summary_remove): Dont try
-	to access info after its free'd.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Apply encoding to content
-	part, when writing to a stream *sigh*.
-
-	* camel-stream-filter.c (do_write): implement write for the
-	filtering stream.  Writes shouldn't be mixed with reads.
-	(do_flush): Implemented flush.  Again write/flush shouldn't be
-	mixed with reads.  Only flushes if the last op was write.
-	(do_close): Force flush on close.
-
-	* camel-mime-filter.c (filter_run): Oops, make sure we include the
-	backlen in the total length before passing onto the filter.
-
-	* camel-mime-filter-from.c: New filter, munges 'From ' lines into
-	'>From ', for mbox.
-
-	* camel-mime-parser.c (camel_mime_parser_header_remove): New
-	function to remove the parser's raw header, rather than
-	manipulating the header directly (wich doesn't work with
-	mempools).
-
-	* camel-mime-utils.c (header_address_list_clear): Fixed some
-	broken(tm) logic, which would leak entries on multivalued lists.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Use ibex_save() to save the ibex.  Makes a big difference to
-	startup times for very large mailboxes.
-	(camel_mbox_summary_expunge): Dum de dum, reimplemented.  Designed
-	to be much more robust, and to stop immediately if anything awry
-	happens.
-	(copy_block): Utility function to copy n bytes from one fd to
-	another.
-	(header_write): Utility function to write out raw headers to an
-	fd.
-	(camel_mbox_summary_update): Incremental summary updater.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	Dont unref the stream, because of the broken(tm) ref model of gtk
-	widget that for some odd reason is being perpetuated in camel.	
-	(mbox_expunge): Reenable expunge again.
-	(mbox_append_message): Removed the optimised mbox append.  If its
-	an issue, it can go back later.  Cleaned up a lot, checks error
-	returns, and automagically translates 'From ' into '>From' as
-	necessary.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* camel-mime-filter.c (filter_run): Oops, forgot to add the
-	backlen to the pre-buffer (*poof*).
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow
-	HSCAN_FROM_END to terminate the processing of a message.
-
-	* camel-folder-summary.c (perform_content_info_load): Ick, dont
-	try and append a node onto its own list.
-	(camel_folder_summary_clear): Actually clear the indexes after
-	we've removed the messages.
-	(camel_folder_summary_clear): Set dirty if it changes.
-	(camel_folder_summary_load): Clear dirty.
-	(camel_folder_summary_save): Only save if dirty.
-
-	* providers/mbox/camel-mbox-summary.c (summary_header_load): Oops,
-	remember to call that parent class first ...
-	(summary_header_save): Here too.
-	(camel_mbox_summary_load): Do more checking to verify the index
-	contents as well as teh summary contents, against the mbox
-	contents.
-	(camel_mbox_summary_load): Removed some fo that checking, it needs
-	more code to work reliably.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Set the size and mtime of the mbox we indexed once done.
-
-	* camel-folder-summary.c (camel_folder_summary_set_index): Dont
-	write the index if it changes - let the claler fix it (uh, kind of
-	impacts performance).
-	(camel_folder_summary_load): close in.
-
-	* camel-folder-summary.c (summary_format_string): Check header
-	exists before trying to strip its leading spaces.
-
-2000-05-06  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Removed summary info from here, and include
-	camel-folder-summary.h as well.
-	
-	* camel-mime-parser.c (camel_mime_parser_step): Allow it to accept
-	a NULL databuffer.
-
-	* providers/mbox/camel-mbox-summary.c: Totally new file, now
-	subclasses camel-folder-summary.
-
-	* camel-folder-summary.c (message_info_load): Load the uid as a
-	string.
-	(message_info_save): And save too.
-	(camel_folder_summary_clear): New function, clears the contents of
-	the summary.
-
-	* providers/mbox/camel-mbox-folder.c: Fixes for	summary changes.
-	(mbox_get_message_by_uid): Completely redone.  Now cross-checks
-	the summary information to make sure we get a real message.
-	(mbox_append_message): Disabled the copy version of append for
-	now.
-	(mbox_expunge): Temporarily disabled the expunge function, until
-	it is put back in camel-mbox-summary.c
-
-2000-05-05  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c: And same here ...
-	(camel_folder_summary_encode_fixed_int32): Ugh, fwrite doesn't
-	return -1 on error ..
-	(camel_folder_summary_decode_fixed_int32): Neither deos fread.
-	(camel_folder_summary_encode_token): Fix here too.
-	(summary_build_content_info): Use start-headers to get the pos of
-	the message, not parser_tell(), which might not be what we
-	expected because of parser_unstep().
-	(camel_folder_summary_encode_token): Use bserch() to tokenise the
-	values, rather than a linear search.
-
-	* camel-mime-utils.c: Defined out some memory profiling stuff I
-	left there by mistake.
-	(header_decode_mailbox): Dont try to append the word part of a
-	local address if we ran out of words.
-
-	* camel-mime-parser.c (folder_scan_content): Apply the fix from
-	the header scanner to here too.
-	(folder_scan_header): Only check for end of header if we have
-	space for it (didn't end the read with a newline)
-	(folder_scan_header): inptr is the only real thing we need
-	registerised for performance.  Try to help the compiler be smart
-	about it ..
-	(folder_scan_header): Simplified the save header case a tad.
-
-	Commented out some memory profiling stuff.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.
-	(header_decode_text): Fixed memory leaks with g_string_append().
-	(header_encode_string): And here too, and a few other places.  The
-	glib api is so awful ...
-	(header_content_type_decode): More memory leaks.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we
-	init the end of buffer sentinal!
-	(folder_scan_init_with_stream): And here too ...
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):
-	Maxcount is minimum of the max and the requested count, not the
-	maximum :)
-
-	* camel-mime-parser.c (folder_scan_content): Properly set midline,
-	so we dont falsely catch offset boundary markers (i.e. From inside
-	content).
-	(folder_read): Set a sentinal on the end of the read data (\n) so
-	we dont have to check the buffer boundary in the inner loop.
-	(mempool_*): New experimental memory management routines, speed
-	up simple structure parsing by about 25% ... not compiled in by
-	default.  Something similar may be needed for camel-mime-utils to
-	address performance issues with g_malloc and friends.
-
-	* camel-mime-utils.c: Added a macro w(x) used to wrap all warnings
-	about mime/rfc violations, so they can be turned off.
-
-	* camel-folder-summary.c (summary_build_content_info): Step after
-	the end of a message ...
-	Turn into a stand-alone program for testing and profiling.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Don't fall
-	back to plaintext passwords if APOP fails, since it should also
-	fail.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_list_providers): New function to
-	replace camel_provider_scan. Returns a list of either (a) all
-	currently-loaded providers, or (b) all available providers.
-
-	* camel-url.[ch]: Add an "empty" flag to CamelURL (indicating that
-	it contains only a protocol).
-
-	* camel-service.c (camel_service_query_auth_types): Make this take
-	a CamelException (since it may have to try to connect to the
-	server, and it might not able to.)
-
-	* providers/pop3/camel-pop3-store.c: add KPOP (Kerberized POP)
-	support. This is mostly so I have two kinds of authmech to play
-	with instead of just one. (But it does actually work.)
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): update
-	for prototype change, but disable the functionality, since it
-	doesn't really support any auth types yet.
-	(camel_smtp_transport_get_type): add an object init function to
-	set the service url_flags.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Yes, and anotherone.
-
-	* camel-mime-utils.c: And another one.
-
-	* camel-mime-part.c: And another one.
-
-	* camel-mime-part-utils.c: And another one.
-
-	* camel-folder-search.c: And another one.
-
-	* camel-mime-parser.c: Reverted a change wihtout a ChangeLog entry.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.[hc]: Yes, CamelFolderSummary is back ...
-	... re-usable class to summarise and index any stream or message
-	and to manage/load/save the created summaries.
-	
-	* camel-folder.c: Include string.h to kill a warning.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,
-	people who installed libunicde in non-standard include paths need
-	this.
-
-2000-05-03  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Added pos/bodypos/endpos to the basic message
-	content info object.  Size to be removed?  Moved the
-	messageconentinfo and messageinfo back to camel-folder-summary.h.
-
-	* camel-mime-filter-index.c (camel_mime_filter_index_set_ibex):
-	New function to (re)set the index to use on a filter.
-
-	* camel-mime-parser.c (camel_mime_parser_scan_from): Whole bunch
-	of inline docs.
-	(camel_mime_parser_drop_step): New function to drop a state from
-	the parser.  Needs more testing.
-
-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is
-	-1, then dont try and convert (crashes unicode_iconv?).
-	(rfc2047_decode_word): Use alloca for variables instead of
-	g_malloc - by the rfc they should always be short.
-	(rfc2047_decode_word): If we can't do the charset conversion, undo
-	the quoted-printable/base64 at least?  Should probably convert
-	unknown characters to the utf-8 unknown character.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_date): fix typo when
-	dereferencing saveoffset.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c: Added some header doco.
-
-	* camel.h: REmove gmime-utils.h from here.
-
-	* providers/mbox/camel-mbox-search.[ch]: Removed.  Functionally
-	redundant.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	Use the new CamelFolderSearch class to do the actual searching,
-	just setup the search here.
-
-	* camel-folder-search.[ch]: A helper class that providers may
-	subclass to provide their own search functionality, or they can
-	simply use as is, it supports body searches if an ibex is
-	supplied, and header searches if a summary is supplied.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-	* providers/MH/Makefile.am: same.
-	* providers/maildir/Makefile.am: same.
-	* providers/mbox/Makefile.am: same.
-	* providers/nntp/Makefile.am: same.
-	* providers/pop3/Makefile.am: same.
-	* providers/sendmail/Makefile.am: same.	
-	* providers/smtp/Makefile.am: same.		
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Dont store/remove
-	current search from the search list.
-	
-	* providers/mbox/camel-mbox-folder.h: Removed searches list,
-	searches are all sync now.
-
-	* gmime-utils.[ch]: What the hell, remove it.  This will break the
-	nntp provider.  The mime parser can be used instead though.
-	Removed from all code including it (but none were using it).
-
-	* gmime-utils.c (_store_header_pair_from_string): Removed bizarre
-	string_dichotomy version of this.  This code is somewhat redundant
-	now, and is headed for death anyway.
-
-	* gstring-util.c (g_string_dichotomy): Same with this one.
-	(g_string_clone): Removed a memory leak, g_string_new() allocates
-	its own memory.
-	(g_string_append_g_string): Allow to append an empty gstring onto
-	another gstring, dont abort()!
-
-	* string-utils.c (string_dichotomy): Removed this incredibly weird
-	function.
-
-	* camel-folder.c (_create): Replaced the rather obtuse use of
-	"string_dichotomy" function with a simple strrchr().  Still not
-	sure it'll work.
-
-	* camel-folder-summary.c: cvs removed a long-removed file.
-
-	* camel-mime-parser.c (folder_scan_header): Fix the previous
-	overflow problem properly (can happen in 2 places).
-	(header_append): A new macro to include the code changed above, so
-	it only appears in one place.
-	(folder_scan_step): Change the content type to text/plain if the
-	multipart is broken.  Doesn't actually change the header though.
-	(header_append): Also move the header-start tracking stuff here.
-	Could be a static function to save code.
-
-2000-05-02    <notzed@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Dont use autofill on
-	these fucking long function anmes!!!!!!
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Fix the offset for the summary when
-	an item is expunged to take account of the From line.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.h (CamelMboxFolder): Removed
-	search_id.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_cancel): Remove.d
-	(camel_mbox_folder_search_complete): Removed.
-	(camel_mbox_folder_search_by_expression): Changed back to sync
-	api.
-	(struct _searchcontext): Removed cancelled flag.
-	(find_context): Removed.
-	(func_header_contains): Debug out some search stuff.
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Moved back to sync api.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_set_flags_by_uid): New function to update the
-	flags in the summary.
-	(camel_mbox_summary_expunge): Expunge messages from a folder.
-	(offset_content): Re-align offsets of summary when messages
-	added/removed to an existing summary.
-	(camel_mbox_summary_remove_uid): Remove a message summary entry by
-	uid.
-	(index_folder): Restore flags from X-Evolution header, if they are set.
-	(index_folder): Make sure we index using a decimal uid, since
-	thats what everything else indexes off (oops).
-	Upped SUMMARY_VERSION as a result.
-	(camel_mbox_summary_expunge): Oops, my wrong, use the string uid
-	to unindex on.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Connect to the message_changed signal.
-	(_init): Set permanent flags to something reasonable.  No user
-	flags yet ...
-	(message_changed): If the flags of the message change, update the
-	flags in the summary.
-	(mbox_expunge): Implement the expunge.
-	(camel_mbox_folder_class_init): Renamed all leading _'s to mbox_'s
-	(mbox_expunge): Emit a folder_changed signal on expunge (uh, even
-	if it didn't ...)
-
-	* camel-folder.c (_finalize): Uh, dont free permanent_flags
-	anymore (this wouldn't failed anyway, it was a GList !!!)
-	(camel_folder_search_complete): Removed.
-	(camel_folder_search_cancel): Removed.
-	(camel_folder_expunge): Changed to only allow expunge on an open
-	folder.  It doesn't make sense for mbox, otherwise (?)
-	(camel_folder_class_init): Added a folder_changed signal.
-
-	* camel-folder.h (struct _CamelFolder): Change permanent_flags to
-	a bitfield.
-	(list_permanent_flags): Renamed to get_permanent_flags, and
-	returns a bitfield.
-	(camel_folder_expunge): Changed expunge to a void type.  The
-	messages would no longer be useful after they have been removed
-	...
-	(CamelFolderClass): New function summary_get_by_uid() to get a single
-	summary.
-	(*search*): Moved back to synchronous search api ... *sigh*
-	
-	* camel-folder.h: Removed CamelSearchFunc.
-
-	* camel-mime-message.c (set_flag): Removed.
-	(camel_mime_message_set_flag): Removed.
-	(get_flag): Removed.
-	(camel_mime_message_get_flag): Removed.
-	(add_flag_to_list): Removed.
-	(get_flag_list): Removed.
-	(camel_mime_message_get_flag_list): Removed.
-	(camel_mime_message_get_flags): New interface to get system flags.
-	(camel_mime_message_set_flags):  " to set ".
-	(camel_mime_message_get_user_flag): To get a user flag.
-	(camel_mime_message_set_user_flag): To set a user flag.
-	(finalize): Hmm, the old one free'd the key and data, not good
-	when the data is a boolean ...
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Tweak the definition of CamelProvider. Among
-	other things, a provider may now be both a store and a transport.
-
-	* camel-provider.c: Remove a lot of code we had no intention of
-	using. This now only contains two functions: camel_provider_init
-	to read the installed .urls files, and camel_provider_load to
-	load and register a new provider.
-
-	* camel-session.c: Remove more unused code and simplify some of
-	the remaining code. The list of available provider modules is now
-	stored in the session, and it handles calling camel_provider_load
-	to load them as needed. Provider registration is now done by
-	calling back from the module init routine, which allows a single
-	module to register providers for multiple URL types.
-
-	* providers/*: Update provider structures and init routines for
-	the new stuff. Add a .urls file to each provider specifying what
-	urls it handles, and install that with the library.
-
-	* providers/nntp/camel-nntp-provider.c: Add hints towards
-	supporting both news: and nntp: URLs, and using nntp as both a
-	store and a transport.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-internet-address.c (camel_internet_address_get): const
-	poison
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser):
-	camel_mime_parser_tell() returns an offset from where it started
-	parsing, not necessarily from the start of data. Since we're
-	parsing a bounded seekable_stream, we need to add the stream's
-	starting bound to camel_mime_parser_tell's return value to
-	create the substream in the right place.
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	say CAMEL_STREAM_UNBOUND rather than -1 in doc.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek): Add more
-	info to docs.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): fix a bug that would
-	cause corruption with very long headers.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'
-	to pick the Camel includes.
-	* providers/sendmail/Makefile.am (INCLUDES): Likewise.
-
-	* camel.h: Don't #include <camel/data-wrapper-repository.h> anymore.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (check_header): Dont try and check a NULL
-	header.
-
-	* camel-recipient.[ch]: Dead.  Its not pining.
-
-	* camel-mime-message.h: Dont include recipients.h anymore.
-
-	* camel-mime-message.c (camel_mime_message_add_recipient): Accept
-	name/address separately, and store in an CamelInternetAddress.
-	(add_recipient): Removed.
-	(remove_recipient): Removed.
-	(remove_recipient_address): Renamed from remove_receipient, works
-	via address.
-	(camel_mime_message_remove_recipient_name): New function to remove
-	by name.
-	(get_recipients): Removed.
-	(camel_mime_message_get_recipients): Return a camel-internet-address.
-	(write_to_stream): No longer write receipients directly.
-	(write_recipients_to_stream): Removed.
-	(write_one_recipient_to_stream): Removed.
-	(camel_mime_message_init): Setup recipients hashtable, rather than
-	usign the recipients stuff.
-	(set_recipient_list_from_string): Killed, a violent and lengthy
-	death.
-	(process_header): Simplified recipient handling code a lot.
-	(received_date_str, sent_date_str, reply_to_str, subject_str,
-	from_str): Removed some oddly-defined global statics.
-	(camel_mime_message_class_init): Dont initialise above variables
-	anymore.
-	(init_header_name_table): Removed, use a table to init this, and
-	do it in class init (2 lines of code ...).
-
-	* camel-news-address.c: Class to represent news addresses -
-	currently empty, and not built.
-
-	* camel-internet-address.h: Class to represent internet (email)
-	addresses.
-
-	* camel-address.h: Abstract class to represent (lists of)
-	addresses.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Revert previous change. I
-	was confused.
-
-	* camel-url.[ch] (camel_url_encode, camel_url_decode): expose
-	these routines.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Only write a newline
-	between the headers and the content object if the content object
-	is not a CamelMedium. (If the content is a medium, it may have its
-	own headers, which then need to go before the blank line.)
-
-	* camel-mime-body-part.[ch]: Remove. We weren't using the fields
-	that made this different from camel-mime-part, so it basically
-	just forced us to do lots of gratuitous typecasting.
-
-	* camel-multipart.[ch]: Use CamelMimePart. Remove the multipart
-	parent stuff, since we weren't using that either.
-
-	* etc: update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (set_content_object): sink the content object
-	after referencing it.
-
-	* camel-mime-part.c: fix various little things in the handling
-	of CamelMedium methods. Change camel_mime_part_set_text to the
-	more generic camel_mime_part_set_content.
-
-	* camel.h: sync to current reality
-
-	* camel-folder-utils.[ch]: removed
-
-	* camel-mime-utils.c (header_format_date): fix format specifier
-	for time zone. Fix typo in month names array.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* camel-seekable-substream.c (stream_seek): Changed to have
-	absolute seek semantics, not relative to the bounds.
-
-	* camel-seekable-stream.c (reset): When we reset, seek to the
-	start of the bound, if there is one.
-	(stream_tell): Make tell virtual.
-
-	* camel-stream-filter.c (do_available): Removed.
-
-	* camel-stream-buffer.c: Remove leading _'s from static functions.
-	(stream_read): Renamed from read().  Fancy that conflicting!  (my
-	boo!)  Others too.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	Changed to stream_mem interface.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed
-	for streamfs interface changes, and implement a failure case.
-	(_append_message): Changed for fs stream interface change.
-
-	* camel-multipart.c (print_part): Iterate rahter than callback.  I
-	hate glists's interface (hence, move this to write_to_stream).
-	(write_to_stream): Return an error (yuck, this is a royal PITA to
-	do with the stream write interface).
-
-	* camel-mime-message.c: Removed leading _ from static names.
-
-	* camel-mime-part.h: construct_from_parser() now returns an error
-	code.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Changed to use a
-	camel-data-wrapper instead of a camel-simple-data-wrapper (no
-	change needed elsewhere?).
-	(simple_data_wrapper_construct_from_parser): Fixes for stream-mem
-	interface changes.
-
-	* camel-simple-data-wrapper.[ch],
-	camel-simple-data-wrapper-stream.[ch],
-	camel-stream-data-wrapper.[ch], removed.  Fixed including of these
-	files.
-	
-	* camel-mime-part.c (camel_mime_part_set_text): Remove the use of
-	the camel-simple-data-wrapper-stream, just use a mem stream.
-	(write_to_stream): Renamed from my_*
-	(construct_from_stream): Return an error on error.
-
-	* camel-stream-mem.c (camel_stream_mem_new*): Remove mode
-	parameter.
-
-	* camel-stream-mem.h (enum CamelStreamMemMode): Removed.  It
-	wasn't used at all.
-
-	* camel-data-wrapper.h: Add camel_data_wrapper_new() to create
-	these.
-	(write_to_stream, construct_from_stream): Return an error
-	indicator for success.  Fixed all methods to match (ICK).
-
-	* Makefile.am (libcamel_la_SOURCES): Remove
-	camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c,
-	camel-stream-data-wrapper.c.  Obsoleted by code re-use!
-
-	* camel-data-wrapper.c (construct_from_stream): Change the default
-	implementation to just set the output stream == construction
-	stream.  Well, this lets me get rid of both simple-data-wrapper
-	and stream-data-wrapper (unused anyway), and
-	simple-data-wrapper-stream in one hit.  CamelDataWrapper is now
-	also a concrete class.
-	(write_to_stream): Use camel_stream_write_to_stream() to
-	calculate/return values (and save code).
-	Include <errno.h> for obvious reasons.
-
-	* camel-stream.c (eos): Provide a default implementation of .eos().
-	(camel_stream_write_to_stream): Make it return an error code on
-	error.
-	(camel_stream_printf): Changed to return the number of bytes
-	written/error.
-	(camel_stream_available): Removed.
-
-	* camel-stream-fs.h (enum CamelStreamFsMode): Removed.  Changed to
-	use unix modes and so forth (wasn't used for anything but new file
-	creation and didn't work well either).
-
-	* camel-stream-fs.c: Removed leading _'s for names.  And removed
-	some virtual method 'documentation'.
-	(destroy): Dont try and close a closed/error fd.  Only report
-	error if close returns -1.  Moved all the code to finalise(), and
-	killed this function.
-	(init_with_fd): Properly setup the seek offset, if it is a
-	valid and seekable file descriptor.
-	(init_with_fd_and_bounds): Use off_t for bounds, set bounds on the
-	seekable stream.
-	(init_with_name): Return error codes.
-	(init_with_name_and_bounds): Ditto.
-	(camel_stream_fs_new_with_name): REturn NULL object if it failed.
-	(camel_stream_fs_new_with_name_and_bounds): Return NULL object on
-	failure.  Changed with_name* api's to take unix open style args
-	and flags.
-	(read): The bounded stream bounds checking seemed off, simplified
-	code a bit.
-	(write): Implement bounds checking for writing, the comment was
-	wrong, it could make sense to bound writing.  Cleaned up a little.
-	(available): Gone.
-	(eos): Removed.  Use CamelStream's implementation now.
-	(close): Reset the fd to -1, provide a warning for bad usage.
-	(seek): Cleaned up.  Changed the behaviour a little, the returned
-	offset is the absolute position in the file, even in bounded
-	streams.	
-	(seek): Seek from end mirrors lseek() behaviour (reverse seeking).
-
-2000-04-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof
-	indicator to other parent classes.
-
-	* camel-stream.c (camel_stream_printf): New utility
-	function.  Obvious use.
-
-	* camel-stream-mem.c: Removed leading _'s from static func's.
-	(camel_stream_mem_new_with_byte_array): Fixed for api changes, set
-	the owner for the byte array to us.
-	: Removed A bunch of gtk doc stuff for static (implementation) functions.
-	(available): Removed.
-	(write): Fixed the write implementation so that seek() works on a
-	seekable memory stream, as expected.  Seeking past the end of the
-	buffer has unix semantics (filling with 0).
-	(available): Removed.
-	(write): Implement seekable stream bounded stream.
-	(read): Implement seekable stream bounded stream.
-	(close): Dont free the stream_mem if we're not the owner.
-	(seek): Allow to seek beyond the end of memory area,
-	implement bounds checking.
-	(seek): Set errno on bad policy.
-
-	* camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t.
-	(new_with_buffer): Changed len to be a size_t.
-	(set_buffer, set_byte_array): New interface functions.
-	(struct _CamelStreamMem): Removed position, it is stored in the
-	superclass.
-
-	* camel-stream.h: Removed some of the seemingly random
-	whitespace.  Removed the available method (its not
-	impelemented/useful enough).
-
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds): Remove the data_available
-	stuff, it hasn't been properly implemented/finished, and may never
-	work (unfortunately *sigh).
-	(reemit_parent_signal): Removed part of the above change.
-	(set_bounds): Removed (moved to seekable-stream).
-	: Fixed up some of the generally unreadable indenting (sorry,
-	wrapping at 80 characters with
-	camels_really_long_function_names()
-	just_doesnt_work_very_well_does_it().
-	(available): Removed.
-	(stream_seek): Fixup for object changes.  Make sure we return -1
-	if the parent stream can't seek.
-
-	* camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New
-	function to bound any seekable stream.
-	: Removed _'s.
-	(camel_seekable_stream_class_init): Implement an init function, to
-	setup the stream bounds to unbound.
-
-	* camel-seekable-stream.h (CamelSeekableStreamClass): New virtual
-	method set_bounds for seekable streams.
-	(CAMEL_STREAM_UNBOUND): New define for no bound.
-
-	* camel-seekable-substream.h (struct _CamelSeekableSubstream):
-	Removed sup_bound and inf_bound, moved to CamelSeekableStream (and
-	renamed, and changed to off_t's).
-	(new_with_seekable_stream_and_bounds): Use off_t as the bounds.
-	(CamelSeekableSubstreamClass): Uh, why was the intialiser virtual?
-	Removed.
-
-	* camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek
-	to accept an off_t as the offset.
-	(struct _CamelSeekableStream): Renamed cur_pos to position and
-	changed it to an off_t type.
-	(enum CamelStreamSeekPolicy): Set to match the SEEK_* constants
-	from lseek().
-	(get_current_position): Renamed to tell().
-
-	* camel-stream-buffer.h: Commented out set_vbuf - never implemented.
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (_eos): only return TRUE if the parent is
-	at eos AND the buffer has been exhausted
-
-	* camel-mime-message.c: fix some incorrect macro usage that
-	resulted in bogus casts
-
-2000-04-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): fix a cut-and-pasto.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): ref
-	(and sink) the message stream if we're going to unref it later.
-	Otherwise it could get destroyed while there are still substreams
-	attached to it. This needs a cleaner solution.
-
-	* camel.h: remove data-wrapper-repository.h include(s)
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow MESSAGE_END
-	_or_ EOF as valid termination conditions.
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Decode
-	and then re-encode the addresses, so they are consistently
-	formatted.
-
-	* camel-mime-utils.c (header_decode_mailbox): Store the address in
-	a _header_address.  And try to get a comment-stored name if there
-	is one.
-	(header_decode_address): Actually return an address.
-	(header_to_decode): Renamed to header_address_decode()
-	(header_mailbox_decode): New function to get a single mailbox.
-	(header_mime_decode): Return the major/minor value, as
-	appropriate.
-	(header_address_new, and friends): Whole bunch of utility
-	functions for working with the address thingies.
-	(header_decode_domain): Free the string header, and dont expand
-	'.' into ' . '.
-
-	* camel.c (camel_init): No longer call
-	data_wrapper_repository_init.
-
-	* camel-medium.c (write_to_stream): Moved (back) to
-	camel-mime-part.
-	(add_header):
-	(set_header):
-	(remove_header): 
-	(get_header): Make all these abstract, and spit warnings if
-	called.  I guess it could manage the list, but well, it doesn't.
-
-	* camel-medium.h (struct _CamelMedium): Dont store headers here,
-	the implementor is the only one who knows their format.
-	(CamelMediumClass): Changed header values to be void *'s.  They
-	need not be strings?
-
-	* camel-simple-data-wrapper.c (construct_from_stream): And we're
-	back.  Set the output stream.
-	(construct_from_parser): Moved to camel-mime-part-utils.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Create the
-	contents of multipart and simple messages.
-	(camel_mime_part_construct_content_from_parser): Oops, this was
-	totally screwed up, try creating the right cotnent on the right
-	object.
-
-	* camel-multipart.c (construct_from_parser): Moved to
-	camel-mime-part-utils.
-	(separate_part): Removed.
-
-	* camel-mime-part.c (construct_from_stream): Back again!  This now
-	switches over to using a mime parser for any mime parts, only.
-	(my_write_to_stream): Write our headers and so forth here.
-	(add_header): Add header directly, parent class is abstract.
-	(remove_header): Ditto.
-	(set_header): Ditto.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):
-	Remade abstract.
-	(camel_data_wrapper_construct_from_parser): Moved to
-	camel_mime_part.
-
-	* camel-data-wrapper.h: Put back construct_from_stream.
-
-	* camel-mime-part.h: Put construct_from_parser in here, the
-	data-wrapper shouldn't know about mime.  Ok, so now to undo half
-	of the last hours changes ... duh.
-	
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_to_decode, header_mime_decode): fix
-	some obvious minor bugs noted by -Wall.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use
-	construct_from_stream instead of set_input_stream().
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): REmoved the destroy
-	callback code.
-	(wrapper_destroy_cb): Removed.
-
-	* camel-simple-data-wrapper.h: Add prototype for _construct()
-	method.
-
-	* camel.c: Include unicode.h to kill a warning.
-
-	* camel-data-wrapper.h (CameldataWrapperClass): Removed
-	construct_from_stream virtual method.
-	Removed get/set input stream.
-
-	* data-wrapper-repository.[ch]: Removed&from build.  Obsoleted?
-	The justification as is follows: It is mixing storage
-	protocol/format with message architecture.  It really just doesn't
-	serve any purpose, as each medium implementor will have to have its
-	own type->handler mapping, and the only current implementor,
-	mimepart has a very simple structure and no need for this.
-
-	* camel-medium.c (write_to_stream): Moved here from most of the
-	stuff in camel-mime-part.  Well, the MEDIUM is the one that knows
-	what the headers are, and the content is, let it write it out.
-
-	* camel-mime-part-utils.c (camel_mime_part_construct_content):
-	Copied from camel-mime-part.c, removed handling of message
-	followon state (moved to camel-mime-message).
-	(camel_mime_part_construct_content_from_parser): Renamed from
-	construct_content.
-	(camel_mime_part_construct_headers_from_stream):
-	(camel_mime_part_construct_content_from_stream):
-	(camel_mime_part_store_stream_in_buffer): Removed.  Replaced by
-	the new construct from parser stuff.
-
-	* camel-mime-message.c (construct_from_parser): Do
-	construct_from_parser for mime-message.
-	(_write_to_stream): Set the mime-version header for medium to
-	write out, rather than writing it out ourselves.
-
-	* camel-data-wrapper.c (set_mime_type_field): Ref the
-	content_field when we get it?
-	(construct_from_stream): Removed.
-	(camel_data_wrapper_construct_from_stream): Changed to a helper
-	function, creates a mime_parser, and constructs from that.
-	(set_input_stream): Removed.
-	(camel_data_wrapper_set_input_stream): Removed.
-	(get_input_stream): Removed.
-	(camel_data_wrapper_get_input_stream): Removed.
-
-	* camel-mime-parser.c (camel_mime_parser_unstep): New function.
-	Cause a subsequent call to mime_parser_step() to return the same
-	state over again.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Initial test code using the mime parser to construct the message.
-	(_get_message_by_uid): Use construct_from_stream() instead of
-	creating our own parser.
-
-	* camel-mime-part.c (construct_from_parser): part constructor.
-	(camel_mime_part_construct_content): Basically a simpler
-	replacement for the datawrapper repository.
-	(camel_mime_part_init): Set the default type to text/plain.
-	(camel_mime_part_construct_content): Removed to
-	camel-mime-part-utils.c
-	(my_get_output_stream): Removed.  The streeam is in the
-	data-wrapper.
-	(my_get_content_object): Removed.  The content object is stored in
-	the medium.  If none is there, the object wasn't created properly.
-	(my_write_content_to_stream): Removed.  The content object is the
-	one that knows how to write itself out!!!!!!!!
-	(my_write_to_stream): Remove the base header writing stuff - has
-	been moved to camel-medium, where it belongs.  This can just be
-	used to check for mandatory headers.
-	(my_construct_from_stream): Removed.
-	(my_set_input_stream): What the hell, i'll remove this too.
-	Nobody seems to understand how it differs from create from stream,
-	and they both seem to serve the same purpose ...
-
-	* camel-simple-data-wrapper.c (construct_from_parser): Initial
-	implementation of a content constructor.
-	(construct_from_stream): Removed!  Job taken over by
-	construct_from_parser.
-
-	* camel-multipart.c (construct_from_parser): Multipart
-	construction routine.
-	(camel_multipart_init): Set the default multipart type to
-	multipart/mixed.  Duh, no subtype is not allowed anyway.
-	(set_input_stream): REmoved.  Replaced by construct_from_parser.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.[ch]: clean, document, etc.
-	(camel_multipart_init): pick a prettier default boundary. Still
-	need to deal with the larger problem
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed
-	send_date, and received_date, and replaced it with a time_t
-	'date' (this is what the header is called), and date_offset to
-	store the GMT offset of the date.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Update raw
-	header as we go.
-	(_set_from): Removed.
-	(_get_from): Removed.
-	(camel_mime_message_get_from): Moved implementation here.
-	(camel_mime_message_get_subject): Move implementation here.
-	(_get_subject): Nuked.
-	(camel_mime_message_set_subject): Handle utf-8 input, and also
-	update raw header when changed.
-	(_set_subject): Removed.
-	(_set_received_date): Removed.
-	(camel_mime_message_set_received_date): Removed.
-	(_get_received_date): Removed.
-	(camel_mime_message_get_received_date): Removed.
-	(_get_sent_date): Removed.
-	(camel_mime_message_get_sent_date): Removed.
-	(camel_mime_message_get_date): New function to get the date as a
-	time_t/offset.
-	(camel_mime_message_set_date): Set the date as a time_t/offset.
-	(camel_mime_message_get_date_string): Get the date as a string.
-	(camel_mime_message_init): Initialise the current date as
-	'CMAEL_MESSAGE_DATE_CURRENT'.
-	(_set_reply_to): Removed.
-	(camel_mime_message_set_reply_to): Moved implementation here.
-	This is still broken, reply-to can have multiple addresses.
-	(_get_reply_to): Removed.
-	(_set_field): Removed, no longer used anywhere.
-	(_get_field): Also removed.
-	(_init_header_name_table): Add the Date header.
-	(process_header): Also handle snooping of Date header here.
-
-	* camel-stream-filter.c (finalise): Unref the source stream on
-	finalise, and also call the parent class (oops).
-
-	* camel-mime-parser.c (camel_mime_parser_state): New function to
-	get the current parser state.
-	(camel_mime_parser_stream): Allow you to get the stream back from
-	the mime_parser.
-	(camel_mime_parser_fd): Alternative to allow you to get the fd
-	back from the mime_parser.
-	(folder_scan_init_with_stream): Properly ref/unref the stream.
-	(folder_scan_close): Properly unref the stream/close the fd on
-	exit.
-	(folder_scan_init_with_fd): Close the old fd if there is one.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):
-	New method, construct a data wrapper from an initialised parser.
-	(construct_from_parser): Empty implementation.
-	
-	* providers/mbox/camel-mbox-summary.c (message_struct_new):
-	Convert subject line to unicode, before storing in the summary.
-	(strdup_trim): Removed, no longer needed.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref
-	the folder after setting it in the new message.
-
-	* camel-mime-part.c (my_set_content_object): Have the headers
-	follow the content-type change here too.
-	(my_write_to_stream): Dont write content-type here, automatically
-	stored in the headers ...
-	(my_write_to_stream): Use header_disposition_format() to format
-	the content-disposition header.
-	(my_write_to_stream): Removed old code, all headers are now stored
-	in the camel-medium level, always.  Need to do the same with
-	camel-mime-message i suppose ...
-	(my_write_to_stream): Write the content using the parent class,
-	not some weird function.
-	(camel_mime_part_class_init): Dont override get_output_stream.
-	(camel_mime_part_encoding_from_string): Bleh, make it
-	case-insensitive.
-
-	* camel-mime-utils.c (header_content_type_is): Handle empty types.
-	(header_encode_string): Start of an implementation of the rfc2047
-	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get
-	tricky *sigh*)
-	(rfc2047_encode_word): Convert a single word/string into rfc2047
-	encoding.
-	(quoted_encode): Different quoted-printable encoding for rfc2047
-	encoding of headers.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream): Use
-	header_content_type_format() to format it.
-
-2000-04-21  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.h: Add prototype for header_param_list_free.
-
-	* camel-recipient.c: New function to remove all the types of a
-	recipient list.  I think this whole object needs a major review.
-
-	* camel-mime-message.c (camel_mime_message_class_init): Removed
-	parse_header_pair override, override add_header instead.
-	(_parse_header_pair): Renamed to add_header.
-	(remove_header): Add this method, to make sure we keep upto date
-	with removed headers too.
-	(_set_field): If given a NULL value, clear it out.
-	(_set_recipient_list_from_string): Constify.
-	(set_header): Override set_header from camel_medium.
-	(process_header): Local function to handle set/add/remove of each
-	header we know about.
-
-	* camel-mime-part.c (camel_mime_part_class_init): Removed
-	parse_header_pair setup.
-	(my_parse_header_pair): Moved into add_header(), removed.
-	(my_set_disposition): Allow a NULL disposition to clear it.
-	(my_set_content_id): Allow NULL content id to clear it.
-	(remove_header): Track removed headers.
-	(my_set_description): Allow NULL description to clear it.
-	(my_set_content_MD5): Make sure we copy the md5 value, and allow a
-	NULL value to reset it.
-	(my_set_filename): Copy the filename.
-	(my_set_header_lines): Removed.  Nothing uses it, it doesn't
-	actually serve any purpose.
-	(camel_mime_part_set_header_lines): Ditto.
-	(my_get_header_lines): Ditto.
-	(camel_mime_part_get_header_lines): Ditto.
-	(camel_mime_part_class_init): Remove *_header_lines setup.
-	(camel_mime_part_init): Remove header_lines init.
-	(my_finalize): Remove header_lines finalise.
-	(my_write_to_stream): Write the headers here.  This is just WRONG,
-	camel_medium should be doing this.
-	(my_get_output_stream): Kill a warning.
-	(camel_mime_part_encoding_to_string): Ditto.
-	(camel_mime_part_set_description): Unvirtualiase, use add_header()
-	to do the processing.
-	(my_set_description): Removed.
-	(set_disposition): Renamed from my_set_disposition.
-	(camel_mime_part_get_description): Get the descriptionf rom the
-	get_header method.
-	(my_get_description): Removed.
-	(my_set_filename): Removed.
-	(camel_mime_part_get_filename): Get the parameter from the
-	disposition.
-	(camel_mime_part_encoding_from_string): Handle NULL string.
-	(camel_mime_part_init): Remove reference to filename.
-	(my_finalize): Dont free filename.
-
-	* camel-mime-part.h (CamelMimePartClass): Removed
-	parse_header_pair() method, it doesn't add anything that
-	add_header() can't be used for.
-	(CamelMimePartClass): Remove *_header_lines methods.
-	(struct _CamelMimePart): Remove header_lines list.
-	(struct _CamelMimePart): Removed filename attribute.
-
-	* camel-medium.c (camel_medium_init): Init headers to null, not a
-	hashtable.
-	(add_header): Append the headers as a list.
-	(remove_header): Remove headers as a list.
-	(get_header): Likewise for lookup.
-	(free_header): Removed, no longer needed.
-	(finalize): Free headers using header_raw_clear().
-	(camel_medium_set_header): New function, to reset and override all
-	values of a header with a new value.
-
-	* camel-medium.h (struct _CamelMedium): Changed to use a
-	header_raw struct rather than a hash table, to store headers
-	(many headers can occur multiple times).
-
-	* camel-mime-utils.c (header_raw_find_next): New function, allows
-	you to find multi-valued header fields.
-	(header_disposition_format): New function to format/create
-	content-disposition header string.
-	(header_param_list_format_append): Function to format parameter
-	lists into a GString.
-	(header_content_type_format): Function to format content-type into
-	a usable format.
-	(header_set_param): allow NULL value to remove the parameter.
-	(decode_token): Renamed from header_decode_token.
-	(header_decode_token): New interface for external use.
-	(quoted_decode): Made static to kill annoying warnings.
-	(g_strdup_len): Killed, replaced with calls to g_strndup().
-	(rfc2047_decode_word): Made static to kill warnings.
-	(decode_coded_string): Terminated.
-	(g_string_append_len): Made static to kill warnings.
-	(header_decode_text): Made static to kill warnings.
-	(header_decode_text): Constify.
-	(rfc2047_decode_word): Constify.
-	(header_param): Constify.
-	(header_content_type_new): Copy the type/subtype strings.
-	(header_param_list_decode): Made static.
-	(header_param_list_format_append): Made static.
-	(quoted_decode): Constify.
-	(g_string_append_len): Constify.
-	(header_token_decode): New function to decode a single token.
-
-	* providers/mbox/camel-mbox-summary.c (header_write): Append a
-	trailing \n when writing headers.
-	(strdup_trim): Killed a warning.
-	(camel_mbox_summary_set_uid): Make sure the next uid is at least 1
-	higher than any existing one.
-	(header_evolution_decode): Use header_token_decode to get the
-	token.
-
-	* camel-mime-parser.c (folder_scan_header): Strip the trailing \n
-	of the end of all header lines.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.[ch]: Removed.
-
-	* providers/mbox/camel-mbox-parser.[ch]: Removed.  Removed
-	references to it.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): use libunicode iconv
-	functions rather than libc ones (since libc might not have them).
-	(header_decode_date): add autoconfiscation on timezone code
-
-	* camel.c (camel_init): call unicode_init ()
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Trim
-	leading/trailing spaces off the raw headers.
-
-	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.
-	
-	* gmime-content-field.c (_print_parameter): Duh, removed again
-	(@@#$@ cvs merge).
-
-	* camel-mime-utils.c (header_content_type_is): Constify.
-	(header_content_type_unref): Killed a couple warnings.
-
-	* camel-folder.c (_init): Removed more log crap.
-
-	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for
-	summary changes.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	Fixed for new summary interface.  Added a warning for using this
-	broken api.
-	(_get_message_by_uid): Fixed for message new with session
-	vanishing.
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_get_type): This is a subtype of
-	CamelSeekableStream, not CamelStream.
-
-	* camel-seekable-substream.c: clean up a lot.
-	(eos): When testing for end-of-stream, reset the parent position
-	before testing if it is at end-of-stream, since either (a) it may
-	have been seek'ed to eos by someone else, or (b) we may have been
-	seek'ed away from eos and it hasn't been synced yet.
-
-	* camel-medium.[ch] (camel_medium_add_header): const poison.
-	(Belatedly goes with my change of 2000-02-23.)
-	(camel_medium_init): Use g_strcase_{hash,equal} on the header
-	array.
-	
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (my_set_input_stream): 
-	* camel-data-wrapper.c (set_input_stream, set_output_stream): do
-	better reference counting of streams so they actually go away
-	when they should.
-
-	* camel-log.[ch], *: Nuke camel log stuff. Replace calls to
-	CAMEL_LOG_WARNING with calls to g_warning.
-
-	* camel-data-wrapper.[ch]:
-	* camel-simple-data-wrapper.[ch]:
-	* camel-medium.[ch]: Clean, polish, document. Most of the gtk-doc
-	comments added to camel-data-wrapper.c note serious problems that
-	need to be fixed.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.[ch]: Remove the "session" field from
-	CamelMimeMessage. Nothing uses it, about half of the existing
-	calls to camel_mime_message_new_with_session pass NULL, and
-	there's no obvious reason for it to be there.
-
-	* providers/MH/camel-mh-folder.c:
-	* providers/maildir/camel-maildir-folder.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-utils.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/pop3/camel-pop3-folder.c: Use camel_mime_message_new
-	instead of camel_mime_message_new_with_session.
-
-	* camel-session.c (get_store_for_protocol_with_url): Set the
-	exception if no provider is found.
-
-	* camel-url.c: Add code to encode and decode %-escapes in URLs,
-	and do some additional correctness-checking on URL syntax. From
-	Tiago Antào with modifications by me.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): add nntp
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c: Fix switch statement.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c (_exists): always return TRUE
-	for now.  we need to check the server response to make sure the
-	group exists.
-	(_get_message_by_uid): make sure to account for the \n we add to
-	the string after every line.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): function
-	to get the headers using the XOVER command.
-	(get_HEAD_headers): function to get the headers using the HEAD
-	command on each message. slooooooow.
-	(camel_nntp_get_headers): make this function use either XOVER or HEAD
-	versions depending on whether or not the server extension is present.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* camel-formatter.[ch]: This didn't belong in Camel. Move to mail/
-
-	* Makefile.am, camel-types.h: remove references to
-	camel-formatter.
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message
-	for broken function.
-	(_folder_close_cb): Same.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am (pthread_SRC): Use correct names for the pthread
-	source variables.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): fix various
-	bugs in APOP code (still untested) and some of the error cases.
-
-	* camel-provider.h: Clarify what provider.protocol, provider.name,
-	and provider.description should be.
-
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: update protocols, names,
-	and descriptions
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	implement get_message_by_number for the mail fetch code.
-
-2000-04-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: reformatted to fit
-	the standard indent format used by helix code
-
-2000-04-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c: New file with new function to dot-lock an mbox
-	file and copy it to a safe private directory.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/.cvsignore: Added a .cvsignore file.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	actually record the pid returned by fork(). Noticed by clahey.
-
-	* providers/smtp/camel-smtp-transport.c: #include <sys/param.h>
-	for MAXHOSTNAMELEN. (This is a stopgap: some of the uses of
-	MAXHOSTNAMELEN are wrong anyway...)
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: fixes to numerous bugs;
-	should now build fine.
-	* providers/Makefile.am: Readded smtp now that smtp builds without
-	error.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_next_uid): Public function to get the next
-	uid, makes sure its saved to disk too.
-
-	* camel-mime-part.c (my_finalize): Fix disposition crap with a
-	real disposition.
-	(my_set_disposition): Likewise.
-	(my_get_disposition): And here.
-	(my_write_to_stream): And here, needs more cleanup.
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Assign a
-	new uid at this point.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream):
-	Make something up if we have an invalid/missing content type
-	(i.e. text/plain).
-
-2000-04-19  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_delete): Fixed completely
-	broken switch() syntax, only compiled because errno is a macro on
-	some systems.
-	(_list_subfolders): Likewise.
-
-2000-04-18  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_init): init stream to null.
-
-	* providers/mbox/camel-mbox-summary.c
-	(CAMEL_MBOX_SUMMARY_VERSION): Moved to .c file, incremented.
-	(index_folder): Changed to have index passed via the summary.
-	(decode_string): Do a sanity check on the string size, so we dont
-	visit g_malloc()'s friendly abort().
-
-	* camel-folder-pt-proxy.c (camel_folder_pt_proxy_class_init):
-	Removed reference to set_name.
-	(_set_name): Removed.
-
-	* providers/mbox/camel-mbox-utils.c
-	(parsed_information_to_mbox_summary): Removed.  Most of this file
-	is about to be binned.
-
-	* providers/mbox/camel-mbox-search.c (func_header_contains): Fixes
-	for changes to summary interface.
-	(struct _searchcontext): Remove pointer to message info, get it
-	straight from the mboxsummary.
-	(camel_mbox_folder_search_by_expression): New summary interface.
-	(camel_mbox_folder_search_by_expression): Uh, the summary is not
-	an object anymore (well not yet).
-
-	* providers/mbox/camel-mbox-folder.c
-	(camel_mbox_folder_class_init): Removed set_name init.
-	(_set_name): Removed.
-	(_open): Call new summary interface.
-	(_close): Use new summary interface.
-	(_create): Removed a summary object leak.
-	(_get_message_count): New summary interface.
-	(_get_uid_list): Use new summary interface. FIXME: this is leaky.
-	(_get_message_by_uid): Use the new summary interface, some
-	cleanup.
-	(_append_message): Totally changed, basically just appends the
-	message directly, ignores the summary (for now), the summary will
-	fix itself up if it needs to.
-	(_check_get_or_maybe_generate_summary_file): Bye bye old code.
-	(summary_get_message_info): Implement get_message_info again, for
-	folder.
-
-	* camel-folder.c (camel_folder_class_init): Removed set_name
-	setup.
-	(_set_name): Moved contents into _init.
-	(_init): Perform the old functions of set_name here.
-
-	* camel-folder.h: Removed the set_name internal interface.
-
-2000-04-14  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.[ch]: Completely replaced with
-	new code.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-folder-summary.[ch].
-
-	* camel-folder.h (struct _CamelFolder): Removed summary.
-	(struct _CamelFolder): Changed flags to be 1 bit bitfields.
-
-	* camel-folder-summary.[ch]: Class removed entirely.
-
-	* camel-folder.c (camel_folder_get_summary): Removed.
-	(camel_folder_summary_get_message_info): Moved from
-	camel-folder-summary.c
-	(camel_folder_summary_get_subfolder_info): Moved from
-	camel-folder-summary.c
-
-	* camel-mime-parser.c (folder_scan_step): Store the start of
-	headers and start of from in the scan state.
-	(camel_mime_parser_tell_start_headers): Query the start of the
-	headers.
-	(camel_mime_parser_tell_start_from): Query the cached start of
-	from marker.
-
-2000-04-13  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_free): Removed this
-	function.  If its too dangerous to use, it shouldn't be here.
-	(gmime_content_field_ref): Also ref the embedded content-type.
-	(gmime_content_field_unref): Ditto to unref it.
-
-	* camel-mime-utils.h: Add a refcount for content-type header.
-
-	* camel-mime-utils.c (header_content_type_unref): Implement unref
-	for content-type.
-	(header_content_type_ref): Implement ref for header content type.
-
-2000-04-12  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.h: Changed to use a _header_content_type.
-	Added type/subtype back for compatability with clients.
-	
-	* gmime-content-field.c: Basically a total rewrite, and now just a
-	thin wrapper ontop of header_content_type.
-	(_free_parameter): Got rid of it.
-	(gmime_content_field_new): Use header_content_type_* functions.
-	(gmime_content_field_set_parameter): Likewise.
-	(_print_parameter): Blow away.
-	(gmime_content_field_write_to_stream): Get details from the
-	content_type field.  Should check if it needs to escape chars in
-	the paramter value.
-	(gmime_content_field_get_mime_type): Likewise.
-	(___debug_print_parameter): Get rid of this rather annoyingly
-	named function.
-	(gmime_content_field_get_parameter): Simplified function.
-	(gmime_content_field_construct_from_string): Fixed this to use a
-	real parser.
-	(gmime_content_field_is_type): New function to test if a type matches.
-	(gmime_content_field_construct_from_string): Track type/subtype
-	from subordinate content_type header struct.
-
-	* gmime-rfc2047.[ch]: Removed.  Unused.
-
-	* camel-stream-b64.[ch]: Blown away more duplicated code.
-
-	* Makefile.am: Removed camel-stream-b64.[ch], and
-	gmime-base64.[ch].
-
-	* camel-mime-part.c (my_get_content_object): Replaced
-	camel-stream-b64 with camel-stream-filter/camel-mime-filter-basic.
-	(my_write_content_to_stream): Replaced camel-stream-b64 with the
-	camel-stream-filter with an encoder.
-	(my_get_content_object): Also implement quoted-printable decoding.
-	(my_write_content_to_stream): Also implement quoted-printable
-	encoding.
-	(my_get_output_stream): Took out stream-b64 code (nothing's being
-	executed yet anyway).
-
-	* gmime-base64.[ch]: Blown away.  Not used, dont need it.
-
-	* camel-mime-utils.h: Added offset for this header.  Records where
-	it is in the source.
-
-	* camel-mime-utils.c (header_raw_append_parse): Add offset
-	parameter, to store where the header is stored in the stream.
-	(header_raw_append): Added offset param.
-	(header_raw_find): Return offset, if a pointer supplied for it.
-	(header_raw_replace): Add offset param.
-	(header_content_type_new): New function, to create an empty
-	content type.
-	(header_content_type_set_param): Set a parameter in the
-	content-type.
-	(header_set_param): Generic header parameter setting function.
-	(header_decode_string): Handle NULL input.
-
-	* camel-mime-parser.c (camel_mime_parser_headers_raw): New
-	function to get access to all the raw headers.
-	(folder_scan_header): Keep track of the header start position, and
-	store it when saving the header.
-
-2000-04-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c: Moved a bunch of printf's to debug.
-
-	* camel-mime-parser.c: Moved a bunch of printf's to debug.
-	(folder_scan_header): Detect end of each header line using the
-	last scanned char, and not the last scanned position.
-
-	* camel-mime-filter-index.[ch]: Indexing filter.  Indexes unicode
-	sequences into ibex files.
-
-2000-04-09  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c: Dont include gmime-base64.h
-
-	* camel-mime-filter-charset.c (complete): Implement the completion
-	function.
-
-	* camel-mime-parser.c (folder_scan_step): If we get to the end of
-	the body data, check any filters for outstanding completion data.
-	(camel_mime_parser_scan_from): Set whether we scan for "From "
-	headers or not.
-
-	* camel-stream-filter.c (do_read): If we get to end of stream on
-	the source, then call the filtering completion function to see if
-	we have any more data to return.
-
-	* camel-mime-filter-basic.c (filter): Implement quoted printable
-	encoding and decoding filters.
-	(complete): And the complete function as well.
-
-	* camel-mime-utils.c (base64_encode_close): Also take an input
-	buffer, allow closing of filters.
-	(quoted_encode_step): First cut, simple quoted-printable encoder.
-	Doesn't handle trailing spaces/tabs on end of line properly yet.
-	(quoted_encode_close): Complete a quoted-encoding.
-	(is_qpsafe): New type check, for quoted-printable safe characters
-	(that do not need encoding).  Thats all bits used in the type
-	table!  Rebuilt the types table.
-	(header_content_type_is): Checks a content type against at
-	type/subtype match.
-	(header_content_type_param): Handle NULL content type pointer.
-
-2000-04-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (filter): Implement the base64
-	encoder.  Problem is, there is no way to know when to close it.
-	Close/Reset will have to provide the same args as filter, so it can
-	flush remaining data *sigh*
-
-	* camel-mime-utils.c (base64_encode_step): A rather complex base64
-	encoder, fast?
-	(base64_step_close): Companion function to finish off the base64
-	sequence.
-
-	* camel-mime-part.c (my_write_content_to_stream): Changed to use
-	camel_stream_write_to_stream().
-
-	* camel-stream.[ch] (camel_stream_write_to_stream): From
-	camel_stream_b64_write_to_stream().  Fixed some infinite loop
-	bugs with error conditions.
-
-	* camel-stream-b64.[ch] (camel_stream_b64_write_to_stream): Removed.
-	This has nothing to do with stream-b64, so i've moved it to
-	CamelStream.
-
-	* camel-mime-utils.h: Add a comment about refcounting
-	header_content_type struct.
-
-	* Makefile.am: Added camel-stream-filter*.[ch].
-
-	* camel-stream-filter.[ch]: Class to implement a generic
-	(multipass) filter ontop of a stream.  Only implements a read-only
-	stream.
-
-	* camel-mime-parser.c (camel_mime_parser_filter_add): Ref the
-	filter we just added.
-
-	* Makefile.am: Added camel-mime-filter*.[ch].
-
-	* camel-mime-filter-charset.[ch]: A filter to preform character set
-	conversion (uses unicode_iconv).
-
-	* camel-mime-filter-save.[ch]: A simple filter which will save all
-	data directly to a file or file descriptor.
-
-	* camel-mime-filter-basic.[ch]: Implements the basic mime filters,
-	base64 and quoted-printable decoding (encoding not implemented yet).
-
-	* camel-mime-filter.[ch]: A filtering class, which can filter streams
-	of data without having to copy them.  Simpler than stream classes,
-	and can be plugged into a single stream class (when i write it).
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Clarify error
-	messages.
-	(finalize): fix a bug in camel_exception usage
-	(pop3_connect): Remember the password after asking for it the
-	first time.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am: Added camel-mime-parser/camel-mime-utils.
-
-	* camel-mime-parser.c: Fast mime parser.
-
-	* camel-mime-utils.c: Mime utility functions, and email header
-	parsers.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed smtp for now, its a long way from
-	building.
-	* providers/smtp/Makefile.in: Removed file that shouldn't have been
-	checked in.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_get_full_name): Remove exception param
-	from get_full_name() called, since get_full_name() was changed to
-	not have an exception in the last param (see dan's notes below).
-	(_get_name): same.
-
-2000-04-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-store.[ch]: Reorganize the folder-fetching methods and
-	implement a folder cache so that multiple requests for the same
-	folder will yield the same CamelFolder object (as long as it
-	remains active). Includes some code to remove no-longer-active
-	folders from the cache, but it doesn't get used since nothing is
-	ever unref'ed in Camel right now...
-	
-	* providers/mbox/camel-mbox-store.c:
-	* providers/pop3/camel-pop3-store.c: update for CamelStore
-	changes.
-
-	* camel-folder.[ch]: Remove the (unused) CamelException argument
-	from camel_folder_get_name and camel_folder_get_full_name.
-	(camel_folder_set_name): make this go away since changing a
-	folder's name after it has been created could result in it
-	conflicting with a separately-issued folder.
-	
-2000-04-05  Dan Winship  <danw@helixcode.com>
-
-	* g_url_new really wanted to take a CamelException. So, rename
-	Gurl to CamelURL, g_url_* to camel_url_* (with camel_url_new
-	taking an exception), and url-util.[ch] to camel-url.[ch]. Also
-	force url->port to be numeric and remove camel_service_getport. (I
-	was confused before: the URL RFC says the port must be numeric, so
-	we don't want to do getportbyname.)
-
-2000-04-01  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Compare
-	mbox_file_size and mbox_modtime to the results of stat()ing the
-	mbox file, not the summary file. Duh.
-	(_close): Update the summary's mbox_file_size and mbox_modtime
-	before writing it to disk.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_save,
-	camel_mbox_summary_load): Wow. I must have been tired when I wrote
-	this code. First, the comparison bug above. Second, it was using
-	ntohs and htons instead of ntohl and htonl. Third, I was reading
-	the status flag byte in two different places and thus getting out
-	of sync. Fourth, it was writing out field_length bytes of each
-	header field after having converted field_length to network byte
-	order, resulting in lots of random crap being appended, and the
-	summary files being huge. (Fortunately, since the size/modtime
-	comparison was biffed, the garbage summary read from disk was
-	always immediately discarded.)
-
-	* providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): fix
-	an off-by-one error that caused the last-used UID to be reused if
-	the summary file was regenerated. (That one wasn't my fault. :-)
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-mem.c: implement unimplemented methods
-
-	* gmime-content-field.c
-	(gmime_content_field_construct_from_string):
-	* data-wrapper-repository.c
-	(data_wrapper_repository_get_data_wrapper_type):
-	* camel-simple-data-wrapper.c (my_write_to_stream):
-	* camel-mime-part.c (my_set_input_stream):
-	remove debugging printf()s that no longer seem useful.
-
-2000-03-31  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (text_to_html): Added "convert_newlines_to_br"
-	boolean param, to give the option of not converting '\n's to <br>
-	tags. This way, when we stick stuff in a <pre> tag, newlines stay
-	newlines.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (handle_text_plain): Use <pre> tag to force
-	the use of monospaced fonts.
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_getport): Add a htons in the
-	default_number case, and document the fact that the function
-	returns the port in network byte order.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert
-	Miguel's change. The port number bug was actually somewhere
-	else, and the IP address copying code was fine already.
-	
-2000-03-29  Miguel de Icaza  <miguel@gnu.org>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Add htons
-	(port), and only copy 4 bytes for the IP address to prevent a DNS
-	attack. 
-
-2000-03-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	make this return a CamelStream rather than a
-	CamelSeekableSubstream, because that's the way Gtk objects tend to
-	work.
-
-	* camel-service.c (camel_service_gethost,
-	camel_service_getport): convenience functions to canonicalize
-	the host and port values of a service's URL.
-	* providers/pop3/camel-pop3-store.c: use them
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Make this work when
-	the inbox file doesn't yet exist.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): uncomment
-	the call to unlink the temp file: there's no way to tell
-	camel_stream_fs to truncate a file, so reusing the same file was
-	resulting in junk at the ends of messages.
-
-	* camel-folder.[ch]: add delete_message_by_{number,uid}.
-
-	* providers/pop3/camel-pop3-folder.[ch]: implement
-	delete_message_by_uid. Add a close method to do expunging
-	of deleted messages if requested.
-
-	* providers/pop3/camel-pop3-store.[ch]: support for
-	CamelPop3Folder::close. (You have to close the connection
-	in order to expunge the folder, thus the store may be
-	connected in the CamelService::is_connected sense when it
-	is not actually connected to the server.) Also some bugfixes.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Unref the
-	output_stream when done, close doesn't do it.
-	(_append_message): Clear all uid's from the appending messages, so
-	they are reassigned proper unique id's.
-
-	* gmime-utils.c (get_header_array_from_stream): Actually free the
-	header, it is copied elsewhere.
-
-2000-03-26  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Added
-	folder parameter to function.  Fixed callers.
-	(index_message): Index a message as it is assigned a unique id.
-
-	* camel-mime-part.c (my_set_content_id): Make sure we malloc and
-	copy the content_id, otherwise *poof*
-
-2000-03-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-medium.c (_finalize): Another leak, unref the content if
-	finished with it.
-
-	* camel-recipient.c (camel_recipient_table_free): Plug another
-	memory leak - actually free the recipient table.
-
-	* camel-mime-message.c (_finalize): Plugged a memory leak with the
-	flags table.
-
-	* gmime-utils.c (_store_header_pair_from_string): A simpler, more
-	debuggable and functionally identical header extraction function.
-
-2000-03-24  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_set_parameter):
-	Remove the hash table entry before freeing its key and data.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): Add pop3.
-
-	* providers/pop3/camel-pop3-store.c: keep separate input and
-	output streams so the output doesn't end up being buffered.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	finish implementing this.
-
-2000-03-27  Michael Meeks  <michael@helixcode.com>
-
-	* camel-mime-part.c (my_set_disposition): fix so less broken.
-	(my_finalize): remove dodgy disposition free.
-
-	* camel-data-wrapper.c (my_set_mime_type_field): unref instead of
-	free on mime_type.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_free_auth_types): new routine to
-	free the data allocated by camel_service_query_auth_types.
-
-	* providers/pop3/camel-pop3-store.c (free_auth_types): implement
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): rename
-	camel_stream_mem_new_with_buffer to ..._with_byte_array and add a
-	new ..._with_buffer that takes a char * rather than a GByteArray.
-
-	* Remove CamelStreamBufferedFs, since CamelStreamBuffer makes it
-	redundant.
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.[ch]: change the CamelFolderSummary
-	interfaces to allow partial summary queries (for dealing
-	with very large folders). Remove the "extended_fields" from
-	CamelFolderInfo and CamelMessageInfo: this is better dealt
-	with by subtyping.
-
-	* providers/mbox/camel-mbox-summary.[ch]: Make CamelMboxSummary a
-	subclass of CamelFolderSummary. Update interfaces for that. Remove
-	the internal/external summary distinction. Remove the (unused) md5
-	checksum in the folder summary. Change the summary file format
-	(primarily to make it no longer byte-order dependent) and add a
-	version number to it so it will be easier to change in the future.
-	
-	* providers/mbox/camel-mbox-folder.[ch]
-	* providers/mbox/camel-mbox-search.c
-	* providers/mbox/camel-mbox-utils.c: update for summary changes
-
-	* camel-exception-list.def: add
-	CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID
-	
-2000-03-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-provider.c: Added flag to provider
-	initialisation, to match changed structure.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.[ch]: Added async search api.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Changed to use an
-	asynchronous interface.
-	(camel_mbox_folder_search_cancel): Cancel function for async
-	interface.
-
-2000-03-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Function
-	to read one line of any size from a stream and return it in
-	allocated memory.
-
-2000-03-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_query_auth_types): New function
-	to query a service for the authentication protocols it supports.
-	* providers/pop3/camel-pop3-store.c (query_auth_types): implement
-
-	* camel-provider.c (camel_provider_scan): New function to
-	scan the provider dir and return a list of all providers.
-
-	* providers/pop3/camel-pop3-folder.c: fill this in partially
-	* providers/pop3/camel-pop3-store.c: make camel_pop3_command
-	return the text after "+OK"/"-ERR" and add a separate
-	camel_pop3_get_additional_data to get the message body or
-	whatever. Also make them take a CamelPop3Store rather than
-	a CamelStreamBuffer.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (debug): Disabled some useless debug
-	messaging.
-
-2000-03-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3: some initial bits of the POP3 provider, to
-	make Matt happy. Incomplete, untested, etc.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c 
-	(camel_mbox_summary_append_internal_to_external): copy the size field
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): initialize 
-	message_info to NULL
-
-	* camel-folder-summary.h: added the size field.
-
-	* providers/mbox/camel-mbox-summary.h: 
-	added the received_date field.
-
-	* providers/mbox/camel-mbox-summary.c:
-	documented all functions.
-
-	* camel-folder-summary.h: name change and 
-	new fields.
-
-	* providers/mbox/camel-mbox-search.c: update to 
-	conform to name change in the summary fields.
-
-2000-03-10  bertrand  <bertrand@helixcode.com>
-
-	* camel-service.h: cosmetic changes.
-
-2000-03-09  Dan Winship  <danw@helixcode.com>
-
-	* s/HelixCode/Helix Code, Inc./ in the copyrights
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_mime_part): 
-	plug mem leaks due to bad documentation
-	of camel_content_field_get_mime_type
-	(print_camel_body_part): idem
-	(handle_multipart_alternative): idem
-
-	* gmime-content-field.c (gmime_content_field_get_mime_type): 
-	documentation fix.
-
-
-	* camel-mime-part.c (my_finalize): unref the 
-	content_input_stream if any. 
-
-2000-03-06  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-fs.c (_seek): fix a bogus calculation
-	in the return position.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* camel-session.h: cosmetic fixes.
-
-	* camel-stream-fs.c (_read): 
-	(_seek): fixed the current position so that it refers
-	to the current position in the stream, not in its parent.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Ref the summary
-	after we have got it.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* camel-mime-part.c (my_write_content_to_stream): 
-	stream the raw content instead of nothing if the encoding
-	is not supported.
-
-	* camel-stream-fs.c (_seek): handle eos more
-	properly.
-
-	* camel-formatter.c (get_bonobo_tag_for_object): 
-	bonobo-goad-id is the good key to look for. 
-	(get_bonobo_tag_for_object): close the <object> tag.
-	(get_bonobo_tag_for_object): the correct syntax for the
-	to set a parameter inside an <object> tag is :
-	<object classid="..."> <param name="uid" value="..."> <param ...>
-	</object>
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): 
-	use set_input_stream instead of construct_from_stream
-	to feed the message object. 
-
-	* camel-data-wrapper.c (my_write_to_stream): reset output stream.
-	(my_set_input_stream): unref the previous input stream.
-	use the set_output_stream for default behaviour.
-	(my_set_output_stream): unref previous output stream.
-
-	* camel-mime-part.c (my_write_content_to_stream): reset content
-	object output stream.
-
-2000-03-03  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make
-	sure we open with create with a creation mask.
-
-2000-03-01  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_stream): DO NOT assert on
-	content type, we have fallback code 4 lines below it ... *sigh*
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer
-	to build.
-
-	* camel-stream-buffer.[ch]: Generic buffer which can be applied to
-	any stream.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_image): in the case
-	of images, put the content object output stream
-	in the url. This allows the message browser
-	to show inline images.
-
-	* camel-stream-b64.c (my_read_encode): fixed state
-	0 keep value. 
-
-2000-03-02  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): don't forget to 
-	set the state to 0 after 3.
-	(my_read_encode): don't forget to encode, even in state 3.
-
-	* camel-simple-data-wrapper.c: static functions are prefixed 
-	with my_ instead of _
-	* camel-multipart.c: static functions are prefixed 
-	with my_ instead of _
-	(my_write_to_stream): commented.
-	(my_write_to_stream): warning in case the boudary is set
-	but is a zero length string.
-
-	* camel-mime-part.c (camel_mime_part_encoding_from_string): 
-	remove debug trace. 
-	
-	* camel-mime-part.c: Replaced all static functions
-	with name begining with _ by the same name begining
-	with "my_" to prevent the possible conflicts 
-	with system symbols Dan warned us about. 
-	
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	use CamelStreamB64 type for the input stream.
-
-	* camel-mime-part.c (_get_content_object): remove 
-	debugging trace
-	(_write_content_to_stream): implement the b64 
-	encoding the new way (that is using camel_stream_b64)
-
-	* camel-data-wrapper.c (my_write_to_stream): 
-	fix implementation so that it writes properly
-	to the output stream even.
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	fix implementation. 
-
-2000-02-29  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): new
-	utility function. 
-
-	* camel-data-wrapper.c (_write_to_stream): default
-	implementation. 
-
-	* gmime-utils.c (_store_header_pair_from_string): 
-	revert strange changes. 
-
-	* camel-stream-b64.c (my_read_decode): set eos to true when we
-	have read the whole input stream. 
-	(my_reset): set eos to FALSE.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (_parse_header_pair): Dont free this either.
-
-	* camel-medium.c (_remove_header): Ugh, dont free the header
-	before we actually remove it.
-	(_add_header): Ugh, dont free hashtable entries which may be
-	duplicated (hash_insert _will_ reference that memory).
-
-	* string-utils.c (string_trim): Trimming a 0-length string is not
-	an error.
-
-	* camel-mime-message.c (_parse_header_pair): Fixed very broken
-	memory handling of header_name/value.
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev):
-	Initialise end_of_last_message always.
-	(camel_mbox_copy_file_chunk): Stop trying to read if we run out of
-	data, rather than looping forever.
-	(camel_mbox_write_xev): Use an open flag when opening with create.
-
-	* camel-folder.c (camel_folder_search_by_expression): No, its not
-	a fatal error to search on a non-searchable folder, you just dont
-	get any matches.
-	(_open): Dont open an opened folder (i dont see why this is really
-	a bug, but what the hell ...)
-
-	* providers/mbox/camel-mbox-folder.c (_init): Set search cap on.
-	(_open): Call parent class to perform open.  Remove folder-open
-	check to parent instead.
-	(_create): open takes a creation mask, dont use umask to try and
-	set the open mode.
-	(_delete): Dont bother checking folder==NULL, its already been
-	checked on the external interface (changed to an assertion, this
-	would have to be a camel bug).
-	(_delete_messages): Likewise.
-	(_create): Ditto.
-	(_init): Dont go and clear all the paths and shit that the parent
-	open just setup for us.
-	(_delete_messages): Get rid of more umask stuff.
-	(_append_message): Make sure we pass file mode to open with create.
-	(_append_message): Cleaned up some indenting to make it readable.
-
-	* camel-stream-b64.c (my_read_encode): Fixed a typo.
-
-	* providers/mbox/camel-mbox-search.c: Changed to use e-sexp,
-	rather than filter-sexp.
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): encoding
-	filter.
-
-2000-02-23  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c: changed the __static 
-	suffix into a my_ prefix. 
-	(camel_stream_b64_set_mode): reset the persistent
-	status. 
-	(my_read_decode): remove superfluous %
-	
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_copy_file_chunk): 
-	fix exception description message.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: Add camel_session_get_transport_for_protocol.
-
-	* camel-transport.h:
-	* camel-transport.c: Add an abstract CamelTransport class.
-
-	* providers/sendmail/*: A CamelTransport that uses sendmail
-	to deliver mail.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: use CamelExceptions for run-time errors, not
-	incorrect code. Don't bother validating that an object exists from
-	inside one of its methods, since you couldn't have gotten there if
-	it didn't. Fix some code style bugs.
-
-	(_init): Rename init_with_store to init and add parent_folder,
-	separator, and name arguments.
-	(_set_name): Get separator from self, not parent_store now.
-
-	* camel-store.h:
-	* camel-store.c: Remove get/set_separator.
-
-	* providers/mbox/: Update for above.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (_finalize): Free the data in the headers hash
-	table.
-	(_add_header): g_strdup the header name and value when adding it.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_headers_from_stream): Free the header
-	data after calling camel_medium_add_header, since it will have
-	g_strdup()ed it itself.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c: Dont compile by default.
-
-	* providers/mbox/Makefile.am: Fuck off the filter code.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c (read_decode__static): 
-	don't read the char if we reached the length
-	of the output buffer. Hours lost on this
-	%$!@# bug : 3.5
-
-	* camel-folder.c (camel_folder_get_subfolder): 
-	(camel_folder_create): 
-	(camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	(camel_folder_list_subfolders): 
-	(camel_folder_expunge): 
-	(camel_folder_get_message_by_number): 
-	(camel_folder_get_message_count): 
-	(camel_folder_append_message): 
-	(camel_folder_copy_message_to): 
-	(camel_folder_get_summary): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Check folder state (open/close) and raise an
-	exception if it is not ok. 
-	
-	* providers/mbox/camel-mbox-folder.c (_create): 
-	create the file and the path with two different
-	names.
-
-	* camel-folder.c (_create): handle the case 
-	when the folder name starts with '/'
-
-	* camel-exception.c (camel_exception_new): use 
-	(void) instead of () in decl.
-
-	* camel-exception.h: cosmetic fixes.
-
-	* camel-exception.c (camel_exception_init): new routine.
-	Fix a bug in mail/message-list.c
-	
-
-	* camel-folder.h: cosmetic changes.
-
-	* camel-stream-b64.c (reset__static): added a
-	reset method. Thanks message-browser to find
-	so much bugs :)
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd
-	Unicode libs.
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-formatter.c (lookup_unique_id): 
-	awful hack to test get_output_stream.
-	* camel-stream-b64.[ch] :
-	b64 encoding/decoding is now implemented as
-	a stream. 
-	
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-seekable-substream.c (_reemit_parent_signal): 
-	emit "data_available" when parent stream emits it. 
-
-
-2000-02-21  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am: Uh, fixed LIBADD again.  What was
-	there was never ever going to work, wasn't it tested?
-
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.h: (struct _CamelSession): Add authenticator.
-
-	* camel-session.c (camel_session_new): Add authenticator.
-	(camel_session_query_authenticator): New function to query the
-	session authenticator for password, etc, information.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: add CamelExceptions to several functions. Use
-	camel_session_new to initialize the session and URL fields of
-	created CamelStores as appropriate.
-
-	* camel-store.h:
-	* camel-store.c
-	* camel-service.h:
-	* camel-service.c: Move the session and url (and associated
-	functions) from CamelStore to CamelService. Add url_flags to
-	CamelService so subclasses can specify which URL components
-	are mandatory for them.	Add camel_session_new for
-	camel_session_get_store* to use.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-store.c:
-	* providers/mbox/camel-mbox-store.h: Update for above changes.
-
-	* camel-exception-list.def: Once camel is being used for real,
-	exceptions won't be renumberable. So renumber them now to make
-	more room to add exceptions to the various categories later, and
-	add a big warning message.
-
-2000-02-20  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/Makefile.am: add libibex back to
-	libcamelmbox_la_LIBADD
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Added exception to call,
-	and fixed caller.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Major changes, to use
-	the sexp evaluator from filter/filter-sexp.c to implement the
-	searching.
-	(func_body_contains): Changed to support multiple strings in 1
-	command (results or'd together)
-
-	* url-util.c (g_url_new): Fixed a typo (colon == 0 isn't right),
-	and made it so full url's are absolute pathed (Dan, this is how it
-	has to work!).  Also, always include a path part, even if it is an
-	empty string.
-
-2000-02-18  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-types.h: New header with the typedefs for all camel
-	classes. Now the class headers can just include this and the
-	header for the parent type. This makes it possible for
-	CamelService to include a CamelSession without creating an
-	#include loop.
-
-	* camel/*:	
-	* composer/e-msg-composer-attachment-bar.h:
-	* mail/folder-browser.c:
-	* mail/message-list.c: frob #includes to match the new reality
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-service.h:
-	* camel/camel-service.c: Make camel-service us a Gurl internally.
-	Remove the login/password interfaces and instead provide
-	camel_service_connect_with_url. Add CamelExceptions
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	(handle_text_html): use camel_stream_reset instead
-	of seek. The formatter should be able to work 
-	with all streams, not only seekable streams. 
-	In the case where some provider implementation
-	would not be able to provide a reset method 
-	to their stream, implementors would have
-	to find a workaround.
-
-	* camel/camel-session.c (camel_session_new): use
-	(void) instean of () in function decl.
-
-	* camel/camel-folder.c: ifdef async operation 
-	related code. 
-
-	* camel/camel-seekable-stream.c (_seek): added a warning.
-	(_reset): default implementation of reset for seekable
-	stream.
-
-	* camel/camel-mime-message.h: set_received_date declaration fix.
-	cosmetic changes.
-
-	* camel/providers/mbox/camel-mbox-provider.c (camel_provider_module_init): 
-	use (void) instead of ().
-
-	* camel/camel-stream.c (camel_stream_reset): 
-	new method for CamelStream.
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/url-util.c (g_url_to_string): New function to convert
-	a Gurl back into a char *.
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	revamped so that it uses the output stream
-	of the data wrapper
-	(handle_text_html): ditto.
-	
-	
-	* camel/camel-simple-data-wrapper.h: 
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new): 
-	use (void) instead of ().
-	(_get_output_stream): simple implementation. 
-
-2000-02-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_set_input_stream): ref input stream
-	(_set_output_stream): ref output stream
-	(_finalize): unref input and output streams
-
-	* camel/camel-seekable-substream.c (_set_bounds): don't
-	seek the begining of the substream.
-	(_eos): fix eos condition testing. 
-	(_finalize): unref parent stream
-	(_init_with_seekable_stream_and_bounds): ref parent stream
-
-	* camel/gstring-util.c (g_string_equal_for_hash): 
-	(g_string_equal_for_glist): return type is int.
-
-	* camel/camel.h: 
-	* camel/camel.c (camel_init): use (void) 
-	instead of ().
-	
-2000-02-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Added
-	libfilter to link line (temporarily?).  Required for
-	filter-sexp.
-
-2000-02-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-multipart.c (_localize_part): 
-	this routine replaces the _read_part routine
-	and does not store the part in a buffer. 
-	(_set_input_stream): use the set_input_stream
-	instead of the construct_from_stream.
-	each bodypart is given an input stream. 
-
-	* camel/camel-mime-part-utils.c: 
-	include the data-wrapper-repository header. 
-	(camel_mime_part_construct_content_from_stream): 
-	use the set_input_stream instead of the 
-	construct_from_stream method. 
-
-	* camel/camel-seekable-substream.c (_set_bounds): 
-	cur position is set to 0 not to inf_bound.
-
-2000-02-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: include gmime-base64.h
-	various compilation and runtime fixes.
-	(_set_input_stream): store the input substream 
-	for the content object.
-
-	* camel/camel-data-wrapper.h: declare the 
-	set/get function on input/output stream.
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	don't use a temporary mem stream. 	
-
-	* camel/camel-seekable-substream.c (_seek): 
-	(_eos): 
-	(_read): the substream can be unlimited in length
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_class_init): 
-	set the get/set_input/output_stream methods. 	
-
-	* camel/camel-multipart.c (_construct_from_stream): 
-	camel_stream_seek -> camel_seekable_stream_seek
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add
-	the unicode libraries as well.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): Add
-	error reporting here.  Desire to use Solaris increases.  Hair loss
-	in the last two hours: 5,400.
-
-	* camel/providers/mbox/camel-mbox-provider.c
-	(camel_mbox_get_provider): Renamed function.
-
-	* camel/camel.h: All include files use camel/ now here.
-
-	* camel/providers/mbox/Makefile.am: Drop all the dynamism from
-	Camel, and make this a standard library.
-
-2000-02-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_array_from_stream): use the 
-	eos stream method. 
-	(gmime_read_line_from_stream): ditto.
-
-	* camel/camel-stream-fs.h (struct ): add the eof field
-	cosmetics changes. 
-
-	* camel/camel-stream-fs.c (camel_stream_fs_init): set eof.
-	(_read): set eof on end of file.
-	(_eos): implemented.
-
-	* camel/gmime-utils.c (get_header_array_from_stream): 
-	make a blocking version of the header parser. 
-	When the fs stream uses gnome-vfs, this should
-	be changed. 
-	(gmime_read_line_from_stream): ditto. 
-
-2000-02-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c: 
-	everywhere, when using the cur_pos field, do it
-	on the CamelSeekableStream object.
-	(_seek): small fix. 
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_seek): 
-	s/camel_stream_seek/camel_seekable_stream_seek/g
-
-	* camel/camel-seekable-stream.h: 
-	(struct ): added a field to store the
-	current position.
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_get_current_position): 
-	New function. Allows to get the current position 
-	of a seekable stream.
-	
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-search.c: New file, implements the
-	search api for mbox folders.
-
-	* providers/mbox/Makefile.am: Link with ibex.
-
-	* camel-folder.c (camel_folder_has_search_capability): Api
-	additions.
-	(camel_folder_search_by_expression): Ditto.
-
-2000-02-12  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_set_name): Setup index
-	filename as well.
-	(_init_with_store): Init index filename.  Hmm, none of these
-	names ever seem to get free'd (FIXME?)
-
-	* providers/mbox/camel-mbox-folder.h: Add index file name.
-
-2000-02-12  NotZed  <notzed@helixcode.com>
-
-	* camel-folder.h: Add folder search functions.
-
-	** Created ChangeLog just for camel **
-	 - refer to ../ChangeLog for changes prior to this date.
diff --git a/camel/Makefile.am b/camel/Makefile.am
deleted file mode 100644
index 67689b261a..0000000000
--- a/camel/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = providers
-
-libcamelincludedir = $(includedir)/camel
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
-
-lib_LTLIBRARIES = libcamel.la
-
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	 \
-	-I$(top_srcdir)/intl			 \
-	-I$(top_srcdir)/e-util			 \
-	$(GLIB_CFLAGS)				 \
-	$(UNICODE_CFLAGS)			 \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-	-DG_LOG_DOMAIN=\"camel\"
-
-libcamel_la_SOURCES = 				\
-	broken-date-parser.c			\
-	camel-address.c				\
-	camel-data-wrapper.c			\
-	camel-exception.c			\
-	camel-folder-search.c			\
-	camel-folder-summary.c			\
-	camel-folder.c				\
-	camel-internet-address.c		\
-	camel-medium.c				\
-	camel-mime-filter-basic.c		\
-	camel-mime-filter-charset.c		\
-	camel-mime-filter-crlf.c		\
-	camel-mime-filter-from.c		\
-	camel-mime-filter-index.c		\
-	camel-mime-filter-linewrap.c		\
-	camel-mime-filter-save.c		\
-	camel-mime-filter.c			\
-	camel-mime-message.c			\
-	camel-mime-parser.c			\
-	camel-mime-part-utils.c			\
-	camel-mime-part.c			\
-	camel-mime-utils.c			\
-	camel-movemail.c			\
-	camel-multipart.c			\
-	camel-object.c				\
-	camel-provider.c			\
-	camel-remote-store.c			\
-	camel-seekable-stream.c			\
-	camel-seekable-substream.c		\
-	camel-service.c				\
-	camel-session.c				\
-	camel-store.c				\
-	camel-stream-buffer.c			\
-	camel-stream-filter.c			\
-	camel-stream-fs.c			\
-	camel-stream-mem.c			\
-	camel-stream.c				\
-	camel-transport.c			\
-	camel-uid-cache.c			\
-	camel-url.c				\
-	camel-charset-map.c			\
-	camel.c					\
-	gmime-content-field.c			\
-	gstring-util.c				\
-	hash-table-utils.c			\
-	string-utils.c
-
-libcamelinclude_HEADERS =			\
-	broken-date-parser.h			\
-	camel-address.h				\
-	camel-charset-map.h			\
-	camel-charset-map-private.h		\
-	camel-data-wrapper.h			\
-	camel-exception-list.def		\
-	camel-exception.h			\
-	camel-folder-search.h			\
-	camel-folder-summary.h			\
-	camel-folder.h				\
-	camel-internet-address.h		\
-	camel-medium.h				\
-	camel-mime-filter-basic.h		\
-	camel-mime-filter-charset.h		\
-	camel-mime-filter-crlf.h		\
-	camel-mime-filter-from.h		\
-	camel-mime-filter-index.h		\
-	camel-mime-filter-linewrap.h		\
-	camel-mime-filter-save.h		\
-	camel-mime-filter.h			\
-	camel-mime-message.h			\
-	camel-mime-parser.h			\
-	camel-mime-part-utils.h			\
-	camel-mime-part.h			\
-	camel-mime-utils.h			\
-	camel-movemail.h			\
-	camel-multipart.h			\
-	camel-object.h				\
-	camel-provider.h			\
-	camel-remote-store.h			\
-	camel-seekable-stream.h			\
-	camel-seekable-substream.h		\
-	camel-service.h				\
-	camel-session.h				\
-	camel-store.h				\
-	camel-stream-buffer.h			\
-	camel-stream-filter.h			\
-	camel-stream-fs.h			\
-	camel-stream-mem.h			\
-	camel-stream.h				\
-	camel-transport.h			\
-	camel-types.h				\
-	camel-uid-cache.h			\
-	camel-url.h				\
-	camel.h					\
-	gmime-content-field.h			\
-	gstring-util.h				\
-	hash-table-utils.h			\
-	string-utils.h
-
-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-
-libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)
-
-EXTRA_DIST =					\
-	README 
-
-#noinst_PROGRAMS =				\
-#	camel-mime-filter-from
-#
-#camel_mime_filter_from_SOURCES = 		\
-#	camel-mime-filter-from.c
-#
-#camel_mime_filter_from_LDADD = 		\
-#	../camel/libcamel.la			\
-#	../e-util/libeutil.la			\
-#	../libibex/libibex.la			\
-#	$(GNOME_LIBDIR)				\
-#	$(GNOMEUI_LIBS)				\
-#	$(INTLLIBS)				\
-#	$(PTHREAD_LIB)				\
-#	$(EXTRA_GNOME_LIBS)
diff --git a/camel/README b/camel/README
deleted file mode 100644
index f020174d5e..0000000000
--- a/camel/README
+++ /dev/null
@@ -1,57 +0,0 @@
-
-                                   CAMEL
-     
-
-			A generic Messaging Library
-
-
-                                   ----
-				
-
-Introduction:
--------------
-
-Camel will be a generic messaging library. It will evntually support 
-the standard messaging system for receiving and sending messages.
-It aims at being the backend for the future gnome-mailer system.
-
-The name "camel" stands for ... nothing. Open area of development there.
-You know, that "bazaar" thing. Maybe could we organize a big contest on
-gnome-list to find the best explanation :)
-
-Camel draws heavily from JavaMail and the IMAP4rev1 RFC. People
-wanting to hack on a provider should read the JavaMail API
-specification, but CMC and MAPI are of interest too.
-
-Please, before starting anything, wait for me to finish the abstract
-classes. Some parts are not definitive yet.
-
- 
-Organization:
--------------
-
-The library is roughly a set of abstract classes, some kind of generic
-"interfaces" (idl interfaces, not java interfaces ).
-
-Particular implementations are called providers.
-
-Here are the basic objects:
-
-* CamelService : an abstract class representing an access to a server.
-Handles the connection and authentication to any server.
-
-* CamelStore (CamelService): A hierarchy of folders on a server.
-
-* CamelFolder : An object containing messages. A folder is always
-associated with a store.
-
-* CamelMessage : An object contained in folders. Is defined by a set
-of attributes and a content. (Attributes include: the date it was
-received, the sender address, .....)
-
-* CamelTransport (CamelService): A way to send messages.
-
-....
-...
-
-
diff --git a/camel/README.COPYRIGHT b/camel/README.COPYRIGHT
deleted file mode 100644
index 91774e7339..0000000000
--- a/camel/README.COPYRIGHT
+++ /dev/null
@@ -1,47 +0,0 @@
-Important note for Camel hackers:
----------------------------------
-
-Camel has been a lot of work, and has been conceived to be general
-enough to be used outside the gnome-mailer. It is possible in the
-future that it is used in softwares with licenses incompatible with the
-LGPL. For this reason, the copyright has to be owned by a unique
-person.  Be sure, however, that Camel will always be available under
-the LGPL.  Significant authors will always be consulted before any
-special use of Camel. Moreover, in special situations, they may be
-given the authorization to use Camel with a license different than the
-LGPL.
-
-Thus, when adding code in Camel, always add the following lines at the
-begining of the file:
-
-/* 
- *
- * Copyright 199x, 200x Helix Code, Inc. (http://www.helixcode.com)
- * 
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-You may also want to add your name to the author name list after this
-header.
-
-Please contact me (Bertrand.Guiheneuf@aful.org) if you want to discuss
-this copyright issue.
-
-Happy hacking,
-
-Bertrand.
-
-
diff --git a/camel/README.HACKING b/camel/README.HACKING
deleted file mode 100644
index a4742ee7b8..0000000000
--- a/camel/README.HACKING
+++ /dev/null
@@ -1,14 +0,0 @@
-You want to hack on Camel ?
-
-Thanks. Camel aims at being the best messaging
-library for Linux and your help is welcome. 
-Please be sure to read the following files before
-commiting any change or sending any patch:
-
-CODING.STYLE
-README.COPYRIGHT
-
-
-Thanks.
-
-	Bertrand <Bertrand.Guiheneuf@aful.org>
\ No newline at end of file
diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
deleted file mode 100644
index 544dc04e28..0000000000
--- a/camel/broken-date-parser.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "broken-date-parser.h"
-
-/* prototypes for functions dealing with broken date formats */
-static GList *datetok (const gchar *date);
-static gint get_days_in_month (gint mon, gint year);
-static gint get_weekday (gchar *str);
-static gint get_month (gchar *str);
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-/*****************************************************************************
- * The following functions are here in the case of badly broken date formats *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
-
-typedef struct {
-	gchar dow[6];   /* day of week (should only need 4 chars) */
-	gint day;
-	gint mon;       /* 1->12 or 0 if invalid */
-	gint year;
-	gint hour;
-	gint min;
-	gint sec;
-	gchar zone[6];  /* time zone */
-} date_t;
-
-static
-GList *datetok (const gchar *date)
-{
-	GList *tokens = NULL;
-	gchar *token, *start, *end;
-	
-	start = (gchar *) date;
-	while (*start) {
-		/* find the end of this token */
-		for (end = start; *end && *end != ' '; end++);
-		
-		token = g_strndup (start, (end - start));
-		
-		if (token && *token)
-			tokens = g_list_append (tokens, token);
-		else
-			g_free (token);
-
-		if (*end)
-			start = end + 1;
-		else
-			break;
-	}
-
-	return tokens;
-}
-
-static gint
-get_days_in_month (gint mon, gint year)
-{
-	switch (mon) {
-	case 1: case 3: case 5: case 7: case 8: case 10: case 12:
-		return 31;
-	case 4: case 6: case 9: case 11:
-		return 30;
-	case 2:
-		if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-			return 29;
-		return 28;
-	default:
-		return 30;
-	}
-}
-
-static gint
-get_weekday (gchar *str)
-{
-	g_return_val_if_fail ((str != NULL), 0);
-
-	if (strncmp (str, "Mon", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Tue", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Wed", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Thu", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "Fri", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Sat", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Sun", 3) == 0) {
-		return 7;
-	}
-
-	return 0;  /* unknown week day */
-}
-
-static gint
-get_month (gchar *str)
-{
-	g_return_val_if_fail (str != NULL, 0);
-    
-	if (strncmp (str, "Jan", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Feb", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Mar", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Apr", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "May", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Jun", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Jul", 3) == 0) {
-		return 7;
-	} else if (strncmp (str, "Aug", 3) == 0) {
-		return 8;
-	} else if (strncmp (str, "Sep", 3) == 0) {
-		return 9;
-	} else if (strncmp (str, "Oct", 3) == 0) {
-		return 10;
-	} else if (strncmp (str, "Nov", 3) == 0) {
-		return 11;
-	} else if (strncmp (str, "Dec", 3) == 0) {
-		return 12;
-	}
-    
-	return 0;  /* unknown month */
-}
-
-gchar *
-parse_broken_date (const gchar *datestr)
-{
-	GList *tokens;
-	date_t date;
-	gchar *token, *ptr, *newdatestr;
-	guint len, i, retval;
-	gdouble tz = 0.0;
-
-	memset ((void*)&date, 0, sizeof (date_t));
-	g_return_val_if_fail (datestr != NULL, NULL);
-	
-	tokens = datetok (datestr);
-	len = g_list_length (tokens);
-	for (i = 0; i < len; i++) {
-		token = g_list_nth_data (tokens, i);
-		
-		if ((retval = get_weekday (token))) {
-			strncpy (date.dow, datestr, 4);
-		} else if ((retval = get_month (token))) {
-			date.mon = retval;
-		} else if (strlen (token) <= 2) {
-			/* this could be a 1 or 2 digit day of the month */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval && atoi (token) <= 31 && !date.day)  /* probably should find a better way */
-				date.day = atoi (token);
-			else                                            /* fubar'd client using a 2-digit year */
-				date.year = atoi (token) < 69 ? 2000 + atoi (token) : 1900 + atoi (token);
-		} else if (strlen (token) == 4) {
-			/* this could be the year... */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval)
-				date.year = atoi (token);
-		} else if (strchr (token, ':')) {
-			/* this must be the time: hh:mm:ss */
-			sscanf (token, "%d:%d:%d", &date.hour, &date.min, &date.sec);
-		} else if (*token == '-' || *token == '+') {
-			tz = atoi (token) / 100.0;
-		}
-	}
-	
-	g_list_free (tokens);
-	
-	/* adjust times based on time zones */
-	
-	if (tz != 0) {
-		/* check for time-zone shift */
-		if (tz > 0) {
-			/* correct for positive hours off of UCT */
-			date.hour -= (tz / 100);
-			tz = (gint)tz % 100;
-			
-			if (tz > 0) /* correct for positive minutes off of UCT */
-				date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-		} else {
-			if (tz < 0) {
-				/* correct for negative hours off of UCT */
-				tz = -tz;
-				date.hour += (tz / 100);
-				tz = -((gint)tz % 100);
-				
-				if (tz < 0)
-					date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-			}
-		}
-		
-		/* adjust seconds to proper range */
-		if (date.sec > 59) {
-			date.min += (date.sec / 60);
-			date.sec = (date.sec % 60);
-		}
-		
-		/* adjust minutes to proper range */
-		if (date.min > 59) {
-			date.hour += (date.min / 60);
-			date.min = (date.min % 60);
-		} else {
-			if (date.min < 0) {
-				date.min = -date.min;
-				date.hour -= (date.min / 60) - 1;
-				date.min = 60 - (date.min % 60);
-			}
-		}
-		
-		/* adjust hours to the proper randge */
-		if (date.hour > 23) {
-			date.day += (date.hour / 24);
-			date.hour -= (date.hour % 24);
-		} else {
-			if (date.hour < 0) {
-				date.hour = -date.hour;
-				date.day -= (date.hour / 24) - 1;
-				date.hour = 24 - (date.hour % 60);
-			}
-		}
-		
-		/* adjust days to the proper range */
-		while (date.day > get_days_in_month (date.mon, date.year)) {
-			date.day -= get_days_in_month (date.mon, date.year);
-			date.mon++;
-			if (date.mon > 12) {
-				date.year += (date.mon / 12);
-				date.mon = (date.mon % 12);
-				if (date.mon == 0) {
-					/* month sanity check */
-					date.mon = 12;
-					date.year -= 1;
-				}
-			}
-		}
-		
-		while (date.day < 1) {
-			date.day += get_days_in_month (date.mon, date.year);
-			date.mon--;
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-		
-		/* adjust months to the proper range */
-		if (date.mon > 12) {
-			date.year += (date.mon / 12);
-			date.mon = (date.mon % 12);
-			if (date.mon == 0) {
-				/* month sanity check */
-				date.mon = 12;
-				date.year -= 1;
-			}
-		} else {
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-	}
-
-	/* now lets print this date into a string with the correct format */
-	newdatestr = g_strdup_printf ("%s, %d %s %d %s%d:%s%d:%s%d -0000",
-				      date.dow, date.day, tz_months[date.mon-1],
-				      date.year,
-				      date.hour > 10 ? "" : "0", date.hour,
-				      date.min > 10 ? "" : "0", date.min,
-				      date.sec > 10 ? "" : "0", date.sec);
-	
-	return newdatestr;
-}
-
-/*****************************************************************************
- * This ends the code for the broken date parser...                          *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h
deleted file mode 100644
index 17000b3299..0000000000
--- a/camel/broken-date-parser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include <time.h>
-
-#include <ctype.h>
-
-/* prototypes for functions dealing with broken date formats */
-
-gchar *parse_broken_date (const gchar *datestr);
-
-
-
-
-
diff --git a/camel/camel-address.c b/camel/camel-address.c
deleted file mode 100644
index 8f7cea3d67..0000000000
--- a/camel/camel-address.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-address.h"
-
-
-static void camel_address_class_init (CamelAddressClass *klass);
-static void camel_address_init       (CamelAddress *obj);
-static void camel_address_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_address_parent;
-
-static void
-camel_address_class_init (CamelAddressClass *klass)
-{
-	camel_address_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-static void
-camel_address_init (CamelAddress *obj)
-{
-	obj->addresses = g_ptr_array_new();
-}
-
-static void
-camel_address_finalize (CamelObject *obj)
-{
-	camel_address_remove((CamelAddress *)obj, -1);
-}
-
-CamelType
-camel_address_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelAddress",
-					    sizeof (CamelAddress),
-					    sizeof (CamelAddressClass),
-					    (CamelObjectClassInitFunc) camel_address_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_address_init,
-					    (CamelObjectFinalizeFunc) camel_address_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_address_new:
- *
- * Create a new CamelAddress object.
- * 
- * Return value: A new CamelAddress widget.
- **/
-CamelAddress *
-camel_address_new (void)
-{
-	CamelAddress *new = CAMEL_ADDRESS ( camel_object_new (camel_address_get_type ()));
-	return new;
-}
-
-
-/**
- * camel_address_decode:
- * @a: An address.
- * @raw: Raw address description.
- * 
- * Construct a new address from a raw address field.
- * 
- * Return value: Returns the number of addresses found,
- * or -1 if the addresses could not be parsed fully.
- **/
-int
-camel_address_decode	(CamelAddress *a, const char *raw)
-{
-	g_return_val_if_fail(IS_CAMEL_ADDRESS(a), -1);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->decode(a, raw);
-}
-
-/**
- * camel_address_encode:
- * @a: 
- * 
- * Encode an address in a format suitable for a raw header.
- * 
- * Return value: The encoded address.
- **/
-char *
-camel_address_encode	(CamelAddress *a)
-{
-	g_return_val_if_fail(IS_CAMEL_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->encode(a);
-}
-
-/**
- * camel_address_remove:
- * @a: 
- * @index: The address to remove, use -1 to remove all address.
- * 
- * Remove an address by index, or all addresses.
- **/
-void
-camel_address_remove	(CamelAddress *a, int index)
-{
-	g_return_if_fail(IS_CAMEL_ADDRESS(a));
-
-	if (index == -1) {
-		for (index=a->addresses->len; index>-1; index--)
-			CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	} else {
-		CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	}
-}
diff --git a/camel/camel-address.h b/camel/camel-address.h
deleted file mode 100644
index a2d6fe34dd..0000000000
--- a/camel/camel-address.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_ADDRESS_H
-#define _CAMEL_ADDRESS_H
-
-#include <camel/camel-object.h>
-
-#define CAMEL_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)
-#define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)
-#define IS_CAMEL_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_address_get_type ())
-
-typedef struct _CamelAddressClass CamelAddressClass;
-
-struct _CamelAddress {
-	CamelObject parent;
-
-	GPtrArray *addresses;
-
-	struct _CamelAddressPrivate *priv;
-};
-
-struct _CamelAddressClass {
-	CamelObjectClass parent_class;
-
-	int   (*decode)		(CamelAddress *, const char *raw);
-	char *(*encode)		(CamelAddress *);
-
-	void  (*remove)		(CamelAddress *, int index);
-};
-
-guint		camel_address_get_type	(void);
-CamelAddress   *camel_address_new	(void);
-
-int	        camel_address_decode	(CamelAddress *, const char *);
-char	       *camel_address_encode	(CamelAddress *);
-
-void		camel_address_remove	(CamelAddress *, int index);
-
-#endif /* ! _CAMEL_ADDRESS_H */
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
deleted file mode 100644
index 18b603148a..0000000000
--- a/camel/camel-charset-map-private.h
+++ /dev/null
@@ -1,4345 +0,0 @@
-/* This file is automatically generated: DO NOT EDIT */
-
-static unsigned char m000[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xd0, 0xd0, 0xf2, 0xf7, 0xf2, 0xf0, 0xff, 
-	0xf7, 0xf0, 0xb0, 0xf0, 0xe0, 0xff, 0xf2, 0x94, 
-	0xf7, 0xf0, 0xf2, 0xf2, 0xd7, 0xd2, 0xd0, 0xf2, 
-	0xd7, 0xd0, 0x90, 0xe0, 0xd0, 0xf2, 0xd2, 0xc0, 
-	0xd2, 0xc7, 0xc7, 0xc6, 0xc7, 0xc4, 0xc4, 0xc3, 
-	0xc2, 0xc7, 0xc2, 0xc7, 0xc2, 0xc7, 0xc7, 0xc2, 
-	0x42, 0xc2, 0xe2, 0xc3, 0xc7, 0xc4, 0xc7, 0xc7, 
-	0xc4, 0xc2, 0xc7, 0xd6, 0xd7, 0x51, 0x50, 0x97, 
-	0x82, 0x87, 0x87, 0x86, 0x87, 0x84, 0x84, 0x83, 
-	0x82, 0x87, 0x82, 0x87, 0x82, 0x87, 0x87, 0x82, 
-	0x02, 0x82, 0x82, 0x93, 0x97, 0x94, 0x97, 0xd7, 
-	0x94, 0x92, 0x97, 0xd6, 0xd7, 0x51, 0x50, 0xf0, 
-};
-
-static unsigned char m001[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0x0f, 0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x2f, 
-	0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x0f, 
-	0xff, 0x28, 0x6a, 0x6e, 0x72, 0x28, 0x72, 0x7f, 
-	0x70, 0xfe, 0x28, 0x7a, 0x7a, 0x7f, 0x7e, 0x68, 
-	0xfb, 0x7a, 0xea, 0x6a, 0x70, 0x7a, 0x7e, 0xfb, 
-	0x70, 0x6a, 0x28, 0x7a, 0x62, 0x62, 0x62, 0x28, 
-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, 
-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, 
-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0x7a, 
-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x7f, 
-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, 
-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, 
-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0xfa, 
-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x2c, 
-};
-
-static unsigned char m002[256] = {
-	0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 
-	0x1f, 0x18, 0x58, 0x58, 0x18, 0x58, 0x18, 0x7c, 
-	0x78, 0x19, 0x18, 0x1c, 0x58, 0x18, 0x18, 0x18, 
-	0x79, 0x78, 0x19, 0x18, 0x78, 0x18, 0x78, 0x19, 
-	0x18, 0x18, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x02, 0x02, 0x1a, 0x1a, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x79, 
-	0x18, 0x18, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 
-};
-
-static unsigned char m010[256] = {
-	0x04, 0x04, 0x01, 0x01, 0x05, 0x05, 0x01, 0x01, 
-	0x02, 0x02, 0x02, 0x02, 0x05, 0x05, 0x01, 0x01, 
-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x05, 0x05, 0x01, 0x01, 0x02, 0x02, 0x82, 0x82, 
-	0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 
-	0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x82, 0x82, 0x00, 0x00, 0x02, 0x02, 0x04, 0x04, 
-	0x04, 0x01, 0x01, 0x04, 0x04, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x01, 
-	0x01, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x04, 0x04, 
-	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x83, 0x83, 
-	0x05, 0x05, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 
-	0x01, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x03, 0x03, 0x05, 0x05, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m011[256] = {
-	0x43, 0x43, 0x10, 0x10, 0x53, 0x53, 0x52, 0x52, 
-	0x00, 0x00, 0x04, 0x04, 0x53, 0x53, 0x10, 0x10, 
-	0x11, 0x11, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, 
-	0x53, 0x53, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x43, 0x43, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x43, 
-	0x01, 0x10, 0x10, 0x43, 0x43, 0x10, 0x10, 0x00, 
-	0x00, 0x52, 0x52, 0x52, 0x52, 0x43, 0x43, 0x10, 
-	0x10, 0x00, 0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 
-	0x10, 0x10, 0x28, 0x28, 0x10, 0x10, 0x42, 0x42, 
-	0x10, 0x10, 0x52, 0x52, 0x00, 0x00, 0x10, 0x10, 
-	0x7b, 0x7b, 0x10, 0x10, 0x10, 0x10, 0x01, 0x01, 
-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x10, 0x10, 
-	0x10, 0x10, 0x43, 0x43, 0x04, 0x04, 0x04, 0x04, 
-	0x2c, 0x52, 0x52, 0x52, 0x52, 0x7b, 0x7b, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m020[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x07, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m021[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x50, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x50, 0x00, 0x50, 0x20, 0x10, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m022[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m030[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m032[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m040[256] = {
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m041[256] = {
-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m042[256] = {
-	0x00, 0x61, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x60, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 
-	0x00, 0x61, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m050[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m052[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 
-	0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m060[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m0e2[256] = {
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m102[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m1e1[256] = {
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m200[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m201[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x70, 0x71, 0x00, 0x00, 0x00, 
-	0x70, 0x72, 0x70, 0x00, 0x72, 0x72, 0x72, 0x00, 
-	0x70, 0x70, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m202[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x64, 0x00, 0x00, 0x00, 0x04, 0x60, 0x40, 0x00, 
-	0x78, 0x78, 0x00, 0x00, 0x60, 0x60, 0x18, 0x18, 
-	0x60, 0x60, 0x01, 0x00, 0x00, 0x60, 0x64, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m210[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m211[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m212[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m221[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m222[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x61, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x01, 0x01, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m231[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m232[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m242[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m251[256] = {
-	0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m252[256] = {
-	0x61, 0x60, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x60, 
-	0x61, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x61, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m262[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m302[256] = {
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m322[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m332[256] = {
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4e2[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4f2[256] = {
-	0x20, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-};
-
-static unsigned char m502[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m512[256] = {
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m522[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m532[256] = {
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m542[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-};
-
-static unsigned char m552[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m562[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m572[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m582[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m592[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m5a2[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m5b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5c2[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m5d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m5e2[256] = {
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5f2[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m602[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m612[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m622[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m632[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m642[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m652[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m662[256] = {
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x20, 0x20, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m672[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m682[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m692[256] = {
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m6a2[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6c2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x20, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m6f2[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m702[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m712[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-};
-
-static unsigned char m722[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m732[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m742[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m752[256] = {
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m762[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x20, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m772[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m782[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m792[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7a2[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m7b2[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7c2[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m7d2[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7e2[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7f2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m802[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m812[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m822[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m832[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m842[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m852[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m862[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m872[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m882[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m892[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m8a2[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m8b2[256] = {
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m8c2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m8d2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m8e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m8f2[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m902[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m912[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x20, 0x20, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m922[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x20, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, 0x20, 
-};
-
-static unsigned char m932[256] = {
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x20, 0x00, 
-	0x60, 0x20, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m942[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m952[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m962[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m972[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m982[256] = {
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m992[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m9a2[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9b2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9c2[256] = {
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m9d2[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m9e2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m9f2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mf02[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mf92[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mfa2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mff2[256] = {
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-struct {
-	unsigned char *bits0;
-	unsigned char *bits1;
-	unsigned char *bits2;
-} camel_charmap[256] = {
-	{ m000, m001, m002, }, { m010, m011, 0, }, { m020, m021, m022, }, { m030, 0, m032, }, { m040, m041, m042, }, { m050, 0, m052, }, { m060, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, m0e2, }, { 0, 0, 0, }, 
-	{ 0, 0, m102, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, m1e1, 0, }, { 0, 0, 0, }, 
-	{ m200, m201, m202, }, { m210, m211, m212, }, { 0, m221, m222, }, { 0, m231, m232, }, { 0, 0, m242, }, { 0, m251, m252, }, { 0, 0, m262, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, m302, }, { 0, 0, 0, }, { 0, 0, m322, }, { 0, 0, m332, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, m4e2, }, { 0, 0, m4f2, }, 
-	{ 0, 0, m502, }, { 0, 0, m512, }, { 0, 0, m522, }, { 0, 0, m532, }, { 0, 0, m542, }, { 0, 0, m552, }, { 0, 0, m562, }, { 0, 0, m572, }, 
-	{ 0, 0, m582, }, { 0, 0, m592, }, { 0, 0, m5a2, }, { 0, 0, m5b2, }, { 0, 0, m5c2, }, { 0, 0, m5d2, }, { 0, 0, m5e2, }, { 0, 0, m5f2, }, 
-	{ 0, 0, m602, }, { 0, 0, m612, }, { 0, 0, m622, }, { 0, 0, m632, }, { 0, 0, m642, }, { 0, 0, m652, }, { 0, 0, m662, }, { 0, 0, m672, }, 
-	{ 0, 0, m682, }, { 0, 0, m692, }, { 0, 0, m6a2, }, { 0, 0, m6b2, }, { 0, 0, m6c2, }, { 0, 0, m6d2, }, { 0, 0, m6e2, }, { 0, 0, m6f2, }, 
-	{ 0, 0, m702, }, { 0, 0, m712, }, { 0, 0, m722, }, { 0, 0, m732, }, { 0, 0, m742, }, { 0, 0, m752, }, { 0, 0, m762, }, { 0, 0, m772, }, 
-	{ 0, 0, m782, }, { 0, 0, m792, }, { 0, 0, m7a2, }, { 0, 0, m7b2, }, { 0, 0, m7c2, }, { 0, 0, m7d2, }, { 0, 0, m7e2, }, { 0, 0, m7f2, }, 
-	{ 0, 0, m802, }, { 0, 0, m812, }, { 0, 0, m822, }, { 0, 0, m832, }, { 0, 0, m842, }, { 0, 0, m852, }, { 0, 0, m862, }, { 0, 0, m872, }, 
-	{ 0, 0, m882, }, { 0, 0, m892, }, { 0, 0, m8a2, }, { 0, 0, m8b2, }, { 0, 0, m8c2, }, { 0, 0, m8d2, }, { 0, 0, m8e2, }, { 0, 0, m8f2, }, 
-	{ 0, 0, m902, }, { 0, 0, m912, }, { 0, 0, m922, }, { 0, 0, m932, }, { 0, 0, m942, }, { 0, 0, m952, }, { 0, 0, m962, }, { 0, 0, m972, }, 
-	{ 0, 0, m982, }, { 0, 0, m992, }, { 0, 0, m9a2, }, { 0, 0, m9b2, }, { 0, 0, m9c2, }, { 0, 0, m9d2, }, { 0, 0, m9e2, }, { 0, 0, m9f2, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, mf02, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 
-	{ 0, 0, 0, }, { 0, 0, mf92, }, { 0, 0, mfa2, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, mff2, }, 
-};
-
-struct {
-	const char *name;
-	unsigned int bit;
-} camel_charinfo[] = {
-	{ "iso-8859-2", 0x0001 },
-	{ "iso-8859-3", 0x0002 },
-	{ "iso-8859-4", 0x0004 },
-	{ "iso-8859-5", 0x0008 },
-	{ "iso-8859-6", 0x0010 },
-	{ "iso-8859-7", 0x0020 },
-	{ "iso-8859-8", 0x0040 },
-	{ "iso-8859-9", 0x0080 },
-	{ "iso-8859-10", 0x0100 },
-	{ "iso-8859-13", 0x0200 },
-	{ "iso-8859-14", 0x0400 },
-	{ "iso-8859-15", 0x0800 },
-	{ "windows-1250", 0x1000 },
-	{ "windows-1252", 0x2000 },
-	{ "windows-1257", 0x4000 },
-	{ "koi8-r", 0x8000 },
-	{ "koi8-u", 0x10000 },
-	{ "tis620.2533-1", 0x20000 },
-	{ "armscii-8", 0x40000 },
-	{ "georgian-academy", 0x80000 },
-	{ "georgian-ps", 0x100000 },
-	{ "CP932", 0x200000 },
-	{ "Shift-JIS", 0x400000 },
-};
-
-#define charset_mask(x) \
-	(camel_charmap[(x)>>8].bits0?camel_charmap[(x)>>8].bits0[(x)&0xff]<<0:0)	\
-	| (camel_charmap[(x)>>8].bits1?camel_charmap[(x)>>8].bits1[(x)&0xff]<<8:0)	\
-	| (camel_charmap[(x)>>8].bits2?camel_charmap[(x)>>8].bits2[(x)&0xff]<<16:0)
-
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
deleted file mode 100644
index c0b697290b..0000000000
--- a/camel/camel-charset-map.c
+++ /dev/null
@@ -1,270 +0,0 @@
-
-#include <stdio.h>
-
-/*
-  if you want to build the charset map, add the root directory of
-  libunicode to the include path and define BUILD_MAP,
-  then run it as 
-    ./a.out > camel-charset-map-private.h
-
-  The tables genereated work like this:
-
-   An indirect array for each page of unicode character
-   Each array element has an indirect pointer to one of the bytes of
-   the generated bitmask.
-*/
-
-#ifdef BUILD_MAP
-#include "iso/iso8859-2.h"
-#include "iso/iso8859-3.h"
-#include "iso/iso8859-4.h"
-#include "iso/iso8859-5.h"
-#include "iso/iso8859-6.h"
-#include "iso/iso8859-7.h"
-#include "iso/iso8859-8.h"
-#include "iso/iso8859-9.h"
-#include "iso/iso8859-10.h"
-#include "iso/iso8859-13.h"
-#include "iso/iso8859-14.h"
-#include "iso/iso8859-15.h"
-#include "iso/windows-1250.h"
-#include "iso/windows-1252.h"
-#include "iso/windows-1257.h"
-#include "iso/koi8-r.h"
-#include "iso/koi8-u.h"
-#include "iso/tis620.2533-1.h"
-#include "iso/armscii-8.h"
-#include "iso/georgian-academy.h"
-#include "iso/georgian-ps.h"
-#include "msft/cp932.h"
-#include "jis/shiftjis.h"
-
-static struct {
-	unsigned short *table;
-	char *name;
-	int type;		/* type of table */
-	unsigned int bit;	/* assigned bit */
-} tables[] = {
-	{ iso8859_2_table, "iso-8859-2", 0, 0} ,
-	{ iso8859_3_table, "iso-8859-3", 0, 0} ,
-	{ iso8859_4_table, "iso-8859-4", 0, 0},
-	{ iso8859_5_table, "iso-8859-5", 0, 0},
-/* apparently -6 has special digits? */
-	{ iso8859_6_table, "iso-8859-6", 0, 0},
-	{ iso8859_7_table, "iso-8859-7", 0, 0},
-	{ iso8859_8_table, "iso-8859-8", 0, 0},
-	{ iso8859_9_table, "iso-8859-9", 0, 0},
-	{ iso8859_10_table, "iso-8859-10", 0, 0},
-	{ iso8859_13_table, "iso-8859-13", 0, 0},
-	{ iso8859_14_table, "iso-8859-14", 0, 0},
-	{ iso8859_15_table, "iso-8859-15", 0, 0},
-	{ windows_1250_table, "windows-1250", 0, 0},
-	{ windows_1252_table, "windows-1252", 0, 0},
-	{ windows_1257_table, "windows-1257", 0, 0},
-	{ koi8_r_table, "koi8-r", 0, 0},
-	{ koi8_u_table, "koi8-u", 0, 0},
-	{ tis_620_table, "tis620.2533-1", 0, 0},
-	{ armscii_8_table, "armscii-8", 0, 0},
-	{ georgian_academy_table, "georgian-academy", 0, 0},
-	{ georgian_ps_table, "georgian-ps", 0, 0},
-	{ cp932_table, "CP932", 1, 0},
-	{ sjis_table, "Shift-JIS", 1, 0},
-	{ 0, 0}
-};
-
-unsigned int encoding_map[256 * 256];
-
-static void
-add_bigmap(unsigned short **table, int bit)
-{
-	int i;
-	int j;
-
-	for (i=0;i<256;i++) {
-		unsigned short *tab = table[i];
-		if (tab) {
-			for (j=0;j<256;j++) {
-				if (tab[j])
-					encoding_map[tab[j]] |= bit;
-			}
-		}
-	}
-}
-
-void main(void)
-{
-	int i, j;
-	unsigned short *tab;
-	int max, min;
-	int bit = 0x01;
-	int k;
-	int bytes;
-
-#if 0
-	/* iso-latin-1 (not needed-detected in code) */
-	for (i=0;i<256;i++) {
-		encoding_map[i] |= bit;
-	}
-	bit <<= 1;
-#endif
-
-	/* dont count the terminator */
-	bytes = ((sizeof(tables)/sizeof(tables[0]))+7-1)/8;
-
-	/* the other latin charsets */
-	for (j=0;tables[j].table;j++) {
-		switch (tables[j].type) {
-		case 0:		/* table from 128-256 */
-			tab = tables[j].table;
-			for (i=0;i<128;i++) {
-				/* 0-127 is the common */
-				encoding_map[i] |= bit;
-				encoding_map[tab[i]] |= bit;
-			}
-			break;
-		case 1:		/* sparse table */
-			add_bigmap(tables[j].table, bit);
-			break;
-		}
-		tables[j].bit = bit;
-		bit <<= 1;
-	}
-
-	printf("/* This file is automatically generated: DO NOT EDIT */\n\n");
-
-	for (i=0;i<256;i++) {
-		/* first, do we need this block? */
-		for (k=0;k<bytes;k++) {
-			for (j=0;j<256;j++) {
-				if ((encoding_map[i*256 + j] & (0xff << (k*8))) != 0)
-					break;
-			}
-			if (j < 256) {
-				/* yes, dump it */
-				printf("static unsigned char m%02x%x[256] = {\n\t", i, k);
-				for (j=0;j<256;j++) {
-					printf("0x%02x, ", (encoding_map[i*256+j] >> (k*8)) & 0xff );
-					if (((j+1)&7) == 0 && j<255)
-						printf("\n\t");
-				}
-				printf("\n};\n\n");
-			}
-		}
-	}
-
-	printf("struct {\n");
-	for (k=0;k<bytes;k++) {
-		printf("\tunsigned char *bits%d;\n", k);
-	}
-	printf("} camel_charmap[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		/* first, do we need this block? */
-		printf("{ ");
-		for (k=0;k<bytes;k++) {
-			for (j=0;j<256;j++) {
-				if ((encoding_map[i*256 + j] & (0xff << (k*8))) != 0)
-					break;
-			}
-			if (j < 256) {
-				printf("m%02x%x, ", i, k);
-			} else {
-				printf("0, ");
-			}
-		}
-		printf("}, ");
-		if (((i+1)&7) == 0 && i<255)
-			printf("\n\t");
-	}
-	printf("\n};\n\n");
-
-	printf("struct {\n\tconst char *name;\n\tunsigned int bit;\n} camel_charinfo[] = {\n");
-	for (j=0;tables[j].table;j++) {
-		printf("\t{ \"%s\", 0x%04x },\n", tables[j].name, tables[j].bit);
-	}
-	printf("};\n\n");
-
-	printf("#define charset_mask(x) \\\n");
-	for (k=0;k<bytes;k++) {
-		if (k!=0)
-			printf("\t| ");
-		else
-			printf("\t");
-		printf("(camel_charmap[(x)>>8].bits%d?camel_charmap[(x)>>8].bits%d[(x)&0xff]<<%d:0)", k, k, k*8);
-		if (k<bytes-1)
-			printf("\t\\\n");
-	}
-	printf("\n\n");
-
-}
-
-#else
-
-#include "camel-charset-map.h"
-#include "camel-charset-map-private.h"
-#include <unicode.h>
-#include <glib.h>
-
-unsigned int
-camel_charset_mask(unsigned int c)
-{
-	if (c>0xffff)
-		return 0;
-
-	return charset_mask(c);
-}
-
-/* gets the best charset from the mask of chars in it */
-const char *
-camel_charset_best_mask(unsigned int mask)
-{
-	int i;
-
-	for (i=0;i<sizeof(camel_charinfo)/sizeof(camel_charinfo[0]);i++) {
-		if (camel_charinfo[i].bit & mask)
-			return camel_charinfo[i].name;
-	}
-	return "UTF-8";
-}
-
-/* finds the minimum charset for this string NULL means US-ASCII */
-const char *
-camel_charset_best(const char *in, int len)
-{
-	unsigned int mask = ~0;
-	int level = 0;
-	const char *inptr = in, *inend = in+len;
-
-	/* check what charset a given string will fit in */
-	while (inptr < inend) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		if (c<=0xffff) {
-			mask |= camel_charset_mask(c);
-		
-			if (c>=128 && c<256)
-				level = MAX(level, 1);
-			else if (c>=256)
-				level = MAX(level, 2);
-		} else {
-			mask = 0;
-			level = MAX(level, 2);
-		}
-	}
-
-	if (level == 1)
-		return "ISO-8859-1";
-	else if (level == 2)
-		return camel_charset_best_mask(mask);
-	else
-		return NULL;
-}
-
-
-#endif /* !BUILD_MAP */
-
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
deleted file mode 100644
index d5ce0799b8..0000000000
--- a/camel/camel-charset-map.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_CHARSET_MAP_H
-#define _CAMEL_CHARSET_MAP_H
-
-unsigned int camel_charset_mask(unsigned int c);
-const char *camel_charset_best(const char *in, int len);
-const char *camel_charset_best_mask(unsigned int mask);
-
-#endif /* ! _CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
deleted file mode 100644
index 52cf60bd33..0000000000
--- a/camel/camel-data-wrapper.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-data-wrapper.c : Abstract class for a data_wrapper */
-
-/*
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-
-#include <errno.h>
-
-#define d(x)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelDataWrapper */
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static int construct_from_stream(CamelDataWrapper *, CamelStream *);
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type);
-static gchar *get_mime_type (CamelDataWrapper *data_wrapper);
-static GMimeContentField *get_mime_type_field (CamelDataWrapper *data_wrapper);
-static void set_mime_type_field (CamelDataWrapper *data_wrapper, GMimeContentField *mime_type);
-
-static void
-camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	/* virtual method definition */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-	camel_data_wrapper_class->set_mime_type = set_mime_type;
-	camel_data_wrapper_class->get_mime_type = get_mime_type;
-	camel_data_wrapper_class->get_mime_type_field = get_mime_type_field;
-	camel_data_wrapper_class->set_mime_type_field = set_mime_type_field;
-
-	camel_data_wrapper_class->construct_from_stream = construct_from_stream;
-}
-
-static void
-camel_data_wrapper_init (gpointer object, gpointer klass)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-
-	camel_data_wrapper->mime_type = gmime_content_field_new (NULL, NULL);
-}
-
-static void
-camel_data_wrapper_finalize (CamelObject *object)
-{
-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);
-
-	if (camel_data_wrapper->mime_type)
-		gmime_content_field_unref (camel_data_wrapper->mime_type);
-
-	if (camel_data_wrapper->stream)
-		camel_object_unref (CAMEL_OBJECT (camel_data_wrapper->stream));
-}
-
-CamelType
-camel_data_wrapper_get_type (void)
-{
-	static CamelType camel_data_wrapper_type = CAMEL_INVALID_TYPE;
-
-	if (camel_data_wrapper_type == CAMEL_INVALID_TYPE) {
-		camel_data_wrapper_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelDataWrapper",
-							       sizeof (CamelDataWrapper),
-							       sizeof (CamelDataWrapperClass),
-							       (CamelObjectClassInitFunc) camel_data_wrapper_class_init,
-							       NULL,
-							       (CamelObjectInitFunc) camel_data_wrapper_init,
-							       (CamelObjectFinalizeFunc) camel_data_wrapper_finalize);
-	}
-
-	return camel_data_wrapper_type;
-}
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	if (data_wrapper->stream == NULL) {
-		return -1;
-	}
-
-	if (camel_stream_reset (data_wrapper->stream) == -1)
-		return -1;
-
-	return camel_stream_write_to_stream (data_wrapper->stream, stream);
-}
-
-CamelDataWrapper *
-camel_data_wrapper_new(void)
-{
-	return (CamelDataWrapper *)camel_object_new(camel_data_wrapper_get_type());
-}
-
-/**
- * camel_data_wrapper_write_to_stream:
- * @data_wrapper: a data wrapper
- * @stream: stream for data to be written to
- * @ex: a CamelException
- *
- * Writes the data content to @stream in a machine-independent format
- * appropriate for the data. It should be possible to construct an
- * equivalent data wrapper object later by passing this stream to
- * camel_data_construct_from_stream().
- *
- * Return value: the number of bytes written, or -1 if an error occurs.
- **/
-int
-camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
-				    CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CDW_CLASS (data_wrapper)->write_to_stream (data_wrapper, stream);
-}
-
-static int
-construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	if (data_wrapper->stream)
-		camel_object_unref((CamelObject *)data_wrapper->stream);
-
-	data_wrapper->stream = stream;
-	camel_object_ref (CAMEL_OBJECT (stream));
-	return 0;
-}
-
-/**
- * camel_data_wrapper_construct_from_stream:
- * @data_wrapper: a data wrapper
- * @stream: A stream that can be read from.
- *
- * Constructs the content of the data wrapper from the
- * supplied @stream.
- *
- * Return value: -1 on error.
- **/
-int
-camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,
-					  CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CDW_CLASS (data_wrapper)->construct_from_stream (data_wrapper, stream);
-}
-
-
-static void
-set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)
-{
-	gmime_content_field_construct_from_string (data_wrapper->mime_type,
-						   mime_type);
-}
-
-/**
- * camel_data_wrapper_set_mime_type:
- * @data_wrapper: a data wrapper
- * @mime_type: the text representation of a MIME type
- *
- * This sets the data wrapper's MIME type.
- * It might fail, but you won't know. It will allow you to set
- * Content-Type parameters on the data wrapper, which are meaningless.
- * You should not be allowed to change the MIME type of a data wrapper
- * that contains data, or at least, if you do, it should invalidate the
- * data.
- **/
-void
-camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,
-				  const gchar *mime_type)
-{
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
-	g_return_if_fail (mime_type != NULL);
-
-	CDW_CLASS (data_wrapper)->set_mime_type (data_wrapper, mime_type);
-}
-
-static gchar *
-get_mime_type (CamelDataWrapper *data_wrapper)
-{
-	return gmime_content_field_get_mime_type (data_wrapper->mime_type);
-}
-
-/**
- * camel_data_wrapper_get_mime_type:
- * @data_wrapper: a data wrapper
- *
- * Return value: the text form of the data wrapper's MIME type
- **/
-gchar *
-camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
-
-	return CDW_CLASS (data_wrapper)->get_mime_type (data_wrapper);
-}
-
-
-static GMimeContentField *
-get_mime_type_field (CamelDataWrapper *data_wrapper)
-{
-	return data_wrapper->mime_type;
-}
-
-/**
- * camel_data_wrapper_get_mime_type_field:
- * @data_wrapper: a data wrapper
- *
- * Return value: the parsed form of the data wrapper's MIME type
- **/
-GMimeContentField *
-camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper)
-{
-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);
-
-	return CDW_CLASS (data_wrapper)->get_mime_type_field (data_wrapper);
-}
-
-/**
- * camel_data_wrapper_set_mime_type_field:
- * @data_wrapper: a data wrapper
- * @mime_type: the parsed representation of a MIME type
- *
- * This sets the data wrapper's MIME type. It suffers from the same
- * flaws as camel_data_wrapper_set_mime_type.
- **/
-static void
-set_mime_type_field (CamelDataWrapper *data_wrapper,
-		     GMimeContentField *mime_type)
-{
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));
-	g_return_if_fail (mime_type != NULL);
-
-	if (data_wrapper->mime_type)
-		gmime_content_field_unref (data_wrapper->mime_type);
-	data_wrapper->mime_type = mime_type;
-	if (mime_type)
-		gmime_content_field_ref (data_wrapper->mime_type);
-}
-
-void
-camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
-					GMimeContentField *mime_type)
-{
-	CDW_CLASS (data_wrapper)->set_mime_type_field (data_wrapper, mime_type);
-}
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
deleted file mode 100644
index ff4dda649f..0000000000
--- a/camel/camel-data-wrapper.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-data-wrapper.h : Abstract class for a data wrapper */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_DATA_WRAPPER_H
-#define CAMEL_DATA_WRAPPER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/gmime-content-field.h>
-
-#define CAMEL_DATA_WRAPPER_TYPE     (camel_data_wrapper_get_type ())
-#define CAMEL_DATA_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))
-#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))
-#define CAMEL_IS_DATA_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
-
-struct _CamelDataWrapper
-{
-	CamelObject parent_object;
-
-	GMimeContentField *mime_type;
-	CamelStream *stream;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */
-	void                (*set_output_stream)      (CamelDataWrapper *data_wrapper,
-						       CamelStream *stream);
-	CamelStream *       (*get_output_stream)      (CamelDataWrapper *data_wrapper);
-
-	void                (*set_mime_type)          (CamelDataWrapper *data_wrapper,
-						       const gchar * mime_type);
-	gchar *             (*get_mime_type)          (CamelDataWrapper *data_wrapper);
-	GMimeContentField * (*get_mime_type_field)    (CamelDataWrapper *data_wrapper);
-	void                (*set_mime_type_field)    (CamelDataWrapper *data_wrapper,
-						       GMimeContentField *mime_type_field);
-
-	int                 (*write_to_stream)        (CamelDataWrapper *data_wrapper,
-						       CamelStream *stream);
-
-	int                 (*construct_from_stream)  (CamelDataWrapper *data_wrapper,
-						       CamelStream *);
-} CamelDataWrapperClass;
-
-/* Standard Camel function */
-CamelType camel_data_wrapper_get_type (void);
-
-/* public methods */
-CamelDataWrapper *  camel_data_wrapper_new(void);
-int                 camel_data_wrapper_write_to_stream          (CamelDataWrapper *data_wrapper,
-								 CamelStream *stream);
-void                camel_data_wrapper_set_mime_type            (CamelDataWrapper *data_wrapper,
-								 const gchar *mime_type);
-gchar *             camel_data_wrapper_get_mime_type            (CamelDataWrapper *data_wrapper);
-GMimeContentField * camel_data_wrapper_get_mime_type_field      (CamelDataWrapper *data_wrapper);
-void                camel_data_wrapper_set_mime_type_field      (CamelDataWrapper *data_wrapper,
-								 GMimeContentField *mime_type);
-
-int                 camel_data_wrapper_construct_from_stream    (CamelDataWrapper *data_wrapper, CamelStream *stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_DATA_WRAPPER_H */
diff --git a/camel/camel-exception-list.def b/camel/camel-exception-list.def
deleted file mode 100644
index 8fe1e268cf..0000000000
--- a/camel/camel-exception-list.def
+++ /dev/null
@@ -1,37 +0,0 @@
-/* WARNING: Exceptions MUST NOT be renumbered: they need to be
- * consistent across libraries compiled at different times.
- * Categories should be widely separated, old unused exceptions can
- * never be deleted, and new exceptions can be added only to the
- * ends of categories.
- */
-
-CAMEL_EXCEPTION_NONE = 0,
-
-/* Generic exceptions */
-CAMEL_EXCEPTION_INVALID_PARAM,
-CAMEL_EXCEPTION_SYSTEM,
-CAMEL_EXCEPTION_USER_CANCEL,
-
-/* CamelFolderException */
-CAMEL_EXCEPTION_FOLDER_NULL = 100,
-CAMEL_EXCEPTION_FOLDER_INVALID,
-CAMEL_EXCEPTION_FOLDER_INVALID_STATE,
-CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
-CAMEL_EXCEPTION_FOLDER_NON_UID,
-CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
-CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
-CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,
-
-/* CamelStoreException */
-CAMEL_EXCEPTION_STORE_NULL = 200,
-CAMEL_EXCEPTION_STORE_INVALID,
-CAMEL_EXCEPTION_STORE_NO_FOLDER,
-
-/* CamelServiceException */
-CAMEL_EXCEPTION_SERVICE_NULL = 300,
-CAMEL_EXCEPTION_SERVICE_INVALID,
-CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
deleted file mode 100644
index cf5daff9d3..0000000000
--- a/camel/camel-exception.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-execpetion.c : exception utils */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-exception.h"
-
-
-
-/**
- * camel_exception_new: allocate a new exception object. 
- * 
- * Create and returns a new exception object.
- * 
- * 
- * Return value: The newly allocated exception object.
- **/
-CamelException *
-camel_exception_new (void)
-{
-	CamelException *ex;
-
-	ex = g_new (CamelException, 1);
-	ex->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	ex->id = CAMEL_EXCEPTION_NONE;
-
-	return ex;
-}
-
-/**
- * camel_exception_init: init a (statically allocated) exception. 
- * 
- * Init an exception. This routine is mainly
- * useful when using a statically allocated
- * exception. 
- * 
- * 
- **/
-void
-camel_exception_init (CamelException *ex)
-{
-	ex->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	ex->id = CAMEL_EXCEPTION_NONE;
-}
-
-
-/**
- * camel_exception_clear: Clear an exception
- * @exception: the exception object
- * 
- * Clear an exception, that is, set the 
- * exception ID to CAMEL_EXCEPTION_NONE and
- * free the description text.
- * If the exception is NULL, this funtion just
- * returns.
- **/
-void 
-camel_exception_clear (CamelException *exception)
-{
-	if (!exception) return;
-	
-	/* free the description text */
-	if (exception->desc)
-		g_free (exception->desc);
-	exception->desc = NULL;
-
-	/* set the Exception Id to NULL */
-	exception->id = CAMEL_EXCEPTION_NONE;
-}
-
-
-
-
-/**
- * camel_exception_free: Free an exception 
- * @exception: The exception object to free
- * 
- * Free an exception object. If the exception
- * is NULL, nothing is done, the routine simply
- * returns.
- **/
-void 
-camel_exception_free (CamelException *exception)
-{
-	if (!exception) return;
-	
-	/* free the description text */
-	if (exception->desc)
-		g_free (exception->desc);
-       	/* free the exeption itself */
-	g_free (exception);
-}
-
-/**
- * camel_exception_set: set an exception 
- * @ex: exception object 
- * @id: exception id 
- * @desc: textual description of the exception
- * 
- * Set the value of an exception. The exception id is 
- * a unique number representing the exception. The 
- * textual description is a small text explaining 
- * what happened and provoked the exception.
- *
- * When @ex is NULL, nothing is done, this routine
- * simply returns.
- *
- **/
-void
-camel_exception_set (CamelException *ex,
-		     ExceptionId id,
-		     const char *desc)
-{
-	/* if no exception is given, do nothing */
-	if (!ex) return;
-
-	ex->id = id;
-
-	/* remove the previous exception description */
-	if (ex->desc)
-		g_free (ex->desc);
-	ex->desc = g_strdup (desc);
-}
-
-
-/**
- * camel_exception_setv: set an exception 
- * @ex: exception object 
- * @id: exception id 
- * @format: format of the description string. The format string is
- * used as in printf().
- * 
- * Set the value of an exception. The exception id is 
- * a unique number representing the exception. The 
- * textual description is a small text explaining 
- * what happened and provoked the exception. 
- * In this version, the string is created from the format 
- * string and the variable argument list.
- *
- * It is safe to say:
- *   camel_exception_setv (ex, ..., camel_exception_get_description (ex), ...);
- *
- * When @ex is NULL, nothing is done, this routine
- * simply returns.
- *
- **/
-void
-camel_exception_setv (CamelException *ex,
-		      ExceptionId id,
-		      const char *format, 
-		      ...)
-{
-	va_list args;
-	gchar *tmp_desc_string;
-	
-	
-	/* if no exception is given, do nothing */
-	if (!ex) return;
-	
-	
-	/* create the temporary exception string */
-	va_start(args, format);
-	tmp_desc_string = g_strdup_vprintf (format, args);
-	va_end (args);
-	
-	
-	/* now set the exception. We don't call
-	   camel_exception_set because we want to 
-	   avoid a useless strdup () */
-	ex->id = id;
-	
-	/* remove the previous exception description */
-	if (ex->desc)
-		g_free (ex->desc);
-	ex->desc = g_strdup (tmp_desc_string);
-	
-}
-
-
-
-
-
-
-
-/**
- * camel_exception_xfer: transfer an exception
- * @ex_dst: Destination exception object 
- * @ex_src: Source exception object
- * 
- * Transfer the content of an exception from
- * an exception object to another. 
- * The destination exception receives the id and
- * the description text of the source exception. 
- **/
-void 
-camel_exception_xfer (CamelException *ex_dst,
-		      CamelException *ex_src)
-{
-	if (ex_dst->desc)
-		g_free (ex_dst->desc);
-
-	ex_dst->id = ex_src->id;
-	ex_dst->desc = ex_src->desc;
-
-	ex_src->desc = NULL;
-	ex_src->id = CAMEL_EXCEPTION_NONE;
-}
-
-
-
-
-
-
-
-/**
- * camel_exception_get_id: get the exception id
- * @ex: The exception object
- * 
- * Return the id of an exception. 
- * If @ex is NULL, return CAMEL_EXCEPTION_NONE;
- * 
- * Return value: Exception ID.
- **/
-ExceptionId
-camel_exception_get_id (CamelException *ex)
-{
-	if (ex)
-		return ex->id;
-	else 
-		return CAMEL_EXCEPTION_NONE;
-}
-
-
-
-
-/**
- * camel_exception_get_description: get the description of an exception.
- * @ex: The exception object
- * 
- * Return the exception description text. 
- * If @ex is NULL, return NULL;
- * 
- * 
- * Return value: Exception description text.
- **/
-const gchar *
-camel_exception_get_description (CamelException *ex)
-{
-	if (ex)
-		return ex->desc;
-	else 
-		return NULL;
-}
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
deleted file mode 100644
index d5c93e5941..0000000000
--- a/camel/camel-exception.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-execpetion.h : exception utils */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef CAMEL_EXCEPTION_H
-#define CAMEL_EXCEPTION_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-typedef enum {
-#include "camel-exception-list.def"
-
-} ExceptionId;
-
-
-struct _CamelException {
-	/* do not access the fields directly */
-	ExceptionId id;
-	char *desc;
-
-};
-
-
-
-/* creation and destruction functions */
-CamelException *          camel_exception_new           (void);
-void                      camel_exception_free          (CamelException *exception);
-void                      camel_exception_init          (CamelException *ex);
-
-
-/* exception content manipulation */
-void                      camel_exception_clear         (CamelException *exception);
-void                      camel_exception_set           (CamelException *ex,
-							 ExceptionId id,
-							 const char *desc);
-void                      camel_exception_setv          (CamelException *ex,
-							 ExceptionId id,
-							 const char *format,  
-							 ...);
-
-
-/* exception content transfer */
-void                      camel_exception_xfer          (CamelException *ex_dst,
-							 CamelException *ex_src);
-
-
-/* exception content retrieval */
-ExceptionId               camel_exception_get_id        (CamelException *ex);
-const gchar *             camel_exception_get_description (CamelException *ex);
-
-#define camel_exception_is_set(ex) (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_EXCEPTION_H */
-
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
deleted file mode 100644
index ff9539c9ec..0000000000
--- a/camel/camel-folder-search.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-/* This is a helper class for folders to implement the search function.
-   It implements enough to do basic searches on folders that can provide
-   an in-memory summary and a body index. */
-
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "camel-folder-search.h"
-#include "string-utils.h"
-
-#include "camel-exception.h"
-#include "camel-medium.h"
-#include "camel-multipart.h"
-#include "camel-mime-message.h"
-#include "gmime-content-field.h"
-#include "camel-stream-mem.h"
-
-#define d(x) x
-#define r(x) x
-
-struct _CamelFolderSearchPrivate {
-};
-
-#define _PRIVATE(o) (((CamelFolderSearch *)(o))->priv)
-
-static ESExpResult *search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search);
-static ESExpResult *search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-static ESExpResult *search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-static ESExpResult *search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-static ESExpResult *search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);
-
-static void camel_folder_search_class_init (CamelFolderSearchClass *klass);
-static void camel_folder_search_init       (CamelFolderSearch *obj);
-static void camel_folder_search_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_folder_search_parent;
-
-static void
-camel_folder_search_class_init (CamelFolderSearchClass *klass)
-{
-	camel_folder_search_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->match_all = search_match_all;
-	klass->body_contains = search_body_contains;
-	klass->header_contains = search_header_contains;
-	klass->user_tag = search_user_tag;
-	klass->user_flag = search_user_flag;
-	klass->get_sent_date = search_get_sent_date;
-	klass->get_received_date = search_get_received_date;
-	klass->get_current_date = search_get_current_date;
-}
-
-static void
-camel_folder_search_init (CamelFolderSearch *obj)
-{
-	struct _CamelFolderSearchPrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	obj->sexp = e_sexp_new();
-}
-
-static void
-camel_folder_search_finalize (CamelObject *obj)
-{
-	CamelFolderSearch *search = (CamelFolderSearch *)obj;
-	if (search->sexp)
-		camel_object_unref((CamelObject *)search->sexp);
-
-	g_free(search->last_search);
-}
-
-CamelType
-camel_folder_search_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelFolderSearch",
-					    sizeof (CamelFolderSearch),
-					    sizeof (CamelFolderSearchClass),
-					    (CamelObjectClassInitFunc) camel_folder_search_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_folder_search_init,
-					    (CamelObjectFinalizeFunc) camel_folder_search_finalize);
-	}
-	
-	return type;
-}
-
-#ifdef offsetof
-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))
-#else
-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &((type *) 0)->field))
-#endif
-
-struct {
-	char *name;
-	int offset;
-	int flags;		/* 0x02 = immediate, 0x01 = always enter */
-} builtins[] = {
-	/* these have default implementations in e-sexp */
-	{ "and", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },
-	{ "or", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },
-	{ "not", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, not), 2 },
-	{ "<", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },
-	{ ">", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },
-	{ "=", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, eq), 2 },
-
-	/* these we have to use our own default if there is none */
-	/* they should all be defined in the language? so it poarses, or should they not?? */
-	{ "match-all", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, match_all), 3 },
-	{ "body-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, body_contains), 1 },
-	{ "header-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_contains), 1 },
-	{ "user-tag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_tag), 1 },
-	{ "user-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 1 },
-	{ "get-sent-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_sent_date), 1 },
-	{ "get-received-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_received_date), 1 },
-	{ "get-current-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_current_date), 1 }
-};
-
-void
-camel_folder_search_construct (CamelFolderSearch *search)
-{
-	int i;
-	CamelFolderSearchClass *klass = (CamelFolderSearchClass *)CAMEL_OBJECT_GET_CLASS(search);
-
-	for (i=0;i<sizeof(builtins)/sizeof(builtins[0]);i++) {
-		void *func;
-		/* c is sure messy sometimes */
-		func = *((void **)(((char *)klass)+builtins[i].offset));
-		if (func == NULL && builtins[i].flags&1) {
-			g_warning("Search class doesn't implement '%s' method: %s", builtins[i].name, camel_type_to_name(CAMEL_OBJECT_GET_CLASS(search)->s.type));
-			func = (void *)search_dummy;
-		}
-		if (func != NULL) {
-			if (builtins[i].flags&2) {
-				e_sexp_add_ifunction(search->sexp, 0, builtins[i].name, (ESExpIFunc *)func, search);
-			} else {
-				e_sexp_add_function(search->sexp, 0, builtins[i].name, (ESExpFunc *)func, search);
-			}
-		}
-	}
-}
-
-/**
- * camel_folder_search_new:
- *
- * Create a new CamelFolderSearch object.
- * 
- * A CamelFolderSearch is a subclassable, extensible s-exp
- * evaluator which enforces a particular set of s-expressions.
- * Particular methods may be overriden by an implementation to
- * implement a search for any sort of backend.
- *
- * Return value: A new CamelFolderSearch widget.
- **/
-CamelFolderSearch *
-camel_folder_search_new (void)
-{
-	CamelFolderSearch *new = CAMEL_FOLDER_SEARCH ( camel_object_new (camel_folder_search_get_type ()));
-
-	camel_folder_search_construct(new);
-	return new;
-}
-
-/**
- * camel_folder_search_set_folder:
- * @search:
- * @folder: A folder.
- * 
- * Set the folder attribute of the search.  This is currently unused, but
- * could be used to perform a slow-search when indexes and so forth are not
- * available.  Or for use by subclasses.
- **/
-void
-camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder)
-{
-	search->folder = folder;
-}
-
-/**
- * camel_folder_search_set_summary:
- * @search: 
- * @summary: An array of CamelMessageInfo pointers.
- * 
- * Set the array of summary objects representing the span of the search.
- *
- * If this is not set, then a subclass must provide the functions
- * for searching headers and for the match-all operator.
- **/
-void
-camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary)
-{
-	search->summary = summary;
-}
-
-/**
- * camel_folder_search_set_body_index:
- * @search: 
- * @index: 
- * 
- * Set the index (ibex) representing the contents of all messages
- * in this folder.  If this is not set, then the folder implementation
- * should sub-class the CamelFolderSearch and provide its own
- * body-contains function.
- **/
-void
-camel_folder_search_set_body_index(CamelFolderSearch *search, ibex *index)
-{
-	search->body_index = index;
-}
-
-/**
- * camel_folder_search_execute_expression:
- * @search: 
- * @expr: 
- * @ex: 
- * 
- * Execute the search expression @expr, returning an array of
- * all matches as a GPtrArray of uid's of matching messages.
- *
- * Note that any settings such as set_body_index(), set_folder(),
- * and so on are reset to #NULL once the search has completed.
- *
- * TODO: The interface should probably return summary items instead
- * (since they are much more useful to any client).
- * 
- * Return value: A GPtrArray of strings of all matching messages.
- * This must only be freed by camel_folder_search_free_result.
- **/
-GPtrArray *
-camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex)
-{
-	ESExpResult *r;
-	GPtrArray *matches = g_ptr_array_new ();
-	int i;
-	GHashTable *results;
-
-	/* only re-parse if the search has changed */
-	if (search->last_search == NULL
-	    || strcmp(search->last_search, expr)) {
-		e_sexp_input_text(search->sexp, expr, strlen(expr));
-		e_sexp_parse(search->sexp);
-		g_free(search->last_search);
-		search->last_search = g_strdup(expr);
-	}
-	r = e_sexp_eval(search->sexp);
-
-	/* now create a folder summary to return?? */
-	if (r
-	    && r->type == ESEXP_RES_ARRAY_PTR) {
-		d(printf("got result ...\n"));
-		if (search->summary) {
-			/* reorder result in summary order */
-			results = g_hash_table_new(g_str_hash, g_str_equal);
-			for (i=0;i<r->value.ptrarray->len;i++) {
-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-				g_hash_table_insert(results, g_ptr_array_index(r->value.ptrarray, i), (void *)1);
-			}
-			for (i=0;i<search->summary->len;i++) {
-				CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-				if (g_hash_table_lookup(results, info->uid)) {
-					g_ptr_array_add(matches, g_strdup(info->uid));
-				}
-			}
-			g_hash_table_destroy(results);
-		} else {
-			for (i=0;i<r->value.ptrarray->len;i++) {
-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-				g_ptr_array_add(matches, g_strdup(g_ptr_array_index(r->value.ptrarray, i)));
-			}
-		}
-		e_sexp_result_free(r);
-	} else {
-		printf("no result!\n");
-	}
-
-	search->folder = NULL;
-	search->summary = NULL;
-	search->current = NULL;
-	search->body_index = NULL;
-
-	return matches;
-}
-
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *result)
-{
-	int i;
-
-	for (i=0;i<result->len;i++)
-		g_free(g_ptr_array_index(result, i));
-	g_ptr_array_free(result, TRUE);
-}
-
-/* dummy function, returns false always, or an empty match array */
-static ESExpResult *
-search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-
-	if (search->current == NULL) {
-		r = e_sexp_result_new(ESEXP_RES_BOOL);
-		r->value.bool = FALSE;
-	} else {
-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search)
-{
-	int i;
-	ESExpResult *r, *r1;
-
-	if (argc>1) {
-		g_warning("match-all only takes a single argument, other arguments ignored");
-	}
-	r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);
-	r->value.ptrarray = g_ptr_array_new();
-
-	if (search->summary == NULL) {
-		/* TODO: make it work - e.g. use the folder and so forth for a slower search */
-		g_warning("No summary supplied, match-all doesn't work with no summary");
-		return r;
-	}
-
-	/* TODO: Could make this a bit faster in the uncommon case (of match-everything) */
-	for (i=0;i<search->summary->len;i++) {
-		search->current = g_ptr_array_index(search->summary, i);
-		if (argc>0) {
-			r1 = e_sexp_term_eval(f, argv[0]);
-			if (r1->type == ESEXP_RES_BOOL) {
-				if (r1->value.bool)
-					g_ptr_array_add(r->value.ptrarray, search->current->uid);
-			} else {
-				g_warning("invalid syntax, matches require a single bool result");
-			}
-			e_sexp_result_free(r1);
-		} else {
-			g_ptr_array_add(r->value.ptrarray, search->current->uid);
-		}
-	}
-	search->current = NULL;
-
-	return r;
-}
-
-static ESExpResult *
-search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	r(printf("executing header-contains\n"));
-
-	/* are we inside a match-all? */
-	if (search->current && argc>1
-	    && argv[0]->type == ESEXP_RES_STRING) {
-		char *headername, *header = NULL;
-		char strbuf[32];
-		int i;
-
-		/* only a subset of headers are supported .. */
-		headername = argv[0]->value.string;
-		if (!strcasecmp(headername, "subject")) {
-			header = search->current->subject;
-		} else if (!strcasecmp(headername, "date")) {
-			/* FIXME: not a very useful form of the date */
-			sprintf(strbuf, "%d", (int)search->current->date_sent);
-			header = strbuf;
-		} else if (!strcasecmp(headername, "from")) {
-			header = search->current->from;
-		} else if (!strcasecmp(headername, "to")) {
-			header = search->current->to;
-		} else if (!strcasecmp(headername, "cc")) {
-			header = search->current->cc;
-		} else {
-			g_warning("Performing query on unknown header: %s", headername);
-		}
-
-		if (header) {
-			/* performs an OR of all words */
-			for (i=1;i<argc && !truth;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING
-				    && e_utf8_strstrcase (header, argv[i]->value.string)) {
-					r(printf("%s got a match with %s of %s\n", search->current->uid, header, argv[i]->value.string));
-					truth = TRUE;
-					break;
-				}
-			}
-		}
-	}
-	/* TODO: else, find all matches */
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-/* this is just to OR results together */
-struct _glib_sux_donkeys {
-	int count;
-	GPtrArray *uids;
-};
-
-/* or, store all unique values */
-static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	g_ptr_array_add(fuckup->uids, key);
-}
-
-/* performs a 'slow' content-based match */
-static gboolean
-message_body_contains(CamelDataWrapper *object, regex_t *pattern)
-{
-	CamelDataWrapper *containee;
-	int truth = FALSE;
-	int parts, i;
-
-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));
-
-	if (containee == NULL)
-		return FALSE;
-
-	/* TODO: I find it odd that get_part and get_content_object do not
-	   add a reference, probably need fixing for multithreading */
-
-	/* using the object types is more accurate than using the mime/types */
-	if (CAMEL_IS_MULTIPART(containee)) {
-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));
-		for (i=0;i<parts && truth==FALSE;i++) {
-			CamelDataWrapper *part = (CamelDataWrapper *)camel_multipart_get_part(CAMEL_MULTIPART(containee), i);
-			if (part) {
-				truth = message_body_contains(part, pattern);
-			}
-		}
-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {
-		/* for messages we only look at its contents */
-		truth = message_body_contains((CamelDataWrapper *)containee, pattern);
-	} else if (gmime_content_field_is_type(CAMEL_DATA_WRAPPER(containee)->mime_type, "text", "*")) {
-		/* for all other text parts, we look inside, otherwise we dont care */
-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
-
-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)mem);
-		camel_stream_write((CamelStream *)mem, "", 1);
-		truth = regexec(pattern, mem->buffer->data, 0, NULL, 0) == 0;
-		camel_object_unref((CamelObject *)mem);
-	}
-	return truth;
-}
-
-/* builds the regex into pattern */
-static int
-build_match_regex(regex_t *pattern, int argc, struct _ESExpResult **argv)
-{
-	GString *match = g_string_new("");
-	int c, i, count=0, err;
-	char *word;
-
-	/* build a regex pattern we can use to match the words, we OR them together */
-	if (argc>1)
-		g_string_append_c(match, '(');
-	for (i=0;i<argc;i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			if (count > 0)
-				g_string_append_c(match, '|');
-			/* escape any special chars (not sure if this list is complete) */
-			word = argv[i]->value.string;
-			while ((c = *word++)) {
-				if (strchr("*\\.()[]^$+", c) != NULL) {
-					g_string_append_c(match, '\\');
-				}
-				g_string_append_c(match, c);
-			}
-			count++;
-		} else {
-			g_warning("Invalid type passed to body-contains match function");
-		}
-	}
-	if (argc>1)
-		g_string_append_c(match, ')');
-	err = regcomp(pattern, match->str, REG_EXTENDED|REG_ICASE|REG_NOSUB);
-	if (err != 0) {
-		char buffer[1024]; /* dont really care if its longer than this ... */
-		
-		regerror(err, pattern, buffer, 1023);
-		g_warning("Internal error with search pattern: %s: %s", match->str, buffer);
-		regfree(pattern);
-	}
-	d(printf("Built regex: '%s'\n", match->str));
-	g_string_free(match, TRUE);
-	return err;
-}
-
-static int
-match_message(CamelFolder *folder, const char *uid, regex_t *pattern)
-{
-	CamelMimeMessage *msg;
-	int truth = FALSE;
-	CamelException *ex;
-
-	ex = camel_exception_new();
-	msg = camel_folder_get_message(folder, uid, ex);
-	if (!camel_exception_is_set(ex) && msg!=NULL) {
-		truth = message_body_contains((CamelDataWrapper *)msg, pattern);
-		camel_object_unref((CamelObject *)msg);
-	}
-	camel_exception_free(ex);
-	return truth;
-}
-
-static ESExpResult *
-search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i, j;
-	regex_t pattern;
-
-	if (search->current) {
-		int truth = FALSE;
-
-		r = e_sexp_result_new(ESEXP_RES_BOOL);
-		if (search->body_index) {
-			for (i=0;i<argc && !truth;i++) {
-				if (argv[i]->type == ESEXP_RES_STRING) {
-					truth = ibex_find_name(search->body_index, search->current->uid, argv[i]->value.string);
-				} else {
-					g_warning("Invalid type passed to body-contains match function");
-				}
-			}
-		} else if (search->folder) {
-			/* we do a 'slow' direct search */
-			if (build_match_regex(&pattern, argc, argv) == 0) {
-				truth = match_message(search->folder, search->current->uid, &pattern);
-				regfree(&pattern);
-			}
-		} else {
-			g_warning("Cannot perform indexed body query with no index or folder set");
-		}
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);
-
-		if (search->body_index) {
-			if (argc==1) {
-				/* common case */
-				r->value.ptrarray = ibex_find(search->body_index, argv[0]->value.string);
-			} else {
-				GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-				GPtrArray *pa;
-				struct _glib_sux_donkeys lambdafoo;
-
-				/* this sux, perform an or operation on the result(s) of each word */
-				for (i=0;i<argc;i++) {
-					if (argv[i]->type == ESEXP_RES_STRING) {
-						pa = ibex_find(search->body_index, argv[i]->value.string);
-						for (j=0;j<pa->len;j++) {
-							g_hash_table_insert(ht, g_ptr_array_index(pa, j), (void *)1);
-						}
-						g_ptr_array_free(pa, FALSE);
-					} else {
-						g_warning("invalid type passed to body-contains");
-					}
-				}
-				lambdafoo.uids = g_ptr_array_new();
-				g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
-				r->value.ptrarray = lambdafoo.uids;
-				g_hash_table_destroy(ht);
-			}
-		} else if (search->folder) {
-			/* do a slow search */
-			r->value.ptrarray = g_ptr_array_new();
-			if (build_match_regex(&pattern, argc, argv) == 0) {
-				if (search->summary) {
-					for (i=0;i<search->summary->len;i++) {
-						CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
-
-						if (match_message(search->folder, info->uid, &pattern))
-							g_ptr_array_add(r->value.ptrarray, info->uid);
-					}
-				} /* else?  we could always get the summary from the folder, but then
-				     we need to free it later somehow */
-				regfree(&pattern);
-			}
-		} else {
-			g_warning("Cannot perform indexed body query with no index or folder set");
-			r->value.ptrarray = g_ptr_array_new();
-		}
-	}
-
-	return r;
-}
-
-static ESExpResult *search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-	int i;
-
-	r(printf("executing user-flag\n"));
-
-	/* are we inside a match-all? */
-	if (search->current) {
-		int truth = FALSE;
-		/* performs an OR of all words */
-		for (i=0;i<argc && !truth;i++) {
-			if (argv[i]->type == ESEXP_RES_STRING
-			    && camel_flag_get(&search->current->user_flags, argv[i]->value.string)) {
-				truth = TRUE;
-				break;
-			}
-		}
-		r = e_sexp_result_new(ESEXP_RES_BOOL);
-		r->value.bool = truth;
-	} else {
-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)
-{
-	ESExpResult *r;
-
-	r(printf("executing user-tag\n"));
-
-	/* are we inside a match-all? */
-	if (search->current) {
-		const char *value = NULL;
-		if (argc == 1) {
-			value = camel_tag_get(&search->current->user_tags, argv[0]->value.string);
-		}
-		r = e_sexp_result_new(ESEXP_RES_STRING);
-		r->value.string = g_strdup(value?value:"");
-	} else {
-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-sent-date\n"));
-
-	/* are we inside a match-all? */
-	if (s->current) {
-		r = e_sexp_result_new (ESEXP_RES_INT);
-
-		r->value.number = s->current->date_sent;
-	} else {
-		r = e_sexp_result_new (ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-received-date\n"));
-
-	/* are we inside a match-all? */
-	if (s->current) {
-		r = e_sexp_result_new (ESEXP_RES_INT);
-
-		r->value.number = s->current->date_received;
-	} else {
-		r = e_sexp_result_new (ESEXP_RES_ARRAY_PTR);
-		r->value.ptrarray = g_ptr_array_new ();
-	}
-
-	return r;
-}
-
-static ESExpResult *
-search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)
-{
-	ESExpResult *r;
-
-	r(printf("executing get-current-date\n"));
-
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	return r;
-}
-
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
deleted file mode 100644
index f74813e6f7..0000000000
--- a/camel/camel-folder-search.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_FOLDER_SEARCH_H
-#define _CAMEL_FOLDER_SEARCH_H
-
-#include <camel/camel-object.h>
-#include <e-util/e-sexp.h>
-#include <gal/util/e-util.h>
-#include <libibex/ibex.h>
-#include <camel/camel-folder.h>
-
-#define CAMEL_FOLDER_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)
-#define CAMEL_FOLDER_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass)
-#define IS_CAMEL_FOLDER_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_search_get_type ())
-
-typedef struct _CamelFolderSearchClass CamelFolderSearchClass;
-
-struct _CamelFolderSearch {
-	CamelObject parent;
-
-	struct _CamelFolderSearchPrivate *priv;
-
-	ESExp *sexp;		/* s-exp evaluator */
-	char *last_search;	/* last searched expression */
-
-	/* these are only valid during the search, and are reset afterwards */
-	CamelFolder *folder;	/* folder for current search */
-	GPtrArray *summary;	/* summary array for current search */
-	CamelMessageInfo *current; /* current message info, when searching one by one */
-	CamelMimeMessage *current_message; /* cache of current message, if required */
-	ibex *body_index;
-};
-
-struct _CamelFolderSearchClass {
-	CamelObjectClass parent_class;
-
-	/* general bool/comparison options, usually these wont need to be set, unless it is compiling into another language */
-	ESExpResult * (*and)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*or)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*not)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*lt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*gt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-	ESExpResult * (*eq)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-
-	/* search options */
-	/* (match-all [boolean expression]) Apply match to all messages */
-	ESExpResult * (*match_all)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);
-
-	/* (body-contains "string1" "string2" ...) Returns a list of matches, or true if in single-message mode */
-	ESExpResult * (*body_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (header-contains "headername" "string1" ...) List of matches, or true if in single-message mode */
-	ESExpResult * (*header_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (user-flag "flagname" "flagname" ...) If one of user-flag set */
-	ESExpResult * (*user_flag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (user-tag "flagname") Returns the value of a user tag.  Can only be used in match-all */
-	ESExpResult * (*user_tag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (get-sent-date) Retrieve the date that the message was sent on as a time_t */
-	ESExpResult * (*get_sent_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (get-received-date) Retrieve the date that the message was received on as a time_t */
-	ESExpResult * (*get_received_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-
-	/* (get-current-date) Retrieve 'now' as a time_t */
-	ESExpResult * (*get_current_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);
-};
-
-guint		camel_folder_search_get_type	(void);
-CamelFolderSearch      *camel_folder_search_new	(void);
-void camel_folder_search_construct (CamelFolderSearch *search);
-
-void camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder);
-void camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary);
-void camel_folder_search_set_body_index(CamelFolderSearch *search, ibex *index);
-GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);
-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
-
-#endif /* ! _CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
deleted file mode 100644
index f68c2a7970..0000000000
--- a/camel/camel-folder-summary.c
+++ /dev/null
@@ -1,1682 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include <unistd.h>
-#include <netinet/in.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "camel-folder-summary.h"
-
-#include <camel/camel-mime-message.h>
-
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-index.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-save.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-message.h>
-#include "hash-table-utils.h"
-
-/* this should probably be conditional on it existing */
-#define USE_BSEARCH
-
-#define d(x)
-#define io(x)			/* io debug */
-
-#if 0
-extern int strdup_count, malloc_count, free_count;
-#endif
-
-#define CAMEL_FOLDER_SUMMARY_VERSION (8)
-
-struct _CamelFolderSummaryPrivate {
-	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
-
-	CamelMimeFilterIndex *filter_index;
-	CamelMimeFilterBasic *filter_64;
-	CamelMimeFilterBasic *filter_qp;
-	CamelMimeFilterSave *filter_save;
-
-	ibex *index;
-};
-
-#define _PRIVATE(o) (((CamelFolderSummary *)(o))->priv)
-
-/* trivial lists, just because ... */
-struct _node {
-	struct _node *next;
-};
-
-static struct _node *my_list_append(struct _node **list, struct _node *n);
-static int my_list_size(struct _node **list);
-
-static int summary_header_load(CamelFolderSummary *, FILE *);
-static int summary_header_save(CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo * message_info_new(CamelFolderSummary *, struct _header_raw *);
-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageInfo * message_info_load(CamelFolderSummary *, FILE *);
-static int		  message_info_save(CamelFolderSummary *, FILE *, CamelMessageInfo *);
-static void		  message_info_free(CamelFolderSummary *, CamelMessageInfo *);
-
-static CamelMessageContentInfo * content_info_new(CamelFolderSummary *, struct _header_raw *);
-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageContentInfo * content_info_load(CamelFolderSummary *, FILE *);
-static int		         content_info_save(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-static void		         content_info_free(CamelFolderSummary *, CamelMessageContentInfo *);
-
-static CamelMessageContentInfo * summary_build_content_info(CamelFolderSummary *s, CamelMimeParser *mp);
-
-static void camel_folder_summary_class_init (CamelFolderSummaryClass *klass);
-static void camel_folder_summary_init       (CamelFolderSummary *obj);
-static void camel_folder_summary_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_folder_summary_parent;
-
-static void
-camel_folder_summary_class_init (CamelFolderSummaryClass *klass)
-{
-	camel_folder_summary_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->summary_header_load = summary_header_load;
-	klass->summary_header_save = summary_header_save;
-
-	klass->message_info_new  = message_info_new;
-	klass->message_info_new_from_parser = message_info_new_from_parser;
-	klass->message_info_load = message_info_load;
-	klass->message_info_save = message_info_save;
-	klass->message_info_free = message_info_free;
-
-	klass->content_info_new  = content_info_new;
-	klass->content_info_new_from_parser = content_info_new_from_parser;
-	klass->content_info_load = content_info_load;
-	klass->content_info_save = content_info_save;
-	klass->content_info_free = content_info_free;
-}
-
-static void
-camel_folder_summary_init (CamelFolderSummary *s)
-{
-	struct _CamelFolderSummaryPrivate *p;
-
-	p = _PRIVATE(s) = g_malloc0(sizeof(*p));
-
-	p->filter_charset = g_hash_table_new(g_strcase_hash, g_strcase_equal);
-
-	s->message_info_size = sizeof(CamelMessageInfo);
-	s->content_info_size = sizeof(CamelMessageContentInfo);
-
-	s->version = CAMEL_FOLDER_SUMMARY_VERSION;
-	s->flags = 0;
-	s->time = 0;
-	s->nextuid = 1;
-
-	s->messages = g_ptr_array_new();
-	s->messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-static void free_o_name(void *key, void *value, void *data)
-{
-	camel_object_unref((CamelObject *)value);
-	g_free(key);
-}
-
-static void
-camel_folder_summary_finalize (CamelObject *obj)
-{
-	struct _CamelFolderSummaryPrivate *p;
-	CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj);
-
-	camel_folder_summary_clear(s);
-	g_ptr_array_free(s->messages, TRUE);
-	g_hash_table_destroy(s->messages_uid);
-
-	g_hash_table_foreach(p->filter_charset, free_o_name, 0);
-	g_hash_table_destroy(p->filter_charset);
-
-	g_free(s->summary_path);
-
-	if (p->filter_index)
-		camel_object_unref ((CamelObject *)p->filter_index);
-	if (p->filter_64)
-		camel_object_unref ((CamelObject *)p->filter_64);
-	if (p->filter_qp)
-		camel_object_unref ((CamelObject *)p->filter_qp);
-	if (p->filter_save)
-		camel_object_unref ((CamelObject *)p->filter_save);
-
-	g_free(p);
-}
-
-CamelType
-camel_folder_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelFolderSummary",
-					    sizeof (CamelFolderSummary),
-					    sizeof (CamelFolderSummaryClass),
-					    (CamelObjectClassInitFunc) camel_folder_summary_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_folder_summary_init,
-					    (CamelObjectFinalizeFunc) camel_folder_summary_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_folder_summary_new:
- *
- * Create a new CamelFolderSummary object.
- * 
- * Return value: A new CamelFolderSummary widget.
- **/
-CamelFolderSummary *
-camel_folder_summary_new (void)
-{
-	CamelFolderSummary *new = CAMEL_FOLDER_SUMMARY ( camel_object_new (camel_folder_summary_get_type ()));
-	return new;
-}
-
-
-void camel_folder_summary_set_filename(CamelFolderSummary *s, const char *name)
-{
-	g_free(s->summary_path);
-	s->summary_path = g_strdup(name);
-}
-
-void camel_folder_summary_set_index(CamelFolderSummary *s, ibex *index)
-{
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-
-	p->index = index;
-}
-
-void camel_folder_summary_set_build_content(CamelFolderSummary *s, gboolean state)
-{
-	s->build_content = state;
-}
-
-int
-camel_folder_summary_count(CamelFolderSummary *s)
-{
-	return s->messages->len;
-}
-
-CamelMessageInfo *
-camel_folder_summary_index(CamelFolderSummary *s, int i)
-{
-	if (i<s->messages->len)
-		return g_ptr_array_index(s->messages, i);
-	return NULL;
-}
-
-CamelMessageInfo *
-camel_folder_summary_uid(CamelFolderSummary *s, const char *uid)
-{
-	return g_hash_table_lookup(s->messages_uid, uid);
-}
-
-guint32 camel_folder_summary_next_uid(CamelFolderSummary *s)
-{
-	guint32 uid = s->nextuid++;
-
-	/* FIXME: sync this to disk */
-/*	summary_header_save(s);*/
-	return uid;
-}
-
-void camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)
-{
-	s->nextuid = MAX(s->nextuid, uid);
-}
-
-char *
-camel_folder_summary_next_uid_string(CamelFolderSummary *s)
-{
-	return g_strdup_printf("%u", camel_folder_summary_next_uid(s));
-}
-
-/* loads the content descriptions, recursively */
-static CamelMessageContentInfo *
-perform_content_info_load(CamelFolderSummary *s, FILE *in)
-{
-	int i;
-	guint32 count;
-	CamelMessageContentInfo *ci, *part;
-
-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_load(s, in);
-	camel_folder_summary_decode_uint32(in, &count);
-	for (i=0;i<count;i++) {
-		part = perform_content_info_load(s, in);
-		if (part) {
-			my_list_append((struct _node **)&ci->childs, (struct _node *)part);
-			part->parent = ci;
-		} else {
-			g_warning("Summary file format messed up?");
-		}
-	}
-	return ci;
-}
-
-int
-camel_folder_summary_load(CamelFolderSummary *s)
-{
-	FILE *in;
-	int i;
-	CamelMessageInfo *mi;
-
-	g_assert(s->summary_path);
-
-	in = fopen(s->summary_path, "r");
-	if ( in == NULL ) {
-		return -1;
-	}
-
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_load(s, in) == -1) {
-		fclose(in);
-		return -1;
-	}
-
-	/* now read in each message ... */
-	/* FIXME: check returns */
-	for (i=0;i<s->saved_count;i++) {
-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in);
-
-		if (s->build_content) {
-			mi->content = perform_content_info_load(s, in);
-		}
-
-		camel_folder_summary_add(s, mi);
-	}
-	
-	if (fclose(in) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-
-	return 0;
-}
-
-/* saves the content descriptions, recursively */
-static int
-perform_content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)
-{
-	CamelMessageContentInfo *part;
-
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_save(s, out, ci);
-	camel_folder_summary_encode_uint32(out, my_list_size((struct _node **)&ci->childs));
-	part = ci->childs;
-	while (part) {
-		perform_content_info_save(s, out, part);
-		part = part->next;
-	}
-	return 0;
-}
-
-int
-camel_folder_summary_save(CamelFolderSummary *s)
-{
-	FILE *out;
-	int fd;
-	int i;
-	guint32 count;
-	CamelMessageInfo *mi;
-
-	g_assert(s->summary_path);
-
-	if ((s->flags & CAMEL_SUMMARY_DIRTY) == 0)
-		return 0;
-
-	fd = open(s->summary_path, O_RDWR|O_CREAT, 0600);
-	if (fd == -1)
-		return -1;
-	out = fdopen(fd, "w");
-	if ( out == NULL ) {
-		close(fd);
-		return -1;
-	}
-
-	io(printf("saving header\n"));
-
-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_save(s, out) == -1) {
-		fclose(out);
-		return -1;
-	}
-
-	/* now write out each message ... */
-	/* FIXME: check returns */
-	count = camel_folder_summary_count(s);
-	for (i=0;i<count;i++) {
-		mi = camel_folder_summary_index(s, i);
-		((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_save(s, out, mi);
-
-		if (s->build_content) {
-			perform_content_info_save(s, out, mi->content);
-		}
-	}
-	if (fclose(out) == -1)
-		return -1;
-
-	s->flags &= ~CAMEL_SUMMARY_DIRTY;
-	return 0;
-}
-
-void camel_folder_summary_add(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	if (info == NULL)
-		return;
-retry:
-	if (info->uid == NULL) {
-		info->uid = camel_folder_summary_next_uid_string(s);
-	}
-	if (g_hash_table_lookup(s->messages_uid, info->uid)) {
-		g_warning("Trying to insert message with clashing uid (%s).  new uid re-assigned", info->uid);
-		g_free(info->uid);
-		info->uid = NULL;
-		info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-		goto retry;
-	}
-
-	g_ptr_array_add(s->messages, info);
-	g_hash_table_insert(s->messages_uid, info->uid, info);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-}
-
-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *info = NULL;
-
-	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -> message_info_new(s, h);
-	camel_folder_summary_add(s, info);
-
-	return info;
-}
-
-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *info = NULL;
-	char *buffer;
-	int len;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-
-	/* should this check the parser is in the right state, or assume it is?? */
-
-	if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_EOF) {
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_parser(s, mp);
-
-		camel_mime_parser_unstep(mp);
-
-		camel_folder_summary_add(s, info);
-
-		if (p->index) {
-			if (p->filter_index == NULL)
-				p->filter_index = camel_mime_filter_index_new_ibex(p->index);
-			camel_mime_filter_index_set_name(p->filter_index, info->uid);
-			ibex_unindex(p->index, info->uid);
-		}
-
-		/* build the content info, if we're supposed to */
-		if (s->build_content) {
-			info->content = summary_build_content_info(s, mp);
-			if (info->content->pos != -1)
-				info->size = info->content->endpos - info->content->pos;
-		} else {
-			camel_mime_parser_drop_step(mp);
-		}
-	}
-	return info;
-}
-
-static void
-perform_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)
-{
-	CamelMessageContentInfo *pw, *pn;
-
-	pw = ci->childs;
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_free(s, ci);
-	while (pw) {
-		pn = pw->next;
-		perform_content_info_free(s, pw);
-		pw = pn;
-	}
-}
-
-void
-camel_folder_summary_touch(CamelFolderSummary *s)
-{
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-}
-
-void
-camel_folder_summary_clear(CamelFolderSummary *s)
-{
-	int i;
-
-	if (camel_folder_summary_count(s) == 0)
-		return;
-
-	for (i=0;i<camel_folder_summary_count(s);i++) {
-		CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-		CamelMessageContentInfo *ci = mi->content;
-
-		((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_free(s, mi);		
-		if (s->build_content && ci) {
-			perform_content_info_free(s, ci);
-		}
-	}
-
-	g_ptr_array_set_size(s->messages, 0);
-	g_hash_table_destroy(s->messages_uid);
-	s->messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-}
-
-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info)
-{
-	CamelMessageContentInfo *ci = info->content;
-
-	g_hash_table_remove(s->messages_uid, info->uid);
-	g_ptr_array_remove(s->messages, info);
-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_free(s, info);
-	if (s->build_content && ci) {
-		perform_content_info_free(s, ci);
-	}
-	s->flags |= CAMEL_SUMMARY_DIRTY;
-}
-
-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid)
-{
-        CamelMessageInfo *oldinfo;
-        char *olduid;
-
-        if (g_hash_table_lookup_extended(s->messages_uid, uid, (void *)&olduid, (void *)&oldinfo)) {
-		camel_folder_summary_remove(s, oldinfo);
-		g_free(olduid);
-        }
-}
-
-void camel_folder_summary_remove_index(CamelFolderSummary *s, int index)
-{
-        CamelMessageInfo *oldinfo;
-
-	oldinfo = camel_folder_summary_index (s, index);
-	if (oldinfo)
-		camel_folder_summary_remove(s, oldinfo);
-}
-
-int
-camel_folder_summary_encode_uint32(FILE *out, guint32 value)
-{
-	int i;
-
-	io(printf("Encoding int %u\n", value));
-
-	for (i=28;i>0;i-=7) {
-		if (value >= (1<<i)) {
-			unsigned int c = (value>>i) & 0x7f;
-			if (fputc(c, out) == -1)
-				return -1;
-		}
-	}
-	return fputc(value | 0x80, out);
-}
-
-int
-camel_folder_summary_decode_uint32(FILE *in, guint32 *dest)
-{
-        guint32 value=0, v;
-
-        /* until we get the last byte, keep decoding 7 bits at a time */
-        while ( ((v = fgetc(in)) & 0x80) == 0 && v!=EOF) {
-                value |= v;
-                value <<= 7;
-        }
-	if (v == EOF) {
-		*dest = value>>7;
-		return 01;
-	}
-	*dest = value | (v&0x7f);
-
-	io(printf("Decoding int %u\n", *dest));
-
-        return 0;
-}
-
-int
-camel_folder_summary_encode_fixed_int32(FILE *out, gint32 value)
-{
-	guint32 save;
-
-	save = htonl(value);
-	if (fwrite(&save, sizeof(save), 1, out) != 1)
-		return -1;
-	return 0;
-}
-
-int
-camel_folder_summary_decode_fixed_int32(FILE *in, gint32 *dest)
-{
-	guint32 save;
-
-	if (fread(&save, sizeof(save), 1, in) == 1) {
-		*dest = ntohl(save);
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-int
-camel_folder_summary_encode_time_t(FILE *out, time_t value)
-{
-	int i;
-
-	for (i=sizeof(time_t)-1;i>=0;i--) {
-		if (fputc((value >> (i*8)) & 0xff, out) == -1)
-			return -1;
-	}
-	return 0;
-}
-
-int
-camel_folder_summary_decode_time_t(FILE *in, time_t *dest)
-{
-	time_t save = 0;
-	unsigned int v;
-	int i = sizeof(time_t) - 1;
-
-        while ( i>=0 && (v = fgetc(in)) != EOF) {
-		save |= v << (i*8);
-		i--;
-	}
-	*dest = save;
-	return 0;
-}
-
-/* should be sorted, for binary search */
-/* This is a tokenisation mechanism for strings written to the
-   summary - to save space.
-   This list can have at most 31 words. */
-static char * tokens[] = {
-	"7bit",
-	"8bit",
-	"alternative",
-	"application",
-	"base64",
-	"boundary",
-	"charset",
-	"filename",
-	"html",
-	"image",
-	"iso-8859-1",
-	"iso-8859-8",
-	"message",
-	"mixed",
-	"multipart",
-	"name",
-	"octet-stream",
-	"parallel",
-	"plain",
-	"postscript",
-	"quoted-printable",
-	"related",
-	"rfc822",
-	"text",
-	"us-ascii",		/* 25 words */
-};
-
-#define tokens_len (sizeof(tokens)/sizeof(tokens[0]))
-
-/* baiscally ...
-    0 = null
-    1-tokens_len == tokens[id-1]
-    >=32 string, length = n-32
-*/
-
-#ifdef USE_BSEARCH
-static int
-token_search_cmp(char *key, char **index)
-{
-	d(printf("comparing '%s' to '%s'\n", key, *index));
-	return strcmp(key, *index);
-}
-#endif
-
-int
-camel_folder_summary_encode_token(FILE *out, char *str)
-{
-	io(printf("Encoding token: '%s'\n", str));
-
-	if (str == NULL) {
-		return camel_folder_summary_encode_uint32(out, 0);
-	} else {
-		int len = strlen(str);
-		int i, token=-1;
-
-		if (len <= 16) {
-			char lower[32];
-			char **match;
-
-			for (i=0;i<len;i++)
-				lower[i] = tolower(str[i]);
-			lower[i] = 0;
-#ifdef USE_BSEARCH
-			match = bsearch(lower, tokens, tokens_len, sizeof(char *), (int (*)(const void *, const void *))token_search_cmp);
-			if (match)
-				token = match-tokens;
-#else
-			for (i=0;i<tokens_len;i++) {
-				if (!strcmp(tokens[i], lower)) {
-					token = i;
-					break;
-				}
-			}
-#endif
-		}
-		if (token != -1) {
-			return camel_folder_summary_encode_uint32(out, token+1);
-		} else {
-			if (camel_folder_summary_encode_uint32(out, len+32) == -1)
-				return -1;
-			if (fwrite(str, len, 1, out) != 1)
-				return -1;
-		}
-	}
-	return 0;
-}
-
-int
-camel_folder_summary_decode_token(FILE *in, char **str)
-{
-	char *ret;
-	guint32 len;
-
-	io(printf("Decode token ...\n"));
-	
-	if (camel_folder_summary_decode_uint32(in, &len) == -1) {
-		g_warning("Could not decode token from file");
-		*str = NULL;
-		return -1;
-	}
-
-	if (len<32) {
-		if (len <= 0) {
-			ret = NULL;
-		} else if (len<= tokens_len) {
-			ret = g_strdup(tokens[len-1]);
-		} else {
-			g_warning("Invalid token encountered: %d", len);
-			*str = NULL;
-			return -1;
-		}
-	} else if (len > 10240) {
-		g_warning("Got broken string header length: %d bytes", len);
-		*str = NULL;
-		return -1;
-	} else {
-		len -= 32;
-		ret = g_malloc(len+1);
-		if (fread(ret, len, 1, in) != 1) {
-			g_free(ret);
-			*str = NULL;
-			return -1;
-		}
-		ret[len]=0;
-	}
-
-	io(printf("Token = '%s'\n", ret));
-
-	*str = ret;
-	return 0;
-}
-
-int
-camel_folder_summary_encode_string(FILE *out, char *str)
-{
-	register int len;
-
-	io(printf("Encoding string: '%s'\n", str));
-
-	if (str == NULL)
-		return camel_folder_summary_encode_uint32(out, 0);
-
-	len = strlen(str);
-	if (camel_folder_summary_encode_uint32(out, len+1) == -1)
-		return -1;
-	if (fwrite(str, len, 1, out) == 1)
-		return 0;
-	return -1;
-}
-
-
-int
-camel_folder_summary_decode_string(FILE *in, char **str)
-{
-	gint32 len;
-	register char *ret;
-
-	io(printf("Decode string ...\n", str));
-
-	if (camel_folder_summary_decode_uint32(in, &len) == -1) {
-		*str = NULL;
-		return -1;
-	}
-
-	len--;
-	if (len < 0) {
-		*str = NULL;
-		io(printf("String = '%s'\n", *str));
-		return -1;
-	}
-
-	ret = g_malloc(len+1);
-	if (fread(ret, len, 1, in) != 1) {
-		g_free(ret);
-		*str = NULL;
-		return -1;
-	}
-
-	io(printf("String = '%s'\n", ret));
-
-	ret[len] = 0;
-	*str = ret;
-	return 0;
-}
-
-void
-camel_folder_summary_offset_content(CamelMessageContentInfo *content, off_t offset)
-{
-	content->pos += offset;
-	content->bodypos += offset;
-	content->endpos += offset;
-	content = content->childs;
-	while (content) {
-		camel_folder_summary_offset_content(content, offset);
-		content = content->next;
-	}
-}
-
-static struct _node *
-my_list_append(struct _node **list, struct _node *n)
-{
-	struct _node *ln = (struct _node *)list;
-	while (ln->next)
-		ln = ln->next;
-	n->next = 0;
-	ln->next = n;
-	return n;
-}
-
-static int
-my_list_size(struct _node **list)
-{
-	int len = 0;
-	struct _node *ln = (struct _node *)list;
-	while (ln->next) {
-		ln = ln->next;
-		len++;
-	}
-	return len;
-}
-
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
-{
-	gint32 version, flags, nextuid, count, utime;
-
-	fseek(in, 0, SEEK_SET);
-
-	io(printf("Loading header\n"));
-
-	if (camel_folder_summary_decode_fixed_int32(in, &version) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &flags) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &nextuid) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &utime) == -1
-	    || camel_folder_summary_decode_fixed_int32(in, &count) == -1) {
-		return -1;
-	}
-
-	s->nextuid = nextuid;
-	s->flags = flags;
-	s->time = (time_t) utime;
-	s->saved_count = count;
-	if (s->version != version) {
-		g_warning("Summary header version mismatch");
-		return -1;
-	}
-	return 0;
-}
-
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
-{
-	fseek(out, 0, SEEK_SET);
-
-	io(printf("Savining header\n"));
-
-	camel_folder_summary_encode_fixed_int32(out, s->version);
-	camel_folder_summary_encode_fixed_int32(out, s->flags);
-	camel_folder_summary_encode_fixed_int32(out, s->nextuid);
-	camel_folder_summary_encode_fixed_int32(out, s->time);
-	return camel_folder_summary_encode_fixed_int32(out, camel_folder_summary_count(s));
-}
-
-/* are these even useful for anything??? */
-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *mi = NULL;
-	int state;
-
-	state = camel_mime_parser_state(mp);
-	switch (state) {
-	case HSCAN_HEADER:
-	case HSCAN_MESSAGE:
-	case HSCAN_MULTIPART:
-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new(s, camel_mime_parser_headers_raw(mp));
-		break;
-	default:
-		g_error("Invalid parser state");
-	}
-
-	return mi;
-}
-
-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageContentInfo *ci = NULL;
-
-	switch (camel_mime_parser_state(mp)) {
-	case HSCAN_HEADER:
-	case HSCAN_MESSAGE:
-	case HSCAN_MULTIPART:
-		ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new(s, camel_mime_parser_headers_raw(mp));
-		if (ci) {
-			ci->type = camel_mime_parser_content_type(mp);
-			header_content_type_ref(ci->type);
-		}
-		break;
-	default:
-		g_error("Invalid parser state");
-	}
-
-	return ci;
-}
-
-char *
-camel_folder_summary_format_address(struct _header_raw *h, const char *name)
-{
-	struct _header_address *addr;
-	const char *text;
-	char *ret, *tmp;
-
-	text = header_raw_find (&h, name, NULL);
-	addr = header_address_decode (text);
-	if (addr) {
-		/* FIXME: perhaps decoding would be best done in header_address_list_format */
-		tmp = header_address_list_format (addr);
-		ret = header_decode_string (tmp);
-		g_free (tmp);
-		header_address_list_clear (&addr);
-	} else {
-		ret = g_strdup (text);
-	}
-	
-	return ret;
-}
-
-char *
-camel_folder_summary_format_string(struct _header_raw *h, const char *name)
-{
-	const char *text;
-
-	text = header_raw_find(&h, name, NULL);
-	if (text) {
-		while (isspace(*text))
-			text++;
-		return header_decode_string(text);
-	} else {
-		return NULL;
-	}
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	const char *received;
-
-	mi = g_malloc0(s->message_info_size);
-
-	mi->subject = camel_folder_summary_format_string(h, "subject");
-	mi->from = camel_folder_summary_format_address(h, "from");
-	mi->to = camel_folder_summary_format_address(h, "to");
-	mi->cc = camel_folder_summary_format_address(h, "cc");
-	mi->user_flags = NULL;
-	mi->user_tags = NULL;
-	mi->date_sent = header_decode_date(header_raw_find(&h, "date", NULL), NULL);
-	received = header_raw_find(&h, "received", NULL);
-	if (received)
-		received = strrchr(received, ';');
-	if (received)
-		mi->date_received = header_decode_date(received + 1, NULL);
-	else
-		mi->date_received = 0;
-	mi->message_id = header_msgid_decode(header_raw_find(&h, "message-id", NULL));
-	/* if we have a references, use that, otherwise, see if we have an in-reply-to
-	   header, with parsable content, otherwise *shrug* */
-	mi->references = header_references_decode(header_raw_find(&h, "references", NULL));
-	if (mi->references == NULL)
-		mi->references = header_references_decode(header_raw_find(&h, "in-reply-to", NULL));
-	return mi;
-}
-
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-	guint count;
-	int i;
-
-	mi = g_malloc0(s->message_info_size);
-
-	io(printf("Loading message info\n"));
-
-	camel_folder_summary_decode_string(in, &mi->uid);
-	camel_folder_summary_decode_uint32(in, &mi->flags);
-	camel_folder_summary_decode_uint32(in, &mi->size);
-	camel_folder_summary_decode_time_t(in, &mi->date_sent);
-	camel_folder_summary_decode_time_t(in, &mi->date_received);
-	camel_folder_summary_decode_string(in, &mi->subject);
-	camel_folder_summary_decode_string(in, &mi->from);
-	camel_folder_summary_decode_string(in, &mi->to);
-	camel_folder_summary_decode_string(in, &mi->cc);
-	mi->content = NULL;
-
-	camel_folder_summary_decode_string(in, &mi->message_id);
-
-	camel_folder_summary_decode_uint32(in, &count);
-	for (i=0;i<count;i++) {
-		char *id;
-		camel_folder_summary_decode_string(in, &id);
-		header_references_list_append_asis(&mi->references, id);
-	}
-
-	camel_folder_summary_decode_uint32(in, &count);
-	for (i=0;i<count;i++) {
-		char *name;
-		camel_folder_summary_decode_string(in, &name);
-		camel_flag_set(&mi->user_flags, name, TRUE);
-		g_free(name);
-	}
-
-	camel_folder_summary_decode_uint32(in, &count);
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_folder_summary_decode_string(in, &name);
-		camel_folder_summary_decode_string(in, &value);
-		camel_tag_set(&mi->user_tags, name, value);
-		g_free(name);
-		g_free(value);
-	}
-
-	return mi;
-}
-
-static int
-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
-{
-	guint32 count;
-	CamelFlag *flag;
-	CamelTag *tag;
-	struct _header_references *refs;
-
-	io(printf("Saving message info\n"));
-
-	camel_folder_summary_encode_string(out, mi->uid);
-	camel_folder_summary_encode_uint32(out, mi->flags);
-	camel_folder_summary_encode_uint32(out, mi->size);
-	camel_folder_summary_encode_time_t(out, mi->date_sent);
-	camel_folder_summary_encode_time_t(out, mi->date_received);
-	camel_folder_summary_encode_string(out, mi->subject);
-	camel_folder_summary_encode_string(out, mi->from);
-	camel_folder_summary_encode_string(out, mi->to);
-	camel_folder_summary_encode_string(out, mi->cc);
-
-	camel_folder_summary_encode_string(out, mi->message_id);
-
-	count = header_references_list_size(&mi->references);
-	camel_folder_summary_encode_uint32(out, count);
-	refs = mi->references;
-	while (refs) {
-		camel_folder_summary_encode_string(out, refs->id);
-		refs = refs->next;
-	}
-
-	count = camel_flag_list_size(&mi->user_flags);
-	camel_folder_summary_encode_uint32(out, count);
-	flag = mi->user_flags;
-	while (flag) {
-		camel_folder_summary_encode_string(out, flag->name);
-		flag = flag->next;
-	}
-
-	count = camel_tag_list_size(&mi->user_tags);
-	camel_folder_summary_encode_uint32(out, count);
-	tag = mi->user_tags;
-	while (tag) {
-		camel_folder_summary_encode_string(out, tag->name);
-		camel_folder_summary_encode_string(out, tag->value);
-		tag = tag->next;
-	}
-
-	return ferror(out);
-}
-
-static void
-message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
-{
-	camel_message_info_free(mi);
-}
-
-static CamelMessageContentInfo *
-content_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageContentInfo *ci;
-
-	ci = g_malloc0(s->content_info_size);
-
-	ci->id = header_msgid_decode(header_raw_find(&h, "content-id", NULL));
-	ci->description = header_decode_string(header_raw_find(&h, "content-description", NULL));
-	ci->encoding = header_content_encoding_decode(header_raw_find(&h, "content-transfer-encoding", NULL));
-
-	ci->pos = -1;
-	ci->bodypos = -1;
-	ci->endpos = -1;
-	return ci;
-}
-
-static CamelMessageContentInfo *
-content_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageContentInfo *ci;
-	char *type, *subtype;
-	guint32 count, i, upos, ubodypos, uendpos;
-	struct _header_content_type *ct;
-
-	io(printf("Loading content info\n"));
-
-	ci = g_malloc0(s->content_info_size);
-
-	camel_folder_summary_decode_uint32(in, &upos);
-	camel_folder_summary_decode_uint32(in, &ubodypos);
-	camel_folder_summary_decode_uint32(in, &uendpos);
-
-	ci->pos = (off_t) upos;
-        ci->bodypos = (off_t) ubodypos;
-	ci->endpos = (off_t) uendpos;
-	
-	camel_folder_summary_decode_token(in, &type);
-	camel_folder_summary_decode_token(in, &subtype);
-	ct = header_content_type_new(type, subtype);
-	g_free(type);		/* can this be removed? */
-	g_free(subtype);
-	camel_folder_summary_decode_uint32(in, &count);
-	for (i=0;i<count;i++) {
-		char *name, *value;
-		camel_folder_summary_decode_token(in, &name);
-		camel_folder_summary_decode_token(in, &value);
-		header_content_type_set_param(ct, name, value);
-		/* TODO: do this so we dont have to double alloc/free */
-		g_free(name);
-		g_free(value);
-	}
-	ci->type = ct;
-
-	camel_folder_summary_decode_token(in, &ci->id);
-	camel_folder_summary_decode_token(in, &ci->description);
-	camel_folder_summary_decode_token(in, &ci->encoding);
-
-	ci->childs = NULL;
-	return ci;
-}
-
-static int
-content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)
-{
-	struct _header_content_type *ct;
-	struct _header_param *hp;
-
-	io(printf("Saving content info\n"));
-
-	camel_folder_summary_encode_uint32(out, ci->pos);
-	camel_folder_summary_encode_uint32(out, ci->bodypos);
-	camel_folder_summary_encode_uint32(out, ci->endpos);
-
-	ct = ci->type;
-	if (ct) {
-		camel_folder_summary_encode_token(out, ct->type);
-		camel_folder_summary_encode_token(out, ct->subtype);
-		camel_folder_summary_encode_uint32(out, my_list_size((struct _node **)&ct->params));
-		hp = ct->params;
-		while (hp) {
-			camel_folder_summary_encode_token(out, hp->name);
-			camel_folder_summary_encode_token(out, hp->value);
-			hp = hp->next;
-		}
-	} else {
-		camel_folder_summary_encode_token(out, NULL);
-		camel_folder_summary_encode_token(out, NULL);
-		camel_folder_summary_encode_uint32(out, 0);
-	}
-	camel_folder_summary_encode_token(out, ci->id);
-	camel_folder_summary_encode_token(out, ci->description);
-	return camel_folder_summary_encode_token(out, ci->encoding);
-}
-
-static void
-content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)
-{
-	header_content_type_unref(ci->type);
-	g_free(ci->id);
-	g_free(ci->description);
-	g_free(ci->encoding);
-	g_free(ci);
-}
-
-/*
-  OK
-  Now this is where all the "smarts" happen, where the content info is built,
-  and any indexing and what not is performed
-*/
-
-static CamelMessageContentInfo *
-summary_build_content_info(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	int state, len;
-	char *buffer;
-	CamelMessageContentInfo *info = NULL;
-	struct _header_content_type *ct;
-	int body;
-	int enc_id = -1, chr_id = -1, idx_id = -1;
-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);
-	CamelMimeFilterCharset *mfc;
-	CamelMessageContentInfo *part;
-
-	d(printf("building content info\n"));
-
-	/* start of this part */
-	state = camel_mime_parser_step(mp, &buffer, &len);
-	body = camel_mime_parser_tell(mp);
-
-	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->content_info_new_from_parser(s, mp);
-
-	info->pos = camel_mime_parser_tell_start_headers(mp);
-	info->bodypos = body;
-
-	switch(state) {
-	case HSCAN_HEADER:
-		/* check content type for indexing, then read body */
-		ct = camel_mime_parser_content_type(mp);
-		if (p->index && header_content_type_is(ct, "text", "*")) {
-			char *encoding;
-			const char *charset;
-
-			d(printf("generating index:\n"));
-			
-			encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL));
-			if (encoding) {
-				if (!strcasecmp(encoding, "base64")) {
-					d(printf(" decoding base64\n"));
-					if (p->filter_64 == NULL)
-						p->filter_64 = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_64);
-				} else if (!strcasecmp(encoding, "quoted-printable")) {
-					d(printf(" decoding quoted-printable\n"));
-					if (p->filter_qp == NULL)
-						p->filter_qp = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);
-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_qp);
-				} else {
-					d(printf(" ignoring encoding %s\n", encoding));
-				}
-				g_free(encoding);
-			}
-				
-			charset = header_content_type_param(ct, "charset");
-			if (charset!=NULL
-			    && !(strcasecmp(charset, "us-ascii")==0
-				 || strcasecmp(charset, "utf-8")==0)) {
-				d(printf(" Adding conversion filter from %s to UTF-8\n", charset));
-				mfc = g_hash_table_lookup(p->filter_charset, charset);
-				if (mfc == NULL) {
-					mfc = camel_mime_filter_charset_new_convert(charset, "UTF-8");
-					if (mfc)
-						g_hash_table_insert(p->filter_charset, g_strdup(charset), mfc);
-				}
-				if (mfc) {
-					chr_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)mfc);
-				} else {
-					g_warning("Cannot convert '%s' to 'UTF-8', message index may be corrupt", charset);
-				}
-			}
-
-			/* and this filter actually does the indexing */
-			idx_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_index);
-		}
-		/* and scan/index everything */
-		while (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_BODY_END)
-			;
-		/* and remove the filters */
-		camel_mime_parser_filter_remove(mp, enc_id);
-		camel_mime_parser_filter_remove(mp, chr_id);
-		camel_mime_parser_filter_remove(mp, idx_id);
-		break;
-	case HSCAN_MULTIPART:
-		d(printf("Summarising multipart\n"));
-		while (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_MULTIPART_END) {
-			camel_mime_parser_unstep(mp);
-			part = summary_build_content_info(s, mp);
-			if (part) {
-				part->parent = info;
-				my_list_append((struct _node **)&info->childs, (struct _node *)part);
-			} else {
-				g_error("Parsing failed: could not build part of a multipart");
-			}
-		}
-		break;
-	case HSCAN_MESSAGE:
-		d(printf("Summarising message\n"));
-		part = summary_build_content_info(s, mp);
-		if (part) {
-			part->parent = info;
-			my_list_append((struct _node **)&info->childs, (struct _node *)part);
-		} else {
-			g_error("Parsing failed: no content of a message?");
-		}
-		state = camel_mime_parser_step(mp, &buffer, &len);
-		if (state != HSCAN_MESSAGE_END) {
-			g_error("Bad parser state: Expecing MESSAGE_END or MESSAGE_EOF, got: %d", state);
-			camel_mime_parser_unstep(mp);
-		}
-		break;
-	}
-
-	info->endpos = camel_mime_parser_tell(mp);
-
-	d(printf("finished building content info\n"));
-
-	return info;
-}
-
-gboolean
-camel_flag_get(CamelFlag **list, const char *name)
-{
-	CamelFlag *flag;
-	flag = *list;
-	while (flag) {
-		if (!strcmp(flag->name, name))
-			return TRUE;
-		flag = flag->next;
-	}
-	return FALSE;
-}
-
-void
-camel_flag_set(CamelFlag **list, const char *name, gboolean value)
-{
-	CamelFlag *flag, *tmp;
-
-	/* this 'trick' works because flag->next is the first element */
-	flag = (CamelFlag *)list;
-	while (flag->next) {
-		tmp = flag->next;
-		if (!strcmp(flag->next->name, name)) {
-			if (!value) {
-				flag->next = tmp->next;
-				g_free(tmp);
-			}
-			return;
-		}
-		flag = tmp;
-	}
-
-	if (value) {
-		tmp = g_malloc(sizeof(*tmp) + strlen(name));
-		strcpy(tmp->name, name);
-		tmp->next = 0;
-		flag->next = tmp;
-	}
-}
-
-int
-camel_flag_list_size(CamelFlag **list)
-{
-	int count=0;
-	CamelFlag *flag;
-
-	flag = *list;
-	while (flag) {
-		count++;
-		flag = flag->next;
-	}
-	return count;
-}
-
-void
-camel_flag_list_free(CamelFlag **list)
-{
-	CamelFlag *flag, *tmp;
-	flag = *list;
-	while (flag) {
-		tmp = flag->next;
-		g_free(flag);
-		flag = tmp;
-	}
-	*list = NULL;
-}
-
-const char	*camel_tag_get(CamelTag **list, const char *name)
-{
-	CamelTag *tag;
-
-	tag = *list;
-	while (tag) {
-		if (!strcmp(tag->name, name))
-			return (const char *)tag->value;
-		tag = tag->next;
-	}
-	return NULL;
-}
-
-void		camel_tag_set(CamelTag **list, const char *name, const char *value)
-{
-	CamelTag *tag, *tmp;
-
-	/* this 'trick' works because tag->next is the first element */
-	tag = (CamelTag *)list;
-	while (tag->next) {
-		tmp = tag->next;
-		if (!strcmp(tmp->name, name)) {
-			if (value == NULL) { /* clear it? */
-				tag->next = tmp->next;
-				g_free(tmp->value);
-				g_free(tmp);
-			} else if (strcmp(tmp->value, value)) { /* has it changed? */
-				g_free(tmp->value);
-				tmp->value = g_strdup(value);
-			}
-			return;
-		}
-		tag = tmp;
-	}
-
-	if (value) {
-		tmp = g_malloc(sizeof(*tmp)+strlen(name));
-		strcpy(tmp->name, name);
-		tmp->value = g_strdup(value);
-		tmp->next = 0;
-		tag->next = tmp;
-	}
-}
-
-int		camel_tag_list_size(CamelTag **list)
-{
-	int count=0;
-	CamelTag *tag;
-
-	tag = *list;
-	while (tag) {
-		count++;
-		tag = tag->next;
-	}
-	return count;
-}
-
-void		camel_tag_list_free(CamelTag **list)
-{
-	CamelTag *tag, *tmp;
-	tag = *list;
-	while (tag) {
-		tmp = tag->next;
-		g_free(tag->value);
-		g_free(tag);
-		tag = tmp;
-	}
-	*list = NULL;
-}
-
-/**
- * camel_message_info_dup_to:
- * @from: source message info
- * @to: destination message info
- *
- * Duplicates the contents of one CamelMessageInfo structure into another.
- * (The destination is assumed to be empty: its contents are not freed.)
- * The slightly odd interface is to allow this to be used to initialize
- * "subclasses" of CamelMessageInfo.
- **/
-void
-camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to)
-{
-	CamelFlag *flag;
-	CamelTag *tag;
-
-	/* Copy numbers */
-	to->flags = from->flags;
-	to->size = from->size;
-	to->date_sent = from->date_sent;
-	to->date_received = from->date_received;
-
-	/* Copy strings */
-	to->subject = g_strdup(from->subject);
-	to->from = g_strdup(from->from);
-	to->to = g_strdup(from->to);
-	to->cc = g_strdup(from->cc);
-	to->uid = g_strdup(from->uid);
-	to->message_id = g_strdup(from->message_id);
-
-	/* Copy structures */
-	to->references = header_references_dup(from->references);
-	flag = from->user_flags;
-	while (flag) {
-		camel_flag_set(&to->user_flags, flag->name, TRUE);
-		flag = flag->next;
-	}
-
-	tag = from->user_tags;
-	while (tag) {
-		camel_tag_set(&to->user_tags, tag->name, tag->value);
-		tag = tag->next;
-	}
-
-	/* FIXME some day */
-	to->content = NULL;
-}
-
-/**
- * camel_message_info_free:
- * @mi: the message info
- *
- * Frees a CamelMessageInfo and its contents.
- **/
-void
-camel_message_info_free(CamelMessageInfo *mi)
-{
-	g_free(mi->uid);
-	g_free(mi->subject);
-	g_free(mi->from);
-	g_free(mi->to);
-	g_free(mi->cc);
-	g_free(mi->message_id);
-	header_references_list_clear(&mi->references);
-	camel_flag_list_free(&mi->user_flags);
-	camel_tag_list_free(&mi->user_tags);
-	/* FIXME: content info? */
-	g_free(mi);
-}
-
-#if 0
-static void
-content_info_dump(CamelMessageContentInfo *ci, int depth)
-{
-	char *p;
-
-	p = alloca(depth*4+1);
-	memset(p, ' ', depth*4);
-	p[depth*4] = 0;
-
-	if (ci == NULL) {
-		printf("%s<empty>\n", p);
-		return;
-	}
-
-	printf("%sconent-type: %s/%s\n", p, ci->type->type, ci->type->subtype);
-	printf("%sontent-transfer-encoding: %s\n", p, ci->encoding);
-	printf("%scontent-description: %s\n", p, ci->description);
-	printf("%sbytes: %d %d %d\n", p, (int)ci->pos, (int)ci->bodypos, (int)ci->endpos);
-	ci = ci->childs;
-	while (ci) {
-		content_info_dump(ci, depth+1);
-		ci = ci->next;
-	}
-}
-
-static void
-message_info_dump(CamelMessageInfo *mi)
-{
-	if (mi == NULL) {
-		printf("No message?\n");
-		return;
-	}
-
-	printf("Subject: %s\n", mi->subject);
-	printf("To: %s\n", mi->to);
-	printf("Cc: %s\n", mi->cc);
-	printf("From: %s\n", mi->from);
-	printf("UID: %s\n", mi->uid);
-	printf("Flags: %04x\n", mi->flags & 0xffff);
-	content_info_dump(mi->content, 0);
-}
-
-int main(int argc, char **argv)
-{
-	CamelMimeParser *mp;
-	int fd;
-	CamelFolderSummary *s;
-	char *buffer;
-	int len;
-	int i;
-	ibex *index;
-
-	/*g_tk_init(&argc, &argv);*/
-
-#if 0
-	{
-		int i;
-		char *s;
-		char buf[1024];
-
-		for (i=0;i<434712;i++) {
-			memcpy(buf, "                                                         ", 50);
-			buf[50] = 0;
-#if 0
-			s = g_strdup(buf);
-			g_free(s);
-#endif
-		}
-		return 0;
-	}
-#endif
-
-	if (argc < 2 ) {
-		printf("usage: %s mbox\n", argv[0]);
-		return 1;
-	}
-
-	fd = open(argv[1], O_RDONLY);
-
-	index = ibex_open("index.ibex", O_CREAT|O_RDWR, 0600);
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-/*	camel_mime_parser_set_header_regex(mp, "^(content-[^:]*|subject|from|to|date):");*/
-	camel_mime_parser_init_with_fd(mp, fd);
-
-	s = camel_folder_summary_new();
-	camel_folder_summary_set_build_content(s, TRUE);
-/*	camel_folder_summary_set_index(s, index);*/
-
-	while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM) {
-		/*printf("Parsing message ...\n");*/
-		camel_folder_summary_add_from_parser(s, mp);
-		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM_END) {
-			g_warning("Uknown state encountered, excpecting %d, got %d\n", HSCAN_FROM_END, camel_mime_parser_state(mp));
-			break;
-		}
-	}
-
-	printf("Printing summary\n");
-	for (i=0;i<camel_folder_summary_count(s);i++) {
-		message_info_dump(camel_folder_summary_index(s, i));
-	}
-
-	printf("Saivng summary\n");
-	camel_folder_summary_set_filename(s, "index.summary");
-	camel_folder_summary_save(s);
-
-	{
-		CamelFolderSummary *n;
-
-		printf("\nLoading summary\n");
-		n = camel_folder_summary_new();
-		camel_folder_summary_set_build_content(n, TRUE);
-		camel_folder_summary_set_filename(n, "index.summary");
-		camel_folder_summary_load(n);
-
-		printf("Printing summary\n");
-		for (i=0;i<camel_folder_summary_count(n);i++) {
-			message_info_dump(camel_folder_summary_index(n, i));
-		}
-		camel_object_unref(n);		
-	}
-
-
-	camel_object_unref(mp);
-	camel_object_unref(s);
-
-	printf("summarised %d messages\n", camel_folder_summary_count(s));
-#if 0
-	printf("g_strdup count = %d\n", strdup_count);
-	printf("g_malloc count = %d\n", malloc_count);
-	printf("g_free count = %d\n", free_count);
-#endif
-	return 0;
-}
-
-#endif
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
deleted file mode 100644
index 95b394c69f..0000000000
--- a/camel/camel-folder-summary.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_FOLDER_SUMMARY_H
-#define _CAMEL_FOLDER_SUMMARY_H
-
-#include <camel/camel-object.h>
-#include <stdio.h>
-#include <time.h>
-#include <camel/camel-mime-parser.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_FOLDER_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)
-#define CAMEL_FOLDER_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass)
-#define IS_CAMEL_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_summary_get_type ())
-
-/*typedef struct _CamelFolderSummary      CamelFolderSummary;*/
-typedef struct _CamelFolderSummaryClass CamelFolderSummaryClass;
-
-/* A tree of message content info structures
-   describe the content structure of the message (if it has any) */
-typedef struct _CamelMessageContentInfo {
-	struct _CamelMessageContentInfo *next;
-
-	struct _CamelMessageContentInfo *childs;
-	struct _CamelMessageContentInfo *parent;
-
-	struct _header_content_type *type;
-	char *id;
-	char *description;
-	char *encoding;
-
-	/* information about where this object lives in the stream.
-	   if pos is -1 these are all invalid */
-	off_t pos;
-	off_t bodypos;
-	off_t endpos;
-} CamelMessageContentInfo;
-
-/* system flag bits */
-enum _CamelMessageFlags {
-	CAMEL_MESSAGE_ANSWERED = 1<<0,
-	CAMEL_MESSAGE_DELETED = 1<<1,
-	CAMEL_MESSAGE_DRAFT = 1<<2,
-	CAMEL_MESSAGE_FLAGGED = 1<<3,
-	CAMEL_MESSAGE_SEEN = 1<<4,
-	/* following flags are for the folder, and are not really permanent flags */
-	CAMEL_MESSAGE_FOLDER_FLAGGED = 1<<16, /* for use by the folder implementation */
-	CAMEL_MESSAGE_USER = 1<<31 /* supports user flags */
-};
-
-typedef struct _CamelFlag {
-	struct _CamelFlag *next;
-	char name[1];		/* name allocated as part of the structure */
-} CamelFlag;
-
-typedef struct _CamelTag {
-	struct _CamelTag *next;
-	char *value;
-	char name[1];		/* name allocated as part of the structure */
-} CamelTag;
-
-/* information about a given object */
-typedef struct {
-	/* public fields */
-	gchar *subject;
-	gchar *from;
-	gchar *to;
-	gchar *cc;
-
-	gchar *uid;
-	guint32 flags;
-	guint32 size;
-
-	time_t date_sent;
-	time_t date_received;
-
-	/* Message-ID / References structures */
-	char *message_id;	/* for this message */
-	struct _header_references *references; /* from parent to root */
-
-	struct _CamelFlag *user_flags;
-	struct _CamelTag *user_tags;
-
-	/* tree of content description - NULL if it is not available */
-	CamelMessageContentInfo *content;
-} CamelMessageInfo;
-
-enum _CamelFolderSummaryFlags {
-	CAMEL_SUMMARY_DIRTY = 1<<0,
-};
-
-struct _CamelFolderSummary {
-	CamelObject parent;
-
-	struct _CamelFolderSummaryPrivate *priv;
-
-	/* header info */
-	guint32 version;	/* version of file required, should be set by implementors */
-	guint32 flags;		/* flags */
-	guint32 nextuid;	/* next uid? */
-	guint32 saved_count;	/* how many were saved/loaded */
-	time_t time;		/* timestamp for this summary (for implementors to use) */
-
-	/* sizes of memory objects */
-	guint32 message_info_size;
-	guint32 content_info_size;
-
-	char *summary_path;
-	gboolean build_content;	/* do we try and parse/index the content, or not? */
-
-	GPtrArray *messages;	/* CamelMessageInfo's */
-	GHashTable *messages_uid; /* CamelMessageInfo's by uid */
-};
-
-struct _CamelFolderSummaryClass {
-	CamelObjectClass parent_class;
-
-	/* load/save the global info */
-	int (*summary_header_load)(CamelFolderSummary *, FILE *);
-	int (*summary_header_save)(CamelFolderSummary *, FILE *);
-
-	/* create/save/load an individual message info */
-	CamelMessageInfo * (*message_info_new)(CamelFolderSummary *, struct _header_raw *);
-	CamelMessageInfo * (*message_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);
-	CamelMessageInfo * (*message_info_load)(CamelFolderSummary *, FILE *);
-	int		   (*message_info_save)(CamelFolderSummary *, FILE *, CamelMessageInfo *);
-	void		   (*message_info_free)(CamelFolderSummary *, CamelMessageInfo *);
-
-	/* save/load individual content info's */
-	CamelMessageContentInfo * (*content_info_new)(CamelFolderSummary *, struct _header_raw *);
-	CamelMessageContentInfo * (*content_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);
-	CamelMessageContentInfo * (*content_info_load)(CamelFolderSummary *, FILE *);
-	int		          (*content_info_save)(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);
-	void		          (*content_info_free)(CamelFolderSummary *, CamelMessageContentInfo *);
-};
-
-guint			 camel_folder_summary_get_type	(void);
-CamelFolderSummary      *camel_folder_summary_new	(void);
-
-void camel_folder_summary_set_filename(CamelFolderSummary *, const char *);
-void camel_folder_summary_set_index(CamelFolderSummary *, ibex *);
-void camel_folder_summary_set_build_content(CamelFolderSummary *, gboolean state);
-
-guint32  camel_folder_summary_next_uid        (CamelFolderSummary *s);
-char    *camel_folder_summary_next_uid_string (CamelFolderSummary *s);
-void 	 camel_folder_summary_set_uid	      (CamelFolderSummary *s, guint32 uid);
-
-/* load/save the summary in its entirety */
-int camel_folder_summary_load(CamelFolderSummary *);
-int camel_folder_summary_save(CamelFolderSummary *);
-
-/* set the dirty bit on the summary */
-void camel_folder_summary_touch(CamelFolderSummary *s);
-
-/* add a new raw summary item */
-void camel_folder_summary_add(CamelFolderSummary *, CamelMessageInfo *info);
-
-/* build/add raw summary items */
-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *, struct _header_raw *);
-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *, CamelMimeParser *);
-
-/* removes a summary item, doesn't fix content offsets */
-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info);
-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid);
-void camel_folder_summary_remove_index(CamelFolderSummary *s, int);
-/* remove all items */
-void camel_folder_summary_clear(CamelFolderSummary *s);
-
-/* lookup functions */
-int camel_folder_summary_count(CamelFolderSummary *);
-CamelMessageInfo *camel_folder_summary_index(CamelFolderSummary *, int);
-CamelMessageInfo *camel_folder_summary_uid(CamelFolderSummary *, const char *uid);
-
-/* shift content ... */
-void camel_folder_summary_offset_content(CamelMessageContentInfo *content, off_t offset);
-
-/* summary formatting utils */
-char *camel_folder_summary_format_address (struct _header_raw *h, const char *name);
-char *camel_folder_summary_format_string (struct _header_raw *h, const char *name);
-
-/* summary file loading/saving helper functions */
-int camel_folder_summary_encode_fixed_int32(FILE *, gint32);
-int camel_folder_summary_decode_fixed_int32(FILE *, gint32 *);
-
-int camel_folder_summary_encode_uint32(FILE *, guint32);
-int camel_folder_summary_decode_uint32(FILE *, guint32 *);
-
-int camel_folder_summary_encode_time_t(FILE *out, time_t value);
-int camel_folder_summary_decode_time_t(FILE *in, time_t *dest);
-
-int camel_folder_summary_encode_string(FILE *, char *);
-int camel_folder_summary_decode_string(FILE *, char **);
-
-/* basically like strings, but certain keywords can be compressed and de-cased */
-int camel_folder_summary_encode_token(FILE *, char *);
-int camel_folder_summary_decode_token(FILE *, char **);
-
-/* message flag operations */
-gboolean	camel_flag_get(CamelFlag **list, const char *name);
-void		camel_flag_set(CamelFlag **list, const char *name, gboolean state);
-int		camel_flag_list_size(CamelFlag **list);
-void		camel_flag_list_free(CamelFlag **list);
-
-/* message tag operations */
-const char	*camel_tag_get(CamelTag **list, const char *name);
-void		camel_tag_set(CamelTag **list, const char *name, const char *value);
-int		camel_tag_list_size(CamelTag **list);
-void		camel_tag_list_free(CamelTag **list);
-
-/* message info utils */
-void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);
-void camel_message_info_free(CamelMessageInfo *mi);
-
-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
deleted file mode 100644
index 1d929fb4f0..0000000000
--- a/camel/camel-folder.c
+++ /dev/null
@@ -1,1360 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-folder.c: Abstract class for an email folder */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <string.h>
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "string-utils.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelFolder */
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void camel_folder_finalize (CamelObject *object);
-
-static void refresh_info (CamelFolder *folder, CamelException *ex);
-
-static void folder_sync (CamelFolder *folder, gboolean expunge,
-			 CamelException *ex);
-
-static const gchar *get_name (CamelFolder *folder);
-static const gchar *get_full_name (CamelFolder *folder);
-static CamelStore *get_parent_store   (CamelFolder *folder);
-
-static guint32 get_permanent_flags (CamelFolder *folder);
-static guint32 get_message_flags (CamelFolder *folder, const char *uid);
-static void set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set);
-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);
-static void set_message_user_flag (CamelFolder *folder, const char *uid,
-				   const char *name, gboolean value);
-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);
-static void set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
-
-static gint get_message_count (CamelFolder *folder);
-static gint get_unread_message_count (CamelFolder *folder);
-
-static void expunge             (CamelFolder *folder,
-				 CamelException *ex);
-
-
-static void append_message (CamelFolder *folder, CamelMimeMessage *message,
-			    const CamelMessageInfo *info, CamelException *ex);
-
-
-static GPtrArray        *get_uids            (CamelFolder *folder);
-static void              free_uids           (CamelFolder *folder,
-					      GPtrArray *array);
-static GPtrArray        *get_summary         (CamelFolder *folder);
-static void              free_summary        (CamelFolder *folder,
-					      GPtrArray *array);
-
-static CamelMimeMessage *get_message         (CamelFolder *folder,
-					      const gchar *uid,
-					      CamelException *ex);
-
-static const CamelMessageInfo *get_message_info (CamelFolder *folder,
-						 const char *uid);
-
-static GPtrArray      *search_by_expression  (CamelFolder *folder,
-					      const char *exp,
-					      CamelException *ex);
-static void            search_free           (CamelFolder * folder, 
-					      GPtrArray * result);
-
-static void            copy_message_to       (CamelFolder *source,
-					      const char *uid,
-					      CamelFolder *dest,
-					      CamelException *ex);
-
-static void            move_message_to       (CamelFolder *source,
-					      const char *uid,
-					      CamelFolder *dest,
-					      CamelException *ex);
-
-static void            freeze                (CamelFolder *folder);
-static void            thaw                  (CamelFolder *folder);
-
-static gboolean        folder_changed        (CamelObject *object,
-					      gpointer event_data);
-static gboolean        message_changed       (CamelObject *object,
-					      /*const char *uid*/gpointer event_data);
-
-static void
-camel_folder_class_init (CamelFolderClass *camel_folder_class)
-{
-	CamelObjectClass *camel_object_class =
-		CAMEL_OBJECT_CLASS (camel_folder_class);
-
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	/* virtual method definition */
-	camel_folder_class->sync = folder_sync;
-	camel_folder_class->refresh_info = refresh_info;
-	camel_folder_class->get_name = get_name;
-	camel_folder_class->get_full_name = get_full_name;
-	camel_folder_class->get_parent_store = get_parent_store;
-	camel_folder_class->expunge = expunge;
-	camel_folder_class->get_message_count = get_message_count;
-	camel_folder_class->get_unread_message_count = get_unread_message_count;
-	camel_folder_class->append_message = append_message;
-	camel_folder_class->get_permanent_flags = get_permanent_flags;
-	camel_folder_class->get_message_flags = get_message_flags;
-	camel_folder_class->set_message_flags = set_message_flags;
-	camel_folder_class->get_message_user_flag = get_message_user_flag;
-	camel_folder_class->set_message_user_flag = set_message_user_flag;
-	camel_folder_class->get_message_user_tag = get_message_user_tag;
-	camel_folder_class->set_message_user_tag = set_message_user_tag;
-	camel_folder_class->get_message = get_message;
-	camel_folder_class->get_uids = get_uids;
-	camel_folder_class->free_uids = free_uids;
-	camel_folder_class->get_summary = get_summary;
-	camel_folder_class->free_summary = free_summary;
-	camel_folder_class->search_by_expression = search_by_expression;
-	camel_folder_class->search_free = search_free;
-	camel_folder_class->get_message_info = get_message_info;
-	camel_folder_class->copy_message_to = copy_message_to;
-	camel_folder_class->move_message_to = move_message_to;
-	camel_folder_class->freeze = freeze;
-	camel_folder_class->thaw = thaw;
-
-	/* virtual method overload */
-	camel_object_class_declare_event (camel_object_class,
-					  "folder_changed", folder_changed);
-	camel_object_class_declare_event (camel_object_class,
-					  "message_changed", message_changed);
-}
-
-static void
-camel_folder_init (gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-
-	folder->frozen = 0;
-	folder->changed_frozen = camel_folder_change_info_new();
-}
-
-static void
-camel_folder_finalize (CamelObject *object)
-{
-	CamelFolder *camel_folder = CAMEL_FOLDER (object);
-
-	g_free (camel_folder->name);
-	g_free (camel_folder->full_name);
-
-	if (camel_folder->parent_store)
-		camel_object_unref (CAMEL_OBJECT (camel_folder->parent_store));
-
-	camel_folder_change_info_free(camel_folder->changed_frozen);
-}
-
-CamelType
-camel_folder_get_type (void)
-{
-	static CamelType camel_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_folder_type == CAMEL_INVALID_TYPE)	{
-		camel_folder_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelFolder",
-							 sizeof (CamelFolder),
-							 sizeof (CamelFolderClass),
-							 (CamelObjectClassInitFunc) camel_folder_class_init,
-							 NULL,
-							 (CamelObjectInitFunc) camel_folder_init,
-							 (CamelObjectFinalizeFunc) camel_folder_finalize );
-	}
-
-	return camel_folder_type;
-}
-
-
-/**
- * camel_folder_construct:
- * @folder: folder object to construct
- * @parent_store: parent store object of the folder
- * @full_name: full name of the folder
- * @name: short name of the folder
- *
- * Initalizes the folder by setting the parent store and name.
- **/
-void
-camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
-			const char *full_name, const char *name)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (CAMEL_IS_STORE (parent_store));
-	g_return_if_fail (folder->parent_store == NULL);
-	g_return_if_fail (folder->name == NULL);
-
-	folder->parent_store = parent_store;
-	camel_object_ref (CAMEL_OBJECT (parent_store));
-
-	folder->name = g_strdup (name);
-	folder->full_name = g_strdup (full_name);
-}
-
-
-static void
-folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	g_warning ("CamelFolder::sync not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_sync:
- * @folder: The folder object
- * @expunge: whether or not to expunge deleted messages
- * @ex: exception object
- *
- * Sync changes made to a folder to its backing store, possibly expunging
- * deleted messages as well.
- **/
-void
-camel_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->sync (folder, expunge, ex);
-}
-
-
-static void
-refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	/* No op */
-}
-
-/**
- * camel_folder_refresh_info:
- * @folder: The folder object
- * @ex: exception object
- *
- * Updates a folder's summary to be in sync with its backing store.
- **/
-void
-camel_folder_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->refresh_info (folder, ex);
-}
-
-
-static const char *
-get_name (CamelFolder *folder)
-{
-	return folder->name;
-}
-
-/**
- * camel_folder_get_name:
- * @folder: a folder
- *
- * Get the (short) name of the folder. The fully qualified name
- * can be obtained with the get_full_name method.
- *
- * Return value: name of the folder
- **/
-const char *
-camel_folder_get_name (CamelFolder * folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_name (folder);
-}
-
-
-static const char *
-get_full_name (CamelFolder *folder)
-{
-	return folder->full_name;
-}
-
-/**
- * camel_folder_get_full_name:
- * @folder: a folder
- *
- * Get the (full) name of the folder.
- *
- * Return value: full name of the folder
- **/
-const char *
-camel_folder_get_full_name (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_full_name (folder);
-}
-
-
-static CamelStore *
-get_parent_store (CamelFolder * folder)
-{
-	return folder->parent_store;
-}
-
-/**
- * camel_folder_get_parent_store:
- * @folder: folder to get the parent of
- *
- * Return value: the parent store of the folder.
- **/
-CamelStore *
-camel_folder_get_parent_store (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_parent_store (folder);
-}
-
-
-static void
-expunge (CamelFolder *folder, CamelException *ex)
-{
-	g_warning ("CamelFolder::expunge not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-
-/**
- * camel_folder_expunge:
- * @folder: the folder
- * @ex: a CamelException
- *
- * Delete messages which have been marked as "DELETED"
- **/
-void
-camel_folder_expunge (CamelFolder *folder, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->expunge (folder, ex);
-}
-
-
-static int
-get_message_count (CamelFolder *folder)
-{
-	g_warning ("CamelFolder::get_message_count not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return -1;
-}
-
-/**
- * camel_folder_get_message_count:
- * @folder: A CamelFolder object
- *
- * Return value: the number of messages in the folder, or -1 if unknown.
- **/
-int
-camel_folder_get_message_count (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-
-	return CF_CLASS (folder)->get_message_count (folder);
-}
-
-
-static int
-get_unread_message_count (CamelFolder *folder)
-{
-	g_warning ("CamelFolder::get_unread_message_count not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return -1;
-}
-
-/**
- * camel_folder_unread_get_message_count:
- * @folder: A CamelFolder object
- *
- * Return value: the number of unread messages in the folder, or -1 if unknown.
- **/
-int
-camel_folder_get_unread_message_count (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);
-
-	return CF_CLASS (folder)->get_unread_message_count (folder);
-}
-
-
-static void
-append_message (CamelFolder *folder, CamelMimeMessage *message,
-		const CamelMessageInfo *info, CamelException *ex)
-{
-	g_warning ("CamelFolder::append_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return;
-
-}
-
-/**
- * camel_folder_append_message: add a message to a folder
- * @folder: folder object to add the message to
- * @message: message object
- * @info: message info with additional flags/etc to set on
- * new message, or %NULL
- * @ex: exception object
- *
- * Add a message to a folder. Only the flag and tag data from @info
- * is used. If @info is %NULL, no flags or tags will be set.
- **/
-void
-camel_folder_append_message (CamelFolder *folder, CamelMimeMessage *message,
-			     const CamelMessageInfo *info, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->append_message (folder, message, info, ex);
-}
-
-
-static guint32
-get_permanent_flags (CamelFolder *folder)
-{
-	return folder->permanent_flags;
-}
-
-/**
- * camel_folder_get_permanent_flags:
- * @folder: a CamelFolder
- *
- * Return value: the set of CamelMessageFlags that can be permanently
- * stored on a message between sessions. If it includes %CAMEL_FLAG_USER,
- * then user-defined flags will be remembered.
- **/
-guint32
-camel_folder_get_permanent_flags (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	return CF_CLASS (folder)->get_permanent_flags (folder);
-}
-
-
-static guint32
-get_message_flags (CamelFolder *folder, const char *uid)
-{
-	g_warning ("CamelFolder::get_message_flags not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return 0;
-}
-
-/**
- * camel_folder_get_message_flags:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- *
- * Return value: the CamelMessageFlags that are set on the indicated
- * message.
- **/
-guint32
-camel_folder_get_message_flags (CamelFolder *folder, const char *uid)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	return CF_CLASS (folder)->get_message_flags (folder, uid);
-}
-
-
-static void
-set_message_flags (CamelFolder *folder, const char *uid,
-		   guint32 flags, guint32 set)
-{
-	g_warning ("CamelFolder::set_message_flags not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_set_message_flags:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @flags: a set of CamelMessageFlag values to set
- * @set: the mask of values in @flags to use.
- *
- * Sets those flags specified by @set to the values specified by @flags
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_flags (CamelFolder *folder, const char *uid,
-				guint32 flags, guint32 set)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_flags (folder, uid, flags, set);
-}
-
-
-static gboolean
-get_message_user_flag (CamelFolder *folder, const char *uid,
-		       const char *name)
-{
-	g_warning ("CamelFolder::get_message_user_flag not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return FALSE;
-}
-
-/**
- * camel_folder_get_message_user_flag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of a user flag
- *
- * Return value: whether or not the given user flag is set on the message.
- **/
-gboolean
-camel_folder_get_message_user_flag (CamelFolder *folder, const char *uid,
-				    const char *name)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	return CF_CLASS (folder)->get_message_user_flag (folder, uid, name);
-}
-
-
-static void
-set_message_user_flag (CamelFolder *folder, const char *uid,
-		       const char *name, gboolean value)
-{
-	g_warning ("CamelFolder::set_message_user_flag not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_set_message_user_flag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of the user flag to set
- * @value: the value to set it to
- *
- * Sets the user flag specified by @name to the value specified by @value
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_user_flag (CamelFolder *folder, const char *uid,
-				    const char *name, gboolean value)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_user_flag (folder, uid, name, value);
-}
-
-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)
-{
-	g_warning ("CamelFolder::get_message_user_tag not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_message_user_tag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of a user tag
- *
- * Return value: Returns the value of the user tag.
- **/
-const char *
-camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid,  const char *name)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);
-
-	return CF_CLASS (folder)->get_message_user_tag (folder, uid, name);
-}
-
-
-static void
-set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	g_warning ("CamelFolder::set_message_user_tag not implemented "
-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_set_message_user_tag:
- * @folder: a CamelFolder
- * @uid: the UID of a message in @folder
- * @name: the name of the user tag to set
- * @value: the value to set it to
- *
- * Sets the user tag specified by @name to the value specified by @value
- * on the indicated message. (This may or may not persist after the
- * folder or store is closed. See camel_folder_get_permanent_flags().)
- **/
-void
-camel_folder_set_message_user_tag (CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->set_message_user_tag (folder, uid, name, value);
-}
-
-
-static const CamelMessageInfo *
-get_message_info (CamelFolder *folder, const char *uid)
-{
-	g_warning ("CamelFolder::get_message_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_message_info:
- * @folder: a CamelFolder
- * @uid: the uid of a message
- *
- * Return value: the summary information for the indicated message
- **/
-const CamelMessageInfo *
-camel_folder_get_message_info (CamelFolder *folder, const char *uid)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	return CF_CLASS (folder)->get_message_info (folder, uid);
-}
-
-
-/* TODO: is this function required anyway? */
-gboolean
-camel_folder_has_summary_capability (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
-
-	return folder->has_summary_capability;
-}
-
-
-/* UIDs stuff */
-
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	g_warning ("CamelFolder::get_message not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_message:
- * @folder: the folder object
- * @uid: the UID
- * @ex: a CamelException
- *
- * Get a message from its UID in the folder. Messages are cached
- * within a folder, that is, asking twice for the same UID returns the
- * same message object. (FIXME: is this true?)
- *
- * Return value: Message corresponding to the UID
- **/
-CamelMimeMessage *
-camel_folder_get_message (CamelFolder *folder, const gchar *uid,
-			  CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_message (folder, uid, ex);
-}
-
-
-static GPtrArray *
-get_uids (CamelFolder *folder)
-{
-	g_warning ("CamelFolder::get_uids not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_uids:
- * @folder: folder object
- *
- * Get the list of UIDs available in a folder. This routine is useful
- * for finding what messages are available when the folder does not
- * support summaries. The returned array shoudl not be modified, and
- * must be freed by passing it to camel_folder_free_uids().
- *
- * Return value: GPtrArray of UIDs corresponding to the messages
- * available in the folder.
- **/
-GPtrArray *
-camel_folder_get_uids (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_uids (folder);
-}
-
-
-static void
-free_uids (CamelFolder *folder, GPtrArray *array)
-{
-	g_warning ("CamelFolder::free_uids not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_free_uids:
- * @folder: folder object
- * @array: the array of uids to free
- *
- * Frees the array of UIDs returned by camel_folder_get_uids().
- **/
-void
-camel_folder_free_uids (CamelFolder *folder, GPtrArray *array)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->free_uids (folder, array);
-}
-
-
-static GPtrArray *
-get_summary (CamelFolder *folder)
-{
-	g_warning ("CamelFolder::get_summary not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_summary:
- * @folder: a folder object
- *
- * This returns the summary information for the folder. This array
- * should not be modified, and must be freed with
- * camel_folder_free_summary().
- *
- * Return value: an array of CamelMessageInfo
- **/
-GPtrArray *
-camel_folder_get_summary (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-
-	return CF_CLASS (folder)->get_summary (folder);
-}
-
-
-static void
-free_summary (CamelFolder *folder, GPtrArray *array)
-{
-	g_warning ("CamelFolder::free_summary not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-}
-
-/**
- * camel_folder_free_summary:
- * @folder: folder object
- * @array: the summary array to free
- *
- * Frees the summary array returned by camel_folder_get_summary().
- **/
-void camel_folder_free_summary(CamelFolder * folder, GPtrArray * array)
-{
-	g_return_if_fail(CAMEL_IS_FOLDER(folder));
-
-	CF_CLASS(folder)->free_summary(folder, array);
-}
-
-/**
- * camel_folder_has_search_capability:
- * @folder: Folder object
- *
- * Checks if a folder supports searching.
- *
- * Return value: %TRUE if the folder supports searching
- **/
-gboolean
-camel_folder_has_search_capability (CamelFolder *folder)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
-
-	return folder->has_search_capability;
-}
-
-static GPtrArray *
-search_by_expression (CamelFolder *folder, const char *expression,
-		      CamelException *ex)
-{
-	g_warning ("CamelFolder::search_by_expression not implemented for "
-		   "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_search_by_expression:
- * @folder: Folder object
- * @expression: a search expression
- * @ex: a CamelException
- *
- * Searches the folder for messages matching the given search expression.
- *
- * Return value: a list of uids of matching messages. The caller must
- * free the list and each of the elements when it is done.
- **/
-GPtrArray *
-camel_folder_search_by_expression (CamelFolder *folder, const char *expression,
-				   CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (folder->has_search_capability, NULL);
-
-	return CF_CLASS (folder)->search_by_expression (folder, expression, ex);
-}
-
-static void
-search_free (CamelFolder *folder, GPtrArray *result)
-{
-	int i;
-
-	for (i = 0; i < result->len; i++)
-		g_free (g_ptr_array_index (result, i));
-	g_ptr_array_free (result, TRUE);
-}
-
-/**
- * camel_folder_search_free:
- * @folder: 
- * @result: 
- * 
- * Free the result of a search.
- **/
-void 
-camel_folder_search_free (CamelFolder *folder, GPtrArray *result)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (folder->has_search_capability);
-
-	return CF_CLASS (folder)->search_free (folder, result);
-}
-
-
-static void
-copy_message_to (CamelFolder *source, const char *uid, CamelFolder *dest,
-		 CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	const CamelMessageInfo *info;
-
-	/* Default implementation. */
-	
-	msg = camel_folder_get_message (source, uid, ex);
-	if (!msg)
-		return;
-	info = camel_folder_get_message_info (source, uid);
-	camel_folder_append_message (dest, msg, info, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-}
-
-/**
- * camel_folder_copy_message_to:
- * @source: source folder
- * @uid: UID of message in @source
- * @dest: destination folder
- * @ex: a CamelException
- *
- * This copies a message from one folder to another. If the @source and
- * @dest folders have the same parent_store, this may be more efficient
- * than a camel_folder_append_message().
- **/
-void
-camel_folder_copy_message_to (CamelFolder *source, const char *uid,
-			      CamelFolder *dest, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (CAMEL_IS_FOLDER (dest));
-	g_return_if_fail (uid != NULL);
-
-	if (source->parent_store == dest->parent_store) {
-		return CF_CLASS (source)->copy_message_to (source, uid,
-							   dest, ex);
-	} else
-		return copy_message_to (source, uid, dest, ex);
-}
-
-
-static void
-move_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *dest, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	const CamelMessageInfo *info;
-
-	/* Default implementation. */
-	
-	msg = camel_folder_get_message (source, uid, ex);
-	if (!msg)
-		return;
-	info = camel_folder_get_message_info (source, uid);
-	camel_folder_append_message (dest, msg, info, ex);
-	camel_object_unref (CAMEL_OBJECT (msg));
-	if (camel_exception_is_set(ex))
-		return;
-	camel_folder_delete_message (source, uid);
-}
-
-/**
- * camel_folder_move_message_to:
- * @source: source folder
- * @uid: UID of message in @source
- * @dest: destination folder
- * @ex: a CamelException
- *
- * This moves a message from one folder to another. If the @source and
- * @dest folders have the same parent_store, this may be more efficient
- * than a camel_folder_append_message() followed by
- * camel_folder_delete_message().
- **/
-void
-camel_folder_move_message_to (CamelFolder *source, const char *uid,
-			      CamelFolder *dest, CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (source));
-	g_return_if_fail (CAMEL_IS_FOLDER (dest));
-	g_return_if_fail (uid != NULL);
-
-	if (source->parent_store == dest->parent_store) {
-		return CF_CLASS (source)->move_message_to (source, uid,
-							   dest, ex);
-	} else
-		return move_message_to (source, uid, dest, ex);
-}
-
-static void
-freeze (CamelFolder *folder)
-{
-	folder->frozen++;
-}
-
-/**
- * camel_folder_freeze:
- * @folder: a folder
- *
- * Freezes the folder so that a series of operation can be performed
- * without "message_changed" and "folder_changed" signals being emitted.
- * When the folder is later thawed with camel_folder_thaw(), the
- * suppressed signals will be emitted.
- **/
-void
-camel_folder_freeze (CamelFolder * folder)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-
-	CF_CLASS (folder)->freeze (folder);
-}
-
-static void
-thaw (CamelFolder * folder)
-{
-	int i;
-	CamelFolderChangeInfo *info;
-
-	folder->frozen--;
-	if (folder->frozen != 0)
-		return;
-
-	/* If we have more or less messages, do a folder changed, otherwise just
-	   do a message changed for each one.
-	   TODO: message_changed is now probably irrelevant and not required */
-	info = folder->changed_frozen;
-	if (info->uid_added->len > 0 || info->uid_removed->len > 0) {
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", info);
-	} else if (info->uid_changed->len > 0) {
-		for (i=0;i<info->uid_changed->len;i++) {
-			camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", info->uid_changed->pdata[i]);
-		}
-	}
-
-	camel_folder_change_info_clear(info);
-}
-
-/**
- * camel_folder_thaw:
- * @folder: a folder
- *
- * Thaws the folder and emits any pending folder_changed or
- * message_changed signals.
- **/
-void
-camel_folder_thaw (CamelFolder *folder)
-{
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	g_return_if_fail (folder->frozen != 0);
-
-	CF_CLASS (folder)->thaw (folder);
-}
-
-
-/* Event hooks that block emission when frozen */
-static gboolean
-folder_changed (CamelObject *obj, gpointer event_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (obj);
-	CamelFolderChangeInfo *changed = event_data;
-
-	if (folder->frozen) {
-		if (changed != NULL)
-			camel_folder_change_info_cat(folder->changed_frozen, changed);
-		else
-			g_warning("Class %s is passing NULL to folder_changed event",
-				  camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static gboolean
-message_changed (CamelObject *obj, /*const char *uid*/gpointer event_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (obj);
-
-	if (folder->frozen) {
-		camel_folder_change_info_change_uid(folder->changed_frozen, (char *)event_data);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-/**
- * camel_folder_free_nop:
- * @folder: a folder
- * @array: an array of uids or CamelMessageInfo
- *
- * "Frees" the provided array by doing nothing. Used by CamelFolder
- * subclasses as an implementation for free_uids, or free_summary when
- * the returned array is "static" information and should not be freed.
- **/
-void
-camel_folder_free_nop (CamelFolder *folder, GPtrArray *array)
-{
-	;
-}
-
-/**
- * camel_folder_free_shallow:
- * @folder: a folder
- * @array: an array of uids or CamelMessageInfo
- *
- * Frees the provided array but not its contents. Used by CamelFolder
- * subclasses as an implementation for free_uids or free_summary when
- * the returned array needs to be freed but its contents come from
- * "static" information.
- **/
-void
-camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)
-{
-	g_ptr_array_free (array, TRUE);
-}
-
-/**
- * camel_folder_free_deep:
- * @folder: a folder
- * @array: an array of uids
- *
- * Frees the provided array and its contents. Used by CamelFolder
- * subclasses as an implementation for free_uids when the provided
- * information was created explicitly by the corresponding get_ call.
- **/
-void
-camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)
-{
-	int i;
-
-	for (i = 0; i < array->len; i++)
-		g_free (array->pdata[i]);
-	g_ptr_array_free (array, TRUE);
-}
-
-/**
- * camel_folder_change_info_new:
- * @void: 
- * 
- * Create a new folder change info structure.
- * 
- * Return value: 
- **/
-CamelFolderChangeInfo *
-camel_folder_change_info_new(void)
-{
-	CamelFolderChangeInfo *info;
-
-	info = g_malloc(sizeof(*info));
-	info->uid_added = g_ptr_array_new();
-	info->uid_removed = g_ptr_array_new();
-	info->uid_changed = g_ptr_array_new();
-	info->uid_source = NULL;
-
-	return info;
-}
-
-/**
- * camel_folder_change_info_add_source:
- * @info: 
- * @uid: 
- * 
- * Add a source uid for generating a changeset.
- **/
-void
-camel_folder_change_info_add_source(CamelFolderChangeInfo *info, const char *uid)
-{
-	if (info->uid_source == NULL)
-		info->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
-
-	if (g_hash_table_lookup(info->uid_source, uid) == NULL)
-		g_hash_table_insert(info->uid_source, g_strdup(uid), (void *)1);
-}
-
-/**
- * camel_folder_change_info_add_source_list:
- * @info: 
- * @list: 
- * 
- * Add a list of source uid's for generating a changeset.
- **/
-void
-camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list)
-{
-	int i;
-
-	if (info->uid_source == NULL)
-		info->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for (i=0;i<list->len;i++) {
-		char *uid = list->pdata[i];
-
-		if (g_hash_table_lookup(info->uid_source, uid) == NULL)
-			g_hash_table_insert(info->uid_source, g_strdup(uid), (void *)1);
-	}
-}
-
-/**
- * camel_folder_change_info_add_update:
- * @info: 
- * @uid: 
- * 
- * Add a uid from the updated list, used to generate a changeset diff.
- **/
-void
-camel_folder_change_info_add_update(CamelFolderChangeInfo *info, const char *uid)
-{
-	char *key;
-	int value;
-
-	if (info->uid_source == NULL) {
-		camel_folder_change_info_add_uid(info, uid);
-		return;
-	}
-
-	if (g_hash_table_lookup_extended(info->uid_source, uid, (void **)&key, (void **)&value)) {
-		g_hash_table_remove(info->uid_source, key);
-		g_free(key);
-	} else {
-		camel_folder_change_info_add_uid(info, uid);
-	}
-}
-
-/**
- * camel_folder_change_info_add_update_list:
- * @info: 
- * @list: 
- * 
- * Add a list of uid's from the updated list.
- **/
-void
-camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list)
-{
-	int i;
-
-	for (i=0;i<list->len;i++) {
-		camel_folder_change_info_add_update(info, list->pdata[i]);
-	}
-}
-
-static void
-change_info_remove(char *key, void *value, CamelFolderChangeInfo *info)
-{
-	camel_folder_change_info_remove_uid(info, key);
-	g_free(key);
-}
-
-static void
-change_info_free_update(char *key, void *value, CamelFolderChangeInfo *info)
-{
-	g_free(key);
-}
-
-/**
- * camel_folder_change_info_build_diff:
- * @info: 
- * 
- * Compare the source uid set to the updated uid set and generate the differences
- * into the added and removed lists.
- **/
-void
-camel_folder_change_info_build_diff(CamelFolderChangeInfo *info)
-{
-	if (info->uid_source) {
-		g_hash_table_foreach(info->uid_source, (GHFunc)change_info_remove, info);
-		g_hash_table_destroy(info->uid_source);
-		info->uid_source = NULL;
-	}
-}
-
-static void
-change_info_add_uid(CamelFolderChangeInfo *info, GPtrArray *uids, const char *uid)
-{
-	int i;
-
-	/* TODO: Check that it is in the other arrays and remove it from them/etc? */
-	for (i=0;i<uids->len;i++) {
-		if (!strcmp(uids->pdata[i], uid))
-			return;
-	}
-	g_ptr_array_add(uids, g_strdup(uid));
-}
-
-static void
-change_info_cat(CamelFolderChangeInfo *info, GPtrArray *uids, GPtrArray *source)
-{
-	int i;
-
-	for (i=0;i<source->len;i++) {
-		change_info_add_uid(info, uids, source->pdata[i]);
-	}
-}
-
-/**
- * camel_folder_change_info_cat:
- * @info: 
- * @source: 
- * 
- * Concatenate one change info onto antoher.  Can be used to copy
- * them too.
- **/
-void
-camel_folder_change_info_cat(CamelFolderChangeInfo *info, CamelFolderChangeInfo *source)
-{
-	change_info_cat(info, info->uid_added, source->uid_added);
-	change_info_cat(info, info->uid_removed, source->uid_removed);
-	change_info_cat(info, info->uid_changed, source->uid_changed);
-}
-
-/**
- * camel_folder_change_info_add_uid:
- * @info: 
- * @uid: 
- * 
- * Add a new uid to the changeinfo.
- **/
-void
-camel_folder_change_info_add_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	change_info_add_uid(info, info->uid_added, uid);
-}
-
-/**
- * camel_folder_change_info_remove_uid:
- * @info: 
- * @uid: 
- * 
- * Add a uid to the removed uid list.
- **/
-void
-camel_folder_change_info_remove_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	change_info_add_uid(info, info->uid_removed, uid);
-}
-
-/**
- * camel_folder_change_info_change_uid:
- * @info: 
- * @uid: 
- * 
- * Add a uid to the changed uid list.
- **/
-void
-camel_folder_change_info_change_uid(CamelFolderChangeInfo *info, const char *uid)
-{
-	change_info_add_uid(info, info->uid_changed, uid);
-}
-
-static void
-change_info_clear(GPtrArray *uids)
-{
-	int i;
-
-	for (i=0;i<uids->len;i++) {
-		g_free(uids->pdata[i]);
-	}
-	g_ptr_array_set_size(uids, 0);
-}
-
-/**
- * camel_folder_change_info_clear:
- * @info: 
- * 
- * Empty out the change info; called after changes have been processed.
- **/
-void
-camel_folder_change_info_clear(CamelFolderChangeInfo *info)
-{
-	change_info_clear(info->uid_added);
-	change_info_clear(info->uid_removed);
-	change_info_clear(info->uid_changed);
-}
-
-/**
- * camel_folder_change_info_free:
- * @info: 
- * 
- * Free memory associated with the folder change info lists.
- **/
-void
-camel_folder_change_info_free(CamelFolderChangeInfo *info)
-{
-	if (info->uid_source) {
-		g_hash_table_foreach(info->uid_source, (GHFunc)change_info_free_update, info);
-		g_hash_table_destroy(info->uid_source);
-	}
-
-	camel_folder_change_info_clear(info);
-
-	g_ptr_array_free(info->uid_added, TRUE);
-	g_ptr_array_free(info->uid_removed, TRUE);
-	g_ptr_array_free(info->uid_changed, TRUE);
-	g_free(info);
-}
-
-
-
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
deleted file mode 100644
index 12fe86f4b8..0000000000
--- a/camel/camel-folder.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-folder.h: Abstract class for an email folder */
-
-/* 
- * Author: 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_FOLDER_H
-#define CAMEL_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-folder-summary.h>
-
-#define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())
-#define CAMEL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))
-#define CAMEL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))
-#define CAMEL_IS_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))
-
-typedef struct _CamelFolderChangeInfo CamelFolderChangeInfo;
-
-struct _CamelFolderChangeInfo {
-	GPtrArray *uid_added;
-	GPtrArray *uid_removed;
-	GPtrArray *uid_changed;
-
-	GHashTable *uid_source;	/* used to create unique lists */
-};
-
-struct _CamelFolder
-{
-	CamelObject parent_object;
-
-	int frozen;
-	CamelFolderChangeInfo *changed_frozen; /* queues changed events */
-
-	char *name;
-	char *full_name;
-	CamelStore *parent_store;
-
-	guint32 permanent_flags;
-	gboolean has_summary_capability:1;
-	gboolean has_search_capability:1;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */	
-	void   (*refresh_info) (CamelFolder *folder, CamelException *ex);
-
-	void   (*sync) (CamelFolder *folder, gboolean expunge, 
-			CamelException *ex);
-
-	const char *  (*get_name)  (CamelFolder *folder);
-	const char *  (*get_full_name)   (CamelFolder *folder);
-
-	CamelStore *  (*get_parent_store) (CamelFolder *folder);
-
-	void (*expunge)  (CamelFolder *folder, 
-			  CamelException *ex);
-
-	int   (*get_message_count)   (CamelFolder *folder);
-
-	int   (*get_unread_message_count) (CamelFolder *folder);
-
-	void (*append_message)  (CamelFolder *folder, 
-				 CamelMimeMessage *message,
-				 const CamelMessageInfo *info,
-				 CamelException *ex);
-	
-	guint32 (*get_permanent_flags) (CamelFolder *folder);
-	guint32 (*get_message_flags)   (CamelFolder *folder,
-					const char *uid);
-	void    (*set_message_flags)   (CamelFolder *folder,
-					const char *uid,
-					guint32 flags, guint32 set);
-
-	gboolean (*get_message_user_flag) (CamelFolder *folder,
-					   const char *uid,
-					   const char *name);
-	void     (*set_message_user_flag) (CamelFolder *folder,
-					   const char *uid,
-					   const char *name,
-					   gboolean value);
-
-	const char * (*get_message_user_tag) (CamelFolder *folder,
-					      const char *uid,
-					      const char *name);
-	void     (*set_message_user_tag) (CamelFolder *folder,
-					  const char *uid,
-					  const char *name,
-					  const char *value);
-
-	CamelMimeMessage * (*get_message)  (CamelFolder *folder, 
-					    const char *uid, 
-					    CamelException *ex);
-
-	GPtrArray * (*get_uids)       (CamelFolder *folder);
-	void (*free_uids)             (CamelFolder *folder,
-				       GPtrArray *array);
-
-	GPtrArray * (*get_summary)    (CamelFolder *folder);
-	void (*free_summary)          (CamelFolder *folder,
-				       GPtrArray *summary);
-
-	gboolean (*has_search_capability) (CamelFolder *folder);
-
-	GPtrArray * (*search_by_expression) (CamelFolder *folder,
-					     const char *expression,
-					     CamelException *ex);
-
-	void (*search_free) (CamelFolder *folder, GPtrArray *result);
-
-	const CamelMessageInfo * (*get_message_info) (CamelFolder *, const char *uid);
-
-	void (*copy_message_to) (CamelFolder *source,
-				 const char *uid,
-				 CamelFolder *destination,
-				 CamelException *ex);
-	
-	void (*move_message_to) (CamelFolder *source,
-				 const char *uid,
-				 CamelFolder *destination,
-				 CamelException *ex);
-
-	void (*freeze) (CamelFolder *folder);
-	void (*thaw)   (CamelFolder *folder);
-} CamelFolderClass;
-
-/* Standard Camel function */
-CamelType camel_folder_get_type (void);
-
-
-/* public methods */
-void               camel_folder_construct              (CamelFolder *folder,
-							CamelStore *parent_store,
-							const char *full_name,
-							const char *name);
-
-void               camel_folder_refresh_info           (CamelFolder * folder, 
-							CamelException * ex);
-void               camel_folder_sync                   (CamelFolder *folder, 
-							gboolean expunge, 
-							CamelException *ex);
-
-CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
-
-
-/* delete operations */
-void		   camel_folder_expunge                (CamelFolder *folder, 
-							CamelException *ex);
-
-
-/* folder name operations */
-const char *      camel_folder_get_name                (CamelFolder *folder);
-const char *      camel_folder_get_full_name           (CamelFolder *folder);
-
-
-/* various properties accessors */
-guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder);
-
-guint32		   camel_folder_get_message_flags      (CamelFolder *folder,
-							const char *uid);
-
-void		   camel_folder_set_message_flags      (CamelFolder *folder,
-							const char *uid,
-							guint32 flags,
-							guint32 set);
-
-gboolean	   camel_folder_get_message_user_flag  (CamelFolder *folder,
-							const char *uid,
-							const char *name);
-
-void		   camel_folder_set_message_user_flag  (CamelFolder *folder,
-							const char *uid,
-							const char *name,
-							gboolean value);
-const char *	   camel_folder_get_message_user_tag  (CamelFolder *folder,
-						       const char *uid,
-						       const char *name);
-
-void		   camel_folder_set_message_user_tag  (CamelFolder *folder,
-						       const char *uid,
-						       const char *name,
-						       const char *value);
-
-
-
-/* message manipulation */
-void               camel_folder_append_message         (CamelFolder *folder, 
-							CamelMimeMessage *message,
-							const CamelMessageInfo *info,
-							CamelException *ex);
-
-
-/* summary related operations */
-gboolean           camel_folder_has_summary_capability (CamelFolder *folder);
-
-
-int                camel_folder_get_message_count     (CamelFolder *folder);
-
-int                camel_folder_get_unread_message_count (CamelFolder *folder);
-
-GPtrArray *        camel_folder_get_summary           (CamelFolder *folder);
-void               camel_folder_free_summary          (CamelFolder *folder,
-						       GPtrArray *array);
-
-/* uid based access operations */
-CamelMimeMessage * camel_folder_get_message           (CamelFolder *folder, 
-						       const char *uid, 
-						       CamelException *ex);
-#define camel_folder_delete_message(folder, uid) \
-	camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED)
-
-GPtrArray *        camel_folder_get_uids              (CamelFolder *folder);
-void               camel_folder_free_uids             (CamelFolder *folder,
-						       GPtrArray *array);
-
-/* search api */
-gboolean           camel_folder_has_search_capability (CamelFolder *folder);
-GPtrArray *	   camel_folder_search_by_expression  (CamelFolder *folder,
-						       const char *expression,
-						       CamelException *ex);
-void		   camel_folder_search_free	      (CamelFolder *folder, GPtrArray *);
-
-/* summary info */
-const CamelMessageInfo *camel_folder_get_message_info (CamelFolder *summary,
-						       const char *uid);
-
-void               camel_folder_copy_message_to       (CamelFolder *source,
-						       const char *uid,
-						       CamelFolder *dest,
-						       CamelException *ex);
-
-void               camel_folder_move_message_to       (CamelFolder *source,
-						       const char *uid,
-						       CamelFolder *dest,
-						       CamelException *ex);
-
-void               camel_folder_freeze                (CamelFolder *folder);
-void               camel_folder_thaw                  (CamelFolder *folder);
-
-
-/* For use by subclasses (for free_{uids,summary,subfolder_names}) */
-void camel_folder_free_nop     (CamelFolder *folder, GPtrArray *array);
-void camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array);
-void camel_folder_free_deep    (CamelFolder *folder, GPtrArray *array);
-
-/* update functions for change info */
-CamelFolderChangeInfo *	camel_folder_change_info_new		(void);
-void			camel_folder_change_info_clear		(CamelFolderChangeInfo *info);
-void			camel_folder_change_info_free		(CamelFolderChangeInfo *info);
-
-/* for building diff's automatically */
-void			camel_folder_change_info_add_source	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list);
-void			camel_folder_change_info_add_update	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list);
-void			camel_folder_change_info_build_diff	(CamelFolderChangeInfo *info);
-
-/* for manipulating diff's directly */
-void			camel_folder_change_info_cat		(CamelFolderChangeInfo *info, CamelFolderChangeInfo *s);
-void			camel_folder_change_info_add_uid	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_remove_uid	(CamelFolderChangeInfo *info, const char *uid);
-void			camel_folder_change_info_change_uid	(CamelFolderChangeInfo *info, const char *uid);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_FOLDER_H */
-
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
deleted file mode 100644
index 878ff1ca7b..0000000000
--- a/camel/camel-internet-address.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-utils.h"
-#include "camel-internet-address.h"
-
-static int    internet_decode		(CamelAddress *, const char *raw);
-static char * internet_encode		(CamelAddress *);
-static void   internet_remove		(CamelAddress *, int index);
-
-static void camel_internet_address_class_init (CamelInternetAddressClass *klass);
-static void camel_internet_address_init       (CamelInternetAddress *obj);
-
-static CamelAddressClass *camel_internet_address_parent;
-
-struct _address {
-	char *name;
-	char *address;
-};
-
-static void
-camel_internet_address_class_init(CamelInternetAddressClass *klass)
-{
-	CamelAddressClass *address = (CamelAddressClass *) klass;
-
-	camel_internet_address_parent = CAMEL_ADDRESS_CLASS(camel_type_get_global_classfuncs(camel_address_get_type()));
-
-	address->decode = internet_decode;
-	address->encode = internet_encode;
-	address->remove = internet_remove;
-}
-
-static void
-camel_internet_address_init(CamelInternetAddress *obj)
-{
-}
-
-CamelType
-camel_internet_address_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_address_get_type(), "CamelInternetAddress",
-					   sizeof (CamelInternetAddress),
-					   sizeof (CamelInternetAddressClass),
-					   (CamelObjectClassInitFunc) camel_internet_address_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_internet_address_init,
-					   NULL);
-	}
-	
-	return type;
-}
-
-static int
-internet_decode	(CamelAddress *a, const char *raw)
-{
-	struct _header_address *ha, *n;
-	
-	/* Should probably use its own decoder or something */
-	ha = header_address_decode(raw);
-	if (ha) {
-		n = ha;
-		while (n) {
-			if (n->type == HEADER_ADDRESS_NAME) {
-				camel_internet_address_add((CamelInternetAddress *)a, n->name, n->v.addr);
-			} else if (n->type == HEADER_ADDRESS_GROUP) {
-				struct _header_address *g = n->v.members;
-				while (g) {
-					if (g->type == HEADER_ADDRESS_NAME)
-						camel_internet_address_add((CamelInternetAddress *)a, g->name, g->v.addr);
-					/* otherwise, it's an error, infact */
-					g = g->next;
-				}
-			}
-			n = n->next;
-		}
-		header_address_list_clear(&ha);
-	}
-	
-	return 0;
-}
-
-static char *
-internet_encode	(CamelAddress *a)
-{
-	int i;
-	GString *out;
-	char *ret;
-	
-	if (a->addresses->len == 0)
-		return NULL;
-	
-	out = g_string_new("");
-	
-	for (i = 0;i < a->addresses->len; i++) {
-		struct _address *addr = g_ptr_array_index(a->addresses, i);
-		char *name = header_encode_phrase(addr->name);
-		
-		if (i != 0)
-			g_string_append(out, ", ");
-		
-		if (name) {
-			if (*name) {
-				g_string_sprintfa(out, "%s <%s>", name, addr->address);
-			} else if (addr->address)
-				g_string_sprintfa(out, "%s", addr->address);
-			g_free(name);
-		} else
-			g_string_sprintfa(out, "%s", addr->address);
-	}
-	
-	ret = out->str;
-	g_string_free(out, FALSE);
-	
-	return ret;
-}
-
-static void
-internet_remove	(CamelAddress *a, int index)
-{
-	struct _address *addr;
-	
-	if (index < 0 || index >= a->addresses->len)
-		return;
-	
-	addr = g_ptr_array_index(a->addresses, index);
-	g_free(addr->name);
-	g_free(addr->address);
-	g_free(addr);
-	g_ptr_array_remove_index(a->addresses, index);
-}
-
-/**
- * camel_internet_address_new:
- *
- * Create a new CamelInternetAddress object.
- * 
- * Return value: A new CamelInternetAddress object.
- **/
-CamelInternetAddress *
-camel_internet_address_new (void)
-{
-	CamelInternetAddress *new = CAMEL_INTERNET_ADDRESS(camel_object_new(camel_internet_address_get_type()));
-	return new;
-}
-
-/**
- * camel_internet_address_add:
- * @a: internet address object
- * @name: 
- * @address: 
- * 
- * Add a new internet address to the address object.
- * 
- * Return value: Index of added entry.
- **/
-int
-camel_internet_address_add	(CamelInternetAddress *a, const char *name, const char *address)
-{
-	struct _address *new;
-	int index;
-
-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));
-
-	new = g_malloc(sizeof(*new));
-	new->name = g_strdup(name);
-	new->address = g_strdup(address);
-	index = ((CamelAddress *)a)->addresses->len;
-	g_ptr_array_add(((CamelAddress *)a)->addresses, new);
-
-	return index;
-}
-
-/**
- * camel_internet_address_get:
- * @a: internet address object
- * @index: address's array index
- * @namep: Holder for the returned name, or NULL, if not required.
- * @addressp: Holder for the returned address, or NULL, if not required.
- * 
- * Get the address at @index.
- * 
- * Return value: TRUE if such an address exists, or FALSE otherwise.
- **/
-gboolean
-camel_internet_address_get	(const CamelInternetAddress *a, int index, const char **namep, const char **addressp)
-{
-	struct _address *addr;
-
-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));
-	g_return_val_if_fail(index >= 0, -1);
-
-	if (index >= ((CamelAddress *)a)->addresses->len)
-		return FALSE;
-
-	addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, index);
-	if (namep)
-		*namep = addr->name;
-	if (addressp)
-		*addressp = addr->address;
-	return TRUE;
-}
-
-/**
- * camel_internet_address_find_name:
- * @a: 
- * @name: 
- * @addressp: Holder for address part, or NULL, if not required.
- * 
- * Find address by real name.
- * 
- * Return value: The index of the address matching the name, or -1
- * if no match was found.
- **/
-int
-camel_internet_address_find_name(CamelInternetAddress *a, const char *name, const char **addressp)
-{
-	struct _address *addr;
-	int i, len;
-
-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));
-
-	len = ((CamelAddress *)a)->addresses->len;
-	for (i=0;i<len;i++) {
-		addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, i );
-		if (!strcmp(addr->name, name)) {
-			if (addressp)
-				*addressp = addr->address;
-			return i;
-		}
-	}
-	return -1;
-}
-
-/**
- * camel_internet_address_find_address:
- * @a: 
- * @address: 
- * @namep: Return for the matching name, or NULL, if not required.
- * 
- * Find an address by address.
- * 
- * Return value: The index of the address, or -1 if not found.
- **/
-int
-camel_internet_address_find_address(CamelInternetAddress *a, const char *address, const char **namep)
-{
-	struct _address *addr;
-	int i, len;
-
-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));
-
-	len = ((CamelAddress *)a)->addresses->len;
-	for (i=0;i<len;i++) {
-		addr = g_ptr_array_index( ((CamelAddress *)a)->addresses, i );
-		if (!strcmp(addr->address, address)) {
-			if (namep)
-				*namep = addr->name;
-			return i;
-		}
-	}
-	return -1;
-}
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
deleted file mode 100644
index 6b303eef8f..0000000000
--- a/camel/camel-internet-address.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_INTERNET_ADDRESS_H
-#define _CAMEL_INTERNET_ADDRESS_H
-
-#include <camel/camel-address.h>
-
-#define CAMEL_INTERNET_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)
-#define CAMEL_INTERNET_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass)
-#define IS_CAMEL_INTERNET_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_internet_address_get_type ())
-
-typedef struct _CamelInternetAddressClass CamelInternetAddressClass;
-
-struct _CamelInternetAddress {
-	CamelAddress parent;
-
-	struct _CamelInternetAddressPrivate *priv;
-};
-
-struct _CamelInternetAddressClass {
-	CamelAddressClass parent_class;
-};
-
-guint			camel_internet_address_get_type	(void);
-CamelInternetAddress   *camel_internet_address_new	(void);
-
-int			camel_internet_address_add	(CamelInternetAddress *, const char *, const char *);
-gboolean		camel_internet_address_get	(const CamelInternetAddress *, int, const char **, const char **);
-
-int			camel_internet_address_find_name(CamelInternetAddress *, const char *, const char **);
-int			camel_internet_address_find_address(CamelInternetAddress *, const char *, const char **);
-
-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
deleted file mode 100644
index 3c5954e40f..0000000000
--- a/camel/camel-medium.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* camelMedium.c : Abstract class for a medium
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "camel-medium.h"
-#include "gmime-content-field.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-
-#define d(x)
-
-static CamelDataWrapperClass *parent_class = NULL;
-
-/* Returns the class for a CamelMedium */
-#define CM_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void add_header (CamelMedium *medium, const gchar *header_name,
-			const void *header_value);
-static void set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-static void remove_header (CamelMedium *medium, const gchar *header_name);
-static const void *get_header (CamelMedium *medium, const gchar *header_name);
-
-static CamelDataWrapper *get_content_object (CamelMedium *medium);
-static void set_content_object (CamelMedium *medium,
-				CamelDataWrapper *content);
-
-static void
-camel_medium_class_init (CamelMediumClass *camel_medium_class)
-{
-	/*
-	 * CamelDataWrapperClass *camel_data_wrapper_class =
-	 *	CAMEL_DATA_WRAPPER_CLASS (camel_medium_class);
-	 */
-
-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));
-
-	/* virtual method definition */
-	camel_medium_class->add_header = add_header;
-	camel_medium_class->set_header = set_header;
-	camel_medium_class->remove_header = remove_header;
-	camel_medium_class->get_header = get_header;
-
-	camel_medium_class->set_content_object = set_content_object;
-	camel_medium_class->get_content_object = get_content_object;
-}
-
-static void
-camel_medium_init (gpointer object, gpointer klass)
-{
-	CamelMedium *camel_medium = CAMEL_MEDIUM (object);
-
-	camel_medium->content = NULL;
-}
-
-static void
-camel_medium_finalize (CamelObject *object)
-{
-	CamelMedium *medium = CAMEL_MEDIUM (object);
-
-	if (medium->content)
-		camel_object_unref (CAMEL_OBJECT (medium->content));
-}
-
-
-CamelType
-camel_medium_get_type (void)
-{
-	static CamelType camel_medium_type = CAMEL_INVALID_TYPE;
-
-	if (camel_medium_type == CAMEL_INVALID_TYPE) {
-		camel_medium_type = camel_type_register (CAMEL_DATA_WRAPPER_TYPE, "medium",
-							 sizeof (CamelMedium),
-							 sizeof (CamelMediumClass),
-							 (CamelObjectClassInitFunc) camel_medium_class_init,
-							 NULL,
-							 (CamelObjectInitFunc) camel_medium_init,
-							 (CamelObjectFinalizeFunc) camel_medium_finalize);
-	}
-
-	return camel_medium_type;
-}
-
-static void
-add_header (CamelMedium *medium, const gchar *header_name,
-	    const void *header_value)
-{
-	g_warning("No %s::add_header implemented, adding %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_add_header:
- * @medium: a CamelMedium
- * @header_name: name of the header
- * @header_value: value of the header
- *
- * Adds a header to a medium.
- *
- * FIXME: Where does it add it? We need to be able to prepend and
- * append headers, and also be able to insert them relative to other
- * headers.   No we dont, order isn't important! Z
- **/
-void
-camel_medium_add_header (CamelMedium *medium, const gchar *header_name,
-			 const void *header_value)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-	g_return_if_fail (header_value != NULL);
-
-	CM_CLASS (medium)->add_header (medium, header_name, header_value);
-}
-
-static void
-set_header (CamelMedium *medium, const gchar *header_name, const void *header_value)
-{
-	g_warning("No %s::set_header implemented, setting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_set_header:
- * @medium: a CamelMedium
- * @header_name: name of the header
- * @header_value: value of the header
- *
- * Sets the value of a header.  Any other occurances of the header
- * will be removed.
- **/
-void
-camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-	g_return_if_fail (header_value != NULL);
-
-	CM_CLASS (medium)->add_header (medium, header_name, header_value);
-}
-
-static void
-remove_header (CamelMedium *medium, const gchar *header_name)
-{
-	g_warning("No %s::remove_header implemented, removing %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-}
-
-/**
- * camel_medium_remove_header:
- * @medium: a medium
- * @header_name: the name of the header
- *
- * Removes the named header from the medium.  All occurances of the
- * header are removed.
- **/
-void
-camel_medium_remove_header (CamelMedium *medium, const gchar *header_name)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (header_name != NULL);
-
-	CM_CLASS (medium)->remove_header (medium, header_name);
-}
-
-
-static const void *
-get_header (CamelMedium *medium, const gchar *header_name)
-{
-	g_warning("No %s::get_header implemented, getting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);
-	return NULL;
-}
-
-/**
- * camel_medium_get_header:
- * @medium: a medium
- * @header_name: the name of the header
- *
- * Returns the value of the named header in the medium, or %NULL if
- * it is unset. The caller should not modify or free the data.
- *
- * FIXME: What if the header occurs more than once?
- *
- * Return value: the value of the named header, or %NULL
- **/
-const void *
-camel_medium_get_header (CamelMedium *medium, const gchar *header_name)
-{
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);
-	g_return_val_if_fail (header_name != NULL, NULL);
-
-#ifndef NO_WARNINGS
-#warning No way to get multi-valued headers?
-#endif
-
-	return CM_CLASS (medium)->get_header (medium, header_name);
-}
-
-
-static CamelDataWrapper *
-get_content_object (CamelMedium *medium)
-{
-	return medium->content;
-}
-
-/**
- * camel_medium_get_content_object:
- * @medium: a medium
- *
- * Returns a data wrapper that represents the content of the medium,
- * without its headers.
- *
- * Return value: the medium's content object.
- **/
-CamelDataWrapper *
-camel_medium_get_content_object (CamelMedium *medium)
-{
-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);
-
-	return CM_CLASS (medium)->get_content_object (medium);
-}
-
-
-static void
-set_content_object (CamelMedium *medium, CamelDataWrapper *content)
-{
-	if (medium->content)
-		camel_object_unref (CAMEL_OBJECT (medium->content));
-	camel_object_ref (CAMEL_OBJECT (content));
-	medium->content = content;
-}
-
-/**
- * camel_medium_set_content_object:
- * @medium: a medium
- * @content: a data wrapper representing the medium's content
- *
- * Sets the content of @medium to be @content.
- **/
-void
-camel_medium_set_content_object (CamelMedium *medium,
-				 CamelDataWrapper *content)
-{
-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));
-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (content));
-
-	CM_CLASS (medium)->set_content_object (medium, content);
-}
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
deleted file mode 100644
index 9ce548ba1d..0000000000
--- a/camel/camel-medium.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-medium.h : class for a medium object */
-
-/*
- *
- * Authors:  Bertrand Guiheneuf <bertrand@helixcode.com>
- *	     Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MEDIUM_H
-#define CAMEL_MEDIUM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-
-#define CAMEL_MEDIUM_TYPE     (camel_medium_get_type ())
-#define CAMEL_MEDIUM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))
-#define CAMEL_MEDIUM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))
-#define CAMEL_IS_MEDIUM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))
-
-
-struct _CamelMedium
-{
-	CamelDataWrapper parent_object;
-
-	/* The content of the medium, as opposed to our parent
-	 * CamelDataWrapper, which wraps both the headers and the
-	 * content.
-	 */
-	CamelDataWrapper *content;
-
-};
-
-
-
-typedef struct {
-	CamelDataWrapperClass parent_class;
-
-	/* Virtual methods */
-	void  (*add_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
-	void  (*set_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
-	void  (*remove_header) (CamelMedium *medium, const gchar *header_name);
-	const void * (*get_header) (CamelMedium *medium,  const gchar *header_name);
-
-	CamelDataWrapper * (*get_content_object) (CamelMedium *medium);
-	void (*set_content_object) (CamelMedium *medium, CamelDataWrapper *content);
-
-} CamelMediumClass;
-
-/* Standard Camel function */
-CamelType camel_medium_get_type (void);
-
-/* Header get/set interface */
-void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-void camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
-void camel_medium_remove_header (CamelMedium *medium, const gchar *header_name);
-const void *camel_medium_get_header (CamelMedium *medium, const gchar *header_name);
-
-/* accessor methods */
-CamelDataWrapper *camel_medium_get_content_object (CamelMedium *medium);
-void camel_medium_set_content_object (CamelMedium *medium,
-				      CamelDataWrapper *content);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MEDIUM_H */
-
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
deleted file mode 100644
index 8dd94e1580..0000000000
--- a/camel/camel-mime-filter-basic.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-basic.h"
-
-#include "camel-mime-utils.h"
-
-static void reset(CamelMimeFilter *mf);
-static void complete(CamelMimeFilter *mf, char *in, size_t len, 
-		     size_t prespace, char **out, 
-		     size_t *outlen, size_t *outprespace);
-static void filter(CamelMimeFilter *mf, char *in, size_t len, 
-		   size_t prespace, char **out, 
-		   size_t *outlen, size_t *outprespace);
-
-static void camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass);
-static void camel_mime_filter_basic_init       (CamelMimeFilterBasic *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_basic_parent;
-
-static void
-camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_basic_parent = CAMEL_MIME_FILTER_CLASS(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_basic_init (CamelMimeFilterBasic *obj)
-{
-	obj->state = 0;
-	obj->save = 0;
-}
-
-
-CamelType
-camel_mime_filter_basic_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBasic",
-					    sizeof (CamelMimeFilterBasic),
-					    sizeof (CamelMimeFilterBasicClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_basic_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_basic_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/* should this 'flush' outstanding state/data bytes? */
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		f->state = -1;
-		break;
-	default:
-		f->state = 0;
-	}
-	f->save = 0;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-	int newlen;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-		/* wont go to more than 2x size (overly conservative) */
-		camel_mime_filter_set_size(mf, len*2, FALSE);
-		newlen = base64_encode_close(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is definetly more than needed ... */
-		camel_mime_filter_set_size(mf, len*4, FALSE);
-		newlen = quoted_encode_close(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	default:
-		g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
-		goto donothing;
-	}
-
-	*out = mf->outbuf;
-	*outlen = newlen;
-	*outprespace = mf->outpre;
-
-	return;
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/* here we do all of the basic mime filtering */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;
-	int newlen;
-
-	switch(f->type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-		/* wont go to more than 2x size (overly conservative) */
-		camel_mime_filter_set_size(mf, len*2, FALSE);
-		newlen = base64_encode_step(in, len, TRUE, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-		/* *4 is overly conservative, but will do */
-		camel_mime_filter_set_size(mf, len*4, FALSE);
-		newlen = quoted_encode_step(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		/* output can't possibly exceed the input size */
-		camel_mime_filter_set_size(mf, len, FALSE);
-		newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save);
-		break;
-	default:
-		g_warning("unknown type %d in CamelMimeFilterBasic", f->type);
-		goto donothing;
-	}
-
-	*out = mf->outbuf;
-	*outlen = newlen;
-	*outprespace = mf->outpre;
-
-	return;
-donothing:
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/**
- * camel_mime_filter_basic_new:
- *
- * Create a new CamelMimeFilterBasic object.
- * 
- * Return value: A new CamelMimeFilterBasic widget.
- **/
-CamelMimeFilterBasic *
-camel_mime_filter_basic_new (void)
-{
-	CamelMimeFilterBasic *new = CAMEL_MIME_FILTER_BASIC ( camel_object_new (camel_mime_filter_basic_get_type ()));
-	return new;
-}
-
-CamelMimeFilterBasic *
-camel_mime_filter_basic_new_type(CamelMimeFilterBasicType type)
-{
-	CamelMimeFilterBasic *new;
-
-	switch (type) {
-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:
-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:
-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:
-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:
-		new = camel_mime_filter_basic_new();
-		new->type = type;
-		break;
-	default:
-		g_warning("Invalid type of CamelMimeFilterBasic requested: %d", type);
-		new = NULL;
-		break;
-	}
-	camel_mime_filter_reset((CamelMimeFilter *)new);
-	return new;
-}
-
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
deleted file mode 100644
index 42713e334d..0000000000
--- a/camel/camel-mime-filter-basic.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_BASIC_H
-#define _CAMEL_MIME_FILTER_BASIC_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_BASIC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)
-#define CAMEL_MIME_FILTER_BASIC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass)
-#define IS_CAMEL_MIME_FILTER_BASIC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_basic_get_type ())
-
-typedef struct _CamelMimeFilterBasicClass CamelMimeFilterBasicClass;
-
-typedef enum {
-	CAMEL_MIME_FILTER_BASIC_BASE64_ENC = 1,
-	CAMEL_MIME_FILTER_BASIC_BASE64_DEC,
-	CAMEL_MIME_FILTER_BASIC_QP_ENC,
-	CAMEL_MIME_FILTER_BASIC_QP_DEC,
-} CamelMimeFilterBasicType;
-
-struct _CamelMimeFilterBasic {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterBasicPrivate *priv;
-
-	CamelMimeFilterBasicType type;
-
-	int state;
-	int save;
-};
-
-struct _CamelMimeFilterBasicClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_basic_get_type	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new	(void);
-CamelMimeFilterBasic      *camel_mime_filter_basic_new_type	(CamelMimeFilterBasicType type);
-
-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
deleted file mode 100644
index c91c7f061f..0000000000
--- a/camel/camel-mime-filter-charset.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include <unicode.h>
-
-#include <string.h>
-#include <errno.h>
-
-#include "camel-mime-filter-charset.h"
-
-
-static void camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass);
-static void camel_mime_filter_charset_init       (CamelMimeFilterCharset *obj);
-static void camel_mime_filter_charset_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_charset_parent;
-
-CamelType
-camel_mime_filter_charset_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterCharset",
-					    sizeof (CamelMimeFilterCharset),
-					    sizeof (CamelMimeFilterCharsetClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_charset_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_charset_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_charset_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_charset_finalize(CamelObject *o)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)o;
-
-	g_free(f->from);
-	g_free(f->to);
-	if (f->ic != (unicode_iconv_t)-1) {
-		unicode_iconv_close(f->ic);
-		f->ic = (unicode_iconv_t) -1;
-	}
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	char buf[16];
-	char *buffer;
-	int outlen = 16;
-
-	/* what happens with the output bytes if this resets the state? */
-	if (f->ic != (unicode_iconv_t) -1) {
-		buffer = buf;
-		unicode_iconv(f->ic, NULL, 0, &buffer, &outlen);
-	}
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	int converted;
-	const char *inbuf;
-	char *outbuf;
-	int inlen, outlen;
-
-	if (f->ic == (unicode_iconv_t) -1) {
-		goto donothing;
-	}
-
-	/* FIXME: there's probably a safer way to size this ...? */
-	/* We could always resize if we run out of room in outbuf (but it'd be nice not
-	   to have to) */
-	camel_mime_filter_set_size(mf, len*5, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-
-	if (inlen>0) {
-		converted = unicode_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-		if (converted == -1) {
-			if (errno != EINVAL) {
-				g_warning("error occured converting: %s", strerror(errno));
-				goto donothing;
-			}
-		}
-
-		if (inlen>0) {
-			g_warning("Output lost in character conversion, invalid sequence encountered?");
-		}
-	}
-
-	/* this 'resets' the output stream, returning back to the initial
-	   shift state for multishift charactersets */
-	converted = unicode_iconv(f->ic, NULL, 0, &outbuf, &outlen);
-	if (converted == -1) {
-		g_warning("Conversion failed to complete: %s", strerror(errno));
-	}
-
-	*out = mf->outbuf;
-	*outlenptr = mf->outsize - outlen;
-	*outprespace = mf->outpre;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
-	int converted;
-	const char *inbuf;
-	char *outbuf;
-	int inlen, outlen;
-
-	if (f->ic == (unicode_iconv_t) -1) {
-		goto donothing;
-	}
-
-	/* FIXME: there's probably a safer way to size this ...? */
-	camel_mime_filter_set_size(mf, len*5, FALSE);
-	inbuf = in;
-	inlen = len;
-	outbuf = mf->outbuf;
-	outlen = mf->outsize;
-	converted = unicode_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
-	if (converted == -1) {
-		if (errno != EINVAL) {
-			g_warning("error occured converting: %s", strerror(errno));
-			goto donothing;
-		}
-	}
-
-	/*
-	  NOTE: This assumes EINVAL only occurs because we ran out of
-	  bytes for a multibyte sequence, if not, we're in trouble.
-	*/
-
-	if (inlen>0) {
-		camel_mime_filter_backup(mf, inbuf, inlen);
-	}
-
-	*out = mf->outbuf;
-	*outlenptr = mf->outsize - outlen;
-	*outprespace = mf->outpre;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_charset_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)
-{
-	obj->ic = (unicode_iconv_t)-1;
-}
-
-/**
- * camel_mime_filter_charset_new:
- *
- * Create a new CamelMimeFilterCharset object.
- * 
- * Return value: A new CamelMimeFilterCharset widget.
- **/
-CamelMimeFilterCharset *
-camel_mime_filter_charset_new (void)
-{
-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( camel_object_new (camel_mime_filter_charset_get_type ()));
-	return new;
-}
-
-CamelMimeFilterCharset *
-camel_mime_filter_charset_new_convert(const char *from_charset, const char *to_charset)
-{
-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( camel_object_new (camel_mime_filter_charset_get_type ()));
-
-	new->ic = unicode_iconv_open(to_charset, from_charset);
-	if (new->ic == (unicode_iconv_t) -1) {
-		g_warning("Cannot create charset conversion from %s to %s: %s", from_charset, to_charset, strerror(errno));
-		camel_object_unref((CamelObject *)new);
-		new = NULL;
-	} else {
-		new->from = g_strdup(from_charset);
-		new->to = g_strdup(to_charset);
-	}
-	return new;
-}
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
deleted file mode 100644
index c53254c8ab..0000000000
--- a/camel/camel-mime-filter-charset.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_CHARSET_H
-#define _CAMEL_MIME_FILTER_CHARSET_H
-
-#include <camel/camel-mime-filter.h>
-#include <unicode.h>
-
-#define CAMEL_MIME_FILTER_CHARSET(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)
-#define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)
-#define IS_CAMEL_MIME_FILTER_CHARSET(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_charset_get_type ())
-
-typedef struct _CamelMimeFilterCharsetClass CamelMimeFilterCharsetClass;
-
-struct _CamelMimeFilterCharset {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterCharsetPrivate *priv;
-
-	unicode_iconv_t ic;
-	char *from;
-	char *to;
-};
-
-struct _CamelMimeFilterCharsetClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_charset_get_type	(void);
-CamelMimeFilterCharset      *camel_mime_filter_charset_new	(void);
-
-CamelMimeFilterCharset      *camel_mime_filter_charset_new_convert	(const char *from_charset, const char *to_charset);
-
-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c
deleted file mode 100644
index 71a3e8bace..0000000000
--- a/camel/camel-mime-filter-crlf.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code, Inc.
- *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-crlf.h"
-
-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-		    char **out, size_t *outlen, size_t *outprespace);
-static void complete (CamelMimeFilter *f, char *in, size_t len,
-		      size_t prespace, char **out, size_t *outlen,
-		      size_t *outprespace);
-static void reset (CamelMimeFilter *f);
-
-
-static void
-camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *klass)
-{
-	CamelMimeFilterClass *mime_filter_class =
-		(CamelMimeFilterClass *) klass;
-	
-	mime_filter_class->filter = filter;
-	mime_filter_class->complete = complete;
-	mime_filter_class->reset = reset;
-}
-
-CamelType
-camel_mime_filter_crlf_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterCRLF",
-					    sizeof (CamelMimeFilterCRLF),
-					    sizeof (CamelMimeFilterCRLFClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_crlf_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-
-	return type;
-}
-
-static void
-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;
-	gboolean do_dots;
-	char *p, *q;
-
-	do_dots = crlf->mode == CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS;
-
-	if (crlf->direction == CAMEL_MIME_FILTER_CRLF_ENCODE) {
-		camel_mime_filter_set_size (f, 3 * len, FALSE);
-
-		p = in;
-		q = f->outbuf;
-		while (p < in + len) {
-			if (*p == '\n')
-				*q++ = '\r';
-			else
-				if (do_dots && *(p - 1) == '\n' && *p == '.')
-					*q++ = '.';
-			*q++ = *p++;
-		}
-	} else {
-		camel_mime_filter_set_size (f, len, FALSE);
-
-		p = in;
-		q = f->outbuf;
-		while (p < in + len) {
-			if (*p == '\r') {
-				crlf->saw_cr = TRUE;
-			} else {
-				if (crlf->saw_cr) {
-					if (*p != '\n')
-						*q++ = '\r';
-					crlf->saw_cr = FALSE;
-				}
-				*q++ = *p;
-			}
-
-			if (do_dots) {
-				if (*p == '.' && *(p - 1) == '\n') {
-					crlf->saw_dot = TRUE;
-				} else {
-					if (crlf->saw_dot) {
-						if (*p == '.')
-							p++;
-						crlf->saw_dot = FALSE;
-					}
-					*q++ = *p;
-				}
-			}
-
-			p++;
-		}
-	}
-
-	*out = f->outbuf;
-	*outlen = q - f->outbuf;
-	*outprespace = f->outpre;
-}
-
-static void 
-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	  char **out, size_t *outlen, size_t *outprespace)
-{
-	if (len)
-		filter (f, in, len, prespace, out, outlen, outprespace);
-}
-
-static void
-reset (CamelMimeFilter *f)
-{
-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;
-
-	crlf->saw_cr = FALSE;
-}
-
-CamelMimeFilter *
-camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode)
-{
-	CamelMimeFilterCRLF *crlf = CAMEL_MIME_FILTER_CRLF(camel_object_new (CAMEL_MIME_FILTER_CRLF_TYPE));
-
-	crlf->direction = direction;
-	crlf->mode = mode;
-	crlf->saw_cr = FALSE;
-
-	return (CamelMimeFilter *)crlf;
-}
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
deleted file mode 100644
index 6ba109d154..0000000000
--- a/camel/camel-mime-filter-crlf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Dan Winship <danw@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_CRLF_H
-#define _CAMEL_MIME_FILTER_CRLF_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_CRLF_TYPE         (camel_mime_filter_crlf_get_type ())
-#define CAMEL_MIME_FILTER_CRLF(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLF)
-#define CAMEL_MIME_FILTER_CRLF_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass)
-#define CAMEL_IS_MIME_FILTER_CRLF(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CRLF_TYPE)
-
-typedef struct _CamelMimeFilterCRLFClass CamelMimeFilterCRLFClass;
-
-typedef enum {
-	CAMEL_MIME_FILTER_CRLF_ENCODE,
-	CAMEL_MIME_FILTER_CRLF_DECODE
-} CamelMimeFilterCRLFDirection;
-
-typedef enum {
-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS,
-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY,
-} CamelMimeFilterCRLFMode;
-
-struct _CamelMimeFilterCRLF {
-	CamelMimeFilter parent;
-
-	CamelMimeFilterCRLFDirection direction;
-	CamelMimeFilterCRLFMode mode;
-	gboolean saw_cr;
-	gboolean saw_dot;
-};
-
-struct _CamelMimeFilterCRLFClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_crlf_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode);
-
-#endif /* ! _CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
deleted file mode 100644
index 017a256471..0000000000
--- a/camel/camel-mime-filter-from.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-mime-filter-from.h"
-#include <string.h>
-
-#define d(x)
-
-struct _CamelMimeFilterFromPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMimeFilterFrom *)(o))->priv)
-
-static void camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass);
-static void camel_mime_filter_from_init       (CamelMimeFilterFrom *obj);
-
-static CamelMimeFilterClass *camel_mime_filter_from_parent;
-
-CamelType
-camel_mime_filter_from_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterFrom",
-					    sizeof (CamelMimeFilterFrom),
-					    sizeof (CamelMimeFilterFromClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_from_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_from_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-struct fromnode {
-	struct fromnode *next;
-	char *pointer;
-};
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-/* Yes, it is complicated ... */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterFrom *f = (CamelMimeFilterFrom *)mf;
-	register char *inptr, *inend;
-	int left;
-	int midline = f->midline;
-	int fromcount = 0;
-	struct fromnode *head = NULL, *tail = (struct fromnode *)&head, *node;
-	char *outptr;
-
-	inptr = in;
-	inend = inptr+len;
-
-	d(printf("Filtering '%.*s'\n", len, in));
-
-	/* first, see if we need to escape any from's */
-	while (inptr<inend) {
-		register int c = -1;
-
-		if (midline)
-			while (inptr < inend && (c = *inptr++) != '\n')
-				;
-
-		if (c == '\n' || !midline) {
-			left = inend-inptr;
-			if (left > 0) {
-				midline = TRUE;
-				if (left < 5) {
-					if (inptr[0] == 'F') {
-						camel_mime_filter_backup(mf, inptr, left);
-						midline = FALSE;
-						inend = inptr;
-						break;
-					}
-				} else {
-					if (!strncmp(inptr, "From ", 5)) {
-						fromcount++;
-						/* yes, we do alloc them on the stack ... at most we're going to get
-						   len / 7 of them anyway */
-						node = alloca(sizeof(*node));
-						node->pointer = inptr;
-						node->next = NULL;
-						tail->next = node;
-						tail = node;
-						inptr += 5;
-					}
-				}
-			} else {
-				/* \n is at end of line, check next buffer */
-				midline = FALSE;
-			}
-		}
-	}
-
-	f->midline = midline;
-
-	if (fromcount > 0) {
-		camel_mime_filter_set_size(mf, len + fromcount, FALSE);
-		node = head;
-		inptr = in;
-		outptr = mf->outbuf;
-		while (node) {
-			memcpy(outptr, inptr, node->pointer - inptr);
-			outptr += node->pointer - inptr;
-			*outptr++ = '>';
-			inptr = node->pointer;
-			node = node->next;
-		}
-		memcpy(outptr, inptr, inend - inptr);
-		outptr += inend - inptr;
-		*out = mf->outbuf;
-		*outlen = outptr - mf->outbuf;
-		*outprespace = mf->outbuf - mf->outreal;
-
-		d(printf("Filtered '%.*s'\n", *outlen, *out));
-	} else {
-		*out = in;
-		*outlen = inend - in;
-		*outprespace = prespace;
-		
-		d(printf("Filtered '%.*s'\n", *outlen, *out));
-	}
-}
-
-static void
-camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_from_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-static void
-camel_mime_filter_from_init (CamelMimeFilterFrom *obj)
-{
-	struct _CamelMimeFilterFromPrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-	obj->midline = FALSE;
-}
-
-/**
- * camel_mime_filter_from_new:
- *
- * Create a new CamelMimeFilterFrom object.
- * 
- * Return value: A new CamelMimeFilterFrom widget.
- **/
-CamelMimeFilterFrom *
-camel_mime_filter_from_new (void)
-{
-	CamelMimeFilterFrom *new = CAMEL_MIME_FILTER_FROM ( camel_object_new (camel_mime_filter_from_get_type ()));
-	return new;
-}
-
-#if 0
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-{
-	CamelMimeFilterFrom *f;
-	char *buffer;
-	int len, prespace;
-
-	g_tk_init(&argc, &argv);
-
-
-	f = camel_mime_filter_from_new();
-
-	buffer = "This is a test\nFrom Someone\nTo someone. From Someone else, From\n From blah\nFromblah\nBye! \nFrom ";
-	len = strlen(buffer);
-	prespace = 0;
-
-	printf("input = '%.*s'\n", len, buffer);
-	camel_mime_filter_filter(f, buffer, len, prespace, &buffer, &len, &prespace);
-	printf("output = '%.*s'\n", len, buffer);
-	buffer = "";
-	len = 0;
-	prespace = 0;
-	camel_mime_filter_complete(f, buffer, len, prespace, &buffer, &len, &prespace);
-	printf("complete = '%.*s'\n", len, buffer);
-	
-
-	return 0;
-}
-
-#endif
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
deleted file mode 100644
index ac526b6e15..0000000000
--- a/camel/camel-mime-filter-from.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_MIME_FILTER_FROM_H
-#define _CAMEL_MIME_FILTER_FROM_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_FROM(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)
-#define CAMEL_MIME_FILTER_FROM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass)
-#define IS_CAMEL_MIME_FILTER_FROM(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_from_get_type ())
-
-typedef struct _CamelMimeFilterFrom      CamelMimeFilterFrom;
-typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass;
-
-struct _CamelMimeFilterFrom {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterFromPrivate *priv;
-
-	int midline;		/* are we between lines? */
-};
-
-struct _CamelMimeFilterFromClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_from_get_type	(void);
-CamelMimeFilterFrom      *camel_mime_filter_from_new	(void);
-
-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
deleted file mode 100644
index 46e0f3f5e8..0000000000
--- a/camel/camel-mime-filter-index.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-index.h"
-
-
-static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);
-static void camel_mime_filter_index_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_index_parent;
-
-CamelType
-camel_mime_filter_index_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterIndex",
-					    sizeof (CamelMimeFilterIndex),
-					    sizeof (CamelMimeFilterIndexClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_index_class_init,
-					    NULL,
-					    NULL,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_index_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_index_finalize(CamelObject *o)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;
-
-	g_free(f->name);
-	f->index = NULL;	/* ibex's need refcounting? */
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
-
-	if (f->index == NULL || f->name==NULL) {
-		goto donothing;
-	}
-
-	ibex_index_buffer(f->index, f->name, in, len, NULL);
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
-{
-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
-	int inleft = 0;
-
-	if (f->index == NULL || f->name==NULL) {
-		goto donothing;
-	}
-
-	ibex_index_buffer(f->index, f->name, in, len, &inleft);
-
-	if (inleft>0) {
-		camel_mime_filter_backup(mf, in+(len-inleft), inleft);
-	}
-
-	*out = in;
-	*outlenptr = len-inleft;
-	*outprespace = prespace;
-	return;
-
-donothing:
-	*out = in;
-	*outlenptr = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-	
-	camel_mime_filter_index_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	/*filter_class->reset = reset;*/
-	filter_class->filter = filter;
-	filter_class->complete = complete;
-}
-
-/**
- * camel_mime_filter_index_new:
- *
- * Create a new CamelMimeFilterIndex object.
- * 
- * Return value: A new CamelMimeFilterIndex widget.
- **/
-CamelMimeFilterIndex *
-camel_mime_filter_index_new (void)
-{
-	CamelMimeFilterIndex *new = CAMEL_MIME_FILTER_INDEX ( camel_object_new (camel_mime_filter_index_get_type ()));
-	return new;
-}
-
-CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *index)
-{
-	CamelMimeFilterIndex *new = camel_mime_filter_index_new();
-
-	if (new) {
-		new->index = index;
-		new->name = g_strdup("");
-	}
-	return new;
-}
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *mf, char *name)
-{
-	g_free(mf->name);
-	mf->name = g_strdup(name);
-}
-
-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index)
-{
-	if (mf->index) {
-		char *out;
-		size_t outlen, outspace;
-
-		camel_mime_filter_complete((CamelMimeFilter *)mf, "", 0, 0, &out, &outlen, &outspace);
-	}
-	mf->index = index;
-}
-
-
-
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
deleted file mode 100644
index b0a9107852..0000000000
--- a/camel/camel-mime-filter-index.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_INDEX_H
-#define _CAMEL_MIME_FILTER_INDEX_H
-
-#include <camel/camel-mime-filter.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MIME_FILTER_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)
-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)
-#define IS_CAMEL_MIME_FILTER_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_index_get_type ())
-
-typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass;
-
-struct _CamelMimeFilterIndex {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterIndexPrivate *priv;
-
-	ibex *index;
-	char *name;
-};
-
-struct _CamelMimeFilterIndexClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_index_get_type	(void);
-CamelMimeFilterIndex      *camel_mime_filter_index_new	(void);
-
-CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *);
-
-/* Set the match name for any indexed words */
-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, char *);
-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index);
-
-#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
deleted file mode 100644
index dee6c19abb..0000000000
--- a/camel/camel-mime-filter-linewrap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code, Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter-linewrap.h"
-#include <ctype.h>
-
-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-		    char **out, size_t *outlen, size_t *outprespace);
-static void complete (CamelMimeFilter *f, char *in, size_t len,
-		      size_t prespace, char **out, size_t *outlen,
-		      size_t *outprespace);
-static void reset (CamelMimeFilter *f);
-
-
-static void
-camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *klass)
-{
-	CamelMimeFilterClass *mime_filter_class =
-		(CamelMimeFilterClass *) klass;
-	
-	mime_filter_class->filter = filter;
-	mime_filter_class->complete = complete;
-	mime_filter_class->reset = reset;
-}
-
-CamelType
-camel_mime_filter_linewrap_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterLinewrap",
-					    sizeof (CamelMimeFilterLinewrap),
-					    sizeof (CamelMimeFilterLinewrapClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_linewrap_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;
-	char *inend, *last, *p, *q;
-	int nchars = linewrap->nchars;
-	
-	/* we'll be adding chars here so we need a bigger buffer */
-	camel_mime_filter_set_size (f, 3 * len, FALSE);
-	
-	p = in;
-	q = f->outbuf;
-	inend = in + len;
-	
-	while (p < inend) {
-		if (*p == '\n') {
-			last = q;
-			*q++ = *p++;
-			nchars = 0;
-		} else if (isspace (*p)) {
-			last = q;
-			
-			if (nchars >= linewrap->wrap_len) {
-				*q++ = '\n';
-				p++;
-				nchars = 0;
-			} else {
-				*q++ = *p++;
-			}
-		} else {
-			*q++ = *p++;
-			nchars++;
-		}
-		
-		/* line is getting way too long, we must force a wrap here */
-		if (nchars >= (linewrap->max_len - 1) && *p != '\n') {
-			*q++ = '\n';
-			*q++ = linewrap->indent;
-			nchars = 0;
-		}
-	}
-	
-	linewrap->nchars = nchars;
-	
-	*out = f->outbuf;
-	*outlen = q - f->outbuf;
-	*outprespace = f->outpre;
-}
-
-static void 
-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,
-	  char **out, size_t *outlen, size_t *outprespace)
-{
-	if (len)
-		filter (f, in, len, prespace, out, outlen, outprespace);
-}
-
-static void
-reset (CamelMimeFilter *f)
-{
-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;
-	
-	linewrap->nchars = 0;
-}
-
-CamelMimeFilter *
-camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char)
-{
-	CamelMimeFilterLinewrap *linewrap =
-		CAMEL_MIME_FILTER_LINEWRAP (camel_object_new (CAMEL_MIME_FILTER_LINEWRAP_TYPE));
-	
-	linewrap->indent = indent_char;
-	linewrap->wrap_len = preferred_len;
-	linewrap->max_len = max_len;
-	linewrap->nchars = 0;
-	
-	return (CamelMimeFilter *) linewrap;
-}
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
deleted file mode 100644
index 189b80d014..0000000000
--- a/camel/camel-mime-filter-linewrap.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_LINEWRAP_H
-#define _CAMEL_MIME_FILTER_LINEWRAP_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_LINEWRAP_TYPE         (camel_mime_filter_linewrap_get_type ())
-#define CAMEL_MIME_FILTER_LINEWRAP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrap)
-#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass)
-#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE)
-
-typedef struct _CamelMimeFilterLinewrapClass CamelMimeFilterLinewrapClass;
-
-struct _CamelMimeFilterLinewrap {
-	CamelMimeFilter parent;
-	
-	guint wrap_len;
-	guint max_len;
-	char indent;
-	int nchars;
-};
-
-struct _CamelMimeFilterLinewrapClass {
-	CamelMimeFilterClass parent_class;
-};
-
-CamelType camel_mime_filter_linewrap_get_type (void);
-
-CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char);
-
-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c
deleted file mode 100644
index e1761994ed..0000000000
--- a/camel/camel-mime-filter-save.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <string.h>
-#include <errno.h>
-
-#include "camel-mime-filter-save.h"
-
-static void camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass);
-static void camel_mime_filter_save_init       (CamelMimeFilterSave *obj);
-static void camel_mime_filter_save_finalize   (CamelObject *o);
-
-static CamelMimeFilterClass *camel_mime_filter_save_parent;
-
-CamelType
-camel_mime_filter_save_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterSave",
-					    sizeof (CamelMimeFilterSave),
-					    sizeof (CamelMimeFilterSaveClass),
-					    (CamelObjectClassInitFunc) camel_mime_filter_save_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_filter_save_init,
-					    (CamelObjectFinalizeFunc) camel_mime_filter_save_finalize);
-	}
-	
-	return type;
-}
-
-static void
-camel_mime_filter_save_finalize(CamelObject *o)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)o;
-
-	g_free(f->filename);
-	if (f->fd != -1) {
-		/* FIXME: what do we do with failed writes???? */
-		close(f->fd);
-	}
-}
-
-static void
-reset(CamelMimeFilter *mf)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;
-
-	/* i dunno, how do you 'reset' a file?  reopen it? do i care? */
-	if (f->fd != -1){
-		lseek(f->fd, 0, SEEK_SET);
-	}
-}
-
-/* all this code just to support this little trivial filter! */
-static void
-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;
-
-	if (f->fd != -1) {
-		/* FIXME: check return */
-		int outlen = write(f->fd, in, len);
-		if (outlen != len) {
-			g_warning("could not write to '%s': %s", f->filename?f->filename:"<descriptor>", strerror(errno));
-		}
-	}
-	*out = in;
-	*outlen = len;
-	*outprespace = prespace;
-}
-
-static void
-camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass)
-{
-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
-
-	camel_mime_filter_save_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));
-
-	filter_class->reset = reset;
-	filter_class->filter = filter;
-}
-
-static void
-camel_mime_filter_save_init (CamelMimeFilterSave *f)
-{
-	f->fd = -1;
-}
-
-/**
- * camel_mime_filter_save_new:
- *
- * Create a new CamelMimeFilterSave object.
- * 
- * Return value: A new CamelMimeFilterSave widget.
- **/
-CamelMimeFilterSave *
-camel_mime_filter_save_new (void)
-{
-	CamelMimeFilterSave *new = CAMEL_MIME_FILTER_SAVE ( camel_object_new (camel_mime_filter_save_get_type ()));
-	return new;
-}
-
-CamelMimeFilterSave *
-camel_mime_filter_save_new_name (const char *name, int flags, int mode)
-{
-	CamelMimeFilterSave *new = NULL;
-
-	new = camel_mime_filter_save_new();
-	if (new) {
-		new->fd = open(name, flags, mode);
-		if (new->fd != -1) {
-			new->filename = g_strdup(name);
-		} else {
-			camel_object_unref((CamelObject *)new);
-			new = NULL;
-		}
-	}
-	return new;
-}
-
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
deleted file mode 100644
index abc1bf1186..0000000000
--- a/camel/camel-mime-filter-save.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_FILTER_SAVE_H
-#define _CAMEL_MIME_FILTER_SAVE_H
-
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_MIME_FILTER_SAVE(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)
-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)
-#define IS_CAMEL_MIME_FILTER_SAVE(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ())
-
-typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass;
-
-struct _CamelMimeFilterSave {
-	CamelMimeFilter parent;
-
-	struct _CamelMimeFilterSavePrivate *priv;
-
-	char *filename;
-	int fd;
-};
-
-struct _CamelMimeFilterSaveClass {
-	CamelMimeFilterClass parent_class;
-};
-
-guint		camel_mime_filter_save_get_type	(void);
-CamelMimeFilterSave      *camel_mime_filter_save_new	(void);
-
-CamelMimeFilterSave *camel_mime_filter_save_new_name (const char *name, int flags, int mode);
-
-#endif /* ! _CAMEL_MIME_FILTER_SAVE_H */
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
deleted file mode 100644
index 9a81dfb452..0000000000
--- a/camel/camel-mime-filter.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mime-filter.h"
-
-/*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */
-
-/* only suitable for glibc */
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-struct _CamelMimeFilterPrivate {
-	char *inbuf;
-	size_t inlen;
-};
-
-#define PRE_HEAD (64)
-#define BACK_HEAD (64)
-#define _PRIVATE(o) (((CamelMimeFilter *)(o))->priv)
-#define FCLASS(o) ((CamelMimeFilterClass *)(CAMEL_OBJECT_GET_CLASS(o)))
-
-static CamelObjectClass *camel_mime_filter_parent;
-
-static void complete (CamelMimeFilter *mf, char *in, size_t len, 
-		      size_t prespace, char **out, size_t *outlen, 
-		      size_t *outprespace);
-
-static void
-camel_mime_filter_class_init (CamelMimeFilterClass *klass)
-{
-	camel_mime_filter_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-
-	klass->complete = complete;
-}
-
-static void
-camel_mime_filter_init (CamelMimeFilter *obj)
-{
-	obj->outreal = NULL;
-	obj->outbuf = NULL;
-	obj->outsize = 0;
-
-	obj->backbuf = NULL;
-	obj->backsize = 0;
-	obj->backlen = 0;
-
-	_PRIVATE(obj) = g_malloc0(sizeof(*obj->priv));
-}
-
-static void
-camel_mime_filter_finalize(CamelObject *o)
-{
-	CamelMimeFilter *f = (CamelMimeFilter *)o;
-	struct _CamelMimeFilterPrivate *p = _PRIVATE(f);
-
-	g_free(f->outreal);
-	g_free(f->backbuf);
-	g_free(p->inbuf);
-	g_free(p);
-}
-
-CamelType
-camel_mime_filter_get_type (void)
-{
-	static CamelType camel_mime_filter_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_filter_type == CAMEL_INVALID_TYPE) {
-		camel_mime_filter_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelMimeFilter",
-							      sizeof (CamelMimeFilter),
-							      sizeof (CamelMimeFilterClass),
-							      (CamelObjectClassInitFunc) camel_mime_filter_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) camel_mime_filter_init,
-							      (CamelObjectFinalizeFunc) camel_mime_filter_finalize);
-	}
-	
-	return camel_mime_filter_type;
-}
-
-static void
-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)
-{
-	/* default - do nothing */
-}
-
-/**
- * camel_mime_filter_new:
- *
- * Create a new CamelMimeFilter object.
- * 
- * Return value: A new CamelMimeFilter widget.
- **/
-CamelMimeFilter *
-camel_mime_filter_new (void)
-{
-	CamelMimeFilter *new = CAMEL_MIME_FILTER ( camel_object_new (camel_mime_filter_get_type ()));
-	return new;
-}
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-static void filter_run(CamelMimeFilter *f,
-		       char *in, size_t len, size_t prespace,
-		       char **out, size_t *outlen, size_t *outprespace,
-		       void (*filterfunc)(CamelMimeFilter *f,
-					  char *in, size_t len, size_t prespace,
-					  char **out, size_t *outlen, size_t *outprespace))
-{
-	struct _CamelMimeFilterPrivate *p;
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-	/*
-	  here we take a performance hit, if the input buffer doesn't
-	  have the pre-space required.  We make a buffer that does ...
-	*/
-	if (prespace < f->backlen) {
-		int newlen = len+prespace+f->backlen;
-		p = _PRIVATE(f);
-		if (p->inlen < newlen) {
-			/* NOTE: g_realloc copies data, we dont need that (slower) */
-			g_free(p->inbuf);
-			p->inbuf = g_malloc(newlen+PRE_HEAD);
-			p->inlen = newlen+PRE_HEAD;
-		}
-		/* copy to end of structure */
-		memcpy(p->inbuf+p->inlen - len, in, len);
-		in = p->inbuf+p->inlen - len;
-		prespace = p->inlen - len;
-	}
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-
-	/* preload any backed up data */
-	if (f->backlen > 0) {
-		memcpy(in-f->backlen, f->backbuf, f->backlen);
-		in -= f->backlen;
-		len += f->backlen;
-		prespace -= f->backlen;
-		f->backlen = 0;
-	}
-	
-	filterfunc(f, in, len, prespace, out, outlen, outprespace);
-
-#ifdef MALLOC_CHECK
-	checkmem(f->outreal);
-	checkmem(f->backbuf);
-#endif
-
-}
-
-void camel_mime_filter_filter(CamelMimeFilter *f,
-			      char *in, size_t len, size_t prespace,
-			      char **out, size_t *outlen, size_t *outprespace)
-{
-	if (FCLASS(f)->filter)
-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)->filter);
-	else
-		g_error("Filter function unplmenented in class");
-}
-
-void camel_mime_filter_complete(CamelMimeFilter *f,
-				char *in, size_t len, size_t prespace,
-				char **out, size_t *outlen, size_t *outprespace)
-{
-	if (FCLASS(f)->complete)
-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)->complete);
-}
-
-void camel_mime_filter_reset(CamelMimeFilter *f)
-{
-	if (FCLASS(f)->reset) {
-		FCLASS(f)->reset(f);
-	}
-
-	/* could free some buffers, if they are really big? */
-	f->backlen = 0;
-}
-
-/* sets number of bytes backed up on the input, new calls replace previous ones */
-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length)
-{
-	if (f->backsize < length) {
-		/* g_realloc copies data, unnecessary overhead */
-		g_free(f->backbuf);
-		f->backbuf = g_malloc(length+BACK_HEAD);
-		f->backsize = length+BACK_HEAD;
-	}
-	f->backlen = length;
-	memcpy(f->backbuf, data, length);
-}
-
-/* ensure this much size available for filter output (if required) */
-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep)
-{
-	if (f->outsize < size) {
-		int offset = f->outptr - f->outreal;
-		if (keep) {
-			f->outreal = g_realloc(f->outreal, size + PRE_HEAD*4);
-		} else {
-			g_free(f->outreal);
-			f->outreal = g_malloc(size + PRE_HEAD*4);
-		}
-		f->outptr = f->outreal + offset;
-		f->outbuf = f->outreal + PRE_HEAD*4;
-		f->outsize = size;
-		/* this could be offset from the end of the structure, but 
-		   this should be good enough */
-		f->outpre = PRE_HEAD*4;
-	}
-}
-
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
deleted file mode 100644
index 65d8590fa5..0000000000
--- a/camel/camel-mime-filter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* Abstract class for non-copying filters */
-
-#ifndef _CAMEL_MIME_FILTER_H
-#define _CAMEL_MIME_FILTER_H
-
-#include <camel/camel-object.h>
-#include <sys/types.h>
-
-#define CAMEL_MIME_FILTER_TYPE         (camel_mime_filter_get_type ())
-#define CAMEL_MIME_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)
-#define CAMEL_MIME_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)
-#define IS_CAMEL_MIME_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_get_type ())
-
-typedef struct _CamelMimeFilterClass CamelMimeFilterClass;
-
-struct _CamelMimeFilter {
-	CamelObject parent;
-
-	struct _CamelMimeFilterPrivate *priv;
-
-	char *outreal;		/* real malloc'd buffer */
-	char *outbuf;		/* first 'writable' position allowed (outreal + outpre) */
-	char *outptr;
-	int outsize;
-	int outpre;		/* prespace of this buffer */
-
-	char *backbuf;
-	int backsize;
-	int backlen;		/* significant data there */
-};
-
-struct _CamelMimeFilterClass {
-	CamelObjectClass parent_class;
-
-	/* virtual functions */
-	void (*filter)(CamelMimeFilter *f,
-		       char *in, size_t len, size_t prespace,
-		       char **out, size_t *outlen, size_t *outprespace);
-	void (*complete)(CamelMimeFilter *f,
-			 char *in, size_t len, size_t prespace,
-			 char **out, size_t *outlen, size_t *outprespace);
-	void (*reset)(CamelMimeFilter *f);
-};
-
-CamelType	      camel_mime_filter_get_type	(void);
-CamelMimeFilter      *camel_mime_filter_new	(void);
-
-void camel_mime_filter_filter(CamelMimeFilter *f,
-			      char *in, size_t len, size_t prespace,
-			      char **out, size_t *outlen, size_t *outprespace);
-
-void camel_mime_filter_complete(CamelMimeFilter *f,
-				char *in, size_t len, size_t prespace,
-				char **out, size_t *outlen, size_t *outprespace);
-
-void camel_mime_filter_reset(CamelMimeFilter *f);
-
-/* sets/returns number of bytes backed up on the input */
-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length);
-
-/* ensure this much size available for filter output */
-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep);
-
-#endif /* ! _CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
deleted file mode 100644
index fd199f600d..0000000000
--- a/camel/camel-mime-message.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-message.c : class for a mime_message */
-
-/* 
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "gmime-content-field.h"
-#include "camel-stream-mem.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-#include <stdio.h>
-
-#define d(x)
-
-/* these 2 below should be kept in sync */
-typedef enum {
-	HEADER_UNKNOWN,
-	HEADER_FROM,
-	HEADER_REPLY_TO,
-	HEADER_SUBJECT,
-	HEADER_TO,
-	HEADER_CC,
-	HEADER_BCC,
-	HEADER_DATE
-} CamelHeaderType;
-
-static char *header_names[] = {
-	/* dont include HEADER_UNKNOWN string */
-	"From", "Reply-To", "Subject", "To", "Cc", "Bcc", "Date", NULL
-};
-
-static GHashTable *header_name_table;
-
-static CamelMimePartClass *parent_class=NULL;
-
-static char *recipient_names[] = {
-	"To", "Cc", "Bcc", NULL
-};
-
-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void add_header (CamelMedium *medium, const char *header_name, const void *header_value);
-static void set_header (CamelMedium *medium, const char *header_name, const void *header_value);
-static void remove_header (CamelMedium *medium, const char *header_name);
-static int construct_from_parser (CamelMimePart *, CamelMimeParser *);
-static void unref_recipient (gpointer key, gpointer value, gpointer user_data);
-
-/* Returns the class for a CamelMimeMessage */
-#define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void
-camel_mime_message_class_init (CamelMimeMessageClass *camel_mime_message_class)
-{
-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_message_class);
-	CamelMimePartClass *camel_mime_part_class = CAMEL_MIME_PART_CLASS (camel_mime_message_class);
-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_message_class);
-	int i;
-	
-	parent_class = CAMEL_MIME_PART_CLASS(camel_type_get_global_classfuncs (camel_mime_part_get_type ()));
-
-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	for (i=0;header_names[i];i++)
-		g_hash_table_insert (header_name_table, header_names[i], (gpointer)i+1);
-
-	/* virtual method overload */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-
-	camel_medium_class->add_header = add_header;
-	camel_medium_class->set_header = set_header;
-	camel_medium_class->remove_header = remove_header;
-	
-	camel_mime_part_class->construct_from_parser = construct_from_parser;
-}
-
-
-static void
-camel_mime_message_init (gpointer object, gpointer klass)
-{
-	CamelMimeMessage *mime_message = (CamelMimeMessage *)object;
-	int i;
-	
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (object), "message/rfc822");
-
-	mime_message->recipients =  g_hash_table_new(g_strcase_hash, g_strcase_equal);
-	for (i=0;recipient_names[i];i++) {
-		g_hash_table_insert(mime_message->recipients, recipient_names[i], camel_internet_address_new());
-	}
-
-	mime_message->subject = NULL;
-	mime_message->reply_to = NULL;
-	mime_message->from = NULL;
-	mime_message->date = CAMEL_MESSAGE_DATE_CURRENT;
-	mime_message->date_offset = 0;
-	mime_message->date_str = NULL;
-}
-
-static void           
-camel_mime_message_finalize (CamelObject *object)
-{
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (object);
-	
-	g_free (message->date_str);
-	g_free (message->subject);
-	g_free (message->reply_to);
-	g_free (message->from);
-
-	g_hash_table_foreach (message->recipients, unref_recipient, NULL);
-	g_hash_table_destroy (message->recipients);
-}
-
-
-CamelType
-camel_mime_message_get_type (void)
-{
-	static CamelType camel_mime_message_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_message_type == CAMEL_INVALID_TYPE)	{
-		camel_mime_message_type = camel_type_register (camel_mime_part_get_type(), "CamelMimeMessage",
-							       sizeof (CamelMimeMessage),
-							       sizeof (CamelMimeMessageClass),
-							       (CamelObjectClassInitFunc) camel_mime_message_class_init,
-							       NULL,
-							       (CamelObjectInitFunc) camel_mime_message_init,
-							       (CamelObjectFinalizeFunc) camel_mime_message_finalize);
-	}
-	
-	return camel_mime_message_type;
-}
-
-static void unref_recipient (gpointer key, gpointer value, gpointer user_data)
-{
-	camel_object_unref (CAMEL_OBJECT (value));
-}
-
-
-
-CamelMimeMessage *
-camel_mime_message_new (void) 
-{
-	CamelMimeMessage *mime_message;
-	mime_message = CAMEL_MIME_MESSAGE(camel_object_new (CAMEL_MIME_MESSAGE_TYPE));
-	
-	return mime_message;
-}
-
-
-/* **** Date: */
-
-void
-camel_mime_message_set_date(CamelMimeMessage *message,  time_t date, int offset)
-{
-	g_assert(message);
-	if (date == CAMEL_MESSAGE_DATE_CURRENT) {
-		struct tm *local;
-		int tz;
-
-		date = time(0);
-		local = localtime(&date);
-		offset = 0;
-#if defined(HAVE_TIMEZONE)
-		tz = timezone;
-#elif defined(HAVE_TM_GMTOFF)
-		tz = local->tm_gmtoff;
-#endif
-		offset = ((tz/60/60) * 100) + (tz/60 % 60);
-	}
-	message->date = date;
-	message->date_offset = offset;
-	g_free(message->date_str);
-	message->date_str = header_format_date(date, offset);
-
-	CAMEL_MEDIUM_CLASS(parent_class)->set_header((CamelMedium *)message, "Date", message->date_str);
-}
-
-void
-camel_mime_message_get_date(CamelMimeMessage *message,  time_t *date, int *offset)
-{
-	if (message->date == CAMEL_MESSAGE_DATE_CURRENT)
-		camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	if (date)
-		*date = message->date;
-	if (offset)
-		*offset = message->date_offset;
-}
-
-char *
-camel_mime_message_get_date_string (CamelMimeMessage *message)
-{
-	if (message->date == CAMEL_MESSAGE_DATE_CURRENT)
-		camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	return message->date_str;
-}
-
-const gchar *
-camel_mime_message_get_received_date (CamelMimeMessage *message)
-{
-	/* FIXME: is this the received date? and if so then get_sent_date must be wrong */
-	if (message->date == CAMEL_MESSAGE_DATE_CURRENT)
-		camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	return message->date_str;
-}
-
-const gchar *
-camel_mime_message_get_sent_date (CamelMimeMessage *message)
-{
-	/* FIXME: is this the sent date? and if so then get_received_date must be wrong */
-	if (message->date == CAMEL_MESSAGE_DATE_CURRENT)
-		camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	return message->date_str;
-}
-
-/* **** Reply-To: */
-
-void
-camel_mime_message_set_reply_to (CamelMimeMessage *mime_message, const gchar *reply_to)
-{
-	CamelInternetAddress *cia;
-	char *addr;
-	
-	g_assert (mime_message);
-	
-	/* FIXME: check format of string, handle it nicer ... */
-	
-	g_free (mime_message->reply_to);
-	mime_message->reply_to = g_strstrip (g_strdup (reply_to));
-	
-	cia = camel_internet_address_new ();
-	camel_address_decode (CAMEL_ADDRESS (cia), mime_message->reply_to);
-	addr = camel_address_encode (CAMEL_ADDRESS (cia));
-	
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Reply-To", addr);
-	camel_object_unref (CAMEL_OBJECT (cia));
-	g_free (addr);
-}
-
-const gchar *
-camel_mime_message_get_reply_to (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-
-	return mime_message->reply_to;
-}
-
-void
-camel_mime_message_set_subject (CamelMimeMessage *mime_message,
-				const gchar *subject)
-{
-	char *text;
-	
-	g_assert (mime_message);
-	
-	g_free (mime_message->subject);
-	mime_message->subject = g_strstrip (g_strdup (subject));
-	text = header_encode_string ((unsigned char *) mime_message->subject);
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "Subject", text);
-	g_free (text);
-}
-
-const gchar *
-camel_mime_message_get_subject (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-
-	return mime_message->subject;
-}
-
-/* *** From: */
-void
-camel_mime_message_set_from (CamelMimeMessage *mime_message, const gchar *from)
-{
-	CamelInternetAddress *cia;
-	char *addr;
-	
-	g_assert (mime_message);
-	
-	/* FIXME: check format of string, handle it nicer ... */
-	
-	g_free (mime_message->from);
-	mime_message->from = g_strstrip (g_strdup (from));
-	
-	cia = camel_internet_address_new ();
-	camel_address_decode (CAMEL_ADDRESS (cia), mime_message->from);
-	
-	addr = camel_address_encode (CAMEL_ADDRESS (cia));
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), "From", addr);
-	camel_object_unref (CAMEL_OBJECT (cia));
-	g_free (addr);
-}
-
-const gchar *
-camel_mime_message_get_from (CamelMimeMessage *mime_message)
-{
-	g_assert (mime_message);
-
-	return mime_message->from;
-}
-
-/*  ****  */
-
-void
-camel_mime_message_add_recipient (CamelMimeMessage *mime_message, 
-				  const gchar *type, 
-				  const gchar *name, const char *address)
-{
-	CamelInternetAddress *addr;
-	char *text;
-
-	g_assert (mime_message);
-
-	addr = g_hash_table_lookup (mime_message->recipients, type);
-	if (addr == NULL) {
-		g_warning ("trying to add a non-valid receipient type: %s = %s %s", type, name, address);
-		return;
-	}
-
-	camel_internet_address_add (addr, name, address);
-
-	/* FIXME: maybe this should be delayed till we're ready to write out? */
-	text = camel_address_encode (CAMEL_ADDRESS (addr));
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text);
-	g_free (text);
-}
-
-void
-camel_mime_message_remove_recipient_address (CamelMimeMessage *mime_message,
-					     const gchar *type,
-					     const gchar *address)
-{
-	CamelInternetAddress *addr;
-	int index;
-	char *text;
-
-	g_assert (mime_message);
-
-	addr = g_hash_table_lookup(mime_message->recipients, type);
-	if (addr == NULL) {
-		g_warning("trying to remove a non-valid receipient type: %s = %s", type, address);
-		return;
-	}
-	
-	index = camel_internet_address_find_address(addr, address, NULL);
-	if (index == -1) {
-		g_warning("trying to remove address for nonexistand address: %s", address);
-		return;
-	}
-
-	camel_address_remove (CAMEL_ADDRESS (addr), index);
-
-	/* FIXME: maybe this should be delayed till we're ready to write out? */
-	text = camel_address_encode (CAMEL_ADDRESS (addr));
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text);
-	g_free (text);
-}
-
-void
-camel_mime_message_remove_recipient_name (CamelMimeMessage *mime_message,
-					  const gchar *type,
-					  const gchar *name)
-{
-	CamelInternetAddress *addr;
-	int index;
-	char *text;
-
-	g_assert (mime_message);
-
-	addr = g_hash_table_lookup(mime_message->recipients, type);
-	if (addr == NULL) {
-		g_warning("trying to remove a non-valid receipient type: %s = %s", type, name);
-		return;
-	}
-	index = camel_internet_address_find_name(addr, name, NULL);
-	if (index == -1) {
-		g_warning("trying to remove address for nonexistand name: %s", name);
-		return;
-	}
-
-	camel_address_remove (CAMEL_ADDRESS (addr), index);
-
-	/* FIXME: maybe this should be delayed till we're ready to write out? */
-	text = camel_address_encode (CAMEL_ADDRESS (addr));
-	CAMEL_MEDIUM_CLASS (parent_class)->set_header (CAMEL_MEDIUM (mime_message), type, text);
-	g_free (text);
-}
-
-const CamelInternetAddress *
-camel_mime_message_get_recipients (CamelMimeMessage *mime_message, 
-				   const gchar *type)
-{
-	g_assert (mime_message);
-	
-	return g_hash_table_lookup(mime_message->recipients, type);
-}
-
-
-
-/* mime_message */
-static int
-construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	char *buf;
-	int len;
-	int state;
-	int ret;
-
-	d(printf("constructing mime-message\n"));
-
-	d(printf("mime_message::construct_from_parser()\n"));
-
-	/* let the mime-part construct the guts ... */
-	ret = ((CamelMimePartClass *)parent_class)->construct_from_parser(dw, mp);
-
-	if (ret == -1)
-		return -1;
-
-	/* ... then clean up the follow-on state */
-	state = camel_mime_parser_step(mp, &buf, &len);
-	switch (state) {
-	case HSCAN_EOF: case HSCAN_FROM_END: /* these doesn't belong to us */
-		camel_mime_parser_unstep(mp);
-	case HSCAN_MESSAGE_END:
-		break;
-	default:
-		g_error("Bad parser state: Expecing MESSAGE_END or EOF or EOM, got: %d", camel_mime_parser_state(mp));
-		camel_mime_parser_unstep(mp);
-		return -1;
-	}
-
-	d(printf("mime_message::construct_from_parser() leaving\n"));
-#ifndef NO_WARNINGS
-#warning "return a real error code"
-#endif
-	return 0;
-}
-
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimeMessage *mm = CAMEL_MIME_MESSAGE (data_wrapper);
-
-	/* force mandatory headers ... */
-	if (mm->from == NULL) {
-		g_warning("No from set for message");
-		camel_mime_message_set_from(mm, "");
-	}
-	if (mm->date_str == NULL) {
-		g_warning("Application did not set date, using 'now'");
-		camel_mime_message_set_date(mm, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	}
-	if (mm->subject == NULL) {
-		g_warning("Application did not set subject, creating one");
-		camel_mime_message_set_subject(mm, "No Subject");
-	}
-
-	/* FIXME: "To" header needs to be set explicitly as well ... */
-
-	if (!camel_medium_get_header ((CamelMedium *)mm, "Mime-Version"))
-		camel_medium_set_header((CamelMedium *)mm, "Mime-Version", "1.0");
-
-	return CAMEL_DATA_WRAPPER_CLASS (parent_class)->write_to_stream (data_wrapper, stream);
-}
-
-static char *
-format_address(const char *text)
-{
-	struct _header_address *addr;
-	char *ret;
-	
-	addr = header_address_decode (text);
-	if (addr) {
-		ret = header_address_list_format (addr);
-		header_address_list_clear (&addr);
-	} else {
-		ret = g_strdup (text);
-	}
-	
-	return ret;
-}
-
-/* FIXME: check format of fields. */
-static gboolean
-process_header (CamelMedium *medium, const char *header_name, const char *header_value)
-{
-	CamelHeaderType header_type;
-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (medium);
-	CamelInternetAddress *addr;
-
-	header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name);
-	switch (header_type) {
-	case HEADER_FROM:
-		g_free (message->from);
-		message->from = format_address (header_value);
-		break;
-	case HEADER_REPLY_TO:
-		g_free (message->reply_to);
-		message->reply_to = format_address (header_value);
-		break;
-	case HEADER_SUBJECT:
-		g_free (message->subject);
-		message->subject = g_strstrip (header_decode_string (header_value));
-		break;
-	case HEADER_TO:
-	case HEADER_CC:
-	case HEADER_BCC:
-		addr = g_hash_table_lookup (message->recipients, header_name);
-		if (header_value)
-			camel_address_decode (CAMEL_ADDRESS (addr), header_value);
-		else
-			camel_address_remove (CAMEL_ADDRESS (addr), -1);
-		break;
-	case HEADER_DATE:
-		g_free (message->date_str);
-		message->date_str = g_strdup (header_value);
-		if (header_value) {
-			message->date = header_decode_date (header_value, &message->date_offset);
-		} else {
-			message->date = CAMEL_MESSAGE_DATE_CURRENT;
-		}
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-set_header(CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	process_header(medium, header_name, header_value);
-	parent_class->parent_class.set_header (medium, header_name, header_value);
-}
-
-static void
-add_header(CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	/* if we process it, then it must be forced unique as well ... */
-	if (process_header(medium, header_name, header_value))
-		parent_class->parent_class.set_header (medium, header_name, header_value);
-	else
-		parent_class->parent_class.add_header (medium, header_name, header_value);
-}
-
-static void
-remove_header(CamelMedium *medium, const char *header_name)
-{
-	process_header(medium, header_name, NULL);
-	parent_class->parent_class.remove_header (medium, header_name);
-}
-
-static gboolean
-multipart_has_8bit_parts (CamelMultipart *multipart)
-{
-	gboolean has_8bit = FALSE;
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts && !has_8bit; i++) {
-		GMimeContentField *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content = camel_mime_part_get_content_type (mime_part);
-		
-		if (gmime_content_field_is_type (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			has_8bit = multipart_has_8bit_parts (mpart);
-		} else {
-			/* see if this part is 8bit */
-			has_8bit = camel_mime_part_get_encoding (mime_part) == CAMEL_MIME_PART_ENCODING_8BIT;
-		}
-	}
-	
-	return has_8bit;
-}
-
-gboolean
-camel_mime_message_has_8bit_parts (CamelMimeMessage *mime_message)
-{
-	GMimeContentField *content;
-	gboolean has_8bit = FALSE;
-	
-	content = camel_mime_part_get_content_type (CAMEL_MIME_PART (mime_message));
-	
-	if (gmime_content_field_is_type (content, "multipart", "*")) {
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (mime_message)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		has_8bit = multipart_has_8bit_parts (multipart);
-	} else {
-		/* single-part message so just check this part */
-		has_8bit = camel_mime_part_get_encoding (CAMEL_MIME_PART (mime_message)) == CAMEL_MIME_PART_ENCODING_8BIT;
-	}
-	
-	return has_8bit;
-}
-
-static int
-best_encoding (const guchar *text)
-{
-	guchar *ch;
-	int count = 0;
-	int total;
-	
-	for (ch = (guchar *) text; *ch; ch++)
-		if (*ch > (guchar) 127)
-			count++;
-	
-	total = (int) (ch - text);
-	
-	if ((float) count <= total * 0.17)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-}
-
-static void
-multipart_encode_8bit_parts (CamelMultipart *multipart)
-{
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		GMimeContentField *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content = camel_mime_part_get_content_type (mime_part);
-		
-		if (gmime_content_field_is_type (content, "multipart", "*")) {
-			/* ...and the search for Spock continues */
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			multipart_encode_8bit_parts (mpart);
-		} else {
-			/* re-encode this if necessary */
-			gboolean is_8bit;
-			
-			is_8bit = camel_mime_part_get_encoding (mime_part) == CAMEL_MIME_PART_ENCODING_8BIT;
-			if (is_8bit) {
-				CamelStream *stream;
-				GByteArray *array;
-				guchar *content;
-				
-				array = g_byte_array_new ();
-				stream = camel_stream_mem_new_with_byte_array (array);
-				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_part), stream);
-				g_byte_array_append (array, "", 1);
-				
-				content = array->data;
-				g_byte_array_free (array, FALSE);
-				
-				camel_mime_part_set_encoding (mime_part, best_encoding (content));
-				g_free (content);
-				camel_object_unref (CAMEL_OBJECT (stream));
-			}
-		}
-	}
-}
-
-void
-camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)
-{
-	GMimeContentField *content;
-	
-	content = camel_mime_part_get_content_type (CAMEL_MIME_PART (mime_message));
-	
-	if (gmime_content_field_is_type (content, "multipart", "*")) {
-		/* search for Spock */
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (mime_message)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		multipart_encode_8bit_parts (multipart);
-	} else {
-		/* re-encode if we need to */
-		gboolean is_8bit;
-		
-		is_8bit = camel_mime_part_get_encoding (CAMEL_MIME_PART (mime_message)) == CAMEL_MIME_PART_ENCODING_8BIT;
-		if (is_8bit) {
-			/* FIXME: is there a better way of doing this? */
-			CamelStream *stream;
-			GByteArray *array;
-			guchar *content;
-			
-			array = g_byte_array_new ();
-			stream = camel_stream_mem_new_with_byte_array (array);
-			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (CAMEL_MIME_PART (mime_message)), stream);
-			g_byte_array_append (array, "", 1);
-			
-			content = array->data;
-			g_byte_array_free (array, FALSE);
-						
-			camel_mime_part_set_encoding (CAMEL_MIME_PART (mime_message), best_encoding (content));
-			g_free (content);
-			camel_object_unref (CAMEL_OBJECT (stream));
-		}
-	}
-}
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
deleted file mode 100644
index 33436c6dad..0000000000
--- a/camel/camel-mime-message.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camelMimeMessage.h : class for a mime message
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MIME_MESSAGE_H
-#define CAMEL_MIME_MESSAGE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-internet-address.h>
-
-#define CAMEL_RECIPIENT_TYPE_TO "To"
-#define CAMEL_RECIPIENT_TYPE_CC "Cc"
-#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"
-
-
-#define CAMEL_MIME_MESSAGE_TYPE     (camel_mime_message_get_type ())
-#define CAMEL_MIME_MESSAGE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))
-#define CAMEL_MIME_MESSAGE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))
-#define CAMEL_IS_MIME_MESSAGE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))
-
-
-/* specify local time */
-#define CAMEL_MESSAGE_DATE_CURRENT (~0)
-
-struct _CamelMimeMessage
-{
-	CamelMimePart parent_object;
-
-	/* header fields */
-	time_t date;
-	int date_offset;	/* GMT offset */
-	char *date_str;		/* cached copy of date string */
-
-	gchar *subject;
-	gchar *reply_to;
-
-	gchar *from;
-
-	GHashTable *recipients;	/* hash table of CamelInternetAddress's */
-};
-
-typedef struct {
-	CamelMimePartClass parent_class;
-
-	/* Virtual methods */	
-
-} CamelMimeMessageClass;
-
-
-
-/* Standard Camel function */
-CamelType camel_mime_message_get_type (void);
-
-
-/* public methods */
-CamelMimeMessage * camel_mime_message_new                  (void);
-
-
-void               camel_mime_message_set_date		   (CamelMimeMessage *mime_message,  time_t date, int offset);
-void               camel_mime_message_get_date		   (CamelMimeMessage *mime_message,  time_t *date, int *offset);
-char		  *camel_mime_message_get_date_string	   (CamelMimeMessage *mime_message);
-
-const gchar *      camel_mime_message_get_received_date    (CamelMimeMessage *mime_message);
-const gchar *      camel_mime_message_get_sent_date        (CamelMimeMessage *mime_message);
-void               camel_mime_message_set_reply_to         (CamelMimeMessage *mime_message, 
-							    const gchar *reply_to);
-const gchar *      camel_mime_message_get_reply_to         (CamelMimeMessage *mime_message);
-void               camel_mime_message_set_subject          (CamelMimeMessage *mime_message, 
-							    const gchar *subject);
-const gchar *      camel_mime_message_get_subject          (CamelMimeMessage *mime_message);
-void               camel_mime_message_set_from             (CamelMimeMessage *mime_message, 
-							    const gchar *from);
-const gchar *      camel_mime_message_get_from             (CamelMimeMessage *mime_message);
-
-
-void		camel_mime_message_add_recipient (CamelMimeMessage *mime_message,
-						  const char *type, const char *name, const char *address);
-void		camel_mime_message_remove_recipient_address (CamelMimeMessage *mime_message, 
-							     const char *type, const char *address);
-void		camel_mime_message_remove_recipient_name (CamelMimeMessage *mime_message, 
-							  const char *type, const char *name);
-
-const CamelInternetAddress *camel_mime_message_get_recipients (CamelMimeMessage *mime_message, 
-							       const char *type);
-
-
-/* utility functions */
-gboolean camel_mime_message_has_8bit_parts    (CamelMimeMessage *mime_message);
-void     camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MIME_MESSAGE_H */
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
deleted file mode 100644
index efa808170e..0000000000
--- a/camel/camel-mime-parser.c
+++ /dev/null
@@ -1,1902 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* What should hopefully be a fast mail parser */
-
-/* Do not change this code without asking me (Michael Zucchi) first
-
-   There is almost always a reason something was done a certain way.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <string.h>
-
-#include <stdio.h>
-#include <errno.h>
-
-#include <unicode.h>
-
-#include <regex.h>
-#include <ctype.h>
-
-#include <glib.h>
-#include "camel-mime-parser.h"
-#include "camel-mime-utils.h"
-#include "camel-mime-filter.h"
-#include "camel-stream.h"
-#include "camel-seekable-stream.h"
-
-#define r(x) 
-#define h(x) 
-#define c(x) 
-#define d(x) 
-
-/*#define PURIFY*/
-
-#define MEMPOOL
-
-#define STRUCT_ALIGN 4
-
-#ifdef PURIFY
-int inend_id = -1,
-  inbuffer_id = -1;
-#endif
-
-#if 0
-extern int strdup_count;
-extern int malloc_count;
-extern int free_count;
-
-#define g_strdup(x) (strdup_count++, g_strdup(x))
-#define g_malloc(x) (malloc_count++, g_malloc(x))
-#define g_free(x) (free_count++, g_free(x))
-#endif
-
-#ifdef MEMPOOL
-typedef struct _MemPoolNode {
-	struct _MemPoolNode *next;
-
-	int free;
-	char data[1];
-} MemPoolNode;
-
-typedef struct _MemPoolThresholdNode {
-	struct _MemPoolThresholdNode *next;
-	char data[1];
-} MemPoolThresholdNode;
-
-typedef struct _MemPool {
-	int blocksize;
-	int threshold;
-	struct _MemPoolNode *blocks;
-	struct _MemPoolThresholdNode *threshold_blocks;
-} MemPool;
-
-MemPool *mempool_new(int blocksize, int threshold);
-void *mempool_alloc(MemPool *pool, int size);
-void mempool_flush(MemPool *pool, int freeall);
-void mempool_free(MemPool *pool);
-
-MemPool *mempool_new(int blocksize, int threshold)
-{
-	MemPool *pool;
-
-	pool = g_malloc(sizeof(*pool));
-	if (threshold >= blocksize)
-		threshold = blocksize * 2 / 3;
-	pool->blocksize = blocksize;
-	pool->threshold = threshold;
-	pool->blocks = NULL;
-	pool->threshold_blocks = NULL;
-	return pool;
-}
-
-void *mempool_alloc(MemPool *pool, int size)
-{
-	size = (size + STRUCT_ALIGN) & (~(STRUCT_ALIGN-1));
-	if (size>=pool->threshold) {
-		MemPoolThresholdNode *n;
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + size);
-		n->next = pool->threshold_blocks;
-		pool->threshold_blocks = n;
-		return &n->data[0];
-	} else {
-		MemPoolNode *n;
-
-		n = pool->blocks;
-		while (n) {
-			if (n->free >= size) {
-				n->free -= size;
-				return &n->data[n->free];
-			}
-			n = n->next;
-		}
-
-		n = g_malloc(sizeof(*n) - sizeof(char) + pool->blocksize);
-		n->next = pool->blocks;
-		pool->blocks = n;
-		n->free = pool->blocksize - size;
-		return &n->data[n->free];
-	}
-}
-
-void mempool_flush(MemPool *pool, int freeall)
-{
-	MemPoolThresholdNode *tn, *tw;
-	MemPoolNode *pw, *pn;
-
-	tw = pool->threshold_blocks;
-	while (tw) {
-		tn = tw->next;
-		g_free(tw);
-		tw = tn;
-	}
-	pool->threshold_blocks = NULL;
-
-	if (freeall) {
-		pw = pool->blocks;
-		while (pw) {
-			pn = pw->next;
-			g_free(pw);
-			pw = pn;
-		}
-		pool->blocks = NULL;
-	} else {
-		pw = pool->blocks;
-		while (pw) {
-			pw->free = pool->blocksize;
-			pw = pw->next;
-		}
-	}
-}
-
-void mempool_free(MemPool *pool)
-{
-	if (pool) {
-		mempool_flush(pool, 1);
-		g_free(pool);
-	}
-}
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-#define SCAN_BUF 4096		/* size of read buffer */
-#define SCAN_HEAD 128		/* headroom guaranteed to be before each read buffer */
-
-/* a little hacky, but i couldn't be bothered renaming everything */
-#define _header_scan_state _CamelMimeParserPrivate
-#define _PRIVATE(o) (((CamelMimeParser *)(o))->priv)
-
-struct _header_scan_state {
-
-    /* global state */
-
-	enum _header_state state;
-
-	/* for building headers during scanning */
-	char *outbuf;
-	char *outptr;
-	char *outend;
-
-	int fd;			/* input for a fd input */
-	CamelStream *stream;	/* or for a stream */
-
-	/* for scanning input buffers */
-	char *realbuf;		/* the real buffer, SCAN_HEAD*2 + SCAN_BUF bytes */
-	char *inbuf;		/* points to a subset of the allocated memory, the underflow */
-	char *inptr;		/* (upto SCAN_HEAD) is for use by filters so they dont copy all data */
-	char *inend;
-
-	int atleast;
-
-	int seek;		/* current offset to start of buffer */
-	int unstep;		/* how many states to 'unstep' (repeat the current state) */
-
-	int midline;		/* are we mid-line interrupted? */
-	int scan_from;		/* do we care about From lines? */
-
-	int start_of_from;	/* where from started */
-	int start_of_headers;	/* where headers started from the last scan */
-
-	int header_start;	/* start of last header, or -1 */
-
-	/* filters to apply to all content before output */
-	int filterid;		/* id of next filter */
-	struct _header_scan_filter *filters;
-
-    /* per message/part info */
-	struct _header_scan_stack *parts;
-
-};
-
-struct _header_scan_stack {
-	struct _header_scan_stack *parent;
-
-	enum _header_state savestate; /* state at invocation of this part */
-
-#ifdef MEMPOOL
-	MemPool *pool;		/* memory pool to keep track of headers/etc at this level */
-#endif
-	struct _header_raw *headers;	/* headers for this part */
-
-	struct _header_content_type *content_type;
-
-	/* I dont use GString's casue you can't efficiently append a buffer to them */
-	GByteArray *pretext;	/* for multipart types, save the pre-boundary data here */
-	GByteArray *posttext;	/* for multipart types, save the post-boundary data here */
-	int prestage;		/* used to determine if it is a pre-boundary or post-boundary data segment */
-
-	char *boundary;		/* for multipart/ * boundaries, including leading -- and trailing -- for the final part */
-	int boundarylen;	/* length of boundary, including leading -- */
-};
-
-struct _header_scan_filter {
-	struct _header_scan_filter *next;
-	int id;
-	CamelMimeFilter *filter;
-};
-
-static void folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength);
-static void folder_scan_drop_step(struct _header_scan_state *s);
-static int folder_scan_init_with_fd(struct _header_scan_state *s, int fd);
-static int folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream);
-static struct _header_scan_state *folder_scan_init(void);
-static void folder_scan_close(struct _header_scan_state *s);
-static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length);
-static struct _header_scan_stack *folder_scan_header(struct _header_scan_state *s, int *lastone);
-static int folder_scan_skip_line(struct _header_scan_state *s);
-static off_t folder_seek(struct _header_scan_state *s, off_t offset, int whence);
-static off_t folder_tell(struct _header_scan_state *s);
-#ifdef MEMPOOL
-static void header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset);
-#endif
-
-static void camel_mime_parser_class_init (CamelMimeParserClass *klass);
-static void camel_mime_parser_init       (CamelMimeParser *obj);
-
-static char *states[] = {
-	"HSCAN_INITIAL",
-	"HSCAN_FROM",		/* got 'From' line */
-	"HSCAN_HEADER",		/* toplevel header */
-	"HSCAN_BODY",		/* scanning body of message */
-	"HSCAN_MULTIPART",	/* got multipart header */
-	"HSCAN_MESSAGE",	/* rfc822/news message */
-
-	"HSCAN_PART",		/* part of a multipart */
-	"<invalid>",
-
-	"HSCAN_EOF",		/* end of file */
-	"HSCAN_FROM_END",
-	"HSCAN_HEAER_END",
-	"HSCAN_BODY_END",
-	"HSCAN_MULTIPART_END",
-	"HSCAN_MESSAGE_END",
-};
-
-static CamelObjectClass *camel_mime_parser_parent;
-
-static void
-camel_mime_parser_class_init (CamelMimeParserClass *klass)
-{
-	camel_mime_parser_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-static void
-camel_mime_parser_init (CamelMimeParser *obj)
-{
-	struct _header_scan_state *s;
-
-	s = folder_scan_init();
-	_PRIVATE(obj) = s;
-}
-
-static void
-camel_mime_parser_finalise(CamelObject *o)
-{
-	struct _header_scan_state *s = _PRIVATE(o);
-#ifdef PURIFY
-	purify_watch_remove_all();
-#endif
-	folder_scan_close(s);
-}
-
-CamelType
-camel_mime_parser_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelMimeParser",
-					    sizeof (CamelMimeParser),
-					    sizeof (CamelMimeParserClass),
-					    (CamelObjectClassInitFunc) camel_mime_parser_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_mime_parser_init,
-					    (CamelObjectFinalizeFunc) camel_mime_parser_finalise);
-	}
-	
-	return type;
-}
-
-/**
- * camel_mime_parser_new:
- *
- * Create a new CamelMimeParser object.
- * 
- * Return value: A new CamelMimeParser widget.
- **/
-CamelMimeParser *
-camel_mime_parser_new (void)
-{
-	CamelMimeParser *new = CAMEL_MIME_PARSER ( camel_object_new (camel_mime_parser_get_type ()));
-	return new;
-}
-
-
-/**
- * camel_mime_parser_filter_add:
- * @m: 
- * @mf: 
- * 
- * Add a filter that will be applied to any body content before it is passed
- * to the caller.  Filters may be pipelined to perform multi-pass operations
- * on the content, and are applied in the order they were added.
- *
- * Note that filters are only applied to the body content of messages, and once
- * a filter has been set, all content returned by a filter_step() with a state
- * of HSCAN_BODY will have passed through the filter.
- * 
- * Return value: An id that may be passed to filter_remove() to remove
- * the filter, or -1 if the operation failed.
- **/
-int
-camel_mime_parser_filter_add(CamelMimeParser *m, CamelMimeFilter *mf)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	struct _header_scan_filter *f, *new;
-
-	new = g_malloc(sizeof(*new));
-	new->filter = mf;
-	new->id = s->filterid++;
-	if (s->filterid == -1)
-		s->filterid++;
-	new->next = 0;
-	camel_object_ref((CamelObject *)mf);
-
-	/* yes, this is correct, since 'next' is the first element of the struct */
-	f = (struct _header_scan_filter *)&s->filters;
-	while (f->next)
-		f = f->next;
-	f->next = new;
-	return new->id;
-}
-
-/**
- * camel_mime_parser_filter_remove:
- * @m: 
- * @id: 
- * 
- * Remove a processing filter from the pipeline.  There is no
- * restriction on the order the filters can be removed.
- **/
-void
-camel_mime_parser_filter_remove(CamelMimeParser *m, int id)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	struct _header_scan_filter *f, *old;
-	
-	f = (struct _header_scan_filter *)&s->filters;
-	while (f && f->next) {
-		old = f->next;
-		if (old->id == id) {
-			camel_object_unref((CamelObject *)old->filter);
-			f->next = old->next;
-			g_free(old);
-			/* there should only be a single matching id, but
-			   scan the whole lot anyway */
-		}
-		f = f->next;
-	}
-}
-
-/**
- * camel_mime_parser_header:
- * @m: 
- * @name: Name of header.
- * @offset: Pointer that can receive the offset of the header in
- * the stream from the start of parsing.
- * 
- * Lookup a header by name.
- * 
- * Return value: The header value, or NULL if the header is not
- * defined.
- **/
-const char *
-camel_mime_parser_header(CamelMimeParser *m, const char *name, int *offset)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts &&
-	    s->parts->headers) {
-		return header_raw_find(&s->parts->headers, name, offset);
-	}
-	return NULL;
-}
-
-/**
- * camel_mime_parser_headers_raw:
- * @m: 
- * 
- * Get the list of the raw headers which are defined for the
- * current state of the parser.  These headers are valid
- * until the next call to parser_step(), or parser_drop_step().
- * 
- * Return value: The raw headers, or NULL if there are no headers
- * defined for the current part or state.  These are READ ONLY.
- **/
-struct _header_raw *
-camel_mime_parser_headers_raw(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return s->parts->headers;
-	return NULL;
-}
-
-static const char *
-byte_array_to_string(GByteArray *array)
-{
-	if (array == NULL)
-		return NULL;
-
-	if (array->len == 0 || array->data[array->len-1] != '\0')
-		g_byte_array_append(array, "", 1);
-
-	return array->data;
-}
-
-/**
- * camel_mime_parser_preface:
- * @m: 
- * 
- * Retrieve the preface text for the current multipart.
- * Can only be used when the state is HSCAN_MULTIPART_END.
- * 
- * Return value: The preface text, or NULL if there wasn't any.
- **/
-const char *
-camel_mime_parser_preface(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->pretext);
-
-	return NULL;
-}
-
-/**
- * camel_mime_parser_postface:
- * @m: 
- * 
- * Retrieve the postface text for the current multipart.
- * Only returns valid data when the current state if
- * HSCAN_MULTIPART_END.
- * 
- * Return value: The postface text, or NULL if there wasn't any.
- **/
-const char *
-camel_mime_parser_postface(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	if (s->parts)
-		return byte_array_to_string(s->parts->posttext);
-
-	return NULL;
-}
-
-
-/**
- * camel_mime_parser_init_with_fd:
- * @m: 
- * @fd: A valid file descriptor.
- * 
- * Initialise the scanner with an fd.  The scanner's offsets
- * will be relative to the current file position of the file
- * descriptor.  As a result, seekable descritors should
- * be seeked using the parser seek functions.
- * 
- * An initial buffer will be read from the file descriptor
- * immediately, although no parsing will occur.
- *
- * Return value: Returns -1 on error.
- **/
-int
-camel_mime_parser_init_with_fd(CamelMimeParser *m, int fd)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_scan_init_with_fd(s, fd);
-}
-
-/**
- * camel_mime_parser_init_with_stream:
- * @m: 
- * @stream: 
- * 
- * Initialise the scanner with a source stream.  The scanner's
- * offsets will be relative to the current file position of
- * the stream.  As a result, seekable streams should only
- * be seeked using the parser seek function.
- *
- * An initial buffer will be read from the stream
- * immediately, although no parsing will occur.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_scan_init_with_stream(s, stream);
-}
-
-/**
- * camel_mime_parser_scan_from:
- * @m: 
- * @scan_from: #TRUE if the scanner should scan From lines.
- * 
- * Tell the scanner if it should scan "^From " lines or not.
- *
- * If the scanner is scanning from lines, two additional
- * states HSCAN_FROM and HSCAN_FROM_END will be returned
- * to the caller during parsing.
- **/
-void
-camel_mime_parser_scan_from(CamelMimeParser *m, int scan_from)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	s->scan_from = scan_from;
-}
-
-/**
- * camel_mime_parser_content_type:
- * @m: 
- * 
- * Get the content type defined in the current part.
- * 
- * Return value: A content_type structure, or NULL if there
- * is no content-type defined for this part of state of the
- * parser.
- **/
-struct _header_content_type *
-camel_mime_parser_content_type(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	/* FIXME: should this search up until it's found the 'right'
-	   content-type?  can it? */
-	if (s->parts)
-		return s->parts->content_type;
-	return NULL;
-}
-
-/**
- * camel_mime_parser_unstep:
- * @m: 
- * 
- * Cause the last step operation to repeat itself.  If this is 
- * called repeated times, then the same step will be repeated
- * that many times.
- *
- * Note that it is not possible to scan back using this function,
- * only to have a way of peeking the next state.
- **/
-void camel_mime_parser_unstep(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	s->unstep++;
-}
-
-/**
- * camel_mime_parser_drop_step:
- * @m: 
- * 
- * Drop the last step call.  This should only be used
- * in conjunction with seeking of the stream as the
- * stream may be in an undefined state relative to the
- * state of the parser.
- *
- * Use this call with care.
- **/
-void camel_mime_parser_drop_step(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	s->unstep = 0;
-	folder_scan_drop_step(s);
-}
-
-/**
- * camel_mime_parser_step:
- * @m: 
- * @databuffer: Pointer to accept a pointer to the data
- * associated with this step (if any).  May be #NULL,
- * in which case datalength is also ingored.
- * @datalength: Pointer to accept a pointer to the data
- * length associated with this step (if any).
- * 
- * Parse the next part of the MIME message.  If _unstep()
- * has been called, then continue to return the same state
- * for that many calls.
- *
- * If the step is HSCAN_BODY then the databuffer and datalength
- * pointers will be setup to point to the internal data buffer
- * of the scanner and may be processed as required.  Any
- * filters will have already been applied to this data.
- *
- * Refer to the state diagram elsewhere for a full listing of
- * the states an application is gauranteed to get from the
- * scanner.
- *
- * Return value: The current new state of the parser
- * is returned.
- **/
-enum _header_state
-camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	d(printf("OLD STATE:  '%s' :\n", states[s->state]));
-
-	if (s->unstep <= 0) {
-		char *dummy;
-		int dummylength;
-
-		if (databuffer == NULL) {
-			databuffer = &dummy;
-			datalength = &dummylength;
-		}
-			
-		folder_scan_step(s, databuffer, datalength);
-	} else
-		s->unstep--;
-
-	d(printf("NEW STATE:  '%s' :\n", states[s->state]));
-
-	return s->state;
-}
-
-/**
- * camel_mime_parser_tell:
- * @m: 
- * 
- * Return the current scanning offset.  The meaning of this
- * value will depend on the current state of the parser.
- *
- * An incomplete listing of the states:
- *
- * HSCAN_INITIAL, The start of the current message.
- * HSCAN_HEADER, HSCAN_MESSAGE, HSCAN_MULTIPART, the character
- * position immediately after the end of the header.
- * HSCAN_BODY, Position within the message of the start
- * of the current data block.
- * HSCAN_*_END, The position of the character starting
- * the next section of the scan (the last position + 1 of
- * the respective current state).
- * 
- * Return value: See above.
- **/
-off_t camel_mime_parser_tell(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return folder_tell(s);
-}
-
-/**
- * camel_mime_parser_tell_start_headers:
- * @m: 
- * 
- * Find out the position within the file of where the
- * headers started, this is cached by the parser
- * at the time.
- * 
- * Return value: The header start position, or -1 if
- * no headers were scanned in the current state.
- **/
-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return s->start_of_headers;
-}
-
-/**
- * camel_mime_parser_tell_start_from:
- * @m: 
- * 
- * If the parser is scanning From lines, then this returns
- * the position of the start of the From line.
- * 
- * Return value: The start of the from line, or -1 if there
- * was no From line, or From lines are not being scanned.
- **/
-off_t camel_mime_parser_tell_start_from(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-
-	return s->start_of_from;
-}
-
-/**
- * camel_mime_parser_seek:
- * @m: 
- * @off: Number of bytes to offset the seek by.
- * @whence: SEEK_SET, SEEK_CUR, SEEK_END
- * 
- * Reset the source position to a known value.
- *
- * Note that if the source stream/descriptor was not
- * positioned at 0 to begin with, and an absolute seek
- * is specified (whence != SEEK_CUR), then the seek
- * position may not match the desired seek position.
- * 
- * Return value: The new seek offset, or -1 on
- * an error (for example, trying to seek on a non-seekable
- * stream or file descriptor).
- **/
-off_t camel_mime_parser_seek(CamelMimeParser *m, off_t off, int whence)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return folder_seek(s, off, whence);
-}
-
-/**
- * camel_mime_parser_state:
- * @m: 
- * 
- * Get the current parser state.
- * 
- * Return value: The current parser state.
- **/
-enum _header_state camel_mime_parser_state(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->state;
-}
-
-/**
- * camel_mime_parser_stream:
- * @m: 
- * 
- * Get the stream, if any, the parser has been initialised
- * with.  May be used to setup sub-streams, but should not
- * be read from directly (without saving and restoring
- * the seek position in between).
- * 
- * Return value: The stream from _init_with_stream(), or NULL
- * if the parser is reading from a file descriptor or is
- * uninitialised.
- **/
-CamelStream *camel_mime_parser_stream(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->stream;
-}
-
-/**
- * camel_mime_parser_fd:
- * @m: 
- * 
- * Return the file descriptor, if any, the parser has been
- * initialised with.
- *
- * Should not be read from unless the parser it to terminate,
- * or the seek offset can be reset before the next parse
- * step.
- * 
- * Return value: The file descriptor or -1 if the parser
- * is reading from a stream or has not been initialised.
- **/
-int camel_mime_parser_fd(CamelMimeParser *m)
-{
-	struct _header_scan_state *s = _PRIVATE(m);
-	return s->fd;
-}
-
-/* ********************************************************************** */
-/*    Implementation							  */
-/* ********************************************************************** */
-
-/* read the next bit of data, ensure there is enough room 'atleast' bytes */
-static int
-folder_read(struct _header_scan_state *s)
-{
-	int len;
-	int inoffset;
-
-	if (s->inptr<s->inend-s->atleast)
-		return s->inend-s->inptr;
-#ifdef PURIFY
-	purify_watch_remove(inend_id);
-	purify_watch_remove(inbuffer_id);
-#endif
-	/* check for any remaning bytes (under the atleast limit( */
-	inoffset = s->inend - s->inptr;
-	if (inoffset>0) {
-		memcpy(s->inbuf, s->inptr, inoffset);
-	}
-	if (s->stream) {
-		len = camel_stream_read(s->stream, s->inbuf+inoffset, SCAN_BUF-inoffset);
-	} else {
-		len = read(s->fd, s->inbuf+inoffset, SCAN_BUF-inoffset);
-	}
-	r(printf("read %d bytes, offset = %d\n", len, inoffset));
-	if (len>=0) {
-		/* add on the last read block */
-		s->seek += s->inptr - s->inbuf;
-		s->inptr = s->inbuf;
-		s->inend = s->inbuf+len+inoffset;
-		r(printf("content = %d '%.*s'\n",s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
-	}
-
-	g_assert(s->inptr<=s->inend);
-#ifdef PURIFY
-	inend_id = purify_watch(&s->inend);
-	inbuffer_id = purify_watch_n(s->inend+1, SCAN_HEAD-1, "rw");
-#endif
-	r(printf("content = %d '%.*s'\n", s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
-	/* set a sentinal, for the inner loops to check against */
-	s->inend[0] = '\n';
-	return s->inend-s->inptr;
-}
-
-/* return the current absolute position of the data pointer */
-static off_t
-folder_tell(struct _header_scan_state *s)
-{
-	return s->seek + (s->inptr - s->inbuf);
-}
-
-/*
-  need some way to prime the parser state, so this actually works for 
-  other than top-level messages
-*/
-static off_t
-folder_seek(struct _header_scan_state *s, off_t offset, int whence)
-{
-	off_t newoffset;
-	int len;
-
-	if (s->stream) {
-		if (CAMEL_IS_SEEKABLE_STREAM(s->stream)) {
-			/* NOTE: assumes whence seekable stream == whence libc, which is probably
-			   the case (or bloody well should've been) */
-			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence);
-		} else {
-			newoffset = -1;
-			errno = EINVAL;
-		}
-	} else {
-		newoffset = lseek(s->fd, offset, whence);
-	}
-#ifdef PURIFY
-	purify_watch_remove(inend_id);
-	purify_watch_remove(inbuffer_id);
-#endif
-	if (newoffset != -1) {
-		s->seek = newoffset;
-		s->inptr = s->inbuf;
-		s->inend = s->inbuf;
-		if (s->stream)
-			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF);
-		else
-			len = read(s->fd, s->inbuf, SCAN_BUF);
-		if (len>=0) {
-			s->inend = s->inbuf+len;
-			s->inend[0] = '\n';
-		} else
-			newoffset = -1;
-	}
-#ifdef PURIFY
-	inend_id = purify_watch(&s->inend);
-	inbuffer_id = purify_watch_n(s->inend+1, SCAN_HEAD-1, "rw");
-#endif
-	return newoffset;
-}
-
-static void
-folder_push_part(struct _header_scan_state *s, struct _header_scan_stack *h)
-{
-	h->parent = s->parts;
-	s->parts = h;
-}
-
-static void
-folder_pull_part(struct _header_scan_state *s)
-{
-	struct _header_scan_stack *h;
-
-	h = s->parts;
-	if (h) {
-		s->parts = h->parent;
-		g_free(h->boundary);
-#ifdef MEMPOOL
-		mempool_free(h->pool);
-#else
-		header_raw_clear(&h->headers);
-#endif
-		header_content_type_unref(h->content_type);
-		if (h->pretext)
-			g_byte_array_free(h->pretext, TRUE);
-		if (h->posttext)
-			g_byte_array_free(h->posttext, TRUE);
-		g_free(h);
-	} else {
-		g_warning("Header stack underflow!\n");
-	}
-}
-
-static int
-folder_scan_skip_line(struct _header_scan_state *s)
-{
-	int atleast = s->atleast;
-	register char *inptr, *inend, c;
-	int len;
-
-	s->atleast = 1;
-
-	while ( (len = folder_read(s)) > 0 && len > s->atleast) { /* ensure we have at least enough room here */
-		inptr = s->inptr;
-		inend = s->inend-1;
-
-		c = -1;
-		while (inptr<inend
-		       && (c = *inptr++)!='\n')
-			;
-
-		s->inptr = inptr;
-
-		if (c=='\n') {
-			s->atleast = atleast;
-			return 0;
-		}
-	}
-
-	s->atleast = atleast;
-
-	return -1;		/* not found */
-}
-
-/* TODO: Is there any way to make this run faster?  It gets called a lot ... */
-static struct _header_scan_stack *
-folder_boundary_check(struct _header_scan_state *s, const char *boundary, int *lastone)
-{
-	struct _header_scan_stack *part;
-	int len = s->atleast-2;	/* make sure we dont access past the buffer */
-
-	h(printf("checking boundary marker upto %d bytes\n", len));
-	part = s->parts;
-	while (part) {
-		h(printf("  boundary: %s\n", part->boundary));
-		h(printf("   against: '%.*s'\n", len, boundary));
-		if (part->boundary
-		    && part->boundarylen <= len
-		    && memcmp(boundary, part->boundary, part->boundarylen)==0) {
-			h(printf("matched boundary: %s\n", part->boundary));
-			/* again, make sure we're in range */
-			if (part->boundarylen <= len+2) {
-				h(printf("checking lastone\n"));
-				*lastone = (boundary[part->boundarylen]=='-'
-					    && boundary[part->boundarylen+1]=='-');
-			} else {
-				h(printf("not enough room to check last one?\n"));
-				*lastone = FALSE;
-			}
-			/*printf("ok, we found it! : %s \n", (*lastone)?"Last one":"More to come?");*/
-			return part;
-		}
-		part = part->parent;
-	}
-	return NULL;
-}
-
-#ifdef MEMPOOL
-static void
-header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset)
-{
-	struct _header_raw *l, *n;
-	char *content;
-
-	content = strchr(header, ':');
-	if (content) {
-		register int len;
-		n = mempool_alloc(h->pool, sizeof(*n));
-		n->next = NULL;
-
-		len = content-header;
-		n->name = mempool_alloc(h->pool, len+1);
-		memcpy(n->name, header, len);
-		n->name[len] = 0;
-
-		content++;
-
-		len = s->outptr - content;
-		n->value = mempool_alloc(h->pool, len+1);
-		memcpy(n->value, content, len);
-		n->value[len] = 0;
-
-		n->offset = offset;
-
-		l = (struct _header_raw *)&h->headers;
-		while (l->next) {
-			l = l->next;
-		}
-		l->next = n;
-	}
-
-}
-
-#define header_raw_append_parse(a, b, c) (header_append_mempool(s, h, b, c))
-
-#endif
-
-/* Copy the string start->inptr into the header buffer (s->outbuf),
-   grow if necessary
-   and track the start offset of the header */
-/* Basically an optimised version of g_byte_array_append() */
-#define header_append(s, start, inptr)						\
-{										\
-	register int headerlen = inptr-start;					\
-										\
-	if (headerlen >= (s->outend - s->outptr)) {				\
-		register char *outnew;						\
-		register int len = ((s->outend - s->outbuf)+headerlen)*2+1;	\
-		outnew = g_realloc(s->outbuf, len);				\
-		s->outptr = s->outptr - s->outbuf + outnew;			\
-		s->outbuf = outnew;						\
-		s->outend = outnew + len;					\
-	}									\
-	memcpy(s->outptr, start, headerlen);					\
-	s->outptr += headerlen;							\
-	if (s->header_start == -1)						\
-		s->header_start = (start-s->inbuf) + s->seek;			\
-}
-
-static struct _header_scan_stack *
-folder_scan_header(struct _header_scan_state *s, int *lastone)
-{
-	int atleast = s->atleast;
-	char *start;
-	int len;
-	struct _header_scan_stack *part, *overpart = s->parts;
-	struct _header_scan_stack *h;
-	char *inend;
-	register char *inptr;
-
-	h(printf("scanning first bit\n"));
-
-	h = g_malloc0(sizeof(*h));
-#ifdef MEMPOOL
-	h->pool = mempool_new(8192, 4096);
-#endif
-
-	/* FIXME: this info should be cached ? */
-	part = s->parts;
-	s->atleast = 5;
-	while (part) {
-		if (part->boundary)
-			s->atleast = MAX(s->atleast, part->boundarylen+2);
-		part = part->parent;
-	}
-#if 0
-	s->atleast = MAX(s->atleast, 5);
-	if (s->parts)
-		s->atleast = MAX(s->atleast, s->parts->boundarylen+2);
-#endif
-
-	*lastone = FALSE;
-retry:
-
-	while ((len = folder_read(s))>0 && len >= s->atleast) { /* ensure we have at least enough room here */
-		inptr = s->inptr;
-		inend = s->inend-s->atleast;
-
-		while (inptr<=inend) {
-			/*printf("  '%.20s'\n", inptr);*/
-
-			start = inptr;
-
-			if (!s->midline) {
-				if ((part = folder_boundary_check(s, inptr, lastone))) {
-					if ((s->outptr>s->outbuf) || (inptr-start))
-						goto header_truncated; /* may not actually be truncated */
-
-					goto normal_exit;
-				}
-
-				/* Replace any number of spaces and tabs at the start of the line with
-				 * a single space.
-				 */
-				if (*start == ' ' || *start == '\t') {
-					do
-						start++;
-					while (*start == ' ' || *start == '\t');
-					start--;
-					*start = ' ';
-				}
-			}
-
-			/* goto next line */
-			while ((*inptr++)!='\n')
-				;
-
-			g_assert(inptr<=s->inend+1);
-
-			header_append(s, start, inptr-1);
-
-			/* check against the real buffer end, not our 'atleast limited' end */
-			/* also make sure we have at least 1 char lookahead, so even if we found a \n at
-			   the end, well, make out we didn't, and re-scan it next pass */
-			if (inptr>=s->inend) {
-				inptr--;
-				s->midline = TRUE;
-			} else {
-				s->midline = FALSE;
-			}
-
-			h(printf("midline = %s\n", s->midline?"TRUE":"FALSE"));
-			h(printf("outbuf[0] = %02x '%c' oubuf[1] = %02x '%c'\n",
-				 s->outbuf[0], isprint(s->outbuf[0])?s->outbuf[0]:'.',
-				 s->outbuf[1], isprint(s->outbuf[1])?s->outbuf[1]:'.'));
-			h(printf("inptr[0] = %02x '%c' inptr[1] = %02x '%c'\n",
-				 inptr[0], isprint(inptr[0])?inptr[0]:'.',
-				 inptr[1], isprint(inptr[1])?inptr[1]:'.'));
-
-			if (!s->midline
-			    && !(inptr[0] == ' ' || inptr[0] == '\t')) {
-				h(printf("ok, checking\n"));
-				if (s->outbuf == s->outptr
-				    || s->outbuf[0] == '\n'
-				    || (s->outbuf[0] == '\r' && s->outbuf[1]=='\n')) {
-					h(printf("header done?\n"));
-					goto header_done;
-				}
-
-				/* we always have at least _1_ char here ... */
-				if (s->outptr > s->outbuf && s->outptr[-1] == '\n')
-					s->outptr--;
-				s->outptr[0] = 0;
-				
-				d(printf("header '%.10s' at %d\n", s->outbuf, s->header_start));
-				
-				header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-				
-				if (inptr[0]=='\n'
-				    || (inptr[0] == '\r' && inptr[1]=='\n')) {
-					inptr++;
-					goto header_done;
-				}
-				s->outptr = s->outbuf;
-				s->header_start = -1;
-			}
-		}
-		s->inptr = inptr;
-	}
-
-	/* ok, we're at the end of the data, just make sure we're not missing out some small
-	   truncated header markers */
-	if (overpart) {
-		overpart = overpart->parent;
-		while (overpart) {
-			if (overpart->boundary && (overpart->boundarylen+2) < s->atleast) {
-				s->atleast = overpart->boundarylen+2;
-				h(printf("Retrying next smaller part ...\n"));
-				goto retry;
-			}
-			overpart = overpart->parent;
-		}
-	}
-
-	if ((s->outptr > s->outbuf) || s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		goto header_truncated;
-	}
-
-	s->atleast = atleast;
-
-	return h;
-
-header_truncated:
-
-	header_append(s, start, inptr);
-
-	if (s->outptr>s->outbuf && s->outptr[-1] == '\n')
-		s->outptr--;
-	s->outptr[0] = 0;
-
-	if (s->outbuf[0] == '\n'
-	    || (s->outbuf[0] == '\r' && s->outbuf[1]=='\n')) {
-		goto header_done;
-	}
-
-	header_raw_append_parse(&h->headers, s->outbuf, s->header_start);
-
-header_done:
-	part = s->parts;
-
-	s->outptr = s->outbuf;
-normal_exit:
-	s->inptr = inptr;
-	s->atleast = atleast;
-	s->header_start = -1;
-	return h;
-}
-
-static struct _header_scan_stack *
-folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length)
-{
-	int atleast = s->atleast;
-	register char *inptr;
-	char *inend;
-	char *start;
-	int len;
-	struct _header_scan_stack *part, *overpart = s->parts;
-	int already_packed = FALSE;
-	int onboundary = FALSE;
-
-	c(printf("scanning content\n"));
-
-	/* FIXME: this info should be cached ? */
-	part = s->parts;
-	s->atleast = 5;
-	while (part) {
-		if (part->boundary) {
-			c(printf("boundary: %s\n", part->boundary));
-			s->atleast = MAX(s->atleast, part->boundarylen+2);
-		}
-		part = part->parent;
-	}
-/*	s->atleast = MAX(s->atleast, 5);*/
-#if 0
-	if (s->parts)
-		s->atleast = MAX(s->atleast, s->parts->boundarylen+2);
-#endif
-	*lastone = FALSE;
-
-retry:
-	c(printf("atleast = %d\n", s->atleast));
-	
-	while ((len = folder_read(s))>0 && len >= s->atleast) { /* ensure we have at least enough room here */
-		inptr = s->inptr;
-		inend = s->inend-s->atleast;
-		start = inptr;
-
-		c(printf("inptr = %p, inend = %p\n", inptr, inend));
-
-		while (inptr<=inend) {
-			if (!s->midline
-			    && (part = folder_boundary_check(s, inptr, lastone))) {
-				if ( (inptr-start) ) {
-					onboundary = TRUE;
-					goto content;
-				}
-				
-				goto normal_exit;
-			}
-
-			/* goto the next line */
-			while ((*inptr++)!='\n')
-				;
-
-			/* check against the real buffer end, not our 'atleast limited' end */
-			if (inptr> s->inend) {
-				inptr--;
-				s->midline = TRUE;
-			} else {
-				s->midline = FALSE;
-			}
-
-			g_assert(inptr<=s->inend);
-		}
-
-		/* *sigh* so much for the beautiful simplicity of the code so far - here we
-		   have the snot to deal with the nasty end-cases that come from the read-ahead
-		   buffers we use */
-		/* what this does, is if we are somewhere near the end of the buffer,
-		   force it to the front, and re-read, ensuring we bunch as much together
-		   as possible, for the final read, without copying too much of the time */
-		/* make sure we dont loop forever, but also make sure we try smaller
-		   boundaries, if there are any, so we dont miss any. */
-		/* this is not needed for the header scanner, since it copies its own
-		   data */
-		c(printf("start offset = %d  atleast = %d\n", start-s->inbuf, s->atleast));
-		if (start > (s->inbuf + s->atleast)) {
-			/* force a re-scan of this data */
-			s->inptr = start;
-			if (already_packed)
-				goto smaller_boundary;
-			c(printf("near the end, try and bunch things up a bit first\n"));
-			already_packed = TRUE;
-		} else {
-			c(printf("dumping what i've got ...\n"));
-			/* what would be nice here, is if that we're at eof, we bunch the last
-			   little bit in the same content, but i dont think this is easy */
-			goto content_mid;
-		}
-	}
-
-	c(printf("length read = %d\n", len));
-smaller_boundary:
-
-	/* ok, we're at the end of the data, just make sure we're not missing out some small
-	   truncated header markers */
-	if (overpart) {
-		overpart = overpart->parent;
-		while (overpart) {
-			if (overpart->boundary && (overpart->boundarylen+2) < s->atleast) {
-				s->atleast = overpart->boundarylen+2;
-				c(printf("Retrying next smaller part ...\n"));
-				goto retry;
-			}
-			overpart = overpart->parent;
-		}
-	}
-
-	if (s->inend > s->inptr) {
-		start = s->inptr;
-		inptr = s->inend;
-		goto content;
-	}
-
-	*length = 0;
-	s->atleast = atleast;
-	return NULL;
-
-content_mid:
-	s->midline = TRUE;
-content:
-	part = s->parts;
-normal_exit:
-	s->atleast = atleast;
-	s->inptr = inptr;
-
-	*data = start;
-	/* if we hit a boundary, we should not include the closing \n */
-	if (onboundary)
-		*length = inptr-start-1;
-	else
-		*length = inptr-start;
-
-/*	printf("got %scontent: %.*s", s->midline?"partial ":"", inptr-start, start);*/
-
-	return part;
-}
-
-
-static void
-folder_scan_close(struct _header_scan_state *s)
-{
-	g_free(s->realbuf);
-	g_free(s->outbuf);
-	while (s->parts)
-		folder_pull_part(s);
-	if (s->fd != -1)
-		close(s->fd);
-	if (s->stream) {
-		camel_object_unref((CamelObject *)s->stream);
-	}
-	g_free(s);
-}
-
-
-static struct _header_scan_state *
-folder_scan_init(void)
-{
-	struct _header_scan_state *s;
-
-	s = g_malloc(sizeof(*s));
-
-	s->fd = -1;
-	s->stream = NULL;
-
-	s->outbuf = g_malloc(1024);
-	s->outptr = s->outbuf;
-	s->outend = s->outbuf+1024;
-
-	s->realbuf = g_malloc(SCAN_BUF + SCAN_HEAD*2);
-	s->inbuf = s->realbuf + SCAN_HEAD;
-	s->inptr = s->inbuf;
-	s->inend = s->inbuf;
-	s->atleast = 0;
-
-	s->seek = 0;		/* current character position in file of the last read block */
-	s->unstep = 0;
-
-	s->header_start = -1;
-
-	s->start_of_from = -1;
-	s->start_of_headers = -1;
-
-	s->midline = FALSE;
-	s->scan_from = FALSE;
-
-	s->filters = NULL;
-	s->filterid = 1;
-
-	s->parts = NULL;
-
-	s->state = HSCAN_INITIAL;
-	return s;
-}
-
-static int
-folder_scan_init_with_fd(struct _header_scan_state *s, int fd)
-{
-	int len;
-
-	len = read(fd, s->inbuf, SCAN_BUF);
-	if (len>=0) {
-		s->inend = s->inbuf+len;
-		s->inptr = s->inbuf;
-		s->inend[0] = '\n';
-		if (s->fd != -1)
-			close(s->fd);
-		s->fd = fd;
-		if (s->stream) {
-			camel_object_unref((CamelObject *)s->stream);
-			s->stream = NULL;
-		}
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-static int
-folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
-{
-	int len;
-
-	len = camel_stream_read(stream, s->inbuf, SCAN_BUF);
-	if (len >= 0) {
-		s->inend = s->inbuf+len;
-		s->inptr = s->inbuf;
-		s->inend[0] = '\n';
-		if (s->stream)
-			camel_object_unref((CamelObject *)s->stream);
-		s->stream = stream;
-		camel_object_ref((CamelObject *)stream);
-		if (s->fd != -1) {
-			close(s->fd);
-			s->fd = -1;
-		}
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
-#define USE_FROM
-
-static void
-folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength)
-{
-	struct _header_scan_stack *h, *hb;
-	const char *content;
-	const char *bound;
-	int type;
-	int state;
-	struct _header_content_type *ct = NULL;
-	struct _header_scan_filter *f;
-	size_t presize;
-
-/*	printf("\nSCAN PASS: state = %d '%s'\n", s->state, states[s->state]);*/
-
-tail_recurse:
-	d({
-		printf("\nSCAN STACK:\n");
-		printf(" '%s' :\n", states[s->state]);
-		hb = s->parts;
-		while (hb) {
-			printf("  '%s' : %s ", states[hb->savestate], hb->boundary);
-			if (hb->content_type) {
-				printf("(%s/%s)", hb->content_type->type, hb->content_type->subtype);
-			} else {
-				printf("(default)");
-			}
-			printf("\n");
-			hb = hb->parent;
-		}
-		printf("\n");
-	});
-
-	switch (s->state) {
-
-	case HSCAN_INITIAL:
-#ifdef USE_FROM
-		if (s->scan_from) {
-			/* FIXME: it would be nice not to have to allocate this every pass */
-			h = g_malloc0(sizeof(*h));
-			h->boundary = g_strdup("From ");
-			h->boundarylen = strlen(h->boundary);
-			folder_push_part(s, h);
-			
-			h = s->parts;
-			do {
-				hb = folder_scan_content(s, &state, databuffer, datalength);
-			} while (hb==h && *datalength>0);
-			
-			if (*datalength==0 && hb==h) {
-				d(printf("found 'From '\n"));
-				s->start_of_from = folder_tell(s);
-				folder_scan_skip_line(s);
-				h->savestate = HSCAN_INITIAL;
-				s->state = HSCAN_FROM;
-			} else {
-				folder_pull_part(s);
-				s->state = HSCAN_EOF;
-			}
-			return;
-		} else {
-			s->start_of_from = -1;
-		}
-
-#endif
-	case HSCAN_FROM:
-		s->start_of_headers = folder_tell(s);
-		h = folder_scan_header(s, &state);
-#ifdef USE_FROM
-		if (s->scan_from)
-			h->savestate = HSCAN_FROM_END;
-		else
-#endif
-			h->savestate = HSCAN_EOF;
-
-		/* FIXME: should this check for MIME-Version: 1.0 as well? */
-
-		type = HSCAN_HEADER;
-		if ( (content = header_raw_find(&h->headers, "Content-Type", NULL))
-		     && (ct = header_content_type_decode(content))) {
-			if (!strcasecmp(ct->type, "multipart")) {
-				bound = header_content_type_param(ct, "boundary");
-				if (bound) {
-					d(printf("multipart, boundary = %s\n", bound));
-					h->boundarylen = strlen(bound)+2;
-					h->boundary = g_malloc(h->boundarylen+3);
-					sprintf(h->boundary, "--%s--", bound);
-					type = HSCAN_MULTIPART;
-				} else {
-					header_content_type_unref(ct);
-					ct = header_content_type_decode("text/plain");
-/* We can't quite do this, as it will mess up all the offsets ... */
-/*					header_raw_replace(&h->headers, "Content-Type", "text/plain", offset);*/
-					g_warning("Multipart with no boundary, treating as text/plain");
-				}
-			} else if (!strcasecmp(ct->type, "message")) {
-				if (!strcasecmp(ct->subtype, "rfc822")
-				    || !strcasecmp(ct->subtype, "news")
-				    /*|| !strcasecmp(ct->subtype, "partial")*/) {
-					type = HSCAN_MESSAGE;
-				}
-			}
-		} else {
-			/* make the default type for multipart/digest be message/rfc822 */
-			if ((s->parts
-			     && header_content_type_is(s->parts->content_type, "multipart", "digest"))) {
-				ct = header_content_type_decode("message/rfc822");
-				type = HSCAN_MESSAGE;
-				d(printf("parent was multipart/digest, autoupgrading to message/rfc822?\n"));
-				/* maybe we should do this too?
-				   header_raw_append_parse(&h->headers, "Content-Type: message/rfc822", -1);*/
-			}
-		}
-		h->content_type = ct;
-		folder_push_part(s, h);
-		s->state = type;
-		return;
-		
-	case HSCAN_HEADER:
-		s->state = HSCAN_BODY;
-		
-	case HSCAN_BODY:
-		h = s->parts;
-		*datalength = 0;
-		presize = SCAN_HEAD;
-		f = s->filters;
-		
-		do {
-			hb = folder_scan_content (s, &state, databuffer, datalength);
-
-			d(printf ("\n\nOriginal content: '"));
-			d(fwrite(*databuffer, sizeof(char), *datalength, stdout));
-			d(printf("'\n"));
-
-			if (*datalength > 0) {
-				while (f) {
-					camel_mime_filter_filter(f->filter, *databuffer, *datalength, presize,
-								 databuffer, datalength, &presize);
-					d(printf ("Filtered content (%s): '",
-						  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-					d(fwrite(*databuffer, sizeof(char), *datalength, stdout));
-					d(printf("'\n"));
-					f = f->next;
-				}
-				return;
-			}
-		} while (hb == h && *datalength > 0);
-		
-		/* check for any filter completion data */
-		if (*datalength > 0) {
-			while (f) {
-				camel_mime_filter_filter(f->filter, *databuffer, *datalength, presize,
-							 databuffer, datalength, &presize);
-				f = f->next;
-			}
-		}
-		if (*datalength > 0)
-			return;
-		
-		s->state = HSCAN_BODY_END;
-		break;
-		
-	case HSCAN_MULTIPART:
-		h = s->parts;
-		do {
-			do {
-				hb = folder_scan_content(s, &state, databuffer, datalength);
-				if (*datalength>0) {
-					/* instead of a new state, we'll just store it locally and provide
-					   an accessor function */
-					d(printf("Multipart %s Content %p: '%.*s'\n",
-						 h->prestage>0?"post":"pre", h, *datalength, *databuffer));
-					if (h->prestage > 0) {
-						if (h->posttext == NULL)
-							h->posttext = g_byte_array_new();
-						g_byte_array_append(h->posttext, *databuffer, *datalength);
-					} else {
-						if (h->pretext == NULL)
-							h->pretext = g_byte_array_new();
-						g_byte_array_append(h->pretext, *databuffer, *datalength);
-					}
-				}
-			} while (hb==h && *datalength>0);
-			h->prestage++;
-			if (*datalength==0 && hb==h) {
-				d(printf("got boundary: %s\n", hb->boundary));
-				folder_scan_skip_line(s);
-				if (!state) {
-					s->state = HSCAN_FROM;
-					folder_scan_step(s, databuffer, datalength);
-					s->parts->savestate = HSCAN_MULTIPART; /* set return state for the new head part */
-					return;
-				}
-			} else {
-				break;
-			}
-		} while (1);
-
-		s->state = HSCAN_MULTIPART_END;
-		break;
-
-	case HSCAN_MESSAGE:
-		s->state = HSCAN_FROM;
-		folder_scan_step(s, databuffer, datalength);
-		s->parts->savestate = HSCAN_MESSAGE_END;
-		break;
-
-	case HSCAN_FROM_END:
-	case HSCAN_BODY_END:
-	case HSCAN_MULTIPART_END:
-	case HSCAN_MESSAGE_END:
-		s->state = s->parts->savestate;
-		folder_pull_part(s);
-		if (s->state & HSCAN_END)
-			return;
-		goto tail_recurse;
-
-	case HSCAN_EOF:
-		return;
-
-	default:
-		g_warning("Invalid state in camel-mime-parser: %d", s->state);
-		break;
-	}
-
-	return;
-}
-
-/* drops the current state back one */
-static void
-folder_scan_drop_step(struct _header_scan_state *s)
-{
-	switch (s->state) {
-	case HSCAN_INITIAL:
-	case HSCAN_EOF:
-		return;
-
-	case HSCAN_FROM:
-		s->state = HSCAN_INITIAL;
-		folder_pull_part(s);
-		return;
-
-	case HSCAN_MESSAGE:
-	case HSCAN_HEADER:
-	case HSCAN_MULTIPART:
-
-	case HSCAN_FROM_END:
-	case HSCAN_BODY_END:
-	case HSCAN_MULTIPART_END:
-	case HSCAN_MESSAGE_END:
-
-		s->state = s->parts->savestate;
-		folder_pull_part(s);
-		if (s->state & HSCAN_END) {
-			s->state &= ~HSCAN_END;
-		}
-		return;
-	default:
-		/* FIXME: not sure if this is entirely right */
-	}
-}
-
-#ifdef STANDALONE
-int main(int argc, char **argv)
-{
-	int fd;
-	struct _header_scan_state *s;
-	char *data;
-	int len;
-	int state;
-	char *name = "/tmp/evmail/Inbox";
-	struct _header_scan_stack *h;
-	int i;
-	int attach = 0;
-
-	if (argc==2)
-		name = argv[1];
-
-	printf("opening: %s", name);
-
-	for (i=1;i<argc;i++) {
-		const char *encoding = NULL, *charset = NULL;
-		char *attachname;
-
-		name = argv[i];
-		printf("opening: %s", name);
-		
-		fd = open(name, O_RDONLY);
-		if (fd==-1) {
-			perror("Cannot open mailbox");
-			exit(1);
-		}
-		s = folder_scan_init();
-		folder_scan_init_with_fd(s, fd);
-		s->scan_from = FALSE;
-#if 0
-		h = g_malloc0(sizeof(*h));
-		h->savestate = HSCAN_EOF;
-		folder_push_part(s, h);
-#endif	
-		while (s->state != HSCAN_EOF) {
-			folder_scan_step(s, &data, &len);
-			printf("\n -- PARSER STEP RETURN -- %d '%s'\n\n", s->state, states[s->state]);
-			switch (s->state) {
-			case HSCAN_HEADER:
-				if (s->parts->content_type
-				    && (charset = header_content_type_param(s->parts->content_type, "charset"))) {
-					if (strcasecmp(charset, "us-ascii")) {
-#if 0
-						folder_push_filter_charset(s, "UTF-8", charset);
-#endif
-					} else {
-						charset = NULL;
-					}
-				} else {
-					charset = NULL;
-				}
-
-				encoding = header_raw_find(&s->parts->headers, "Content-transfer-encoding", 0);
-				printf("encoding = '%s'\n", encoding);
-				if (encoding && !strncasecmp(encoding, " base64", 7)) {
-					printf("adding base64 filter\n");
-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);
-#if 0
-					folder_push_filter_save(s, attachname);
-#endif
-					g_free(attachname);
-#if 0
-					folder_push_filter_mime(s, 0);
-#endif
-				}
-				if (encoding && !strncasecmp(encoding, " quoted-printable", 17)) {
-					printf("adding quoted-printable filter\n");
-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);
-#if 0
-					folder_push_filter_save(s, attachname);
-#endif
-					g_free(attachname);
-#if 0
-					folder_push_filter_mime(s, 1);
-#endif
-				}
-
-				break;
-			case HSCAN_BODY:
-				printf("got body %d '%.*s'\n",  len, len, data);
-				break;
-			case HSCAN_BODY_END:
-				printf("end body %d '%.*s'\n",  len, len, data);
-				if (encoding && !strncasecmp(encoding, " base64", 7)) {
-					printf("removing filters\n");
-#if 0
-					folder_filter_pull(s);
-					folder_filter_pull(s);
-#endif
-				}
-				if (encoding && !strncasecmp(encoding, " quoted-printable", 17)) {
-					printf("removing filters\n");
-#if 0
-					folder_filter_pull(s);
-					folder_filter_pull(s);
-#endif
-				}
-				if (charset) {
-#if 0
-					folder_filter_pull(s);
-#endif
-					charset = NULL;
-				}
-				encoding = NULL;
-				break;
-			default:
-				break;
-			}
-		}
-		folder_scan_close(s);
-		close(fd);
-	}
-	return 0;
-}
-
-#endif /* STANDALONE */
-
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
deleted file mode 100644
index d9a6e8bbb3..0000000000
--- a/camel/camel-mime-parser.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_PARSER_H
-#define _CAMEL_MIME_PARSER_H
-
-#include <camel/camel-object.h>
-
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-stream.h>
-
-#define CAMEL_MIME_PARSER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)
-#define CAMEL_MIME_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)
-#define IS_CAMEL_MIME_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_parser_get_type ())
-
-typedef struct _CamelMimeParserClass CamelMimeParserClass;
-
-/* NOTE: if you add more states, you may need to bump the
-   start of the END tags to 16 or 32, etc - so they are
-   the same as the matching start tag, with a bit difference */
-enum _header_state {
-	HSCAN_INITIAL,
-	HSCAN_FROM,		/* got 'From' line */
-	HSCAN_HEADER,		/* toplevel header */
-	HSCAN_BODY,		/* scanning body of message */
-	HSCAN_MULTIPART,	/* got multipart header */
-	HSCAN_MESSAGE,		/* rfc822 message */
-
-	HSCAN_PART,		/* part of a multipart */
-
-	HSCAN_END = 8,		/* bit mask for 'end' flags */
-
-	HSCAN_EOF = 8,		/* end of file */
-	HSCAN_FROM_END,		/* end of whole from bracket */
-	HSCAN_HEADER_END,	/* dummy value */
-	HSCAN_BODY_END,		/* end of message */
-	HSCAN_MULTIPART_END,	/* end of multipart  */
-	HSCAN_MESSAGE_END,	/* end of message */
-
-};
-
-struct _CamelMimeParser {
-	CamelObject parent;
-
-	struct _CamelMimeParserPrivate *priv;
-};
-
-struct _CamelMimeParserClass {
-	CamelObjectClass parent_class;
-
-	void (*message)(CamelMimeParser *, void *headers);
-	void (*part)(CamelMimeParser *);
-	void (*content)(CamelMimeParser *);
-};
-
-guint		camel_mime_parser_get_type	(void);
-CamelMimeParser      *camel_mime_parser_new	(void);
-
-/* using an fd will be a little faster, but not much (over a simple stream) */
-int		camel_mime_parser_init_with_fd(CamelMimeParser *, int fd);
-int		camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream);
-
-/* get the stream or fd back of the parser */
-CamelStream    *camel_mime_parser_stream(CamelMimeParser *m);
-int		camel_mime_parser_fd(CamelMimeParser *m);
-
-/* scan 'From' separators? */
-void camel_mime_parser_scan_from(CamelMimeParser *, int);
-
-/* what headers to save, MUST include ^Content-Type: */
-int camel_mime_parser_set_header_regex(CamelMimeParser *m, char *matchstr);
-
-/* normal interface */
-enum _header_state camel_mime_parser_step(CamelMimeParser *, char **, int *);
-void camel_mime_parser_unstep(CamelMimeParser *);
-void camel_mime_parser_drop_step(CamelMimeParser *m);
-enum _header_state camel_mime_parser_state(CamelMimeParser *);
-
-/* get content type for the current part/header */
-struct _header_content_type *camel_mime_parser_content_type(CamelMimeParser *);
-
-/* get/change raw header by name */
-const char *camel_mime_parser_header(CamelMimeParser *, const char *, int *offset);
-
-/* get all raw headers. READ ONLY! */
-struct _header_raw *camel_mime_parser_headers_raw(CamelMimeParser *);
-
-/* get multipart pre/postface */
-const char *camel_mime_parser_preface(CamelMimeParser *m);
-const char *camel_mime_parser_postface(CamelMimeParser *m);
-
-/* add a processing filter for body contents */
-int camel_mime_parser_filter_add(CamelMimeParser *, CamelMimeFilter *);
-void camel_mime_parser_filter_remove(CamelMimeParser *, int);
-
-/* these should be used with caution, because the state will not
-   track the seeked position */
-/* FIXME: something to bootstrap the state? */
-off_t camel_mime_parser_tell(CamelMimeParser *);
-off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int);
-
-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *);
-off_t camel_mime_parser_tell_start_from(CamelMimeParser *);
-
-#endif /* ! _CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
deleted file mode 100644
index 2809346a00..0000000000
--- a/camel/camel-mime-part-utils.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-part-utils : Utility for mime parsing and so on
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- * 	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include <string.h>
-#include "gmime-content-field.h"
-#include "string-utils.h"
-#include "camel-mime-part-utils.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-seekable-substream.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-crlf.h"
-
-#define d(x)
-
-/* simple data wrapper */
-static void
-simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp)
-{
-	GByteArray *buffer;
-	char *buf;
-	int len;
-	off_t start = 0, end;
-	CamelMimeFilter *fdec = NULL, *fcrlf = NULL, *fch = NULL;
-	struct _header_content_type *ct;
-	int decid=-1, crlfid=-1, chrid=-1;
-	CamelStream *source;
-	CamelSeekableStream *seekable_source = NULL;
-	char *encoding;
-
-	d(printf("constructing data-wrapper\n"));
-
-		/* Ok, try and be smart.  If we're storing a small message (typical) convert it,
-		   and store it in memory as we parse it ... if not, throw away the conversion
-		   and scan till the end ... */
-
-		/* if we can't seek, dont have a stream/etc, then we must cache it */
-	source = camel_mime_parser_stream(mp);
-	if (source) {
-		camel_object_ref((CamelObject *)source);
-		if (CAMEL_IS_SEEKABLE_STREAM (source)) {
-			seekable_source = CAMEL_SEEKABLE_STREAM (source);
-		}
-	}
-
-	/* first, work out conversion, if any, required, we dont care about what we dont know about */
-	encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL));
-	if (encoding) {
-		if (!strcasecmp(encoding, "base64")) {
-			d(printf("Adding base64 decoder ...\n"));
-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
-			decid = camel_mime_parser_filter_add(mp, fdec);
-		} else if (!strcasecmp(encoding, "quoted-printable")) {
-			d(printf("Adding quoted-printable decoder ...\n"));
-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);
-			decid = camel_mime_parser_filter_add(mp, fdec);
-		}
-		g_free(encoding);
-	}
-
-	/* If we're doing text, we also need to do CRLF->LF and may have to convert it to UTF8 as well. */
-	ct = camel_mime_parser_content_type(mp);
-	if (header_content_type_is(ct, "text", "*")) {
-		const char *charset = header_content_type_param(ct, "charset");
-
-		if (fdec) {
-			d(printf("Adding CRLF conversion filter\n"));
-			fcrlf = (CamelMimeFilter *)camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_DECODE,
-									      CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-			crlfid = camel_mime_parser_filter_add(mp, fcrlf);
-		}
-
-		if (charset!=NULL
-		    && !(strcasecmp(charset, "us-ascii")==0
-			 || strcasecmp(charset, "utf-8")==0)) {
-			d(printf("Adding conversion filter from %s to UTF-8\n", charset));
-			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "UTF-8");
-			if (fch) {
-				chrid = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)fch);
-			} else {
-				g_warning("Cannot convert '%s' to 'UTF-8', message display may be corrupt", charset);
-			}
-		}
-
-	}
-
-	buffer = g_byte_array_new();
-
-	if (seekable_source /* !cache */) {
-		start = camel_mime_parser_tell(mp) + seekable_source->bound_start;
-	}
-	while ( camel_mime_parser_step(mp, &buf, &len) != HSCAN_BODY_END ) {
-		if (buffer) {
-			if (buffer->len > 20480 && seekable_source) {
-				/* is this a 'big' message?  Yes?  We dont want to convert it all then.*/
-				camel_mime_parser_filter_remove(mp, decid);
-				camel_mime_parser_filter_remove(mp, chrid);
-				decid = -1;
-				chrid = -1;
-				g_byte_array_free(buffer, TRUE);
-				buffer = NULL;
-			} else {
-				g_byte_array_append(buffer, buf, len);
-			}
-		}
-	}
-
-	if (buffer) {
-		CamelStream *mem;
-		d(printf("Small message part, kept in memory!\n"));
-		mem = camel_stream_mem_new_with_byte_array(buffer);
-		camel_data_wrapper_construct_from_stream (dw, mem);
-		camel_object_unref ((CamelObject *)mem);
-	} else {
-		CamelStream *sub;
-		CamelStreamFilter *filter;
-
-		d(printf("Big message part, left on disk ...\n"));
-
-		end = camel_mime_parser_tell(mp) + seekable_source->bound_start;
-		sub = camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_source, start, end);
-		if (fdec || fch) {
-			filter = camel_stream_filter_new_with_stream(sub);
-			if (fdec) {
-				camel_mime_filter_reset(fdec);
-				camel_stream_filter_add(filter, fdec);
-			}
-			if (fcrlf) {
-				camel_mime_filter_reset(fcrlf);
-				camel_stream_filter_add(filter, fcrlf);
-			}
-			if (fch) {
-				camel_mime_filter_reset(fch);
-				camel_stream_filter_add(filter, fch);
-			}
-			camel_data_wrapper_construct_from_stream (dw, (CamelStream *)filter);
-			camel_object_unref ((CamelObject *)filter);
-		} else {
-			camel_data_wrapper_construct_from_stream (dw, sub);
-		}
-		camel_object_unref ((CamelObject *)sub);
-	}
-
-	camel_mime_parser_filter_remove(mp, decid);
-	camel_mime_parser_filter_remove(mp, crlfid);
-	camel_mime_parser_filter_remove(mp, chrid);
-
-	if (fdec)
-		camel_object_unref((CamelObject *)fdec);
-	if (fcrlf)
-		camel_object_unref((CamelObject *)fcrlf);
-	if (fch)
-		camel_object_unref((CamelObject *)fch);
-	if (source)
-		camel_object_unref((CamelObject *)source);
-
-}
-
-/* This replaces the data wrapper repository ... and/or could be replaced by it? */
-void
-camel_mime_part_construct_content_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	CamelDataWrapper *content = NULL;
-	char *buf;
-	int len;
-
-	switch (camel_mime_parser_state(mp)) {
-	case HSCAN_HEADER:
-		d(printf("Creating body part\n"));
-		content = camel_data_wrapper_new();
-		simple_data_wrapper_construct_from_parser(content, mp);
-		break;
-	case HSCAN_MESSAGE:
-		d(printf("Creating message part\n"));
-		content = (CamelDataWrapper *)camel_mime_message_new();
-		camel_mime_part_construct_from_parser((CamelMimePart *)content, mp);
-		break;
-	case HSCAN_MULTIPART: {
-		CamelDataWrapper *bodypart;
-
-#ifndef NO_WARNINGS
-#warning This should use a camel-mime-multipart
-#endif
-		d(printf("Creating multi-part\n"));
-		content = (CamelDataWrapper *)camel_multipart_new();
-
-		/* FIXME: use the real boundary? */
-		camel_multipart_set_boundary((CamelMultipart *)content, NULL);
-		while (camel_mime_parser_step(mp, &buf, &len) != HSCAN_MULTIPART_END) {
-			camel_mime_parser_unstep(mp);
-			bodypart = (CamelDataWrapper *)camel_mime_part_new();
-			camel_mime_part_construct_from_parser((CamelMimePart *)bodypart, mp);
-			camel_multipart_add_part((CamelMultipart *)content, (CamelMimePart *)bodypart);
-			camel_object_unref ((CamelObject *)bodypart);
-		}
-
-		/* these are only return valid data in the MULTIPART_END state */
-		camel_multipart_set_preface((CamelMultipart *)content, camel_mime_parser_preface(mp));
-		camel_multipart_set_postface((CamelMultipart *)content, camel_mime_parser_postface(mp));
-
-		d(printf("Created multi-part\n"));
-		break; }
-	default:
-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));
-	}
-	if (content) {
-#ifndef NO_WARNINGS
-#warning there just has got to be a better way ... to transfer the mime-type to the datawrapper
-#endif
-		/* would you believe you have to set this BEFORE you set the content object???  oh my god !!!! */
-		camel_data_wrapper_set_mime_type_field (content, 
-							camel_mime_part_get_content_type ((CamelMimePart *)dw));
-		camel_medium_set_content_object((CamelMedium *)dw, content);
-		camel_object_unref ((CamelObject *)content);
-	}
-}
-
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
deleted file mode 100644
index 1e1c3655aa..0000000000
--- a/camel/camel-mime-part-utils.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mime-part-utils : Utility for mime parsing and so on */
-
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MIME_PART_UTILS_H
-#define CAMEL_MIME_PART_UTILS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-mime-part.h>
-
-void camel_mime_part_construct_content_from_parser(CamelMimePart *, CamelMimeParser *mp);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /*  CAMEL_MIME_PART_UTILS_H  */
-
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
deleted file mode 100644
index e661e0caf5..0000000000
--- a/camel/camel-mime-part.c
+++ /dev/null
@@ -1,747 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camelMimePart.c : Abstract class for a mime_part */
-
-/* 
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <string.h>
-#include "camel-mime-part.h"
-#include <stdio.h>
-#include "gmime-content-field.h"
-#include "string-utils.h"
-#include "hash-table-utils.h"
-#include "camel-mime-part-utils.h"
-#include <ctype.h>
-#include "camel-mime-parser.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-exception.h"
-
-#define d(x)
-
-typedef enum {
-	HEADER_UNKNOWN,
-	HEADER_DESCRIPTION,
-	HEADER_DISPOSITION,
-	HEADER_CONTENT_ID,
-	HEADER_ENCODING,
-	HEADER_CONTENT_MD5,
-	HEADER_CONTENT_LANGUAGES,
-	HEADER_CONTENT_TYPE
-} CamelHeaderType;
-
-
-static GHashTable *header_name_table;
-
-
-static CamelMediumClass *parent_class=NULL;
-
-/* Returns the class for a CamelMimePart */
-#define CMP_CLASS(so) CAMEL_MIME_PART_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-/* from CamelDataWrapper */
-static int             write_to_stream                 (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static int	       construct_from_stream	       (CamelDataWrapper *dw, CamelStream *s);
-
-/* from CamelMedia */ 
-static void            add_header                      (CamelMedium *medium, const char *header_name, const void *header_value);
-static void            set_header                      (CamelMedium *medium, const char *header_name, const void *header_value);
-static void            remove_header                   (CamelMedium *medium, const char *header_name);
-static const void     *get_header                      (CamelMedium *medium, const char *header_name);
-
-static void            set_content_object              (CamelMedium *medium, CamelDataWrapper *content);
-
-/* from camel mime parser */
-static int             construct_from_parser           (CamelMimePart *, CamelMimeParser *);
-
-/* forward references */
-static void set_disposition (CamelMimePart *mime_part, const gchar *disposition);
-
-
-/* loads in a hash table the set of header names we */
-/* recognize and associate them with a unique enum  */
-/* identifier (see CamelHeaderType above)           */
-static void
-init_header_name_table()
-{
-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-	g_hash_table_insert (header_name_table, "Content-Description", (gpointer)HEADER_DESCRIPTION);
-	g_hash_table_insert (header_name_table, "Content-Disposition", (gpointer)HEADER_DISPOSITION);
-	g_hash_table_insert (header_name_table, "Content-id", (gpointer)HEADER_CONTENT_ID);
-	g_hash_table_insert (header_name_table, "Content-Transfer-Encoding", (gpointer)HEADER_ENCODING);
-	g_hash_table_insert (header_name_table, "Content-MD5", (gpointer)HEADER_CONTENT_MD5);
-	g_hash_table_insert (header_name_table, "Content-Type", (gpointer)HEADER_CONTENT_TYPE);
-	
-}
-
-static void
-camel_mime_part_class_init (CamelMimePartClass *camel_mime_part_class)
-{
-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_part_class);
-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_part_class);
-
-	parent_class = CAMEL_MEDIUM_CLASS (camel_type_get_global_classfuncs (camel_medium_get_type ()));
-	init_header_name_table();
-
-	camel_mime_part_class->construct_from_parser = construct_from_parser;
-	
-	/* virtual method overload */	
-	camel_medium_class->add_header                = add_header;
-	camel_medium_class->set_header                = set_header;
-	camel_medium_class->get_header                = get_header;
-	camel_medium_class->remove_header             = remove_header;
-	camel_medium_class->set_content_object        = set_content_object;
-
-	camel_data_wrapper_class->write_to_stream     = write_to_stream;
-	camel_data_wrapper_class->construct_from_stream= construct_from_stream;
-}
-
-static void
-camel_mime_part_init (gpointer   object,  gpointer   klass)
-{
-	CamelMimePart *camel_mime_part = CAMEL_MIME_PART (object);
-	
-	camel_mime_part->content_type         = gmime_content_field_new ("text", "plain");
-	camel_mime_part->description          = NULL;
-	camel_mime_part->disposition          = NULL;
-	camel_mime_part->content_id           = NULL;
-	camel_mime_part->content_MD5          = NULL;
-	camel_mime_part->content_languages    = NULL;
-	camel_mime_part->encoding             = CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-
-static void           
-camel_mime_part_finalize (CamelObject *object)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (object);
-
-	g_free (mime_part->description);
-	g_free (mime_part->content_id);
-	g_free (mime_part->content_MD5);
-	string_list_free (mime_part->content_languages);
-	header_disposition_unref(mime_part->disposition);
-	
-	if (mime_part->content_type)
-		gmime_content_field_unref (mime_part->content_type);
-
-	header_raw_clear(&mime_part->headers);
-}
-
-
-
-CamelType
-camel_mime_part_get_type (void)
-{
-	static CamelType camel_mime_part_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mime_part_type == CAMEL_INVALID_TYPE)	{
-		camel_mime_part_type = camel_type_register (CAMEL_MEDIUM_TYPE, "CamelMimePart",
-							    sizeof (CamelMimePart),
-							    sizeof (CamelMimePartClass),
-							    (CamelObjectClassInitFunc) camel_mime_part_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_mime_part_init,
-							    (CamelObjectFinalizeFunc) camel_mime_part_finalize);
-	}
-	
-	return camel_mime_part_type;
-}
-
-
-/* **** */
-
-static gboolean
-process_header(CamelMedium *medium, const char *header_name, const char *header_value)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);
-	CamelHeaderType header_type;
-	char *text;
-
-	/* Try to parse the header pair. If it corresponds to something   */
-	/* known, the job is done in the parsing routine. If not,         */
-	/* we simply add the header in a raw fashion                      */
-
-	header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name);
-	switch (header_type) {
-	case HEADER_DESCRIPTION: /* raw header->utf8 conversion */
-		text = header_decode_string(header_value);
-		g_free(mime_part->description);
-		mime_part->description = g_strstrip (text);
-		break;
-	case HEADER_DISPOSITION:
-		set_disposition(mime_part, header_value);
-		break;
-	case HEADER_CONTENT_ID:
-		text = header_msgid_decode(header_value);
-		g_free(mime_part->content_id);
-		mime_part->content_id = text;
-		break;
-	case HEADER_ENCODING:
-		text = header_token_decode(header_value);
-		mime_part->encoding = camel_mime_part_encoding_from_string (text);
-		g_free(text);
-		break;
-	case HEADER_CONTENT_MD5:
-		g_free(mime_part->content_MD5);
-		mime_part->content_MD5 = g_strdup(header_value);
-		break;
-	case HEADER_CONTENT_TYPE: 
-		gmime_content_field_construct_from_string(mime_part->content_type, header_value);
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/* Note: It is my understanding that we need to encode the values here as they are
-   not being encoded at the header_raw_* level. */
-
-/*
-   NO: This is absolutely wrong.  The medium interface is entirely raw.
-   You cannot just go blingingly encoding headers because it depends entirely
-   on the header being encoded.  process_header decodes and mirrors the
-   known headers, appropriately, and we just add this raw header to our
-   list.
-
-   Please read the comments, they explained it already!!!!!!!
-*/
-
-static void
-set_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	CamelMimePart *part = CAMEL_MIME_PART (medium);
-	
-	process_header(medium, header_name, header_value);
-	header_raw_replace(&part->headers, header_name, header_value, -1);
-}
-
-static void
-add_header (CamelMedium *medium, const char *header_name, const void *header_value)
-{
-	CamelMimePart *part = CAMEL_MIME_PART (medium);
-	
-	/* Try to parse the header pair. If it corresponds to something   */
-	/* known, the job is done in the parsing routine. If not,         */
-	/* we simply add the header in a raw fashion                      */
-
-	/* If it was one of the headers we handled, it must be unique, set it instead of add */
-	if (process_header(medium, header_name, header_value))
-		header_raw_replace(&part->headers, header_name, header_value, -1);
-	else
-		header_raw_append(&part->headers, header_name, header_value, -1);
-}
-
-static void
-remove_header (CamelMedium *medium, const char *header_name)
-{
-	CamelMimePart *part = (CamelMimePart *)medium;
-	
-	process_header(medium, header_name, NULL);
-	header_raw_remove(&part->headers, header_name);
-}
-
-static const void *
-get_header (CamelMedium *medium, const char *header_name)
-{
-	CamelMimePart *part = (CamelMimePart *)medium;
-
-	return header_raw_find(&part->headers, header_name, NULL);
-}
-
-
-/* **** Content-Description */
-void
-camel_mime_part_set_description (CamelMimePart *mime_part, const gchar *description)
-{
-	char *text = header_encode_string (description);
-	
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Description", text);
-	g_free (text);
-}
-
-const gchar *
-camel_mime_part_get_description (CamelMimePart *mime_part)
-{
-	return mime_part->description;
-}
-
-/* **** Content-Disposition */
-
-static void
-set_disposition (CamelMimePart *mime_part, const gchar *disposition)
-{
-	header_disposition_unref(mime_part->disposition);
-	if (disposition)
-		mime_part->disposition = header_disposition_decode(disposition);
-	else
-		mime_part->disposition = NULL;
-}
-
-
-void
-camel_mime_part_set_disposition (CamelMimePart *mime_part, const gchar *disposition)
-{
-	char *text;
-
-	/* we poke in a new disposition (so we dont lose 'filename', etc) */
-	if (mime_part->disposition == NULL) {
-		set_disposition(mime_part, disposition);
-	}
-	if (mime_part->disposition != NULL) {
-		g_free(mime_part->disposition->disposition);
-		mime_part->disposition->disposition = g_strdup(disposition);
-	}
-	text = header_disposition_format(mime_part->disposition);
-
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Disposition", text);
-
-	g_free(text);
-}
-
-const gchar *
-camel_mime_part_get_disposition (CamelMimePart *mime_part)
-{
-	if (mime_part->disposition)
-		return (mime_part->disposition)->disposition;
-	else
-		return NULL;
-}
-
-
-/* **** Content-Disposition: filename="xxx" */
-
-void
-camel_mime_part_set_filename (CamelMimePart *mime_part, const gchar *filename)
-{
-	char *str;
-	if (mime_part->disposition == NULL)
-		mime_part->disposition = header_disposition_decode("attachment");
-
-	header_set_param(&mime_part->disposition->params, "filename", filename);
-	str = header_disposition_format(mime_part->disposition);
-
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Disposition", str);
-	g_free(str);
-}
-
-const gchar *
-camel_mime_part_get_filename (CamelMimePart *mime_part)
-{
-	if (mime_part->disposition) {
-		const gchar *name = header_param (mime_part->disposition->params, "filename");
-		if (name)
-			return name;
-	}
-
-	return gmime_content_field_get_parameter (mime_part->content_type, "name");
-}
-
-
-/* **** Content-ID: */
-
-void
-camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID",
-				 contentid);
-}
-
-const gchar *
-camel_mime_part_get_content_id (CamelMimePart *mime_part)
-{
-	return mime_part->content_id;
-}
-
-/* **** Content-MD5: */
-
-void
-camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, const char *md5)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-MD5", md5);
-}
-
-const gchar *
-camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
-{
-	return mime_part->content_MD5;
-}
-
-/* **** Content-Transfer-Encoding: */
-
-void
-camel_mime_part_set_encoding (CamelMimePart *mime_part,
-			      CamelMimePartEncodingType encoding)
-{
-	const char *text;
-
-	text = camel_mime_part_encoding_to_string (encoding);
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Transfer-Encoding", text);
-}
-
-const CamelMimePartEncodingType
-camel_mime_part_get_encoding (CamelMimePart *mime_part)
-{
-	return mime_part->encoding;
-}
-
-/* FIXME: do something with this stuff ... */
-
-void
-camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages)
-{
-	if (mime_part->content_languages) string_list_free (mime_part->content_languages);
-	mime_part->content_languages = content_languages;
-
-	/* FIXME: translate to a header and set it */
-}
-
-const GList *
-camel_mime_part_get_content_languages (CamelMimePart *mime_part)
-{
-	return mime_part->content_languages;
-}
-
-
-/* **** */
-
-/* **** Content-Type: */
-
-void 
-camel_mime_part_set_content_type (CamelMimePart *mime_part, gchar *content_type)
-{
-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-				 "Content-Type", content_type);
-}
-
-GMimeContentField *
-camel_mime_part_get_content_type (CamelMimePart *mime_part)
-{
-	return mime_part->content_type;
-}
-
-/*********/
-
-
-
-static void
-set_content_object (CamelMedium *medium, CamelDataWrapper *content)
-{
-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);
-	GMimeContentField *object_content_field;
-
-	parent_class->set_content_object (medium, content);
-
-	object_content_field = camel_data_wrapper_get_mime_type_field (content);
-	if (mime_part->content_type &&
-	    (mime_part->content_type != object_content_field)) {
-		char *txt;
-
-		txt = header_content_type_format(object_content_field?object_content_field->content_type:NULL);
-		camel_medium_set_header (CAMEL_MEDIUM (mime_part),
-					 "Content-Type", txt);
-	}
-}
-
-/**********************************************************************/
-
-static int
-write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMimePart *mp = CAMEL_MIME_PART(data_wrapper);
-	CamelMedium *medium = CAMEL_MEDIUM(data_wrapper);
-	CamelDataWrapper *content;
-	int total = 0;
-	int count;
-
-	d(printf("mime_part::write_to_stream\n"));
-
-	/* FIXME: something needs to be done about this ... */
-	/* FIXME: need to count these bytes too */
-#ifndef NO_WARNINGS
-#warning content-languages should be stored as a header
-#endif
-
-	if (mp->headers) {
-		struct _header_raw *h = mp->headers;
-
-		while (h) {
-			if (h->value == NULL){
-				g_warning("h->value is NULL here for %s", h->name);
-				count = 0;
-			} else {
-				count = camel_stream_printf(stream, "%s%s%s\n", h->name, isspace(h->value[0]) ? ":" : ": ", h->value);
-			}
-			if (count == -1)
-				return -1;
-			total += count;
-			h = h->next;
-		}
-	}
-
-	count = camel_stream_write(stream, "\n", 1);
-	if (count == -1)
-		return -1;
-	total += count;
-
-	content = camel_medium_get_content_object(medium);
-	if (content) {
-		/* I dont really like this here, but i dont know where else it might go ... */
-#define CAN_THIS_GO_ELSEWHERE
-#ifdef CAN_THIS_GO_ELSEWHERE
-		CamelMimeFilter *filter = NULL;
-		CamelStreamFilter *filter_stream = NULL;
-		CamelMimeFilter *charenc = NULL;
-		const char *charset;
-
-		switch(mp->encoding) {
-		case CAMEL_MIME_PART_ENCODING_BASE64:
-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_ENC);
-			break;
-		case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:
-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_ENC);
-			break;
-		default:
-			break;
-		}
-
-		if (gmime_content_field_is_type(mp->content_type, "text", "*")) {
-			charset = gmime_content_field_get_parameter(mp->content_type, "charset");
-			if (!(charset == NULL || !strcasecmp(charset, "us-ascii") || !strcasecmp(charset, "utf-8"))) {
-				charenc = (CamelMimeFilter *)camel_mime_filter_charset_new_convert("utf-8", charset);
-			} 
-		}
-
-		if (filter || charenc) {
-			filter_stream = camel_stream_filter_new_with_stream(stream);
-
-			/* if we have a character encoder, add that always */
-			if (charenc) {
-				camel_stream_filter_add(filter_stream, charenc);
-				camel_object_unref((CamelObject *)charenc);
-			}
-
-			/* we only re-do crlf on encoded blocks */
-			if (filter && gmime_content_field_is_type(mp->content_type, "text", "*")) {
-				CamelMimeFilter *crlf = camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_ENCODE,
-										   CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-
-				camel_stream_filter_add(filter_stream, crlf);
-				camel_object_unref((CamelObject *)crlf);
-
-			}
-
-			if (filter) {
-				camel_stream_filter_add(filter_stream, filter);
-				camel_object_unref((CamelObject *)filter);
-			}
-
-			stream = (CamelStream *)filter_stream;
-		}
-
-#endif
-		count = camel_data_wrapper_write_to_stream(content, stream);
-		if (filter_stream) {
-			camel_stream_flush((CamelStream *)filter_stream);
-			camel_object_unref((CamelObject *)filter_stream);
-		}
-		if (count == -1)
-			return -1;
-		total += count;
-	} else {
-		g_warning("No content for medium, nothing to write");
-	}
-	return total;
-}
-
-/* mime_part */
-static int
-construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp)
-{
-	struct _header_raw *headers;
-	char *buf;
-	int len;
-
-	d(printf("mime_part::construct_from_parser()\n"));
-
-	switch (camel_mime_parser_step(mp, &buf, &len)) {
-	case HSCAN_MESSAGE:
-		/* set the default type of a message always */
-		gmime_content_field_construct_from_string (dw->content_type, "message/rfc822");
-	case HSCAN_HEADER:
-	case HSCAN_MULTIPART:
-		/* we have the headers, build them into 'us' */
-		headers = camel_mime_parser_headers_raw(mp);
-		while (headers) {
-			camel_medium_add_header((CamelMedium *)dw, headers->name, headers->value);
-			headers = headers->next;
-		}
-		camel_mime_part_construct_content_from_parser(dw, mp);
-		break;
-	default:
-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));
-	}
-
-	d(printf("mime_part::construct_from_parser() leaving\n"));
-#ifndef NO_WARNINGS
-#warning "Need to work out how to detect a (fatally) bad parse in the parser"
-#endif
-	return 0;
-}
-
-/**
- * camel_mime_part_construct_from_parser:
- * @mime_part: 
- * @mp: 
- * 
- * 
- * 
- * Return value: 
- **/
-int
-camel_mime_part_construct_from_parser(CamelMimePart *mime_part, CamelMimeParser *mp)
-{
-	return CMP_CLASS (mime_part)->construct_from_parser (mime_part, mp);
-}
-
-static int
-construct_from_stream(CamelDataWrapper *dw, CamelStream *s)
-{
-	CamelMimeParser *mp;
-	int ret;
-
-	d(printf("mime_part::construct_from_stream()\n"));
-
-	mp = camel_mime_parser_new();
-	if (camel_mime_parser_init_with_stream(mp, s) == -1) {
-		g_warning("Cannot create parser for stream");
-		ret = -1;
-	} else {
-		ret = camel_mime_part_construct_from_parser((CamelMimePart *)dw, mp);
-	}
-	camel_object_unref((CamelObject *)mp);
-	return ret;
-}
-
-
-const gchar *
-camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)
-{
-	switch (encoding) {
-	case CAMEL_MIME_PART_ENCODING_DEFAULT:
-	case CAMEL_MIME_PART_ENCODING_7BIT:
-		return "7bit";
-	case CAMEL_MIME_PART_ENCODING_8BIT:
-		return "8bit";
-	case CAMEL_MIME_PART_ENCODING_BASE64:
-		return "base64";
-	case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:
-		return "quoted-printable";
-	default:
-		break;
-	}
-	return "";
-}
-
-
-
-/* FIXME I am not sure this is the correct way to do this.  */
-CamelMimePartEncodingType
-camel_mime_part_encoding_from_string (const gchar *string)
-{
-	if (string == NULL)
-		return CAMEL_MIME_PART_ENCODING_DEFAULT;
-	else if (strcasecmp (string, "7bit") == 0)
-		return CAMEL_MIME_PART_ENCODING_7BIT;
-	else if (strcasecmp (string, "8bit") == 0)
-		return CAMEL_MIME_PART_ENCODING_8BIT;
-	else if (strcasecmp (string, "base64") == 0)
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-	else if (strcasecmp (string, "quoted-printable") == 0)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		/* FIXME?  Spit a warning?  */
-		return CAMEL_MIME_PART_ENCODING_DEFAULT;
-}
-
-
-/******************************/
-/**  Misc utility functions  **/
-
-/**
- * camel_mime_part_new:
- *
- * Return value: a new CamelMimePart
- **/
-CamelMimePart *
-camel_mime_part_new (void)
-{
-	return (CamelMimePart *)camel_object_new (CAMEL_MIME_PART_TYPE);
-}
-
-/**
- * camel_mime_part_set_content:
- * @camel_mime_part: Mime part
- * @data: data to put into the part
- * @length: length of @data
- * @type: Content-Type of the data
- * 
- * Utility function used to set the content of a mime part object to 
- * be the provided data. If @length is 0, this routine can be used as
- * a way to remove old content (in which case @data and @type are
- * ignored and may be %NULL).
- **/
-void 
-camel_mime_part_set_content (CamelMimePart *camel_mime_part,
-			     const char *data, int length,
-			     const char *type) /* why on earth is the type last? */
-{
-	CamelMedium *medium = CAMEL_MEDIUM (camel_mime_part);
-
-	if (length) {
-		CamelDataWrapper *dw;
-		CamelStream *stream;
-
-		dw = camel_data_wrapper_new ();
-		camel_data_wrapper_set_mime_type (dw, type);
-		stream = camel_stream_mem_new_with_buffer (data, length);
-		camel_data_wrapper_construct_from_stream (dw, stream);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_medium_set_content_object (medium, dw);
-		camel_object_unref (CAMEL_OBJECT (dw));
-	} else {
-		if (medium->content)
-			camel_object_unref (CAMEL_OBJECT (medium->content));
-		medium->content = NULL;
-	}
-}
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
deleted file mode 100644
index ed0df94a4b..0000000000
--- a/camel/camel-mime-part.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mime-part.h : class for a mime part */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MIME_PART_H
-#define CAMEL_MIME_PART_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-parser.h>
-
-#define CAMEL_MIME_PART_TYPE     (camel_mime_part_get_type ())
-#define CAMEL_MIME_PART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))
-#define CAMEL_MIME_PART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))
-#define CAMEL_IS_MIME_PART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))
-
-
-enum _CamelMimePartEncodingType {
-        CAMEL_MIME_PART_ENCODING_DEFAULT,
-        CAMEL_MIME_PART_ENCODING_7BIT,
-        CAMEL_MIME_PART_ENCODING_8BIT,
-        CAMEL_MIME_PART_ENCODING_BASE64,
-        CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE,
-        CAMEL_MIME_PART_NUM_ENCODINGS
-};
-typedef enum _CamelMimePartEncodingType CamelMimePartEncodingType;
-
-
-/* Do not change these values directly, you would regret it one day */
-struct _CamelMimePart
-{
-	CamelMedium parent_object;
-	
-	/* All fields here are -** PRIVATE **- */ 
-	gchar *description;
-	CamelMimeDisposition *disposition;
-	gchar *content_id;
-	gchar *content_MD5;
-	GList *content_languages;
-	CamelMimePartEncodingType encoding;
-	
-	GMimeContentField *content_type;
-
-	struct _header_raw *headers; /* mime headers */
-};
-
-typedef struct _CamelMimePartClass {
-	CamelMediumClass parent_class;
-	
-	/* Virtual methods */
-	int (*construct_from_parser) (CamelMimePart *, CamelMimeParser *);
-} CamelMimePartClass;
-
-/* Standard Camel function */
-CamelType camel_mime_part_get_type (void);
-
-/* public methods */
-CamelMimePart *  camel_mime_part_new                    (void);
-
-void	         camel_mime_part_set_description	(CamelMimePart *mime_part, const gchar *description);
-const     gchar *camel_mime_part_get_description	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_disposition	(CamelMimePart *mime_part, const gchar *disposition);
-const     gchar *camel_mime_part_get_disposition	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_filename		(CamelMimePart *mime_part, const gchar *filename);
-const	  gchar *camel_mime_part_get_filename		(CamelMimePart *mime_part);
-
-void             camel_mime_part_set_content_id		(CamelMimePart *mime_part, const char *contentid);
-const	  gchar *camel_mime_part_get_content_id		(CamelMimePart *mime_part);
-
-void		 camel_mime_part_set_content_MD5	(CamelMimePart *mime_part, const char *);
-const	  gchar *camel_mime_part_get_content_MD5	(CamelMimePart *mime_part);
-
-void	         camel_mime_part_set_encoding		(CamelMimePart *mime_part, CamelMimePartEncodingType type);
-CamelMimePartEncodingType camel_mime_part_get_encoding	(CamelMimePart *mime_part);
-
-void	 	 camel_mime_part_set_content_languages	(CamelMimePart *mime_part, GList *content_languages);
-const	  GList *camel_mime_part_get_content_languages	(CamelMimePart *mime_part);
-
-/* FIXME: what about content-type parameters?   what about major/minor parts? */
-void               camel_mime_part_set_content_type 	(CamelMimePart *mime_part, gchar *content_type);
-GMimeContentField *camel_mime_part_get_content_type	(CamelMimePart *mime_part);
-
-const     gchar *         camel_mime_part_encoding_to_string   (CamelMimePartEncodingType encoding);
-CamelMimePartEncodingType camel_mime_part_encoding_from_string (const gchar *string);
-
-/* construction */
-int		camel_mime_part_construct_from_parser  (CamelMimePart *, CamelMimeParser *);
-
-/* utility functions */
-void      	camel_mime_part_set_content 	       (CamelMimePart *camel_mime_part,
-							const char *content, int length, const char *type);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MIME_PART_H */
-
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
deleted file mode 100644
index d2df6cac76..0000000000
--- a/camel/camel-mime-utils.c
+++ /dev/null
@@ -1,3070 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* dont touch this file without my permission - Michael */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <unicode.h>
-
-#include <glib.h>
-#include <time.h>
-
-#include <ctype.h>
-#include <errno.h>
-
-#include "camel-mime-utils.h"
-#include "camel-charset-map.h"
-
-#ifndef CLEAN_DATE
-#include "broken-date-parser.h"
-#endif
-
-#if 0
-int strdup_count = 0;
-int malloc_count = 0;
-int free_count = 0;
-
-#define g_strdup(x) (strdup_count++, g_strdup(x))
-#define g_malloc(x) (malloc_count++, g_malloc(x))
-#define g_free(x) (free_count++, g_free(x))
-#endif
-
-/* for all warnings ... */
-#define w(x) x
-
-#define d(x)
-#define d2(x)
-
-#define	CAMEL_UUDECODE_CHAR(c)	(((c) - ' ') & 077)
-
-static char *base64_alphabet =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static unsigned char tohex[16] = {
-	'0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-static unsigned short camel_mime_special_table[256] = {
-	  5,  5,  5,  5,  5,  5,  5,  5,  5,231,  7,  5,  5, 39,  5,  5,
-	  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-	242,448, 76,192,192,192,192,192, 76, 76,448,448, 76,448, 72,324,
-	448,448,448,448,448,448,448,448,448,448, 76, 76, 76,  4, 76, 68,
-	 76,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-	448,448,448,448,448,448,448,448,448,448,448,108,236,108,192, 64,
-	192,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
-	448,448,448,448,448,448,448,448,448,448,448,192,192,192,192,  5,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-static unsigned char camel_mime_base64_rank[256] = {
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,
-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-};
-
-/*
-  if any of these change, then the tables above should be regenerated
-  by compiling this with -DBUILD_TABLE, and running.
-
-  gcc -DCLEAN_DATE -o buildtable -I.. `glib-config --cflags --libs` -lunicode -DBUILD_TABLE camel-mime-utils.c camel-charset-map.c
-  ./buildtable
-
-*/
-enum {
-	IS_CTRL		= 1<<0,
-	IS_LWSP		= 1<<1,
-	IS_TSPECIAL	= 1<<2,
-	IS_SPECIAL	= 1<<3,
-	IS_SPACE	= 1<<4,
-	IS_DSPECIAL	= 1<<5,
-	IS_QPSAFE	= 1<<6,
-	IS_ESAFE	= 1<<7,	/* encoded word safe */
-	IS_PSAFE	= 1<<8,	/* encoded word in phrase safe */
-};
-
-#define is_ctrl(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_CTRL) != 0)
-#define is_lwsp(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_LWSP) != 0)
-#define is_tspecial(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_TSPECIAL) != 0)
-#define is_type(x, t) ((camel_mime_special_table[(unsigned char)(x)] & (t)) != 0)
-#define is_ttoken(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_TSPECIAL|IS_LWSP|IS_CTRL)) == 0)
-#define is_atom(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_SPECIAL|IS_SPACE|IS_CTRL)) == 0)
-#define is_dtext(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_DSPECIAL) == 0)
-#define is_fieldname(x) ((camel_mime_special_table[(unsigned char)(x)] & (IS_CTRL|IS_SPACE)) == 0)
-#define is_qpsafe(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_QPSAFE) != 0)
-#define is_especial(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_ESPECIAL) != 0)
-#define is_psafe(x) ((camel_mime_special_table[(unsigned char)(x)] & IS_PSAFE) != 0)
-
-/* only needs to be run to rebuild the tables above */
-#ifdef BUILD_TABLE
-
-#define CHARS_LWSP " \t\n\r"
-#define CHARS_TSPECIAL "()<>@,;:\\\"/[]?="
-#define CHARS_SPECIAL "()<>@,;:\\\".[]"
-#define CHARS_CSPECIAL "()\\\r"	/* not in comments */
-#define CHARS_DSPECIAL "[]\\\r \t"	/* not in domains */
-#define CHARS_ESPECIAL "()<>@,;:\"/[]?.=_" /* list of characters that must be encoded.
-					      encoded word in text specials: rfc 2047 5(1)*/
-#define CHARS_PSPECIAL "!*+-/" /* list of additional characters that can be left unencoded.
-				  encoded word in phrase specials: rfc 2047 5(3) */
-
-static void
-header_remove_bits(unsigned short bit, unsigned char *vals)
-{
-	int i;
-
-	for (i=0;vals[i];i++)
-		camel_mime_special_table[vals[i]] &= ~ bit;
-}
-
-static void
-header_init_bits(unsigned short bit, unsigned short bitcopy, int remove, unsigned char *vals)
-{
-	int i;
-	int len = strlen(vals);
-
-	if (!remove) {
-		for (i=0;i<len;i++) {
-			camel_mime_special_table[vals[i]] |= bit;
-		}
-		if (bitcopy) {
-			for (i=0;i<256;i++) {
-				if (camel_mime_special_table[i] & bitcopy)
-					camel_mime_special_table[i] |= bit;
-			}
-		}
-	} else {
-		for (i=0;i<256;i++)
-			camel_mime_special_table[i] |= bit;
-		for (i=0;i<len;i++) {
-			camel_mime_special_table[vals[i]] &= ~bit;
-		}
-		if (bitcopy) {
-			for (i=0;i<256;i++) {
-				if (camel_mime_special_table[i] & bitcopy)
-					camel_mime_special_table[i] &= ~bit;
-			}
-		}
-	}
-}
-
-static void
-header_decode_init(void)
-{
-	int i;
-
-	for (i=0;i<256;i++) {
-		camel_mime_special_table[i] = 0;
-		if (i<32)
-			camel_mime_special_table[i] |= IS_CTRL;
-		if ((i>=33 && i<=60) || (i>=62 && i<=126) || i==32 || i==9)
-			camel_mime_special_table[i] |= (IS_QPSAFE|IS_ESAFE);
-		if ((i>='0' && i<='9') || (i>='a' && i<='z') || (i>='A' && i<= 'Z'))
-			camel_mime_special_table[i] |= IS_PSAFE;
-	}
-	camel_mime_special_table[127] |= IS_CTRL;
-	camel_mime_special_table[' '] |= IS_SPACE;
-	header_init_bits(IS_LWSP, 0, 0, CHARS_LWSP);
-	header_init_bits(IS_TSPECIAL, IS_CTRL, 0, CHARS_TSPECIAL);
-	header_init_bits(IS_SPECIAL, 0, 0, CHARS_SPECIAL);
-	header_init_bits(IS_DSPECIAL, 0, FALSE, CHARS_DSPECIAL);
-	header_remove_bits(IS_ESAFE, CHARS_ESPECIAL);
-	header_init_bits(IS_PSAFE, 0, 0, CHARS_PSPECIAL);
-}
-
-void
-base64_init(void)
-{
-	int i;
-
-	memset(camel_mime_base64_rank, 0xff, sizeof(camel_mime_base64_rank));
-	for (i=0;i<64;i++) {
-		camel_mime_base64_rank[(unsigned int)base64_alphabet[i]] = i;
-	}
-	camel_mime_base64_rank['='] = 0;
-}
-
-int main(int argc, char **argv)
-{
-	int i;
-	void run_test(void);
-
-	header_decode_init();
-	base64_init();
-
-	printf("static unsigned short camel_mime_special_table[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		printf("%3d,", camel_mime_special_table[i]);
-		if ((i&15) == 15) {
-			printf("\n");
-			if (i!=255) {
-				printf("\t");
-			}
-		}
-	}
-	printf("};\n");
-
-	printf("static unsigned char camel_mime_base64_rank[256] = {\n\t");
-	for (i=0;i<256;i++) {
-		printf("%3d,", camel_mime_base64_rank[i]);
-		if ((i&15) == 15) {
-			printf("\n");
-			if (i!=255) {
-				printf("\t");
-			}
-		}
-	}
-	printf("};\n");
-
-	run_test();
-
-	return 0;
-}
-
-#endif
-
-
-/* call this when finished encoding everything, to
-   flush off the last little bit */
-int
-base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
-	int c1, c2;
-	unsigned char *outptr = out;
-
-	if (inlen>0)
-		outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);
-
-	c1 = ((unsigned char *)save)[1];
-	c2 = ((unsigned char *)save)[2];
-
-	switch (((char *)save)[0]) {
-	case 2:
-		outptr[2] = base64_alphabet[ ( (c2 &0x0f) << 2 ) ];
-		g_assert(outptr[2] != 0);
-		goto skip;
-	case 1:
-		outptr[2] = '=';
-	skip:
-		outptr[0] = base64_alphabet[ c1 >> 2 ];
-		outptr[1] = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 )];
-		outptr[3] = '=';
-		outptr += 4;
-		break;
-	}
-	if (break_lines)
-		*outptr++ = '\n';
-
-	*save = 0;
-	*state = 0;
-
-	return outptr-out;
-}
-
-/*
-  performs an 'encode step', only encodes blocks of 3 characters to the
-  output at a time, saves left-over state in state and save (initialise to
-  0 on first invocation).
-*/
-int
-base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save)
-{
-	register unsigned char *inptr, *outptr;
-
-	if (len<=0)
-		return 0;
-
-	inptr = in;
-	outptr = out;
-
-	d(printf("we have %d chars, and %d saved chars\n", len, ((char *)save)[0]));
-
-	if (len + ((char *)save)[0] > 2) {
-		unsigned char *inend = in+len-2;
-		register int c1, c2, c3;
-		register int already;
-
-		already = *state;
-
-		switch (((char *)save)[0]) {
-		case 1:	c1 = ((unsigned char *)save)[1]; goto skip1;
-		case 2:	c1 = ((unsigned char *)save)[1];
-			c2 = ((unsigned char *)save)[2]; goto skip2;
-		}
-		
-		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */
-		while (inptr < inend) {
-			c1 = *inptr++;
-		skip1:
-			c2 = *inptr++;
-		skip2:
-			c3 = *inptr++;
-			*outptr++ = base64_alphabet[ c1 >> 2 ];
-			*outptr++ = base64_alphabet[ c2 >> 4 | ( (c1&0x3) << 4 ) ];
-			*outptr++ = base64_alphabet[ ( (c2 &0x0f) << 2 ) | (c3 >> 6) ];
-			*outptr++ = base64_alphabet[ c3 & 0x3f ];
-			/* this is a bit ugly ... */
-			if (break_lines && (++already)>=19) {
-				*outptr++='\n';
-				already = 0;
-			}
-		}
-
-		((char *)save)[0] = 0;
-		len = 2-(inptr-inend);
-		*state = already;
-	}
-
-	d(printf("state = %d, len = %d\n",
-		 (int)((char *)save)[0],
-		 len));
-
-	if (len>0) {
-		register char *saveout;
-
-		/* points to the slot for the next char to save */
-		saveout = & (((char *)save)[1]) + ((char *)save)[0];
-
-		/* len can only be 0 1 or 2 */
-		switch(len) {
-		case 2:	*saveout++ = *inptr++;
-		case 1:	*saveout++ = *inptr++;
-		}
-		((char *)save)[0]+=len;
-	}
-
-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",
-		 (int)((char *)save)[0],
-		 (int)((char *)save)[1],
-		 (int)((char *)save)[2]));
-
-	return outptr-out;
-}
-
-
-/**
- * base64_decode_step: decode a chunk of base64 encoded data
- * @in: input stream
- * @len: max length of data to decode
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- *
- * Decodes a chunk of base64 encoded data
- **/
-int
-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	register unsigned int v;
-	int i;
-
-	inend = in+len;
-	outptr = out;
-
-	/* convert 4 base64 bytes to 3 normal bytes */
-	v=*save;
-	i=*state;
-	inptr = in;
-	while (inptr<inend) {
-		c = camel_mime_base64_rank[*inptr++];
-		if (c != 0xff) {
-			v = (v<<6) | c;
-			i++;
-			if (i==4) {
-				*outptr++ = v>>16;
-				*outptr++ = v>>8;
-				*outptr++ = v;
-				i=0;
-			}
-		}
-	}
-
-	*save = v;
-	*state = i;
-
-	/* quick scan back for '=' on the end somewhere */
-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */
-	i=2;
-	while (inptr>in && i) {
-		inptr--;
-		if (camel_mime_base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-
-/**
- * uudecode_step: uudecode a chunk of data
- * @in: input stream
- * @len: max length of data to decode ( normally strlen(in) ??)
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- * @uulen: holds the value of the length-char which is used to calculate
- *         how many more chars need to be decoded for that 'line'
- *
- * uudecodes a chunk of data. Assumes the "begin <mode> <file name>" line
- * has been stripped off.
- **/
-int
-uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, ch;
-	register guint32 saved;
-	gboolean last_was_eoln;
-	int i;
-
-	if (*uulen <= 0)
-		last_was_eoln = TRUE;
-	else
-		last_was_eoln = FALSE;
-	
-	inend = in + len;
-	outptr = out;
-	saved = *save;
-	i = *state;
-	inptr = in;
-	while (inptr < inend && *inptr) {
-		if (*inptr == '\n' || last_was_eoln) {
-			if (last_was_eoln) {
-				*uulen = CAMEL_UUDECODE_CHAR (*inptr);
-				last_was_eoln = FALSE;
-			} else {
-				last_was_eoln = TRUE;
-			}
-
-			inptr++;
-			continue;
-		}
-
-		ch = *inptr++;
-		
-		if (*uulen > 0) {
-			/* save the byte */
-			saved = (saved << 8) | ch;
-			i++;
-			if (i == 4) {
-				/* convert 4 uuencoded bytes to 3 normal bytes */
-				unsigned char b0, b1, b2, b3;
-
-				b0 = saved >> 24;
-				b1 = saved >> 16 & 0xff;
-				b2 = saved >> 8 & 0xff;
-				b3 = saved & 0xff;
-
-				if (*uulen >= 3) {
-					*outptr++ = CAMEL_UUDECODE_CHAR (b0) << 2 | CAMEL_UUDECODE_CHAR (b1) >> 4;
-					*outptr++ = CAMEL_UUDECODE_CHAR (b1) << 4 | CAMEL_UUDECODE_CHAR (b2) >> 2;
-				        *outptr++ = CAMEL_UUDECODE_CHAR (b2) << 6 | CAMEL_UUDECODE_CHAR (b3);
-				} else {
-					if (*uulen >= 1) {
-						*outptr++ = CAMEL_UUDECODE_CHAR (b0) << 2 | CAMEL_UUDECODE_CHAR (b1) >> 4;
-					}
-					if (*uulen >= 2) {
-						*outptr++ = CAMEL_UUDECODE_CHAR (b1) << 4 | CAMEL_UUDECODE_CHAR (b2) >> 2;
-					}
-				}
-
-				i = 0;
-				saved = 0;
-				*uulen -= 3;
-			}
-		} else {
-			break;
-		}
-	}
-
-	*save = saved;
-	*state = i;
-
-	return outptr - out;
-}
-
-/* complete qp encoding */
-int
-quoted_encode_close(unsigned char *in, int len, unsigned char *out, int *state, int *save)
-{
-	register unsigned char *outptr = out;
-	int last;
-
-	if (len>0)
-		outptr += quoted_encode_step(in, len, outptr, state, save);
-
-	last = *state;
-	if (last != -1) {
-		/* space/tab must be encoded if it's the last character on
-		   the line */
-		if (is_qpsafe(last) && last!=' ' && last!=9) {
-			*outptr++ = last;
-		} else {
-			*outptr++ = '=';
-			*outptr++ = tohex[(last>>4) & 0xf];
-			*outptr++ = tohex[last & 0xf];
-		}
-	}
-
-	/* hmm, not sure if this should really be added here, we dont want
-	   to add it to the content, afterall ...? */
-	*outptr++ = '\n';
-
-	*save = 0;
-	*state = -1;
-
-	return outptr-out;
-}
-
-/* perform qp encoding, initialise state to -1 and save to 0 on first invocation */
-int
-quoted_encode_step (unsigned char *in, int len, unsigned char *out, int *statep, int *save)
-{
-	register guchar *inptr, *outptr, *inend;
-	guchar c;
-	register int sofar = *save;  /* keeps track of how many chars on a line */
-	register int last = *statep; /* keeps track if last char to end was a space cr etc */
-	
-	inptr = in;
-	inend = in + len;
-	outptr = out;
-	while (inptr < inend) {
-		c = *inptr++;
-		if (c == '\r') {
-			if (last != -1) {
-				*outptr++ = '=';
-				*outptr++ = tohex[(last >> 4) & 0xf];
-				*outptr++ = tohex[last & 0xf];
-				sofar += 3;
-			}
-			last = c;
-		} else if (c == '\n') {
-			if (last != -1 && last != '\r') {
-				*outptr++ = '=';
-				*outptr++ = tohex[(last >> 4) & 0xf];
-				*outptr++ = tohex[last & 0xf];
-			}
-			*outptr++ = '\n';
-			sofar = 0;
-			last = -1;
-		} else {
-			if (last != -1) {
-				if (is_qpsafe(last)) {
-					*outptr++ = last;
-					sofar++;
-				} else {
-					*outptr++ = '=';
-					*outptr++ = tohex[(last >> 4) & 0xf];
-					*outptr++ = tohex[last & 0xf];
-					sofar += 3;
-				}
-			}
-			
-			if (is_qpsafe(c)) {
-				if (sofar > 74) {
-					*outptr++ = '=';
-					*outptr++ = '\n';
-					sofar = 0;
-				}
-				
-				/* delay output of space char */
-				if (c==' ' || c=='\t') {
-					last = c;
-				} else {
-					*outptr++ = c;
-					sofar++;
-					last = -1;
-				}
-			} else {
-				if (sofar > 72) {
-					*outptr++ = '=';
-					*outptr++ = '\n';
-					sofar = 3;
-				} else
-					sofar += 3;
-				
-				*outptr++ = '=';
-				*outptr++ = tohex[(c >> 4) & 0xf];
-				*outptr++ = tohex[c & 0xf];
-				last = -1;
-			}
-		}
-	}
-	*save = sofar;
-	*statep = last;
-	
-	return (outptr - out);
-}
-
-/*
-  FIXME: this does not strip trailing spaces from lines (as it should, rfc 2045, section 6.7)
-  Should it also canonicalise the end of line to CR LF??
-
-  Note: Trailing rubbish (at the end of input), like = or =x or =\r will be lost.
-*/ 
-
-int
-quoted_decode_step(unsigned char *in, int len, unsigned char *out, int *savestate, int *saveme)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	int state, save;
-
-	inend = in+len;
-	outptr = out;
-
-	d(printf("quoted-printable, decoding text '%.*s'\n", len, in));
-
-	state = *savestate;
-	save = *saveme;
-	inptr = in;
-	while (inptr<inend) {
-		switch (state) {
-		case 0:
-			while (inptr<inend) {
-				c = *inptr++;
-				/* FIXME: use a specials table to avoid 3 comparisons for the common case */
-				if (c=='=') { 
-					state = 1;
-					break;
-				}
-#ifdef CANONICALISE_EOL
-				/*else if (c=='\r') {
-					state = 3;
-				} else if (c=='\n') {
-					*outptr++ = '\r';
-					*outptr++ = c;
-					} */
-#endif
-				else {
-					*outptr++ = c;
-				}
-			}
-			break;
-		case 1:
-			c = *inptr++;
-			if (c=='\n') {
-				/* soft break ... unix end of line */
-				state = 0;
-			} else {
-				save = c;
-				state = 2;
-			}
-			break;
-		case 2:
-			c = *inptr++;
-			if (isxdigit(c) && isxdigit(save)) {
-				c = toupper(c);
-				save = toupper(save);
-				*outptr++ = (((save>='A'?save-'A'+10:save-'0')&0x0f) << 4)
-					| ((c>='A'?c-'A'+10:c-'0')&0x0f);
-			} else if (c=='\n' && save == '\r') {
-				/* soft break ... canonical end of line */
-			} else {
-				/* just output the data */
-				*outptr++ = '=';
-				*outptr++ = save;
-				*outptr++ = c;
-			}
-			state = 0;
-			break;
-#ifdef CANONICALISE_EOL
-		case 3:
-			/* convert \r -> to \r\n, leaves \r\n alone */
-			c = *inptr++;
-			if (c=='\n') {
-				*outptr++ = '\r';
-				*outptr++ = c;
-			} else {
-				*outptr++ = '\r';
-				*outptr++ = '\n';
-				*outptr++ = c;
-			}
-			state = 0;
-			break;
-#endif
-		}
-	}
-
-	*savestate = state;
-	*saveme = save;
-
-	return outptr-out;
-}
-
-/*
-  this is for the "Q" encoding of international words,
-  which is slightly different than plain quoted-printable (mainly by allowing 0x20 <> _)
-*/
-static int
-quoted_decode(const unsigned char *in, int len, unsigned char *out)
-{
-	register const unsigned char *inptr;
-	register unsigned char *outptr;
-	unsigned const char *inend;
-	unsigned char c, c1;
-	int ret = 0;
-
-	inend = in+len;
-	outptr = out;
-
-	d(printf("decoding text '%.*s'\n", len, in));
-
-	inptr = in;
-	while (inptr<inend) {
-		c = *inptr++;
-		if (c=='=') {
-			/* silently ignore truncated data? */
-			if (inend-in>=2) {
-				c = toupper(*inptr++);
-				c1 = toupper(*inptr++);
-				*outptr++ = (((c>='A'?c-'A'+10:c-'0')&0x0f) << 4)
-					| ((c1>='A'?c1-'A'+10:c1-'0')&0x0f);
-			} else {
-				ret = -1;
-				break;
-			}
-		} else if (c=='_') {
-			*outptr++ = 0x20;
-		} else if (c==' ' || c==0x09) {
-			/* FIXME: this is an error! ignore for now ... */
-			ret = -1;
-			break;
-		} else {
-			*outptr++ = c;
-		}
-	}
-	if (ret==0) {
-		return outptr-out;
-	}
-	return -1;
-}
-
-/* rfc2047 version of quoted-printable */
-/* safemask is the mask to apply to the camel_mime_special_table to determine what
-   characters can safely be included without encoding */
-static int
-quoted_encode(const unsigned char *in, int len, unsigned char *out, unsigned short safemask)
-{
-	register const unsigned char *inptr, *inend;
-	unsigned char *outptr;
-	unsigned char c;
-
-	inptr = in;
-	inend = in + len;
-	outptr = out;
-	while (inptr < inend) {
-		c = *inptr++;
-		if (camel_mime_special_table[c] & safemask) {
-			if (c==' ')
-				c = '_';
-			*outptr++ = c;
-		} else {
-			*outptr++ = '=';
-			*outptr++ = tohex[(c >> 4) & 0xf];
-			*outptr++ = tohex[c & 0xf];
-		}
-	}
-
-	d(printf("encoding '%.*s' = '%.*s'\n", len, in, outptr-out, out));
-
-	return (outptr - out);
-}
-
-
-static void
-header_decode_lwsp(const char **in)
-{
-	const char *inptr = *in;
-	char c;
-
-	d2(printf("is ws: '%s'\n", *in));
-
-	while (is_lwsp(*inptr) || (*inptr =='(' && *inptr != '\0')) {
-		while (is_lwsp(*inptr) && inptr != '\0') {
-			d2(printf("(%c)", *inptr));
-			inptr++;
-		}
-		d2(printf("\n"));
-
-		/* check for comments */
-		if (*inptr == '(') {
-			int depth = 1;
-			inptr++;
-			while (depth && (c=*inptr) && *inptr != '\0') {
-				if (c=='\\' && inptr[1]) {
-					inptr++;
-				} else if (c=='(') {
-					depth++;
-				} else if (c==')') {
-					depth--;
-				}
-				inptr++;
-			}
-		}
-	}
-	*in = inptr;
-}
-
-/* decode rfc 2047 encoded string segment */
-static char *
-rfc2047_decode_word(const char *in, int len)
-{
-	const char *inptr = in+2;
-	const char *inend = in+len-2;
-	char *encname;
-	int tmplen;
-	int ret;
-	char *decword = NULL;
-	char *decoded = NULL;
-	char *outbase = NULL;
-	char *inbuf, *outbuf;
-	int inlen, outlen;
-	unicode_iconv_t ic;
-
-	d(printf("decoding '%.*s'\n", len, in));
-
-	/* just make sure we're not passed shit */
-	if (len<7
-	    || !(in[0]=='=' && in[1]=='?' && in[len-1]=='=' && in[len-2]=='?')) {
-		d(printf("invalid\n"));
-		return NULL;
-	}
-
-	inptr = memchr(inptr, '?', inend-inptr);
-	if (inptr!=NULL
-	    && inptr<inend+2
-	    && inptr[2]=='?') {
-		d(printf("found ?, encoding is '%c'\n", inptr[0]));
-		inptr++;
-		tmplen = inend-inptr-2;
-		decword = alloca(tmplen); /* this will always be more-than-enough room */
-		switch(toupper(inptr[0])) {
-		case 'Q':
-			inlen = quoted_decode(inptr+2, tmplen, decword);
-			break;
-		case 'B': {
-			int state=0;
-			unsigned int save=0;
-			inlen = base64_decode_step((char *)inptr+2, tmplen, decword, &state, &save);
-			/* if state != 0 then error? */
-			break;
-		}
-		}
-		d(printf("The encoded length = %d\n", inlen));
-		if (inlen>0) {
-			/* yuck, all this snot is to setup iconv! */
-			tmplen = inptr-in-3;
-			encname = alloca(tmplen+1);
-			encname[tmplen]=0;
-			memcpy(encname, in+2, tmplen);
-
-			inbuf = decword;
-
-			outlen = inlen*6;
-			outbase = alloca(outlen);
-			outbuf = outbase;
-
-			/* TODO: Should this cache iconv converters? */
-			ic = unicode_iconv_open("UTF-8", encname);
-			if (ic != (unicode_iconv_t)-1) {
-				ret = unicode_iconv(ic, (const char **)&inbuf, &inlen, &outbuf, &outlen);
-				unicode_iconv_close(ic);
-				if (ret>=0) {
-					*outbuf = 0;
-					decoded = g_strdup(outbase);
-				}
-			} else {
-				w(g_warning("Cannot decode charset, header display may be corrupt: %s: %s", encname, strerror(errno)));
-				/* TODO: Should this do this, or just leave the encoded strings? */
-				decword[inlen] = 0;
-				decoded = g_strdup(decword);
-			}
-		}
-	}
-
-	d(printf("decoded '%s'\n", decoded));
-
-	return decoded;
-}
-
-/* grrr, glib should have this ! */
-static GString *
-g_string_append_len(GString *st, const char *s, int l)
-{
-	char *tmp;
-
-	tmp = alloca(l+1);
-	tmp[l]=0;
-	memcpy(tmp, s, l);
-	return g_string_append(st, tmp);
-}
-
-/* ok, a lot of mailers are BROKEN, and send iso-latin1 encoded
-   headers, when they should just be sticking to US-ASCII
-   according to the rfc's.  Anyway, since the conversion to utf-8
-   is trivial, just do it here without iconv */
-static GString *
-append_latin1(GString *out, const char *in, int len)
-{
-	unsigned int c;
-
-	while (len) {
-		c = (unsigned int)*in++;
-		len--;
-		if (c & 0x80) {
-			out = g_string_append_c(out, 0xc0 | ((c>>6) & 0x3));		/* 110000xx */
-			out = g_string_append_c(out, 0x80 | (c&0x3f)); 	/* 10xxxxxx */
-		} else {
-			out = g_string_append_c(out, c);
-		}
-	}
-	return out;
-}
-
-/* decodes a simple text, rfc822 */
-static char *
-header_decode_text (const char *in, int inlen)
-{
-	GString *out;
-	char *inptr, *inend, *start;
-	char *decoded;
-	
-	out = g_string_new ("");
-	start = inptr = (char *) in;
-	inend = inptr + inlen;
-	
-	while (inptr && inptr < inend) {
-		char c = *inptr++;
-		
-		if (isspace (c)) {
-			char *word, *dword;
-			guint len;
-			
-			len = inptr - start - 1;
-			word = start;
-			
-			dword = rfc2047_decode_word (word, len);
-			
-			if (dword) {
-				g_string_append (out, dword);
-				g_free (dword);
-			} else {
-				out = append_latin1 (out, word, len);
-			}
-			
-			g_string_append_c (out, c);
-			
-			start = inptr;
-		}
-	}
-	
-	if (inptr - start) {
-		char *word, *dword;
-		guint len;
-		
-		len = inptr - start;
-		word = start;
-		
-		dword = rfc2047_decode_word (word, len);
-		
-		if (dword) {
-			g_string_append (out, dword);
-			g_free (dword);
-		} else {
-			out = g_string_append_len (out, word, len);
-		}
-	}
-	
-	decoded = out->str;
-	g_string_free (out, FALSE);
-	
-	return decoded;
-}
-
-#if 0     /* This is broken */
-
-/* so in what way is it broken? */
-
-/* decodes a simple text, rfc822 */
-static char *
-header_decode_text(const char *in, int inlen)
-{
-	GString *out;
-	const char *inptr = in;
-	const char *inend = in+inlen;
-	char *encstart, *encend;
-	char *decword;
-
-	out = g_string_new("");
-	while ( (encstart = strstr(inptr, "=?"))
-		&& (encend = strstr(encstart+2, "?=")) ) {
-
-		decword = rfc2047_decode_word(encstart, encend-encstart+2);
-		if (decword) {
-			out = g_string_append_len(out, inptr, encstart-inptr);
-			out = g_string_append_len(out, decword, strlen(decword));
-			g_free (decword);
-		} else {
-			out = append_latin1(out, inptr, encend-inptr+2);
-		}
-		inptr = encend+2;
-	}
-	out = append_latin1(out, inptr, inend-inptr);
-
-	encstart = out->str;
-	g_string_free(out, FALSE);
-
-	return encstart;
-}
-#endif
-
-char *
-header_decode_string(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-	return header_decode_text(in, strlen(in));
-}
-
-static char *encoding_map[] = {
-	"US-ASCII",
-	"ISO-8859-1",
-	"UTF-8"
-};
-
-/* FIXME: needs a way to cache iconv opens for different charsets? */
-static void
-rfc2047_encode_word(GString *outstring, const char *in, int len, const char *type, unsigned short safemask)
-{
-	unicode_iconv_t ic;
-	char *buffer, *out, *ascii;
-	size_t inlen, outlen, enclen;
-
-	d(printf("Converting '%.*s' to %s\n", len, in, type));
-
-	/* convert utf8->encoding */
-	outlen = len*6;
-	buffer = alloca(outlen);
-	inlen = len;
-	out = buffer;
-
-	/* if we can't convert from utf-8, just encode as utf-8 */
-	if (!strcasecmp(type, "UTF-8")
-	    || (ic = unicode_iconv_open(type, "UTF-8")) == (unicode_iconv_t)-1) {
-		memcpy(buffer, in, len);
-		out = buffer+len;
-		type = "UTF-8";
-	} else {
-		if (unicode_iconv(ic, &in, &inlen, &out, &outlen) == -1) {
-			w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno)));
-		}
-		unicode_iconv_close(ic);
-	}
-	enclen = out-buffer;
-
-	/* now create qp version */
-	ascii = alloca(enclen*3 + strlen(type) + 8);
-	out = ascii;
-	/* should determine which encoding is smaller, and use that? */
-	out += sprintf(out, "=?%s?Q?", type);
-	out += quoted_encode(buffer, enclen, out, safemask);
-	sprintf(out, "?=");
-
-	d(printf("converted = %s\n", ascii));
-	g_string_append(outstring, ascii);
-}
-
-
-/* TODO: Should this worry about quotes?? */
-char *
-header_encode_string(const unsigned char *in)
-{
-	GString *out;
-	const unsigned char *inptr = in, *start;
-	int encoding;
-	char *outstr;
-
-	if (in == NULL)
-		return NULL;
-
-	/* do a quick us-ascii check (the common case?) */
-	while (*inptr) {
-		if (*inptr > 127)
-			break;
-		inptr++;
-	}
-	if (*inptr == 0)
-		return g_strdup(in);
-
-	/* This gets each word out of the input, and checks to see what charset
-	   can be used to encode it. */
-	/* TODO: Work out when to merge subsequent words, or across word-parts */
-	/* FIXME: Make sure a converted word is less than the encoding size */
-	out = g_string_new("");
-	inptr = in;
-	encoding = 0;
-	start = inptr;
-	while (inptr && *inptr) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			w(g_warning("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s", (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		if (unicode_isspace(c)) {
-			/* we've reached the end of a 'word' */
-			switch (encoding) {
-			case 0:
-				out = g_string_append_len(out, start, inptr-start);
-				break;
-			case 1:
-				rfc2047_encode_word(out, start, inptr-start-1, "ISO-8859-1", IS_ESAFE);
-				out = g_string_append_c (out, c);
-				break;
-			case 2:
-				rfc2047_encode_word(out, start, inptr-start-1,
-						    camel_charset_best(start, inptr-start-1), IS_ESAFE);
-				out = g_string_append_c(out, c);
-				break;
-			}
-			start = inptr;
-			encoding = 0;
-		} else if (c > 127 && c < 256) {
-			encoding = MAX(encoding, 1);
-		} else if (c >= 256) {
-			encoding = MAX(encoding, 2);
-		}
-	}
-	if (inptr-start) {
-		switch (encoding) {
-		case 0:
-			out = g_string_append_len(out, start, inptr-start);
-			break;
-		case 1:
-			rfc2047_encode_word(out, start, inptr-start, "ISO-8859-1", IS_ESAFE);
-			break;
-		case 2:
-			rfc2047_encode_word(out, start, inptr-start,
-					    camel_charset_best(start, inptr-start-1), IS_ESAFE);
-			break;
-		}
-	}
-	outstr = out->str;
-	g_string_free(out, FALSE);
-	return outstr;
-}
-
-/* apply quoted-string rules to a string */
-static void
-quote_word(GString *out, gboolean do_quotes, const char *start, int len)
-{
-	int i, c;
-
-	/* TODO: What about folding on long lines? */
-	if (do_quotes)
-		g_string_append_c(out, '"');
-	for (i=0;i<len;i++) {
-		c = *start++;
-		if (c == '\"' || c=='\\' || c=='\r')
-			g_string_append_c(out, '\\');
-		g_string_append_c(out, c);
-	}
-	if (do_quotes)
-		g_string_append_c(out, '"');
-}
-
-/* incrementing possibility for the word type */
-enum _phrase_word_t {
-	WORD_ATOM,
-	WORD_QSTRING,
-	WORD_2047
-};
-
-struct _phrase_word {
-	const unsigned char *start, *end;
-	enum _phrase_word_t type;
-	int encoding;
-};
-
-/* split the input into words
-   with info about each word
-   merge common word types
-   clean up
-*/
-/* encodes a phrase sequence (different quoting/encoding rules to strings) */
-char *
-header_encode_phrase(const unsigned char *in)
-{
-	GString *out;
-	const unsigned char *inptr = in, *start, *last;
-	int encoding;
-	char *outstr;
-	struct _phrase_word *word, *next;
-	enum _phrase_word_t type;
-	GList *words = NULL, *wordl, *nextl;
-	int count;
-
-	if (in == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-	/* break the input into words */
-	type = WORD_ATOM;
-	count = 0;
-	last = inptr;
-	start = inptr;
-	encoding = 0;
-	while (inptr && *inptr) {
-		unicode_char_t c;
-		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
-		if (newinptr == NULL) {
-			w(g_warning("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s", (inptr-in), inptr[0], in));
-			inptr++;
-			continue;
-		}
-		inptr = newinptr;
-		/* save this word out, multiple whitespace is not explicitly counted (?) */
-		if (unicode_isspace(c)) {
-			if (count > 0) {
-				word = g_malloc0(sizeof(*word));
-				word->start = start;
-				word->end = last;
-				word->type = type;
-				word->encoding = encoding;
-				words = g_list_append(words, word);
-				count = 0;
-			}
-			start = inptr;
-			type = WORD_ATOM;
-			encoding = 0;
-		} else {
-			count++;
-			if (c<128) {
-				if (!is_atom(c))
-					type = MAX(type, WORD_QSTRING);
-			} else if (c>127 && c < 256) {
-				type = WORD_2047;
-				encoding = MAX(encoding, 1);
-			} else if (c >=256) {
-				type = WORD_2047;
-				encoding = MAX(encoding, 2);
-			}
-		}
-		last = inptr;
-	}
-	if (count > 0) {
-		word = g_malloc0(sizeof(*word));
-		word->start = start;
-		word->end = last;
-		word->type = type;
-		word->encoding = encoding;
-		words = g_list_append(words, word);
-	}
-
-	/* now scan the list, checking for words of similar types that can be merged */
-	wordl = words;
-	while (wordl) {
-		word = wordl->data;
-		/* leave atoms as atoms (unless they're surrounded by quoted words??) */
-		if (word->type != WORD_ATOM) {
-			nextl = g_list_next(wordl);
-			while (nextl) {
-				next = nextl->data;
-				/* merge nodes of the same (or lower?) type*/
-				if (word->type == next->type || (next->type < word->type && word->type < WORD_2047) ) {
-					word->end = next->end;
-					words = g_list_remove_link(words, nextl);
-					g_free(next);
-					nextl = g_list_next(wordl);
-				} else {
-					break;
-				}
-			}
-		}
-		wordl = g_list_next(wordl);
-	}
-
-	/* output words now with spaces between them */
-	wordl = words;
-	while (wordl) {
-		word = wordl->data;
-		switch (word->type) {
-		case WORD_ATOM:
-			out = g_string_append_len(out, word->start, word->end-word->start);
-			break;
-		case WORD_QSTRING:
-			quote_word(out, TRUE, word->start, word->end-word->start);
-			break;
-		case WORD_2047:
-			if (word->encoding == 1)
-				rfc2047_encode_word(out, word->start, word->end-word->start, "ISO-8859-1", IS_PSAFE);
-			else
-				rfc2047_encode_word(out, word->start, word->end-word->start,
-						    camel_charset_best(word->start, word->end-word->start), IS_PSAFE);
-			break;
-		}
-
-		/* copy across the right number of spaces between words */
-		nextl = g_list_next(wordl);
-		if (nextl) {
-			int i;
-			next = nextl->data;
-			for (i=next->start-word->end;i>0;i--)
-				out = g_string_append_c(out, ' ');
-		}
-
-		g_free(word);
-		wordl = g_list_next(wordl);
-	}
-	/* and we no longer need the list */
-	g_list_free(words);
-
-	outstr = out->str;
-	g_string_free(out, FALSE);
-	return outstr;
-}
-
-
-/* these are all internal parser functions */
-
-static char *
-decode_token(const char **in)
-{
-	const char *inptr = *in;
-	const char *start;
-
-	header_decode_lwsp(&inptr);
-	start = inptr;
-	while (is_ttoken(*inptr))
-		inptr++;
-	if (inptr>start) {
-		*in = inptr;
-		return g_strndup(start, inptr-start);
-	} else {
-		return NULL;
-	}
-}
-
-char *
-header_token_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return decode_token(&in);
-}
-
-/*
-   <"> * ( <any char except <"> \, cr  /  \ <any char> ) <">
-*/
-static char *
-header_decode_quoted_string(const char **in)
-{
-	const char *inptr = *in;
-	char *out = NULL, *outptr;
-	int outlen;
-	int c;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		const char *intmp;
-		int skip = 0;
-
-		/* first, calc length */
-		inptr++;
-		intmp = inptr;
-		while ( (c = *intmp++) && c!= '"' && c != '\0') {
-			if (c=='\\' && *intmp) {
-				intmp++;
-				skip++;
-			}
-		}
-		outlen = intmp-inptr-skip;
-		out = outptr = g_malloc(outlen+1);
-		while ( (c = *inptr++) && c!= '"' && c != '\0') {
-			if (c=='\\' && *inptr) {
-				c = *inptr++;
-			}
-			*outptr++ = c;
-		}
-		*outptr = 0;
-	}
-	*in = inptr;
-	return out;
-}
-
-static char *
-header_decode_atom(const char **in)
-{
-	const char *inptr = *in, *start;
-
-	header_decode_lwsp(&inptr);
-	start = inptr;
-	while (is_atom(*inptr))
-		inptr++;
-	*in = inptr;
-	if (inptr > start)
-		return g_strndup(start, inptr-start);
-	else
-		return NULL;
-}
-
-static char *
-header_decode_word(const char **in)
-{
-	const char *inptr = *in;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		*in = inptr;
-		return header_decode_quoted_string(in);
-	} else {
-		*in = inptr;
-		return header_decode_atom(in);
-	}
-}
-
-static char *
-header_decode_value(const char **in)
-{
-	const char *inptr = *in;
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '"') {
-		d(printf("decoding quoted string\n"));
-		return header_decode_quoted_string(in);
-	} else if (is_ttoken(*inptr)) {
-		d(printf("decoding token\n"));
-		/* this may not have the right specials for all params? */
-		return decode_token(in);
-	}
-	return NULL;
-}
-
-/* shoudl this return -1 for no int? */
-static int
-header_decode_int(const char **in)
-{
-	const char *inptr = *in;
-	int c, v=0;
-
-	header_decode_lwsp(&inptr);
-	while ( (c=*inptr++ & 0xff)
-		&& isdigit(c) ) {
-		v = v*10+(c-'0');
-	}
-	*in = inptr-1;
-	return v;
-}
-
-static int
-header_decode_param(const char **in, char **paramp, char **valuep)
-{
-	const char *inptr = *in;
-	char *param, *value=NULL;
-
-	param = decode_token(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == '=') {
-		inptr++;
-		value = header_decode_value(&inptr);
-	}
-
-	if (param && value) {
-		*paramp = param;
-		*valuep = value;
-		*in = inptr;
-		return 0;
-	} else {
-		g_free(param);
-		g_free(value);
-		return 1;
-	}
-}
-
-char *
-header_param(struct _header_param *p, const char *name)
-{
-	while (p && strcasecmp(p->name, name) != 0)
-		p = p->next;
-	if (p)
-		return p->value;
-	return NULL;
-}
-
-struct _header_param *
-header_set_param(struct _header_param **l, const char *name, const char *value)
-{
-	struct _header_param *p = (struct _header_param *)l, *pn;
-
-	while (p->next) {
-		pn = p->next;
-		if (!strcasecmp(pn->name, name)) {
-			g_free(pn->value);
-			if (value) {
-				pn->value = g_strdup(value);
-				return pn;
-			} else {
-				p->next = pn->next;
-				g_free(pn);
-				return NULL;
-			}
-		}
-		p = pn;
-	}
-
-	if (value == NULL)
-		return NULL;
-
-	pn = g_malloc(sizeof(*pn));
-	pn->next = 0;
-	pn->name = g_strdup(name);
-	pn->value = g_strdup(value);
-	p->next = pn;
-
-	return pn;
-}
-
-const char *
-header_content_type_param(struct _header_content_type *t, const char *name)
-{
-	if (t==NULL)
-		return NULL;
-	return header_param(t->params, name);
-}
-
-void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value)
-{
-	header_set_param(&t->params, name, value);
-}
-
-/**
- * header_content_type_is:
- * @ct: A content type specifier, or #NULL.
- * @type: A type to check against.
- * @subtype: A subtype to check against, or "*" to match any subtype.
- * 
- * Returns #TRUE if the content type @ct is of type @type/@subtype.
- * The subtype of "*" will match any subtype.  If @ct is #NULL, then
- * it will match the type "text/plain".
- * 
- * Return value: #TRUE or #FALSE depending on the matching of the type.
- **/
-int
-header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype)
-{
-	/* no type == text/plain or text/"*" */
-	if (ct==NULL || (ct->type == NULL && ct->subtype == NULL)) {
-		return (!strcasecmp(type, "text")
-			&& (!strcasecmp(subtype, "plain")
-			    || !strcasecmp(subtype, "*")));
-	}
-
-	return (ct->type != NULL
-		&& (!strcasecmp(ct->type, type)
-		    && ((ct->subtype != NULL
-			 && !strcasecmp(ct->subtype, subtype))
-			|| !strcasecmp("*", subtype))));
-}
-
-void
-header_param_list_free(struct _header_param *p)
-{
-	struct _header_param *n;
-
-	while (p) {
-		n = p->next;
-		g_free(p->name);
-		g_free(p->value);
-		g_free(p);
-		p = n;
-	}
-}
-
-struct _header_content_type *
-header_content_type_new(const char *type, const char *subtype)
-{
-	struct _header_content_type *t = g_malloc(sizeof(*t));
-
-	t->type = g_strdup(type);
-	t->subtype = g_strdup(subtype);
-	t->params = NULL;
-	t->refcount = 1;
-	return t;
-}
-
-void
-header_content_type_ref(struct _header_content_type *ct)
-{
-	if (ct)
-		ct->refcount++;
-}
-
-
-void
-header_content_type_unref(struct _header_content_type *ct)
-{
-	if (ct) {
-		if (ct->refcount <= 1) {
-			header_param_list_free(ct->params);
-			g_free(ct->type);
-			g_free(ct->subtype);
-			g_free(ct);
-		} else {
-			ct->refcount--;
-		}
-	}
-}
-
-/* for decoding email addresses, canonically */
-static char *
-header_decode_domain(const char **in)
-{
-	const char *inptr = *in, *start;
-	int go = TRUE;
-	char *ret;
-	GString *domain = g_string_new("");
-
-				/* domain ref | domain literal */
-	header_decode_lwsp(&inptr);
-	while (go) {
-		if (*inptr == '[') { /* domain literal */
-			domain = g_string_append(domain, "[ ");
-			inptr++;
-			header_decode_lwsp(&inptr);
-			start = inptr;
-			while (is_dtext(*inptr)) {
-				domain = g_string_append_c(domain, *inptr);
-				inptr++;
-			}
-			if (*inptr == ']') {
-				domain = g_string_append(domain, " ]");
-				inptr++;
-			} else {
-				w(g_warning("closing ']' not found in domain: %s", *in));
-			}
-		} else {
-			char *a = header_decode_atom(&inptr);
-			if (a) {
-				domain = g_string_append(domain, a);
-				g_free(a);
-			} else {
-				w(g_warning("missing atom from domain-ref"));
-				break;
-			}
-		}
-		header_decode_lwsp(&inptr);
-		if (*inptr == '.') { /* next sub-domain? */
-			domain = g_string_append_c(domain, '.');
-			inptr++;
-			header_decode_lwsp(&inptr);
-		} else
-			go = FALSE;
-	}
-
-	*in = inptr;
-
-	ret = domain->str;
-	g_string_free(domain, FALSE);
-	return ret;
-}
-
-static char *
-header_decode_addrspec(const char **in)
-{
-	const char *inptr = *in;
-	char *word;
-	GString *addr = g_string_new("");
-
-	header_decode_lwsp(&inptr);
-
-	/* addr-spec */
-	word = header_decode_word(&inptr);
-	if (word) {
-		addr = g_string_append(addr, word);
-		header_decode_lwsp(&inptr);
-		g_free(word);
-		while (*inptr == '.' && word) {
-			inptr++;
-			addr = g_string_append_c(addr, '.');
-			word = header_decode_word(&inptr);
-			if (word) {
-				addr = g_string_append(addr, word);
-				header_decode_lwsp(&inptr);
-				g_free(word);
-			} else {
-				w(g_warning("Invalid address spec: %s", *in));
-			}
-		}
-		if (*inptr == '@') {
-			inptr++;
-			addr = g_string_append_c(addr, '@');
-			word = header_decode_domain(&inptr);
-			if (word) {
-				addr = g_string_append(addr, word);
-				g_free(word);
-			} else {
-				w(g_warning("Invalid address, missing domain: %s", *in));
-			}
-		} else {
-			w(g_warning("Invalid addr-spec, missing @: %s", *in));
-		}
-	} else {
-		w(g_warning("invalid addr-spec, no local part"));
-	}
-
-	/* FIXME: return null on error? */
-
-	*in = inptr;
-	word = addr->str;
-	g_string_free(addr, FALSE);
-	return word;
-}
-
-/*
-  address:
-   word *('.' word) @ domain |
-   *(word) '<' [ *('@' domain ) ':' ] word *( '.' word) @ domain |
-
-   1*word ':' [ word ... etc (mailbox, as above) ] ';'
- */
-
-/* mailbox:
-   word *( '.' word ) '@' domain
-   *(word) '<' [ *('@' domain ) ':' ] word *( '.' word) @ domain
-   */
-
-static struct _header_address *
-header_decode_mailbox(const char **in)
-{
-	const char *inptr = *in;
-	char *pre;
-	int closeme = FALSE;
-	GString *addr;
-	GString *name = NULL;
-	struct _header_address *address = NULL;
-
-	addr = g_string_new("");
-
-	/* for each address */
-	pre = header_decode_word(&inptr);
-	header_decode_lwsp(&inptr);
-	if (!(*inptr == '.' || *inptr == '@' || *inptr==',' || *inptr=='\0')) {
-		/* ',' and '\0' required incase it is a simple address, no @ domain part (buggy writer) */
-		name = g_string_new("");
-		while (pre) {
-			char *text;
-
-			/* perform internationalised decoding, and appent */
-			text = header_decode_string(pre);
-			name = g_string_append(name, text);
-			g_free(pre);
-			g_free(text);
-
-			pre = header_decode_word(&inptr);
-			if (pre)
-				name = g_string_append_c(name, ' ');
-		}
-		header_decode_lwsp(&inptr);
-		if (*inptr == '<') {
-			closeme = TRUE;
-			inptr++;
-			header_decode_lwsp(&inptr);
-			if (*inptr == '@') {
-				while (*inptr == '@') {
-					inptr++;
-					header_decode_domain(&inptr);
-					header_decode_lwsp(&inptr);
-					if (*inptr == ',') {
-						inptr++;
-						header_decode_lwsp(&inptr);
-					}
-				}
-				if (*inptr == ':') {
-					inptr++;
-				} else {
-					w(g_warning("broken route-address, missing ':': %s", *in));
-				}
-			}
-			pre = header_decode_word(&inptr);
-			header_decode_lwsp(&inptr);
-		} else {
-			w(g_warning("broken address? %s", *in));
-		}
-	}
-
-	if (pre) {
-		addr = g_string_append(addr, pre);
-	} else {
-		w(g_warning("No local-part for email address: %s", *in));
-	}
-
-	/* should be at word '.' localpart */
-	while (*inptr == '.' && pre) {
-		inptr++;
-		g_free(pre);
-		pre = header_decode_word(&inptr);
-		if (pre) {
-			addr = g_string_append_c(addr, '.');
-			addr = g_string_append(addr, pre);
-		}
-		header_decode_lwsp(&inptr);
-	}
-	g_free(pre);
-
-	/* now at '@' domain part */
-	if (*inptr == '@') {
-		char *dom;
-
-		inptr++;
-		addr = g_string_append_c(addr, '@');
-		dom = header_decode_domain(&inptr);
-		addr = g_string_append(addr, dom);
-		g_free(dom);
-	} else {
-		w(g_warning("invalid address, no '@' domain part at %c: %s", *inptr, *in));
-	}
-
-	if (closeme) {
-		header_decode_lwsp(&inptr);
-		if (*inptr == '>') {
-			inptr++;
-		} else {
-			w(g_warning("invalid route address, no closing '>': %s", *in));
-		} 
-	} else if (name == NULL) { /* check for comment after address */
-		char *text, *tmp;
-		const char *comment = inptr;
-
-		header_decode_lwsp(&inptr);
-		if (inptr-comment > 3) { /* just guess ... */
-			tmp = g_strndup(comment, inptr-comment);
-			text = header_decode_string(tmp);
-			name = g_string_new(text);
-			g_free(tmp);
-			g_free(text);
-		}
-	}
-
-	*in = inptr;
-
-	if (addr->len > 0) {
-		address = header_address_new_name(name?name->str:"", addr->str);
-	}
-
-	g_string_free(addr, TRUE);
-	if (name)
-		g_string_free(name, TRUE);
-
-	d(printf("got mailbox: %s\n", addr->str));
-	return address;
-}
-
-static struct _header_address *
-header_decode_address(const char **in)
-{
-	const char *inptr = *in;
-	char *pre;
-	GString *group = g_string_new("");
-	struct _header_address *addr = NULL, *member;
-
-	/* pre-scan, trying to work out format, discard results */
-	header_decode_lwsp(&inptr);
-	while ( (pre = header_decode_word(&inptr)) ) {
-		group = g_string_append(group, pre);
-		group = g_string_append(group, " ");
-		g_free(pre);
-	}
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':') {
-		d(printf("group detected: %s\n", group->str));
-		addr = header_address_new_group(group->str);
-		/* that was a group spec, scan mailbox's */
-		inptr++;
-		/* FIXME: check rfc 2047 encodings of words, here or above in the loop */
-		header_decode_lwsp(&inptr);
-		if (*inptr != ';') {
-			int go = TRUE;
-			do {
-				member = header_decode_mailbox(&inptr);
-				if (member)
-					header_address_add_member(addr, member);
-				header_decode_lwsp(&inptr);
-				if (*inptr == ',')
-					inptr++;
-				else
-					go = FALSE;
-			} while (go);
-			if (*inptr == ';') {
-				inptr++;
-			} else {
-				w(g_warning("Invalid group spec, missing closing ';': %s", *in));
-			}
-		} else {
-			inptr++;
-		}
-		*in = inptr;
-	} else {
-		addr = header_decode_mailbox(in);
-	}
-
-	g_string_free(group, TRUE);
-
-	return addr;
-}
-
-static char *
-header_msgid_decode_internal(const char **in)
-{
-	const char *inptr = *in;
-	char *msgid = NULL;
-
-	d(printf("decoding Message-ID: '%s'\n", *in));
-
-	header_decode_lwsp(&inptr);
-	if (*inptr == '<') {
-		inptr++;
-		header_decode_lwsp(&inptr);
-		msgid = header_decode_addrspec(&inptr);
-		if (msgid) {
-			header_decode_lwsp(&inptr);
-			if (*inptr == '>') {
-				inptr++;
-			} else {
-				w(g_warning("Missing closing '>' on message id: %s", *in));
-			}
-		} else {
-			w(g_warning("Cannot find message id in: %s", *in));
-		}
-	} else {
-		w(g_warning("missing opening '<' on message id: %s", *in));
-	}
-	*in = inptr;
-
-	return msgid;
-}
-
-char *
-header_msgid_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_msgid_decode_internal(&in);
-}
-
-void
-header_references_list_append_asis(struct _header_references **list, char *ref)
-{
-	struct _header_references *w = (struct _header_references *)list, *n;
-	while (w->next)
-		w = w->next;
-	n = g_malloc(sizeof(*n));
-	n->id = ref;
-	n->next = 0;
-	w->next = n;
-}
-
-int
-header_references_list_size(struct _header_references **list)
-{
-	int count = 0;
-	struct _header_references *w = *list;
-	while (w) {
-		count++;
-		w = w->next;
-	}
-	return count;
-}
-
-void
-header_references_list_clear(struct _header_references **list)
-{
-	struct _header_references *w = *list, *n;
-	while (w) {
-		n = w->next;
-		g_free(w->id);
-		g_free(w);
-		w = n;
-	}
-	*list = NULL;
-}
-
-/* generate a list of references, from most recent up */
-struct _header_references *
-header_references_decode(const char *in)
-{
-	const char *inptr = in;
-	struct _header_references *head = NULL, *node;
-	char *id, *word;
-
-	if (in == NULL || in[0] == '\0')
-		return NULL;
-
-	while (*inptr) {
-		header_decode_lwsp(&inptr);
-		if (*inptr == '<') {
-			id = header_msgid_decode_internal(&inptr);
-			if (id) {
-				node = g_malloc(sizeof(*node));
-				node->next = head;
-				head = node;
-				node->id = id;
-			}
-		} else {
-			word = header_decode_word(&inptr);
-			if (word)
-				g_free (word);
-			else if (*inptr != '\0')
-				inptr++; /* Stupid mailer tricks */
-		}
-	}
-
-	return head;
-}
-
-struct _header_references *
-header_references_dup(const struct _header_references *list)
-{
-	struct _header_references *new = NULL, *tmp;
-
-	while (list) {
-		tmp = g_new(struct _header_references, 1);
-		tmp->next = new;
-		tmp->id = g_strdup(list->id);
-		new = tmp;
-		list = list->next;
-	}
-	return new;
-}
-
-struct _header_address *
-header_mailbox_decode(const char *in)
-{
-	if (in == NULL)
-		return NULL;
-
-	return header_decode_mailbox(&in);
-}
-
-struct _header_address *
-header_address_decode(const char *in)
-{
-	const char *inptr = in, *last;
-	struct _header_address *list = NULL, *addr;
-
-	d(printf("decoding To: '%s'\n", in));
-
-	if (in == NULL)
-		return NULL;
-
-	do {
-		last = inptr;
-		addr = header_decode_address(&inptr);
-		if (addr)
-			header_address_list_append(&list, addr);
-		header_decode_lwsp(&inptr);
-		if (*inptr == ',')
-			inptr++;
-		else
-			break;
-	} while (inptr != last);
-
-	if (*inptr) {
-		w(g_warning("Invalid input detected at %c (%d): %s\n or at: %s", *inptr, inptr-in, in, inptr));
-	}
-
-	if (inptr == last) {
-		w(g_warning("detected invalid input loop at : %s", last));
-	}
-
-	return list;
-}
-
-void
-header_mime_decode(const char *in, int *maj, int *min)
-{
-	const char *inptr = in;
-	int major=-1, minor=-1;
-
-	d(printf("decoding MIME-Version: '%s'\n", in));
-
-	if (in != NULL) {
-		header_decode_lwsp(&inptr);
-		if (isdigit(*inptr)) {
-			major = header_decode_int(&inptr);
-			header_decode_lwsp(&inptr);
-			if (*inptr == '.') {
-				inptr++;
-				header_decode_lwsp(&inptr);
-				if (isdigit(*inptr))
-					minor = header_decode_int(&inptr);
-			}
-		}
-	}
-
-	if (maj)
-		*maj = major;
-	if (min)
-		*min = minor;
-
-	d(printf("major = %d, minor = %d\n", major, minor));
-}
-
-static struct _header_param *
-header_param_list_decode(const char **in)
-{
-	const char *inptr = *in;
-	struct _header_param *head = NULL, *tail = NULL;
-
-	header_decode_lwsp(&inptr);
-	while (*inptr == ';') {
-		char *param, *value;
-		struct _header_param *p;
-
-		inptr++;
-		/* invalid format? */
-		if (header_decode_param(&inptr, &param, &value) != 0)
-			break;
-
-		p = g_malloc(sizeof(*p));
-		p->name = param;
-		p->value = value;
-		p->next = NULL;
-		if (head == NULL)
-			head = p;
-		if (tail)
-			tail->next = p;
-		tail = p;
-		header_decode_lwsp(&inptr);
-	}
-	*in = inptr;
-	return head;
-}
-
-static void
-header_param_list_format_append(GString *out, struct _header_param *p)
-{
-	int len = out->len;
-	char *ch;
-
-	while (p) {
-		int here = out->len;
-		if (len+strlen(p->name)+strlen(p->value)>60) {
-			out = g_string_append(out, "\n\t");
-			len = 0;
-		}
-
-		g_string_sprintfa(out, " ; %s=", p->name);
-
-		for (ch = p->value; *ch; ch++) {
-			if (is_tspecial(*ch))
-				break;
-		}
-		if (!*ch)
-			g_string_append(out, p->value);
-		else
-			quote_word(out, TRUE, p->value, strlen(p->value));
-
-		len += (out->len - here);
-		p = p->next;
-	}
-}
-
-struct _header_content_type *
-header_content_type_decode(const char *in)
-{
-	const char *inptr = in;
-	char *type, *subtype = NULL;
-	struct _header_content_type *t = NULL;
-
-	if (in==NULL)
-		return NULL;
-
-	type = decode_token(&inptr);
-	header_decode_lwsp(&inptr);
-	if (type) {
-		if  (*inptr == '/') {
-			inptr++;
-			subtype = decode_token(&inptr);
-		}
-		if (subtype == NULL && (!strcasecmp(type, "text"))) {
-			w(g_warning("text type with no subtype, resorting to text/plain: %s", in));
-			subtype = g_strdup("plain");
-		}
-		if (subtype == NULL) {
-			w(g_warning("MIME type with no subtype: %s", in));
-		}
-
-		t = header_content_type_new(type, subtype);
-		t->params = header_param_list_decode(&inptr);
-		g_free(type);
-		g_free(subtype);
-	} else {
-		g_free(type);
-		d(printf("cannot find MIME type in header (2) '%s'", in));
-	}
-	return t;
-}
-
-void
-header_content_type_dump(struct _header_content_type *ct)
-{
-	struct _header_param *p;
-
-	printf("Content-Type: ");
-	if (ct==NULL) {
-		printf("<NULL>\n");
-		return;
-	}
-	printf("%s / %s", ct->type, ct->subtype);
-	p = ct->params;
-	if (p) {
-		while (p) {
-			printf(";\n\t%s=\"%s\"", p->name, p->value);
-			p = p->next;
-		}
-	}
-	printf("\n");
-}
-
-char *
-header_content_type_format(struct _header_content_type *ct)
-{
-	GString *out;
-	char *ret;
-
-	if (ct==NULL)
-		return NULL;
-
-	out = g_string_new("");
-	if (ct->type == NULL) {
-		g_string_sprintfa(out, "text/plain");
-		w(g_warning("Content-Type with no main type"));
-	} else if (ct->subtype == NULL) {
-		w(g_warning("Content-Type with no sub type: %s", ct->type));
-		if (!strcasecmp(ct->type, "multipart"))
-			g_string_sprintfa(out, "%s/mixed", ct->type);
-		else
-			g_string_sprintfa(out, "%s", ct->type);
-	} else {
-		g_string_sprintfa(out, "%s/%s", ct->type, ct->subtype);
-	}
-	header_param_list_format_append(out, ct->params);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-char *
-header_content_encoding_decode(const char *in)
-{
-	if (in)
-		return decode_token(&in);
-	return NULL;
-}
-
-CamelMimeDisposition *header_disposition_decode(const char *in)
-{
-	CamelMimeDisposition *d = NULL;
-	const char *inptr = in;
-
-	if (in == NULL)
-		return NULL;
-
-	d = g_malloc(sizeof(*d));
-	d->refcount = 1;
-	d->disposition = decode_token(&inptr);
-	if (d->disposition == NULL)
-		w(g_warning("Empty disposition type"));
-	d->params = header_param_list_decode(&inptr);
-	return d;
-}
-
-void header_disposition_ref(CamelMimeDisposition *d)
-{
-	if (d)
-		d->refcount++;
-}
-void header_disposition_unref(CamelMimeDisposition *d)
-{
-	if (d) {
-		if (d->refcount<=1) {
-			header_param_list_free(d->params);
-			g_free(d->disposition);
-			g_free(d);
-		} else {
-			d->refcount--;
-		}
-	}
-}
-
-char *header_disposition_format(CamelMimeDisposition *d)
-{
-	GString *out;
-	char *ret;
-
-	if (d==NULL)
-		return NULL;
-
-	out = g_string_new("");
-	if (d->disposition)
-		out = g_string_append(out, d->disposition);
-	else
-		out = g_string_append(out, "attachment");
-	header_param_list_format_append(out, d->params);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-/* hrm, is there a library for this shit? */
-static struct {
-	char *name;
-	int offset;
-} tz_offsets [] = {
-	{ "UT", 0 },
-	{ "GMT", 0 },
-	{ "EST", -500 },	/* these are all US timezones.  bloody yanks */
-	{ "EDT", -400 },
-	{ "CST", -600 },
-	{ "CDT", -500 },
-	{ "MST", -700 },
-	{ "MDT", -600 },
-	{ "PST", -800 },
-	{ "PDT", -700 },
-	{ "Z", 0 },
-	{ "A", -100 },
-	{ "M", -1200 },
-	{ "N", 100 },
-	{ "Y", 1200 },
-};
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-char *
-header_format_date(time_t time, int offset)
-{
-	struct tm tm;
-
-	d(printf("offset = %d\n", offset));
-
-	d(printf("converting date %s", ctime(&time)));
-
-	time += ((offset / 100) * (60*60)) + (offset % 100)*60;
-
-	d(printf("converting date %s", ctime(&time)));
-
-	memcpy(&tm, gmtime(&time), sizeof(tm));
-
-	return g_strdup_printf("%02d %s %04d %02d:%02d:%02d %+05d",
-			       tm.tm_mday, tz_months[tm.tm_mon],
-			       tm.tm_year + 1900,
-			       tm.tm_hour, tm.tm_min, tm.tm_sec,
-			       offset);
-}
-
-/* convert a date to time_t representation */
-/* this is an awful mess oh well */
-time_t
-header_decode_date(const char *in, int *saveoffset)
-{
-	const char *inptr = in;
-	char *monthname;
-	int year, offset = 0;
-	struct tm tm;
-	int i;
-	time_t t;
-
-	if (in == NULL) {
-		if (saveoffset)
-			*saveoffset = 0;
-		return 0;
-	}
-
-	d(printf ("\ndecoding date '%s'\n", inptr));
-
-	memset (&tm, 0, sizeof(tm));
-
-	header_decode_lwsp (&inptr);
-	if (!isdigit (*inptr)) {
-		char *day = decode_token (&inptr);
-		/* we dont really care about the day, it's only for display */
-		if (day) {
-			d(printf ("got day: %s\n", day));
-			g_free (day);
-			header_decode_lwsp (&inptr);
-			if (*inptr == ',') {
-				inptr++;
-			} else {
-#ifndef CLEAN_DATE
-				char *newdate;
-
-				w(g_warning("day not followed by ',' it's probably a broken mail client, so we'll ignore its date entirely"));
-				printf ("Giving it one last chance...\n");
-				newdate = parse_broken_date (in);
-				if (newdate) {
-					printf ("Got: %s\n", newdate);
-					t = header_decode_date (newdate, saveoffset);
-					g_free (newdate);
-					return t;
-				}
-#endif
-				if (saveoffset)
-					*saveoffset = 0;
-				return 0;
-			}
-		}
-	}
-	tm.tm_mday = header_decode_int(&inptr);
-	monthname = decode_token(&inptr);
-	if (monthname) {
-		for (i=0;i<sizeof(tz_months)/sizeof(tz_months[0]);i++) {
-			if (!strcasecmp(tz_months[i], monthname)) {
-				tm.tm_mon = i;
-				break;
-			}
-		}
-		g_free(monthname);
-	}
-	year = header_decode_int(&inptr);
-	if (year<100) {
-		tm.tm_year = year;
-	} else {
-		tm.tm_year = year-1900;
-	}
-	/* get the time ... yurck */
-	tm.tm_hour = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':')
-		inptr++;
-	tm.tm_min = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == ':')
-		inptr++;
-	tm.tm_sec = header_decode_int(&inptr);
-	header_decode_lwsp(&inptr);
-	if (*inptr == '+'
-	    || *inptr == '-') {
-		offset = (*inptr++)=='-'?-1:1;
-		offset = offset * header_decode_int(&inptr);
-		d(printf("abs signed offset = %d\n", offset));
-	} else if (isdigit(*inptr)) {
-		offset = header_decode_int(&inptr);
-		d(printf("abs offset = %d\n", offset));
-	} else {
-		char *tz = decode_token(&inptr);
-
-		if (tz) {
-			for (i=0;i<sizeof(tz_offsets)/sizeof(tz_offsets[0]);i++) {
-				if (!strcasecmp(tz_offsets[i].name, tz)) {
-					offset = tz_offsets[i].offset;
-					break;
-				}
-			}
-			g_free(tz);
-		}
-		/* some broken mailers seem to put in things like GMT+1030 instead of just +1030 */
-		header_decode_lwsp(&inptr);
-		if (*inptr == '+' || *inptr == '-') {
-			int sign = (*inptr++)=='-'?-1:1;
-			offset = offset + (header_decode_int(&inptr)*sign);
-		}
-		d(printf("named offset = %d\n", offset));
-	}
-
-	t = mktime(&tm);
-#if defined(HAVE_TIMEZONE)
-	t -= timezone;
-#elif defined(HAVE_TM_GMTOFF)
-	t += tm.tm_gmtoff;
-#else
-#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.
-#endif
-
-	/* t is now GMT of the time we want, but not offset by the timezone ... */
-
-	d(printf(" gmt normalized? = %s\n", ctime(&t)));
-
-	/* this should convert the time to the GMT equiv time */
-	t -= ( (offset/100) * 60*60) + (offset % 100)*60;
-
-	d(printf(" gmt normalized for timezone? = %s\n", ctime(&t)));
-
-	d({
-		char *tmp;
-		tmp = header_format_date(t, offset);
-		printf(" encoded again: %s\n", tmp);
-		g_free(tmp);
-	});
-
-	if (saveoffset)
-		*saveoffset = offset;
-
-	return t;
-}
-
-/* extra rfc checks */
-#define CHECKS
-
-#ifdef CHECKS
-static void
-check_header(struct _header_raw *h)
-{
-	unsigned char *p;
-
-	p = h->value;
-	while (p && *p) {
-		if (!isascii(*p)) {
-			w(g_warning("Appending header violates rfc: %s: %s", h->name, h->value));
-			return;
-		}
-		p++;
-	}
-}
-#endif
-
-void
-header_raw_append_parse(struct _header_raw **list, const char *header, int offset)
-{
-	register const char *in;
-	int fieldlen;
-	char *name;
-
-	in = header;
-	while (is_fieldname(*in) || *in==':')
-		in++;
-	fieldlen = in-header-1;
-	while (is_lwsp(*in))
-		in++;
-	if (fieldlen == 0 || header[fieldlen] != ':') {
-		printf("Invalid header line: '%s'\n", header);
-		return;
-	}
-	name = alloca(fieldlen+1);
-	memcpy(name, header, fieldlen);
-	name[fieldlen] = 0;
-
-	header_raw_append(list, name, in, offset);
-}
-
-void
-header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset)
-{
-	struct _header_raw *l, *n;
-
-	d(printf("Header: %s: %s\n", name, value));
-
-	n = g_malloc(sizeof(*n));
-	n->next = NULL;
-	n->name = g_strdup(name);
-	n->value = g_strdup(value);
-	n->offset = offset;
-#ifdef CHECKS
-	check_header(n);
-#endif
-	l = (struct _header_raw *)list;
-	while (l->next) {
-		l = l->next;
-	}
-	l->next = n;
-
-	/* debug */
-#if 0
-	if (!strcasecmp(name, "To")) {
-		printf("- Decoding To\n");
-		header_to_decode(value);
-	} else if (!strcasecmp(name, "Content-type")) {
-		printf("- Decoding content-type\n");
-		header_content_type_dump(header_content_type_decode(value));		
-	} else if (!strcasecmp(name, "MIME-Version")) {
-		printf("- Decoding mime version\n");
-		header_mime_decode(value);
-	}
-#endif
-}
-
-static struct _header_raw *
-header_raw_find_node(struct _header_raw **list, const char *name)
-{
-	struct _header_raw *l;
-
-	l = *list;
-	while (l) {
-		if (!strcasecmp(l->name, name))
-			break;
-		l = l->next;
-	}
-	return l;
-}
-
-const char *
-header_raw_find(struct _header_raw **list, const char *name, int *offset)
-{
-	struct _header_raw *l;
-
-	l = header_raw_find_node(list, name);
-	if (l) {
-		if (offset)
-			*offset = l->offset;
-		return l->value;
-	} else
-		return NULL;
-}
-
-const char *
-header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last)
-{
-	struct _header_raw *l;
-
-	if (last == NULL || name == NULL)
-		return NULL;
-
-	l = *list;
-	while (l && l->value != last)
-		l = l->next;
-	return header_raw_find(&l, name, offset);
-}
-
-static void
-header_raw_free(struct _header_raw *l)
-{
-	g_free(l->name);
-	g_free(l->value);
-	g_free(l);
-}
-
-void
-header_raw_remove(struct _header_raw **list, const char *name)
-{
-	struct _header_raw *l, *p;
-
-	/* the next pointer is at the head of the structure, so this is safe */
-	p = (struct _header_raw *)list;
-	l = *list;
-	while (l) {
-		if (!strcasecmp(l->name, name)) {
-			p->next = l->next;
-			header_raw_free(l);
-			l = p->next;
-		} else {
-			p = l;
-			l = l->next;
-		}
-	}
-}
-
-void
-header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset)
-{
-	header_raw_remove(list, name);
-	header_raw_append(list, name, value, offset);
-}
-
-void
-header_raw_clear(struct _header_raw **list)
-{
-	struct _header_raw *l, *n;
-	l = *list;
-	while (l) {
-		n = l->next;
-		header_raw_free(l);
-		l = n;
-	}
-	*list = NULL;
-}
-
-
-/* ok, here's the address stuff, what a mess ... */
-struct _header_address *header_address_new(void)
-{
-	struct _header_address *h;
-	h = g_malloc0(sizeof(*h));
-	h->type = HEADER_ADDRESS_NONE;
-	h->refcount = 1;
-	return h;
-}
-
-struct _header_address *header_address_new_name(const char *name, const char *addr)
-{
-	struct _header_address *h;
-
-	h = header_address_new();
-	h->type = HEADER_ADDRESS_NAME;
-	h->name = g_strdup(name);
-	h->v.addr = g_strdup(addr);
-	return h;
-}
-
-struct _header_address *header_address_new_group(const char *name)
-{
-	struct _header_address *h;
-
-	h = header_address_new();
-	h->type = HEADER_ADDRESS_GROUP;
-	h->name = g_strdup(name);
-	return h;
-}
-
-void header_address_ref(struct _header_address *h)
-{
-	if (h)
-		h->refcount++;
-}
-
-void header_address_unref(struct _header_address *h)
-{
-	if (h) {
-		if (h->refcount <= 1) {
-			if (h->type == HEADER_ADDRESS_GROUP) {
-				header_address_list_clear(&h->v.members);
-			} else if (h->type == HEADER_ADDRESS_NAME) {
-				g_free(h->v.addr);
-			}
-			g_free(h->name);
-			g_free(h);
-		} else {
-			h->refcount--;
-		}
-	}
-}
-
-void header_address_set_name(struct _header_address *h, const char *name)
-{
-	if (h) {
-		g_free(h->name);
-		h->name = g_strdup(name);
-	}
-}
-
-void header_address_set_addr(struct _header_address *h, const char *addr)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_NAME
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_NAME;
-			g_free(h->v.addr);
-			h->v.addr = g_strdup(addr);
-		} else {
-			g_warning("Trying to set the address on a group");
-		}
-	}
-}
-
-void header_address_set_members(struct _header_address *h, struct _header_address *group)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_GROUP
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_GROUP;
-			header_address_list_clear(&h->v.members);
-			/* should this ref them? */
-			h->v.members = group;
-		} else {
-			g_warning("Trying to set the members on a name, not group");
-		}
-	}
-}
-
-void header_address_add_member(struct _header_address *h, struct _header_address *member)
-{
-	if (h) {
-		if (h->type == HEADER_ADDRESS_GROUP
-		    || h->type == HEADER_ADDRESS_NONE) {
-			h->type = HEADER_ADDRESS_GROUP;
-			header_address_list_append(&h->v.members, member);
-		}		    
-	}
-}
-
-void header_address_list_append_list(struct _header_address **l, struct _header_address **h)
-{
-	if (l) {
-		struct _header_address *n = (struct _header_address *)l;
-
-		while (n->next)
-			n = n->next;
-		n->next = *h;
-	}
-}
-
-
-void header_address_list_append(struct _header_address **l, struct _header_address *h)
-{
-	if (h) {
-		header_address_list_append_list(l, &h);
-		h->next = NULL;
-	}
-}
-
-void header_address_list_clear(struct _header_address **l)
-{
-	struct _header_address *a, *n;
-	a = *l;
-	while (a) {
-		n = a->next;
-		header_address_unref(a);
-		a = n;
-	}
-	*l = NULL;
-}
-
-static void
-header_address_list_format_append(GString *out, struct _header_address *a)
-{
-	char *text;
-
-	while (a) {
-		switch (a->type) {
-		case HEADER_ADDRESS_NAME:
-			text = header_encode_phrase (a->name);
-			if (text && *text)
-				g_string_sprintfa(out, "%s <%s>", text, a->v.addr);
-			else
-				g_string_append(out, a->v.addr);
-			g_free (text);
-			break;
-		case HEADER_ADDRESS_GROUP:
-			text = header_encode_string(a->name);
-			g_string_sprintfa(out, "%s:\n ", text);
-			header_address_list_format_append(out, a->v.members);
-			g_string_sprintfa(out, ";");
-			break;
-		default:
-			g_warning("Invalid address type");
-			break;
-		}
-		a = a->next;
-		if (a)
-			g_string_append(out, ", ");
-	}
-}
-
-/* FIXME: need a 'display friendly' version, as well as a 'rfc friendly' version? */
-char *
-header_address_list_format(struct _header_address *a)
-{
-	GString *out;
-	char *ret;
-
-	if (a == NULL)
-		return NULL;
-
-	out = g_string_new("");
-
-	header_address_list_format_append(out, a);
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-/* simple header folding */
-/* note: assumes the input has not already been folded */
-char *
-header_fold(const char *in)
-{
-	int len, outlen, i;
-	const char *inptr = in, *space;
-	GString *out;
-	char *ret;
-
-	len = strlen(in);
-	if (len <= CAMEL_FOLD_SIZE)
-		return g_strdup(in);
-
-	out = g_string_new("");
-	outlen = 0;
-	while (*inptr) {
-		space = strchr(inptr, ' ');
-		if (space) {
-			len = space-inptr+1;
-		} else {
-			len = strlen(inptr);
-		}
-		if (outlen + len > CAMEL_FOLD_SIZE) {
-			g_string_append(out, "\n\t");
-			outlen = 1;
-			/* check for very long words, just cut them up */
-			while (outlen+len > CAMEL_FOLD_SIZE) {
-				for (i=0;i<CAMEL_FOLD_SIZE-outlen;i++)
-					g_string_append_c(out, inptr[i]);
-				inptr += CAMEL_FOLD_SIZE-outlen;
-				len -= CAMEL_FOLD_SIZE-outlen;
-				g_string_append(out, "\n\t");
-				outlen = 1;
-			}
-		}
-		outlen += len;
-		for (i=0;i<len;i++) {
-			g_string_append_c(out, inptr[i]);
-		}
-		inptr += len;
-	}
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;	
-}
-
-#ifdef BUILD_TABLE
-
-/* for debugging tests */
-/* should also have some regression tests somewhere */
-
-void test_phrase(const char *in)
-{
-	printf("'%s' -> '%s'\n", in, header_encode_phrase(in));
-}
-
-void test_fold(const char *in)
-{
-	printf("'%s'\n ->\n '%s'\n", in, header_fold(in));
-}
-
-void run_test(void)
-{
-	char *to = "gnome hacker dudes: license-discuss@opensource.org,
-        \"Richard M. Stallman\" <rms@gnu.org>,
-        Barry Chester <barry_che@antdiv.gov.au>,
-        Michael Zucchi <zucchi.michael(this (is a nested) comment)@zedzone.mmc.com.au>,
-        Miguel de Icaza <miguel@gnome.org>;,
-	zucchi@zedzone.mmc.com.au, \"Foo bar\" <zed@zedzone>,
-	<frob@frobzone>";
-
-#if 0
-	header_to_decode(to);
-
-	header_mime_decode("1.0", 0, 0);
-	header_mime_decode("1.3 (produced by metasend V1.0)", 0, 0);
-	header_mime_decode("(produced by metasend V1.0) 5.2", 0, 0);
-	header_mime_decode("7(produced by metasend 1.0) . (produced by helix/send/1.0) 9 . 5", 0, 0);
-	header_mime_decode("3.", 0, 0);
-	header_mime_decode(".", 0, 0);
-	header_mime_decode(".5", 0, 0);
-	header_mime_decode("c.d", 0, 0);
-	header_mime_decode("", 0, 0);
-
-	header_msgid_decode(" <\"L3x2i1.0.Nm5.Xd-Wu\"@lists.redhat.com>");
-	header_msgid_decode("<200001180446.PAA02065@beaker.htb.com.au>");
-#endif
-
-	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");
-	test_fold("Header: nowletstryfoldingsomethingthatistoolongtofold,iwonderwhatitshoulddointsteadtofoldit?hmm,iguessicanjusttruncateitatsomepointortrytorefoldthepreviousstuff(yuck)tofit");
-	test_phrase("Michael Zucchi (NotZed)");
-	test_phrase("Zucchi, ( \\ NotZed \\ ) Michael");
-	{
-		int ic;
-		char *outbuf, *inbuf, buffer[256];
-		int inlen, outlen;
-
-		outlen = 256;
-		inbuf = "Dra¾en Kaèar";
-		inlen = strlen(inbuf);
-		outbuf = buffer;
-		ic = unicode_iconv_open("UTF-8", "ISO-8859-1");
-		unicode_iconv(ic, &inbuf, &inlen, &outbuf, &outlen);
-		test_phrase(buffer);
-
-		outlen = 256;
-		inbuf = "This is an encoded phrase Tomasz K³oczko";
-		inlen = strlen(inbuf);
-		outbuf = buffer;
-		ic = unicode_iconv_open("UTF-8", "ISO-8859-2");
-		unicode_iconv(ic, &inbuf, &inlen, &outbuf, &outlen);
-		test_phrase(buffer);
-
-	}
-
-	{
-		char *str = "Blah blah\n\t = ? =? ?= This is a TEST For quoted-printable-encoding-encoding-of
-	long lines, and lines that end in spaces                                                                       
-	and line sthat end in tabs 						
-	And lines that just end.";
-
-		char encoded[256];
-		int state=-1,save=0;
-		int len;
-
-		len = quoted_encode_step(str, strlen(str), encoded, &state, &save);
-		len += quoted_encode_close("", 0, encoded+len, &state, &save);
-		printf("encoded = '%.*s'\n", len, encoded);
-	}
-}
-
-#endif /* BUILD_TABLE */
-
-char *
-header_msgid_generate (void)
-{
-	gchar host [256], domain [768];
-	static gint count = 0;
-
-	gethostname (host, sizeof (host));
-	getdomainname (domain, sizeof (domain));
-
-	return g_strdup_printf ("%d.%d.%d.camel@%s.%s", (gint) time (NULL), getpid (), count++, host, domain);
-}
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
deleted file mode 100644
index a1f8bb549d..0000000000
--- a/camel/camel-mime-utils.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MIME_UTILS_H
-#define _CAMEL_MIME_UTILS_H
-
-#include <glib.h>
-#include <time.h>
-
-/* maximum size of a line from header_fold() */
-#define CAMEL_FOLD_SIZE (72)
-
-/* a list of references for this message */
-struct _header_references {
-	struct _header_references *next;
-	char *id;
-};
-
-struct _header_param {
-	struct _header_param *next;
-	char *name;
-	char *value;
-};
-
-/* describes a content-type */
-struct _header_content_type {
-	char *type;
-	char *subtype;
-	struct _header_param *params;
-	unsigned int refcount;
-};
-
-/* a raw rfc822 header */
-/* the value MUST be US-ASCII */
-struct _header_raw {
-	struct _header_raw *next;
-	char *name;
-	char *value;
-	int offset;		/* in file, if known */
-};
-
-typedef struct _CamelMimeDisposition {
-	char *disposition;
-	struct _header_param *params;
-	unsigned int refcount;
-} CamelMimeDisposition;
-
-enum _header_address_type {
-	HEADER_ADDRESS_NONE,	/* uninitialised */
-	HEADER_ADDRESS_NAME,
-	HEADER_ADDRESS_GROUP
-};
-
-struct _header_address {
-	struct _header_address *next;
-	enum _header_address_type type;
-	char *name;
-	union {
-		char *addr;
-		struct _header_address *members;
-	} v;
-	unsigned int refcount;
-};
-
-/* Address lists */
-struct _header_address *header_address_new(void);
-struct _header_address *header_address_new_name(const char *name, const char *addr);
-struct _header_address *header_address_new_group(const char *name);
-void header_address_ref(struct _header_address *);
-void header_address_unref(struct _header_address *);
-void header_address_set_name(struct _header_address *, const char *name);
-void header_address_set_addr(struct _header_address *, const char *addr);
-void header_address_set_members(struct _header_address *, struct _header_address *group);
-void header_address_add_member(struct _header_address *, struct _header_address *member);
-void header_address_list_append_list(struct _header_address **l, struct _header_address **h);
-void header_address_list_append(struct _header_address **, struct _header_address *);
-void header_address_list_clear(struct _header_address **);
-
-struct _header_address *header_address_decode(const char *in);
-struct _header_address *header_mailbox_decode(const char *in);
-char *header_address_list_format(struct _header_address *a);
-
-/* structured header prameters */
-char *header_param(struct _header_param *p, const char *name);
-struct _header_param *header_set_param(struct _header_param **l, const char *name, const char *value);
-void header_param_list_free(struct _header_param *p);
-
-/* Content-Type header */
-struct _header_content_type *header_content_type_new(const char *type, const char *subtype);
-struct _header_content_type *header_content_type_decode(const char *in);
-void header_content_type_unref(struct _header_content_type *ct);
-void header_content_type_ref(struct _header_content_type *ct);
-const char *header_content_type_param(struct _header_content_type *t, const char *name);
-void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value);
-int header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype);
-char *header_content_type_format(struct _header_content_type *ct);
-
-/* DEBUGGING function */
-void header_content_type_dump(struct _header_content_type *ct);
-
-/* Content-Disposition header */
-CamelMimeDisposition *header_disposition_decode(const char *in);
-void header_disposition_ref(CamelMimeDisposition *);
-void header_disposition_unref(CamelMimeDisposition *);
-char *header_disposition_format(CamelMimeDisposition *d);
-
-/* decode the contents of a content-encoding header */
-char *header_content_encoding_decode(const char *in);
-
-/* raw headers */
-void header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset);
-void header_raw_append_parse(struct _header_raw **list, const char *header, int offset);
-const char *header_raw_find(struct _header_raw **list, const char *name, int *ofset);
-const char *header_raw_find_next(struct _header_raw **list, const char *name, int *ofset, const char *last);
-void header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset);
-void header_raw_remove(struct _header_raw **list, const char *name);
-void header_raw_clear(struct _header_raw **list);
-
-/* fold a header */
-char *header_fold(const char *in);
-
-/* decode a header which is a simple token */
-char *header_token_decode(const char *in);
-
-/* decode/encode a string type, like a subject line */
-char *header_decode_string(const char *in);
-char *header_encode_string(const unsigned char *in);
-
-/* encode a phrase, like the real name of an address */
-char *header_encode_phrase(const unsigned char *in);
-
-/* decode an email date field into a GMT time, + optional offset */
-time_t header_decode_date(const char *in, int *saveoffset);
-char *header_format_date(time_t time, int offset);
-
-/* decode a message id */
-char *header_msgid_decode(const char *in);
-
-/* generate msg id */
-char *header_msgid_generate (void);
-
-/* decode a References header */
-struct _header_references *header_references_decode(const char *in);
-void header_references_list_clear(struct _header_references **list);
-void header_references_list_append_asis(struct _header_references **list, char *ref);
-int header_references_list_size(struct _header_references **list);
-struct _header_references *header_references_dup(const struct _header_references *list);
-
-/* decode the mime-type header */
-void header_mime_decode(const char *in, int *maj, int *min);
-
-/* do incremental base64/quoted-printable (de/en)coding */
-int base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save);
-
-int base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save);
-int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
-
-int uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen);
-
-int quoted_decode_step(unsigned char *in, int len, unsigned char *out, int *savestate, int *saveme);
-
-int quoted_encode_step(unsigned char *in, int len, unsigned char *out, int *state, int *save);
-int quoted_encode_close(unsigned char *in, int len, unsigned char *out, int *state, int *save);
-
-#endif /* ! _CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
deleted file mode 100644
index ea3fdb3da0..0000000000
--- a/camel/camel-movemail.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-movemail.c: mbox copying function */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-
-#include "camel-movemail.h"
-#include "camel-exception.h"
-
-#include "camel-mime-parser.h"
-#include "camel-mime-filter.h"
-#include "camel-mime-filter-from.h"
-
-#define d(x)
-
-#ifdef MOVEMAIL_PATH
-#include <sys/wait.h>
-
-static void movemail_external (const char *source, const char *dest,
-			       CamelException *ex);
-#endif
-
-/* these could probably be exposed as a utility? (but only mbox needs it) */
-#if 0
-static int camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter);
-static int camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes);
-#endif
-
-/**
- * camel_movemail: Copy an mbox file from a shared spool directory to a
- * new folder in a Camel store
- * @source: source file
- * @dest: destination file
- * @ex: a CamelException
- *
- * This copies an mbox file from a shared directory with multiple
- * readers and writers into a private (presumably Camel-controlled)
- * directory. Dot locking is used on the source file (but not the
- * destination).
- **/
-void
-camel_movemail (const char *source, const char *dest, CamelException *ex)
-{
-	gboolean locked;
-	int sfd, dfd, tmpfd;
-	char *locktmpfile, *lockfile;
-	struct stat st;
-	time_t now, timeout;
-	int nread, nwrote;
-	char buf[BUFSIZ];
-
-	camel_exception_clear (ex);
-
-	/* Stat and then open the spool file. If it doesn't exist or
-	 * is empty, the user has no mail. (There's technically a race
-	 * condition here in that an MDA might have just now locked it
-	 * to deliver a message, but we don't care. In that case,
-	 * assuming it's unlocked is equivalent to pretending we were
-	 * called a fraction earlier.)
-	 */
-	if (stat (source, &st) == -1) {
-		if (errno != ENOENT) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not check mail file "
-						"%s: %s"), source,
-					      g_strerror (errno));
-		}
-		return;
-	}
-	if (st.st_size == 0)
-		return;
-
-	/* Create the unique lock file. */
-	locktmpfile = g_strdup_printf ("%s.lock.XXXXXX", source);
-#ifdef HAVE_MKSTEMP
-	tmpfd = mkstemp (locktmpfile);
-#else
-	if (mktemp (locktmpfile)) {
-		tmpfd = open (locktmpfile, O_RDWR | O_CREAT | O_EXCL,
-			      S_IRUSR | S_IWUSR);
-	} else
-		tmpfd = -1;
-#endif
-	if (tmpfd == -1) {
-		g_free (locktmpfile);
-#ifdef MOVEMAIL_PATH
-		if (errno == EACCES) {
-			/* movemail_external will fail if the dest file
-			 * already exists, so if it does, return now,
-			 * let the fetch code process the mail that's
-			 * already there, and then the user can try again.
-			 */
-			if (stat (dest, &st) == 0)
-				return;
-
-			movemail_external (source, dest, ex);
-			return;
-		}
-#endif
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create lock file "
-					"for %s: %s"), source,
-				      g_strerror (errno));
-		return;
-	}
-	close (tmpfd);
-
-	sfd = open (source, O_RDWR);
-	if (sfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open mail file %s: %s"),
-				      source, g_strerror (errno));
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		return;
-	}
-
-	dfd = open (dest, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-	if (dfd == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open temporary mail "
-					"file %s: %s"), dest,
-				      g_strerror (errno));
-		close (sfd);
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		return;
-	}
-
-	lockfile = g_strdup_printf ("%s.lock", source);
-	locked = FALSE;
-	time (&timeout);
-	timeout += 30;
-
-	/* Loop trying to lock the file for 30 seconds. */
-	while (time (&now) < timeout) {
-		/* Try to make the lock. */
-		if (symlink (locktmpfile, lockfile) == 0) {
-			locked = TRUE;
-			break;
-		}
-
-		/* If we fail for a reason other than that someone
-		 * else has the lock, then abort.
-		 */
-		if (errno != EEXIST) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not create lock "
-						"file for %s: %s"), source,
-					      g_strerror (errno));
-			break;
-		}
-
-		/* Check the modtime on the lock file. */
-		if (stat (lockfile, &st) == -1) {
-			/* If the lockfile disappeared, try again. */
-			if (errno == ENOENT)
-				continue;
-
-			/* Some other error. Abort. */
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not test lock "
-						"file for %s: %s"), source,
-					      g_strerror (errno));
-			break;
-		}
-
-		/* If the lock file is stale, remove it and try again. */
-		if (st.st_mtime < now - 60) {
-			unlink (lockfile);
-			continue;
-		}
-
-		/* Otherwise, sleep and try again. */
-		sleep (5);
-	}
-
-	if (!locked) {
-		/* Something has gone awry. */
-		if (now >= timeout) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Timed out trying to get "
-						"lock file on %s. Try again "
-						"later."), source);
-		}
-		g_free (lockfile);
-		unlink (locktmpfile);
-		g_free (locktmpfile);
-		close (sfd);
-		close (dfd);
-		return;
-	}
-
-	/* OK. We have the file locked now. */
-
-	/* FIXME: Set a timer to keep the file locked. */
-
-	while (1) {
-		int written = 0;
-
-		nread = read (sfd, buf, sizeof (buf));
-		if (nread == 0)
-			break;
-		else if (nread == -1) {
-			if (errno == EINTR)
-				continue;
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error reading mail file: %s"),
-					      g_strerror (errno));
-			break;
-		}
-
-		while (nread) {
-			nwrote = write (dfd, buf + written, nread);
-			if (nwrote == -1) {
-				if (errno == EINTR)
-					continue; /* continues inner loop */
-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Error writing "
-							"mail temp file: %s"),
-						      g_strerror (errno));
-				break;
-			}
-			written += nwrote;
-			nread -= nwrote;
-		}
-	}
-
-	/* If no errors occurred copying the data, and we successfully
-	 * close the destination file, then truncate the source file.
-	 */
-	if (!camel_exception_is_set (ex)) {
-		if (close (dfd) == 0)
-			ftruncate (sfd, 0);
-		else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Failed to store mail in "
-						"temp file %s: %s"), dest,
-					      g_strerror (errno));
-		}
-	} else
-		close (dfd);
-	close (sfd);
-
-	/* Clean up lock files. */
-	unlink (lockfile);
-	g_free (lockfile);
-	unlink (locktmpfile);
-	g_free (locktmpfile);
-}
-
-#ifdef MOVEMAIL_PATH
-static void
-movemail_external (const char *source, const char *dest, CamelException *ex)
-{
-	sigset_t mask, omask;
-	pid_t pid;
-	int fd[2], len = 0, nread, status;
-	char buf[BUFSIZ], *output = NULL;
-
-	/* Block SIGCHLD so the app can't mess us up. */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGCHLD);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-
-	if (pipe (fd) == -1) {
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create pipe: %s"),
-				      g_strerror (errno));
-		return;
-	}
-
-	pid = fork ();
-	switch (pid) {
-	case -1:
-		close (fd[0]);
-		close (fd[1]);
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not fork: %s"),
-				      g_strerror (errno));
-		return;
-
-	case 0:
-		/* Child */
-		close (fd[0]);
-		close (STDIN_FILENO);
-		dup2 (fd[1], STDOUT_FILENO);
-		dup2 (fd[1], STDERR_FILENO);
-
-		execl (MOVEMAIL_PATH, MOVEMAIL_PATH, source, dest, NULL);
-		_exit (255);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Parent */
-	close (fd[1]);
-
-	/* Read movemail's output. */
-	while ((nread = read (fd[0], buf, sizeof (buf))) > 0) {
-		output = g_realloc (output, len + nread + 1);
-		memcpy (output + len, buf, nread);
-		len += nread;
-		output[len] = '\0';
-	}
-	close (fd[0]);
-
-	/* Now get the exit status. */
-	while (waitpid (pid, &status, 0) == -1 && errno == EINTR)
-		;
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-
-	if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Movemail program failed: %s"),
-				      output ? output : _("(Unknown error)"));
-	}
-	g_free (output);
-}
-#endif
-
-
-#if 0
-static int
-camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes)
-{
-        char buffer[4096];
-        int written = 0;
-
-	d(printf("writing %d bytes ... ", bytes));
-
-	if (lseek(fromfd, start, SEEK_SET) != start)
-		return -1;
-
-        while (bytes>0) {
-                int toread, towrite;
-
-                toread = bytes;
-                if (bytes>4096)
-                        toread = 4096;
-                else
-                        toread = bytes;
-		do {
-			towrite = read(fromfd, buffer, toread);
-		} while (towrite == -1 && errno == EINTR);
-
-		if (towrite == -1)
-			return -1;
-
-                /* check for 'end of file' */
-                if (towrite == 0) {
-			d(printf("end of file?\n"));
-                        break;
-		}
-
-		do {
-			toread = write(tofd, buffer, towrite);
-		} while (toread == -1 && errno == EINTR);
-
-		if (toread == -1)
-			return -1;
-
-                written += toread;
-                bytes -= toread;
-        }
-
-        d(printf("written %d bytes\n", written));
-
-        return written;
-}
-#endif
-
-#define PRE_SIZE (32)
-
-#if 0
-static int
-camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter)
-{
-        char buffer[4096+PRE_SIZE];
-        int written = 0;
-	char *filterbuffer;
-	int filterlen, filterpre;
-
-	d(printf("writing %d bytes ... ", bytes));
-
-	camel_mime_filter_reset(filter);
-
-	if (lseek(fromfd, start, SEEK_SET) != start)
-		return -1;
-
-        while (bytes>0) {
-                int toread, towrite;
-
-                toread = bytes;
-                if (bytes>4096)
-                        toread = 4096;
-                else
-                        toread = bytes;
-		do {
-			towrite = read(fromfd, buffer+PRE_SIZE, toread);
-		} while (towrite == -1 && errno == EINTR);
-
-		if (towrite == -1)
-			return -1;
-
-                /* check for 'end of file' */
-                if (towrite == 0) {
-			d(printf("end of file?\n"));
-			camel_mime_filter_complete(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,
-						   &filterbuffer, &filterlen, &filterpre);
-			towrite = filterlen;
-			if (towrite == 0)
-				break;
-		} else {
-			camel_mime_filter_filter(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,
-						 &filterbuffer, &filterlen, &filterpre);
-			towrite = filterlen;
-		}
-
-		do {
-			toread = write(tofd, filterbuffer, towrite);
-		} while (toread == -1 && errno == EINTR);
-
-		if (toread == -1)
-			return -1;
-
-                written += toread;
-                bytes -= toread;
-        }
-
-        d(printf("written %d bytes\n", written));
-
-        return written;
-}
-
-/* write the headers back out again, but not he Content-Length header, because we dont
-   want	to maintain it! */
-static int
-solaris_header_write(int fd, struct _header_raw *header)
-{
-        struct iovec iv[4];
-        int outlen = 0, len;
-
-        iv[1].iov_base = ":";
-        iv[1].iov_len = 1;
-        iv[3].iov_base = "\n";
-        iv[3].iov_len = 1;
-
-        while (header) {
-		if (strcasecmp(header->name, "Content-Length")) {
-			iv[0].iov_base = header->name;
-			iv[0].iov_len = strlen(header->name);
-			iv[2].iov_base = header->value;
-			iv[2].iov_len = strlen(header->value);
-		
-			do {
-				len = writev(fd, iv, 4);
-			} while (len == -1 && errno == EINTR);
-			
-			if (len == -1)
-				return -1;
-			outlen += len;
-		}
-                header = header->next;
-        }
-
-	do {
-		len = write(fd, "\n", 1);
-	} while (len == -1 && errno == EINTR);
-
-	if (len == -1)
-		return -1;
-
-	outlen += 1;
-
-	d(printf("Wrote %d bytes of headers\n", outlen));
-
-        return outlen;
-}
-
-/* Well, since Solaris is a tad broken wrt its 'mbox' folder format,
-   we must convert it to a real mbox format.  Thankfully this is
-   mostly pretty easy */
-static int
-camel_movemail_solaris (int sfd, int dfd, CamelException *ex)
-{
-	CamelMimeParser *mp;
-	char *buffer;
-	int len;
-	CamelMimeFilterFrom *ffrom;
-	int ret = 1;
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_init_with_fd(mp, sfd);
-
-	ffrom = camel_mime_filter_from_new();
-
-	while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM) {
-		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM_END) {
-			const char *cl;
-			int length;
-			int start, body;
-			off_t newpos;
-
-			ret = 0;
-
-			start = camel_mime_parser_tell_start_from(mp);
-			body = camel_mime_parser_tell(mp);
-
-			/* write out headers, but NOT content-length header */
-			solaris_header_write(dfd, camel_mime_parser_headers_raw(mp));
-
-			cl = camel_mime_parser_header(mp, "content-length", NULL);
-			if (cl == NULL) {
-				g_warning("Required Content-Length header is missing from solaris mail box @ %d", (int)camel_mime_parser_tell(mp));
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_step(mp, &buffer, &len);
-				camel_mime_parser_unstep(mp);
-				length = camel_mime_parser_tell_start_from(mp) - body;
-				newpos = -1;
-			} else {
-				length = atoi(cl);
-				camel_mime_parser_drop_step(mp);
-				camel_mime_parser_drop_step(mp);
-				newpos = length+body;
-			}
-			/* copy body->length converting From lines */
-			if (camel_movemail_copy_filter(sfd, dfd, body, length, (CamelMimeFilter *)ffrom) == -1)
-				goto fail;
-			if (newpos != -1)
-				camel_mime_parser_seek(mp, newpos, SEEK_SET);
-		} else {
-			g_error("Inalid parser state: %d", camel_mime_parser_state(mp));
-		}
-	}
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return ret;
-
-fail:
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      "Error copying "
-			      "mail temp file: %s",
-			      g_strerror (errno));
-
-
-	camel_object_unref((CamelObject *)mp);
-	camel_object_unref((CamelObject *)ffrom);
-
-	return -1;
-}
-#endif
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
deleted file mode 100644
index 8b73435a43..0000000000
--- a/camel/camel-movemail.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-movemail.h: mbox copy function */
-
-/* 
- * Author: 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MOVEMAIL_H
-#define CAMEL_MOVEMAIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-exception.h>
-
-void camel_movemail (const char *source, const char *dest, CamelException *ex);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MOVEMAIL_H */
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
deleted file mode 100644
index c5a5f81b22..0000000000
--- a/camel/camel-multipart.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-multipart.c : Abstract class for a multipart */
-
-#ifndef NO_WARNINGS
-#warning This should be a mostly abstract class, but it is not!
-#endif
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "gmime-content-field.h"
-#include "camel-stream-mem.h"
-#include "camel-multipart.h"
-#include "camel-mime-part.h"
-#include "camel-exception.h"
-#include "md5-utils.h"
-
-#include <unistd.h> /* for getpid */
-#include <time.h>   /* for time */
-
-#define d(x)
-
-static void                  add_part          (CamelMultipart *multipart,
-						CamelMimePart *part);
-static void                  add_part_at       (CamelMultipart *multipart,
-						CamelMimePart *part,
-						guint index);
-static void                  remove_part       (CamelMultipart *multipart,
-						CamelMimePart *part);
-static CamelMimePart *       remove_part_at    (CamelMultipart *multipart,
-						guint index);
-static CamelMimePart *       get_part          (CamelMultipart *multipart,
-						guint index);
-static guint                 get_number        (CamelMultipart *multipart);
-static void                  set_boundary      (CamelMultipart *multipart,
-						gchar *boundary);
-static const gchar *         get_boundary      (CamelMultipart *multipart);
-static int                   write_to_stream   (CamelDataWrapper *data_wrapper,
-						CamelStream *stream);
-static void                  unref_part        (gpointer data, gpointer user_data);
-
-static CamelDataWrapperClass *parent_class = NULL;
-
-
-
-/* Returns the class for a CamelMultipart */
-#define CMP_CLASS(so) CAMEL_MULTIPART_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-/* Returns the class for a CamelDataWrapper */
-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void
-camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)
-{
-	CamelDataWrapperClass *camel_data_wrapper_class =
-		CAMEL_DATA_WRAPPER_CLASS (camel_multipart_class);
-
-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));
-
-	/* virtual method definition */
-	camel_multipart_class->add_part = add_part;
-	camel_multipart_class->add_part_at = add_part_at;
-	camel_multipart_class->remove_part = remove_part;
-	camel_multipart_class->remove_part_at = remove_part_at;
-	camel_multipart_class->get_part = get_part;
-	camel_multipart_class->get_number = get_number;
-	camel_multipart_class->set_boundary = set_boundary;
-	camel_multipart_class->get_boundary = get_boundary;
-
-	/* virtual method overload */
-	camel_data_wrapper_class->write_to_stream = write_to_stream;
-}
-
-static void
-camel_multipart_init (gpointer object, gpointer klass)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (object);
-
-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-					  "multipart/mixed");
-	multipart->preface = NULL;
-	multipart->postface = NULL;
-}
-
-static void
-camel_multipart_finalize (CamelObject *object)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (object);
-
-	g_list_foreach (multipart->parts, unref_part, NULL);
-
-	if (multipart->boundary)
-		g_free (multipart->boundary);
-	if (multipart->preface)
-		g_free (multipart->preface);
-	if (multipart->postface)
-		g_free (multipart->postface);
-}
-
-
-CamelType
-camel_multipart_get_type (void)
-{
-	static CamelType camel_multipart_type = CAMEL_INVALID_TYPE;
-
-	if (camel_multipart_type == CAMEL_INVALID_TYPE) {
-		camel_multipart_type = camel_type_register (camel_data_wrapper_get_type (), "CamelMultipart",
-							    sizeof (CamelMultipart),
-							    sizeof (CamelMultipartClass),
-							    (CamelObjectClassInitFunc) camel_multipart_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_multipart_init,
-							    (CamelObjectFinalizeFunc) camel_multipart_finalize);
-	}
-
-	return camel_multipart_type;
-}
-
-static void
-unref_part (gpointer data, gpointer user_data)
-{
-	CamelObject *part = CAMEL_OBJECT (data);
-
-	camel_object_unref (part);
-}
-
-/**
- * camel_multipart_new:
- *
- * Create a new CamelMultipart object.
- *
- * Return value: a new CamelMultipart
- **/
-CamelMultipart *
-camel_multipart_new (void)
-{
-	CamelMultipart *multipart;
-
-	multipart = (CamelMultipart *)camel_object_new (CAMEL_MULTIPART_TYPE);
-	multipart->preface = NULL;
-	multipart->postface = NULL;
-
-	return multipart;
-}
-
-
-static void
-add_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	multipart->parts = g_list_append (multipart->parts, part);
-	camel_object_ref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_add_part:
- * @multipart: a CamelMultipart
- * @part: the part to add
- *
- * Appends the part to the multipart object.
- **/
-void
-camel_multipart_add_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->add_part (multipart, part);
-}
-
-
-static void
-add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index)
-{
-	multipart->parts = g_list_insert (multipart->parts, part, index);
-	camel_object_ref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_add_part_at:
- * @multipart: a CamelMultipart
- * @part: the part to add
- * @index: index to add the multipart at
- *
- * Adds the part to the multipart object after the @index'th
- * element. If @index is greater than the number of parts, it is
- * equivalent to camel_multipart_add_part().
- **/
-void
-camel_multipart_add_part_at (CamelMultipart *multipart,
-			     CamelMimePart *part, guint index)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->add_part_at (multipart, part, index);
-}
-
-
-static void
-remove_part (CamelMultipart *multipart, CamelMimePart *part)
-{
-	if (!multipart->parts)
-		return;
-	multipart->parts = g_list_remove (multipart->parts, part);
-	camel_object_unref (CAMEL_OBJECT (part));
-}
-
-/**
- * camel_multipart_remove_part:
- * @multipart: a CamelMultipart
- * @part: the part to remove
- *
- * Removes @part from @multipart.
- **/
-void
-camel_multipart_remove_part (CamelMultipart *multipart,
-			     CamelMimePart *part)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-	g_return_if_fail (CAMEL_IS_MIME_PART (part));
-
-	CMP_CLASS (multipart)->remove_part (multipart, part);
-}
-
-
-static CamelMimePart *
-remove_part_at (CamelMultipart *multipart, guint index)
-{
-	GList *parts_list;
-	GList *part_to_remove;
-	CamelMimePart *removed_part;
-
-	if (!(multipart->parts))
-		return NULL;
-
-	parts_list = multipart->parts;
-	part_to_remove = g_list_nth (parts_list, index);
-	if (!part_to_remove) {
-		g_warning ("CamelMultipart::remove_part_at: "
-			   "part to remove is NULL\n");
-		return NULL;
-	}
-	removed_part = CAMEL_MIME_PART (part_to_remove->data);
-
-	multipart->parts = g_list_remove_link (parts_list, part_to_remove);
-	if (part_to_remove->data)
-		camel_object_unref (CAMEL_OBJECT (part_to_remove->data));
-	g_list_free_1 (part_to_remove);
-
-	return removed_part;
-}
-
-/**
- * camel_multipart_remove_part_at:
- * @multipart: a CamelMultipart
- * @index: a zero-based index indicating the part to remove
- *
- * Remove the indicated part from the multipart object.
- *
- * Return value: the removed part. Note that it is camel_object_unref()ed
- * before being returned, which may cause it to be destroyed.
- **/
-CamelMimePart *
-camel_multipart_remove_part_at (CamelMultipart *multipart, guint index)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);
-
-	return CMP_CLASS (multipart)->remove_part_at (multipart, index);
-}
-
-
-static CamelMimePart *
-get_part (CamelMultipart *multipart, guint index)
-{
-	GList *part;
-
-	if (!(multipart->parts))
-		return NULL;
-
-	part = g_list_nth (multipart->parts, index);
-	if (part)
-		return CAMEL_MIME_PART (part->data);
-	else
-		return NULL;
-}
-
-/**
- * camel_multipart_get_part:
- * @multipart: a CamelMultipart
- * @index: a zero-based index indicating the part to get
- *
- * Return value: the indicated subpart, or %NULL
- **/
-CamelMimePart *
-camel_multipart_get_part (CamelMultipart *multipart, guint index)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);
-
-	return CMP_CLASS (multipart)->get_part (multipart, index);
-}
-
-
-static guint
-get_number (CamelMultipart *multipart)
-{
-	return g_list_length (multipart->parts);
-}
-
-/**
- * camel_multipart_get_number:
- * @multipart: a CamelMultipart
- *
- * Return value: the number of subparts in @multipart
- **/
-guint
-camel_multipart_get_number (CamelMultipart *multipart)
-{
-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), 0);
-
-	return CMP_CLASS (multipart)->get_number (multipart);
-}
-
-
-static void
-set_boundary (CamelMultipart *multipart, gchar *boundary)
-{
-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);
-	char *bgen, digest[16], bbuf[27], *p;
-	int state, save;
-
-	g_return_if_fail (cdw->mime_type != NULL);
-
-	if (!boundary) {
-		/* Generate a fairly random boundary string. */
-		bgen = g_strdup_printf ("%p:%lu:%lu", multipart,
-					(unsigned long) getpid(),
-					(unsigned long) time(0));
-		md5_get_digest (bgen, strlen (bgen), digest);
-		g_free (bgen);
-		strcpy (bbuf, "=-");
-		p = bbuf + 2;
-		state = save = 0;
-		p += base64_encode_step (digest, 16, FALSE, p, &state, &save);
-		*p = '\0';
-
-		boundary = bbuf;
-	}
-
-	gmime_content_field_set_parameter (cdw->mime_type, "boundary",
-					   boundary);
-}
-
-/**
- * camel_multipart_set_boundary:
- * @multipart: a CamelMultipart
- * @boundary: the message boundary, or %NULL
- *
- * Sets the message boundary for @multipart to @boundary. This should
- * be a string which does not occur anywhere in any of @multipart's
- * subparts. If @boundary is %NULL, a randomly-generated boundary will
- * be used.
- **/
-void
-camel_multipart_set_boundary (CamelMultipart *multipart, gchar *boundary)
-{
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-
-	CMP_CLASS (multipart)->set_boundary (multipart, boundary);
-}
-
-
-static const gchar *
-get_boundary (CamelMultipart *multipart)
-{
-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);
-
-	g_return_val_if_fail (cdw->mime_type != NULL, NULL);
-	return gmime_content_field_get_parameter (cdw->mime_type, "boundary");
-}
-
-/**
- * camel_multipart_get_boundary:
- * @multipart: a CamelMultipart
- *
- * Return value: @multipart's message boundary
- **/
-const gchar *
-camel_multipart_get_boundary (CamelMultipart *multipart)
-{
-	return CMP_CLASS (multipart)->get_boundary (multipart);
-}
-
-/* this is MIME specific, doesn't belong here really */
-static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
-{
-	CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
-	const gchar *boundary;
-	int total = 0;
-	int count;
-	GList *node;
-
-	/* get the bundary text */
-	boundary = camel_multipart_get_boundary (multipart);
-
-	/* we cannot write a multipart without a boundary string */
-	g_return_val_if_fail (boundary && *boundary, -1);
-
-	/*
-	 * write the preface text (usually something like
-	 *   "This is a mime message, if you see this, then
-	 *    your mail client probably doesn't support ...."
-	 */
-	if (multipart->preface) {
-		count = camel_stream_write_string (stream, multipart->preface);
-		if (count == -1)
-			return -1;
-		total += count;
-	}
-
-	/*
-	 * Now, write all the parts, separated by the boundary
-	 * delimiter
-	 */
-	node = multipart->parts;
-	while (node) {
-		count = camel_stream_printf (stream, "\n--%s\n", boundary);
-		if (count == -1)
-			return -1;
-		total += count;
-
-		count = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (node->data), stream);
-		if (count == -1)
-			return -1;
-		total += count;
-		node = node->next;
-	}
-
-	/* write the terminating boudary delimiter */
-	count = camel_stream_printf (stream, "\n--%s--\n", boundary);
-	if (count == -1)
-		return -1;
-	total += count;
-
-	/* and finally the postface */
-	if (multipart->postface) {
-		count = camel_stream_write_string (stream, multipart->postface);
-		if (count == -1)
-			return -1;
-		total += count;
-	}
-
-	return total;
-}
-
-/**
- * camel_multipart_set_preface:
- * @multipart: 
- * @preface: 
- * 
- * Set the preface text for this multipart.  Will be written out infront
- * of the multipart.  This text should only include US-ASCII strings, and
- * be relatively short, and will be ignored by any MIME mail client.
- **/
-void
-camel_multipart_set_preface(CamelMultipart *multipart, const char *preface)
-{
-	if (multipart->preface != preface) {
-		g_free(multipart->preface);
-		if (preface)
-			multipart->preface = g_strdup(preface);
-		else
-			multipart->preface = NULL;
-	}
-}
-
-/**
- * camel_multipart_set_postface:
- * @multipart: 
- * @postface: 
- * 
- * Set the postfix text for this multipart.  Will be written out after
- * the last boundary of the multipart, and ignored by any MIME mail
- * client.
- *
- * Generally postface texts should not be sent with multipart messages.
- **/
-void
-camel_multipart_set_postface(CamelMultipart *multipart, const char *postface)
-{
-	if (multipart->postface != postface) {
-		g_free(multipart->postface);
-		if (postface)
-			multipart->postface = g_strdup(postface);
-		else
-			multipart->postface = NULL;
-	}
-}
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
deleted file mode 100644
index 3058b8f2e0..0000000000
--- a/camel/camel-multipart.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-multipart.h : class for a multipart */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MULTIPART_H
-#define CAMEL_MULTIPART_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-
-#define CAMEL_MULTIPART_TYPE     (camel_multipart_get_type ())
-#define CAMEL_MULTIPART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))
-#define CAMEL_MULTIPART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))
-#define CAMEL_IS_MULTIPART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))
-
-
-struct _CamelMultipart
-{
-	CamelDataWrapper parent_object;
-
-	CamelMimePart *parent;
-	GList *parts;
-	gchar *boundary;
-	gchar *preface;
-	gchar *postface;
-
-};
-
-
-
-typedef struct {
-	CamelDataWrapperClass parent_class;
-
-	/* Virtual methods */
-	void (*add_part) (CamelMultipart *multipart, CamelMimePart *part);
-	void (*add_part_at) (CamelMultipart *multipart, CamelMimePart *part, guint index);
-	void (*remove_part) (CamelMultipart *multipart, CamelMimePart *part);
-	CamelMimePart * (*remove_part_at) (CamelMultipart *multipart, guint index);
-	CamelMimePart * (*get_part) (CamelMultipart *multipart, guint index);
-	guint (*get_number) (CamelMultipart *multipart);
-	void (*set_boundary) (CamelMultipart *multipart, gchar *boundary);
-	const gchar * (*get_boundary) (CamelMultipart *multipart);
-
-} CamelMultipartClass;
-
-
-/* Standard Camel function */
-CamelType camel_multipart_get_type (void);
-
-
-/* public methods */
-CamelMultipart *    camel_multipart_new            (void);
-void                camel_multipart_add_part       (CamelMultipart *multipart,
-						    CamelMimePart *part);
-void                camel_multipart_add_part_at    (CamelMultipart *multipart,
-						    CamelMimePart *part,
-						    guint index);
-void                camel_multipart_remove_part    (CamelMultipart *multipart,
-						    CamelMimePart *part);
-CamelMimePart *     camel_multipart_remove_part_at (CamelMultipart *multipart,
-						    guint index);
-CamelMimePart *     camel_multipart_get_part       (CamelMultipart *multipart,
-						    guint index);
-guint               camel_multipart_get_number     (CamelMultipart *multipart);
-void                camel_multipart_set_boundary   (CamelMultipart *multipart,
-						    gchar *boundary);
-const gchar *       camel_multipart_get_boundary   (CamelMultipart *multipart);
-
-void		    camel_multipart_set_preface	   (CamelMultipart *multipart, const char *preface);
-void		    camel_multipart_set_postface   (CamelMultipart *multipart, const char *postface);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MULTIPART_H */
-
diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c
deleted file mode 100644
index ebd35b80c7..0000000000
--- a/camel/camel-news-address.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-news-address.h"
-
-
-static void camel_news_address_class_init (CamelNewsAddressClass *klass);
-
-static CamelAddressClass *camel_news_address_parent;
-
-static void
-camel_news_address_class_init (CamelNewsAddressClass *klass)
-{
-	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));
-}
-
-
-CamelType
-camel_news_address_get_type (void)
-{
-	static guint type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_address_get_type (), "CamelNewsAddress",
-					    sizeof (CamelNewsAddress),
-					    sizeof (CamelNewsAddressClass),
-					    (CamelObjectClassInitFunc) camel_news_address_class_init,
-					    NULL,
-					    NULL,
-					    NULL);
-	}
-	
-	return type;
-}
-
-/**
- * camel_news_address_new:
- *
- * Create a new CamelNewsAddress object.
- * 
- * Return value: A new CamelNewsAddress widget.
- **/
-CamelNewsAddress *
-camel_news_address_new (void)
-{
-	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( camel_object_new (camel_news_address_get_type ()));
-	return new;
-}
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
deleted file mode 100644
index 8d2aa03968..0000000000
--- a/camel/camel-news-address.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: 
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_NEWS_ADDRESS_H
-#define _CAMEL_NEWS_ADDRESS_H
-
-#include <camel/camel-address.h>
-
-#define CAMEL_NEWS_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)
-#define CAMEL_NEWS_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass)
-#define IS_CAMEL_NEWS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_news_address_get_type ())
-
-typedef struct _CamelNewsAddressClass CamelNewsAddressClass;
-
-struct _CamelNewsAddress {
-	CamelAddress parent;
-
-	struct _CamelNewsAddressPrivate *priv;
-};
-
-struct _CamelNewsAddressClass {
-	CamelAddressClass parent_class;
-};
-
-guint		camel_news_address_get_type	(void);
-CamelNewsAddress      *camel_news_address_new	(void);
-
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
diff --git a/camel/camel-object.c b/camel/camel-object.c
deleted file mode 100644
index 75c14b8978..0000000000
--- a/camel/camel-object.c
+++ /dev/null
@@ -1,973 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-object.c: Base class for Camel */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-object.h"
-
-/* I just mashed the keyboard for these... */
-#define CAMEL_OBJECT_MAGIC_VALUE           0x77A344EF
-#define CAMEL_OBJECT_CLASS_MAGIC_VALUE     0xEE26A990
-#define CAMEL_OBJECT_FINALIZED_VALUE       0x84AC3656
-#define CAMEL_OBJECT_CLASS_FINALIZED_VALUE 0x7621ABCD
-
-#define DEFAULT_PREALLOCS 8
-
-#define BAST_CASTARD 1		/* Define to return NULL when casts fail */
-
-#define NULL_PREP_VALUE ((gpointer)make_global_classfuncs)	/* See camel_object_class_declare_event */
-
-/* ** Quickie type system ************************************************* */
-
-typedef struct _CamelTypeInfo
-{
-	CamelType self;
-	CamelType parent;
-	const gchar *name;
-
-	size_t instance_size;
-	GMemChunk *instance_chunk;
-	CamelObjectInitFunc instance_init;
-	CamelObjectFinalizeFunc instance_finalize;
-	GList *free_instances;
-
-	size_t classfuncs_size;
-	CamelObjectClassInitFunc class_init;
-	CamelObjectClassFinalizeFunc class_finalize;
-	CamelObjectClass *global_classfuncs;
-}
-CamelTypeInfo;
-
-typedef struct _CamelHookPair
-{
-	CamelObjectEventHookFunc func;
-	gpointer user_data;
-}
-CamelHookPair;
-
-/* ************************************************************************ */
-
-static void camel_type_lock_up (void);
-static void camel_type_lock_down (void);
-
-static void obj_init (CamelObject * obj);
-static void obj_finalize (CamelObject * obj);
-static void obj_class_init (CamelObjectClass * class);
-static void obj_class_finalize (CamelObjectClass * class);
-
-static gboolean shared_is_of_type (CamelObjectShared * sh, CamelType ctype,
-				   gboolean is_obj);
-static void make_global_classfuncs (CamelTypeInfo * type_info);
-
-/* ************************************************************************ */
-
-G_LOCK_DEFINE_STATIC (type_system);
-G_LOCK_DEFINE_STATIC (type_system_level);
-static GPrivate *type_system_locklevel = NULL;
-
-G_LOCK_DEFINE_STATIC (refcount);
-
-static gboolean type_system_initialized = FALSE;
-static GHashTable *ctype_to_typeinfo = NULL;
-static const CamelType camel_object_type = 1;
-static CamelType cur_max_type = CAMEL_INVALID_TYPE;
-
-/* ************************************************************************ */
-
-#define LOCK_VAL (GPOINTER_TO_INT (g_private_get (type_system_locklevel)))
-#define LOCK_SET( val ) g_private_set (type_system_locklevel, GINT_TO_POINTER (val))
-
-static void
-camel_type_lock_up (void)
-{
-	G_LOCK (type_system_level);
-
-	if (type_system_locklevel == NULL)
-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));
-
-	if (LOCK_VAL == 0) {
-		G_UNLOCK (type_system_level);
-		G_LOCK (type_system);
-		G_LOCK (type_system_level);
-	}
-
-	LOCK_SET (LOCK_VAL + 1);
-
-	G_UNLOCK (type_system_level);
-}
-
-static void
-camel_type_lock_down (void)
-{
-	G_LOCK (type_system_level);
-
-	if (type_system_locklevel == NULL) {
-		g_warning
-			("camel_type_lock_down: lock down before a lock up?");
-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));
-		G_UNLOCK (type_system_level);
-		return;
-	}
-
-	LOCK_SET (LOCK_VAL - 1);
-
-	if (LOCK_VAL == 0)
-		G_UNLOCK (type_system);
-
-	G_UNLOCK (type_system_level);
-}
-
-void
-camel_type_init (void)
-{
-	CamelTypeInfo *obj_info;
-
-	camel_type_lock_up ();
-
-	if (type_system_initialized) {
-		g_warning
-			("camel_type_init: type system already initialized.");
-		camel_type_lock_down ();
-		return;
-	}
-
-	type_system_initialized = TRUE;
-	ctype_to_typeinfo = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-	obj_info = g_new (CamelTypeInfo, 1);
-	obj_info->self = camel_object_type;
-	obj_info->parent = CAMEL_INVALID_TYPE;
-	obj_info->name = "CamelObject";
-
-	obj_info->instance_size = sizeof (CamelObject);
-	obj_info->instance_chunk =
-		g_mem_chunk_create (CamelObject, DEFAULT_PREALLOCS,
-				    G_ALLOC_ONLY);
-	obj_info->instance_init = obj_init;
-	obj_info->instance_finalize = obj_finalize;
-	obj_info->free_instances = NULL;
-
-	obj_info->classfuncs_size = sizeof (CamelObjectClass);
-	obj_info->class_init = obj_class_init;
-	obj_info->class_finalize = obj_class_finalize;
-
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (CAMEL_INVALID_TYPE), NULL);
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (camel_object_type), obj_info);
-
-	/* Sigh. Ugly */
-	make_global_classfuncs (obj_info);
-
-	cur_max_type = camel_object_type;
-
-	camel_type_lock_down ();
-}
-
-CamelType
-camel_type_register (CamelType parent, const gchar * name,
-		     size_t instance_size, size_t classfuncs_size,
-		     CamelObjectClassInitFunc class_init,
-		     CamelObjectClassFinalizeFunc class_finalize,
-		     CamelObjectInitFunc instance_init,
-		     CamelObjectFinalizeFunc instance_finalize)
-{
-	CamelTypeInfo *parent_info;
-	CamelTypeInfo *obj_info;
-	gchar *chunkname;
-
-	g_return_val_if_fail (parent != CAMEL_INVALID_TYPE,
-			      CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (name, CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (instance_size, CAMEL_INVALID_TYPE);
-	g_return_val_if_fail (classfuncs_size, CAMEL_INVALID_TYPE);
-
-	camel_type_lock_up ();
-
-	if (type_system_initialized == FALSE) {
-		G_UNLOCK (type_system);
-		camel_type_init ();
-		G_LOCK (type_system);
-	}
-
-	parent_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (parent));
-
-	if (parent_info == NULL) {
-		g_warning
-			("camel_type_register: no such parent type %d of class `%s'",
-			 parent, name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	if (parent_info->instance_size > instance_size) {
-		g_warning
-			("camel_type_register: instance of class `%s' would be smaller than parent `%s'",
-			 name, parent_info->name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	if (parent_info->classfuncs_size > classfuncs_size) {
-		g_warning
-			("camel_type_register: classfuncs of class `%s' would be smaller than parent `%s'",
-			 name, parent_info->name);
-		camel_type_lock_down ();
-		return CAMEL_INVALID_TYPE;
-	}
-
-	cur_max_type++;
-
-	obj_info = g_new (CamelTypeInfo, 1);
-	obj_info->self = cur_max_type;
-	obj_info->parent = parent;
-	obj_info->name = name;
-
-	obj_info->instance_size = instance_size;
-	chunkname =
-		g_strdup_printf ("chunk for instances of Camel type `%s'",
-				 name);
-	obj_info->instance_chunk =
-		g_mem_chunk_new (chunkname, instance_size,
-				 instance_size * DEFAULT_PREALLOCS,
-				 G_ALLOC_ONLY);
-	g_free (chunkname);
-	obj_info->instance_init = instance_init;
-	obj_info->instance_finalize = instance_finalize;
-	obj_info->free_instances = NULL;
-
-	obj_info->classfuncs_size = classfuncs_size;
-	obj_info->class_init = class_init;
-	obj_info->class_finalize = class_finalize;
-
-	g_hash_table_insert (ctype_to_typeinfo,
-			     GINT_TO_POINTER (obj_info->self), obj_info);
-
-	/* Sigh. Ugly. */
-	make_global_classfuncs (obj_info);
-
-	camel_type_lock_down ();
-	return obj_info->self;
-}
-
-CamelObjectClass *
-camel_type_get_global_classfuncs (CamelType type)
-{
-	CamelTypeInfo *type_info;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);
-
-	camel_type_lock_up ();
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-	camel_type_lock_down ();
-
-	g_return_val_if_fail (type_info != NULL, NULL);
-
-	return type_info->global_classfuncs;
-}
-
-const gchar *
-camel_type_to_name (CamelType type)
-{
-	CamelTypeInfo *type_info;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE,
-			      "(the invalid type)");
-
-	camel_type_lock_up ();
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-	camel_type_lock_down ();
-
-	g_return_val_if_fail (type_info != NULL,
-			      "(a bad type parameter was specified)");
-
-	return type_info->name;
-}
-
-/* ** The CamelObject ***************************************************** */
-
-static void
-obj_init (CamelObject * obj)
-{
-	obj->s.magic = CAMEL_OBJECT_MAGIC_VALUE;
-	obj->ref_count = 1;
-	obj->event_to_hooklist = NULL;
-	obj->in_event = 0;
-}
-
-static void
-obj_finalize (CamelObject * obj)
-{
-	g_return_if_fail (obj->s.magic == CAMEL_OBJECT_MAGIC_VALUE);
-	g_return_if_fail (obj->ref_count == 0);
-	g_return_if_fail (obj->in_event == 0);
-
-	obj->s.magic = CAMEL_OBJECT_FINALIZED_VALUE;
-
-	if (obj->event_to_hooklist) {
-		g_hash_table_foreach (obj->event_to_hooklist, (GHFunc) g_free,
-				      NULL);
-		g_hash_table_destroy (obj->event_to_hooklist);
-		obj->event_to_hooklist = NULL;
-	}
-}
-
-static void
-obj_class_init (CamelObjectClass * class)
-{
-	class->s.magic = CAMEL_OBJECT_CLASS_MAGIC_VALUE;
-
-	camel_object_class_declare_event (class, "finalize", NULL);
-}
-
-static void
-obj_class_finalize (CamelObjectClass * class)
-{
-	g_return_if_fail (class->s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE);
-
-	class->s.magic = CAMEL_OBJECT_CLASS_FINALIZED_VALUE;
-
-	if (class->event_to_preplist) {
-		g_hash_table_foreach (class->event_to_preplist,
-				      (GHFunc) g_free, NULL);
-		g_hash_table_destroy (class->event_to_preplist);
-		class->event_to_preplist = NULL;
-	}
-}
-
-CamelType
-camel_object_get_type (void)
-{
-	if (type_system_initialized == FALSE)
-		camel_type_init ();
-
-	return camel_object_type;
-}
-
-CamelObject *
-camel_object_new (CamelType type)
-{
-	CamelTypeInfo *type_info;
-	GSList *parents = NULL;
-	GSList *head = NULL;
-	CamelObject *instance;
-
-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);
-
-	/* Look up the type */
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (type));
-
-	if (type_info == NULL) {
-		g_warning
-			("camel_object_new: trying to create object of invalid type %d",
-			 type);
-		camel_type_lock_down ();
-		return NULL;
-	}
-
-	/* Grab an instance out of the freed ones if possible, alloc otherwise */
-
-	if (type_info->free_instances) {
-		GList *first;
-
-		first = g_list_first (type_info->free_instances);
-		instance = first->data;
-		type_info->free_instances =
-			g_list_remove_link (type_info->free_instances, first);
-		g_list_free_1 (first);
-	} else {
-		instance = g_mem_chunk_alloc0 (type_info->instance_chunk);
-	}
-
-	/* Init the instance and classfuncs a bit */
-
-	instance->s.type = type;
-	instance->classfuncs = type_info->global_classfuncs;
-
-	/* Loop through the parents in simplest -> most complex order, initing the class and instance.
-
-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL
-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?
-	 */
-
-	while (type_info) {
-		parents = g_slist_prepend (parents, type_info);
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->instance_init)
-			(thisinfo->instance_init) (instance);
-	}
-
-	g_slist_free (head);
-
-	camel_type_lock_down ();
-	return instance;
-}
-
-void
-camel_object_ref (CamelObject * obj)
-{
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-
-	G_LOCK (refcount);
-	obj->ref_count++;
-	G_UNLOCK (refcount);
-}
-
-void
-camel_object_unref (CamelObject * obj)
-{
-	CamelTypeInfo *type_info;
-	CamelTypeInfo *iter;
-	GSList *parents = NULL;
-	GSList *head = NULL;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-
-	G_LOCK (refcount);
-	obj->ref_count--;
-
-	if (obj->ref_count > 0) {
-		G_UNLOCK (refcount);
-		return;
-	}
-
-	G_UNLOCK (refcount);
-
-	/* Oh no! We want to emit a "finalized" event, but that function refs the object
-	 * because it's not supposed to get finalized in an event, but it is being finalized
-	 * right now, and AAUGH AAUGH AUGH AUGH!
-	 *
-	 * So we don't call camel_object_trigger_event. We do it ourselves. We even know
-	 * that CamelObject doesn't provide a prep for the finalized event, so we plunge
-	 * right in and call our hooks.
-	 *
-	 * And there was much rejoicing.
-	 */
-
-#define hooklist parents	/*cough */
-
-	if (obj->event_to_hooklist) {
-		CamelHookPair *pair;
-
-		hooklist =
-			g_hash_table_lookup (obj->event_to_hooklist,
-					     "finalize");
-
-		while (hooklist && hooklist->data) {
-			pair = hooklist->data;
-			(pair->func) (obj, NULL, pair->user_data);
-			hooklist = hooklist->next;
-		}
-	}
-
-	hooklist = NULL;	/* Don't mess with this line */
-
-#undef hooklist
-
-	/* Destroy it! hahaha! */
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (obj->s.type));
-
-	if (type_info == NULL) {
-		g_warning
-			("camel_object_unref: seemingly valid object has a bad type %d",
-			 obj->s.type);
-		camel_type_lock_down ();
-		return;
-	}
-
-	/* Loop through the parents in most complex -> simplest order, finalizing the class 
-	 * and instance.
-	 *
-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL
-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?
-	 *
-	 * Use iter to preserve type_info for free_{instance,classfunc}s
-	 */
-
-	iter = type_info;
-
-	while (iter) {
-		parents = g_slist_prepend (parents, iter);
-		iter =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (iter->parent));
-	}
-
-	parents = g_slist_reverse (parents);
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->instance_finalize)
-			(thisinfo->instance_finalize) (obj);
-	}
-
-	g_slist_free (head);
-
-	/* A little bit of cleaning up.
-
-	 * Don't erase the type, so we can peek at it if a finalized object
-	 * is check_cast'ed somewhere.
-	 */
-
-	memset (obj, 0, type_info->instance_size);
-	obj->s.type = type_info->self;
-	obj->s.magic = CAMEL_OBJECT_FINALIZED_VALUE;
-
-	/* Tuck away the pointer for use in a new object */
-
-	type_info->free_instances =
-		g_list_prepend (type_info->free_instances, obj);
-
-	camel_type_lock_down ();
-}
-
-gboolean
-camel_object_is_of_type (CamelObject * obj, CamelType ctype)
-{
-	return shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE);
-}
-
-gboolean
-camel_object_class_is_of_type (CamelObjectClass * class, CamelType ctype)
-{
-	return shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE);
-}
-
-#ifdef BAST_CASTARD
-#define ERRVAL NULL
-#else
-#define ERRVAL obj
-#endif
-
-CamelObject *
-camel_object_check_cast (CamelObject * obj, CamelType ctype)
-{
-	if (shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE))
-		return obj;
-	return ERRVAL;
-}
-
-CamelObjectClass *
-camel_object_class_check_cast (CamelObjectClass * class, CamelType ctype)
-{
-	if (shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE))
-		return class;
-	return ERRVAL;
-}
-
-#undef ERRVAL
-
-gchar *
-camel_object_describe (CamelObject * obj)
-{
-	if (obj == NULL)
-		return g_strdup ("a NULL pointer");
-
-	if (obj->s.magic == CAMEL_OBJECT_MAGIC_VALUE) {
-		return g_strdup_printf ("an instance of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_FINALIZED_VALUE) {
-		return g_strdup_printf ("a finalized instance of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-		return g_strdup_printf ("the classfuncs of `%s' at %p",
-					camel_type_to_name (obj->s.type),
-					obj);
-	} else if (obj->s.magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {
-		return
-			g_strdup_printf
-			("the finalized classfuncs of `%s' at %p",
-			 camel_type_to_name (obj->s.type), obj);
-	}
-
-	return g_strdup ("not a CamelObject");
-}
-
-/* This is likely to be called in the class_init callback,
- * and the type will likely be somewhat uninitialized. 
- * Is this a problem? We'll see....
- */
-void
-camel_object_class_declare_event (CamelObjectClass * class,
-				  const gchar * name,
-				  CamelObjectEventPrepFunc prep)
-{
-	g_return_if_fail (CAMEL_IS_OBJECT_CLASS (class));
-	g_return_if_fail (name);
-
-	if (class->event_to_preplist == NULL)
-		class->event_to_preplist =
-			g_hash_table_new (g_str_hash, g_str_equal);
-	else if (g_hash_table_lookup (class->event_to_preplist, name) != NULL) {
-		g_warning
-			("camel_object_class_declare_event: event `%s' already declared for `%s'",
-			 name, camel_type_to_name (class->s.type));
-		return;
-	}
-
-	/* AIEEEEEEEEEEEEEEEEEEEEEE
-
-	 * I feel so naughty. Since it's valid to declare an event and not
-	 * provide a hook, it should be valid to insert a NULL value into
-	 * the table. However, then our lookup in trigger_event would be
-	 * ambiguous, not telling us whether the event is undefined or whether
-	 * it merely has no hook.
-	 *
-	 * So we create an 'NULL prep' value that != NULL... specifically, it
-	 * equals the address of one of our static functions , because that
-	 * can't possibly be your hook.
-	 *
-	 * Just don't forget to check for the 'evil value' and it'll work,
-	 * I promise.
-	 */
-
-	if (prep == NULL)
-		prep = NULL_PREP_VALUE;
-
-	g_hash_table_insert (class->event_to_preplist, g_strdup (name), prep);
-}
-
-void
-camel_object_hook_event (CamelObject * obj, const gchar * name,
-			 CamelObjectEventHookFunc hook, gpointer user_data)
-{
-	GSList *hooklist;
-	CamelHookPair *pair;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-	g_return_if_fail (hook);
-
-	if (obj->event_to_hooklist == NULL)
-		obj->event_to_hooklist =
-			g_hash_table_new (g_str_hash, g_str_equal);
-
-	pair = g_new (CamelHookPair, 1);
-	pair->func = hook;
-	pair->user_data = user_data;
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-	hooklist = g_slist_prepend (hooklist, pair);
-	g_hash_table_insert (obj->event_to_hooklist, g_strdup (name),
-			     hooklist);
-}
-
-void
-camel_object_unhook_event (CamelObject * obj, const gchar * name,
-			   CamelObjectEventHookFunc hook, gpointer user_data)
-{
-	GSList *hooklist;
-	GSList *head;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-	g_return_if_fail (hook);
-
-	if (obj->event_to_hooklist == NULL) {
-		g_warning
-			("camel_object_unhook_event: trying to unhook `%s' from an instance "
-			 "of `%s' with no hooks attached", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-
-	if (hooklist == NULL) {
-		g_warning
-			("camel_object_unhook_event: trying to unhook `%s' from an instance "
-			 "of `%s' with no hooks attached to that event.",
-			 name, camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	head = hooklist;
-
-	while (hooklist) {
-		CamelHookPair *pair = (CamelHookPair *) hooklist->data;
-
-		if (pair->func == hook && pair->user_data == user_data) {
-			g_free (hooklist->data);
-			head = g_slist_remove_link (head, hooklist);
-			g_slist_free_1 (hooklist);
-			g_hash_table_insert (obj->event_to_hooklist, (char *) name,
-					     head);
-			return;
-		}
-
-		hooklist = hooklist->next;
-	}
-
-	g_warning
-		("camel_object_unhook_event: cannot find hook/data pair %p/%p in an "
-		 "instance of `%s' attached to `%s'", hook, user_data,
-		 camel_type_to_name (obj->s.type), name);
-}
-
-void
-camel_object_trigger_event (CamelObject * obj, const gchar * name,
-			    gpointer event_data)
-{
-	GSList *hooklist;
-	CamelHookPair *pair;
-	CamelObjectEventPrepFunc prep;
-
-	g_return_if_fail (CAMEL_IS_OBJECT (obj));
-	g_return_if_fail (name);
-
-	if (obj->in_event) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger `%s' in class "
-			 "`%s' while already triggering another event", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	if (obj->classfuncs->event_to_preplist == NULL) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger `%s' in class "
-			 "`%s' with no defined events.", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	prep = g_hash_table_lookup (obj->classfuncs->event_to_preplist, name);
-
-	if (prep == NULL) {
-		g_warning
-			("camel_object_trigger_event: trying to trigger undefined "
-			 "event `%s' in class `%s'.", name,
-			 camel_type_to_name (obj->s.type));
-		return;
-	}
-
-	/* Ref so that it can't get destroyed in the event, which would
-	 * be Bad. And it's a valid ref anyway...
-	 */
-
-	camel_object_ref (obj);
-	obj->in_event = 1;
-
-	if ((prep != NULL_PREP_VALUE && !prep (obj, event_data))
-	    || obj->event_to_hooklist == NULL) {
-		obj->in_event = 0;
-		camel_object_unref (obj);
-		return;
-	}
-
-	hooklist = g_hash_table_lookup (obj->event_to_hooklist, name);
-
-	while (hooklist && hooklist->data) {
-		pair = hooklist->data;
-		(pair->func) (obj, event_data, pair->user_data);
-		hooklist = hooklist->next;
-	}
-
-	obj->in_event = 0;
-	camel_object_unref (obj);
-}
-
-/* ** Static helpers ****************************************************** */
-
-static gboolean
-shared_is_of_type (CamelObjectShared * sh, CamelType ctype, gboolean is_obj)
-{
-	CamelTypeInfo *type_info;
-	gchar *targtype;
-
-	if (is_obj)
-		targtype = "instance";
-	else
-		targtype = "classdata";
-
-	if (ctype == CAMEL_INVALID_TYPE) {
-		g_warning
-			("shared_is_of_type: trying to cast to CAMEL_INVALID_TYPE");
-		return FALSE;
-	}
-
-	if (sh == NULL) {
-		g_warning
-			("shared_is_of_type: trying to cast NULL to %s of `%s'",
-			 targtype, camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (sh->magic == CAMEL_OBJECT_FINALIZED_VALUE) {
-		g_warning
-			("shared_is_of_type: trying to cast finalized instance "
-			 "of `%s' into %s of `%s'",
-			 camel_type_to_name (sh->type), targtype,
-			 camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (sh->magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {
-		g_warning
-			("shared_is_of_type: trying to cast finalized classdata "
-			 "of `%s' into %s of `%s'",
-			 camel_type_to_name (sh->type), targtype,
-			 camel_type_to_name (ctype));
-		return FALSE;
-	}
-
-	if (is_obj) {
-		if (sh->magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast classdata "
-				 "of `%s' into instance of `%s'",
-				 camel_type_to_name (sh->type),
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-
-		if (sh->magic != CAMEL_OBJECT_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast junk data "
-				 "into instance of `%s'",
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-	} else {
-		if (sh->magic == CAMEL_OBJECT_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast instance "
-				 "of `%s' into classdata of `%s'",
-				 camel_type_to_name (sh->type),
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-
-		if (sh->magic != CAMEL_OBJECT_CLASS_MAGIC_VALUE) {
-			g_warning
-				("shared_is_of_type: trying to cast junk data "
-				 "into classdata of `%s'",
-				 camel_type_to_name (ctype));
-			return FALSE;
-		}
-	}
-
-	camel_type_lock_up ();
-
-	type_info =
-		g_hash_table_lookup (ctype_to_typeinfo,
-				     GINT_TO_POINTER (sh->type));
-
-	if (type_info == NULL) {
-		g_warning ("shared_is_of_type: seemingly valid %s has "
-			   "bad type %d.", targtype, sh->type);
-		camel_type_lock_down ();
-		return FALSE;
-	}
-
-	while (type_info) {
-		if (type_info->self == ctype) {
-			camel_type_lock_down ();
-			return TRUE;
-		}
-
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	/* this isn't an error, e.g. CAMEL_IS_FOLDER(folder), its upto  the
-	   caller to handle the false case */
-	/*g_warning
-		("shared_is_of_type: %s of `%s' (@%p) is not also %s of `%s'",
-		 targtype, camel_type_to_name (sh->type), sh, targtype,
-		 camel_type_to_name (ctype));*/
-
-	camel_type_lock_down ();
-	return FALSE;
-}
-
-static void
-make_global_classfuncs (CamelTypeInfo * type_info)
-{
-	CamelObjectClass *funcs;
-	GSList *parents;
-	GSList *head;
-
-	g_assert (type_info);
-
-	funcs = g_malloc0 (type_info->classfuncs_size);
-	funcs->s.type = type_info->self;
-
-	type_info->global_classfuncs = funcs;
-
-	parents = NULL;
-	while (type_info) {
-		parents = g_slist_prepend (parents, type_info);
-		type_info =
-			g_hash_table_lookup (ctype_to_typeinfo,
-					     GINT_TO_POINTER (type_info->
-							      parent));
-	}
-
-	head = parents;
-
-	for (; parents && parents->data; parents = parents->next) {
-		CamelTypeInfo *thisinfo;
-
-		thisinfo = parents->data;
-		if (thisinfo->class_init)
-			(thisinfo->class_init) (funcs);
-	}
-
-	g_slist_free (head);
-}
diff --git a/camel/camel-object.h b/camel/camel-object.h
deleted file mode 100644
index 1308e075d5..0000000000
--- a/camel/camel-object.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-object.h: Base class for Camel */
-
-/*
- * Author:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_OBJECT_H
-#define CAMEL_OBJECT_H 1
-
-#ifdef __cplusplus
-extern "C"
-{
-#pragma }
-#endif				/* __cplusplus } */
-
-#include <stdlib.h>		/* size_t */
-#include <camel/camel-types.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#ifdef G_DISABLE_CHECKS
-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) obj)
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) class)
-#define CAMEL_CHECK_TYPE( obj, ctype )                (TRUE)
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (TRUE)
-#else
-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) camel_object_check_cast( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(class), (CamelType)(ctype) ))
-#define CAMEL_CHECK_TYPE( obj, ctype )                (camel_object_is_of_type( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(class), (CamelType)(ctype) ))
-#endif
-
-#define CAMEL_INVALID_TYPE ((CamelType)0)
-
-#define CAMEL_OBJECT_TYPE        (camel_object_get_type ())
-
-#define CAMEL_OBJECT(obj)        (CAMEL_CHECK_CAST((obj), CAMEL_OBJECT_TYPE, CamelObject))
-#define CAMEL_OBJECT_CLASS(k)    (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_OBJECT_TYPE, CamelObjectClass))
-#define CAMEL_IS_OBJECT(o)       (CAMEL_CHECK_TYPE((o), CAMEL_OBJECT_TYPE))
-#define CAMEL_IS_OBJECT_CLASS(k) (CAMEL_CHECK_CLASS_TYPE((k), CAMEL_OBJECT_TYPE))
-
-#define CAMEL_OBJECT_GET_CLASS(o) ((CamelObjectClass *)(CAMEL_OBJECT(o))->classfuncs)
-#define CAMEL_OBJECT_GET_TYPE(o)  ((CamelType)(CAMEL_OBJECT(o))->s.type)
-
-	typedef guint32 CamelType;
-
-	typedef struct _CamelObjectShared
-	{
-		guint32 magic;
-		CamelType type;
-	}
-	CamelObjectShared;
-
-	typedef struct _CamelObjectClass
-	{
-		CamelObjectShared s;
-
-		GHashTable *event_to_preplist;
-	}
-	CamelObjectClass;
-
-	typedef struct _CamelObject
-	{
-		CamelObjectShared s;
-		guint32 ref_count:31;
-		guint32 in_event:1;
-		CamelObjectClass *classfuncs;
-		GHashTable *event_to_hooklist;
-	}
-	CamelObject;
-
-	typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);
-	typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);
-	typedef void (*CamelObjectInitFunc) (CamelObject *);
-	typedef void (*CamelObjectFinalizeFunc) (CamelObject *);
-
-	typedef gboolean (*CamelObjectEventPrepFunc) (CamelObject *,
-						      gpointer);
-	typedef void (*CamelObjectEventHookFunc) (CamelObject *, gpointer,
-						  gpointer);
-
-/* The type system .... it's pretty simple..... */
-
-	void camel_type_init (void);
-	CamelType camel_type_register (CamelType parent, const gchar * name,
-				       size_t instance_size,
-				       size_t classfuncs_size,
-				       CamelObjectClassInitFunc class_init,
-				       CamelObjectClassFinalizeFunc
-				       class_finalize,
-				       CamelObjectInitFunc instance_init,
-				       CamelObjectFinalizeFunc
-				       instance_finalize);
-	CamelObjectClass *camel_type_get_global_classfuncs (CamelType type);
-	const gchar *camel_type_to_name (CamelType type);
-
-	CamelType camel_object_get_type (void);
-	CamelObject *camel_object_new (CamelType type);
-	void camel_object_ref (CamelObject * obj);
-	void camel_object_unref (CamelObject * obj);
-	CamelObject *camel_object_check_cast (CamelObject * obj,
-					      CamelType ctype);
-	CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *
-							 class,
-							 CamelType ctype);
-	gboolean camel_object_is_of_type (CamelObject * obj, CamelType ctype);
-	gboolean camel_object_class_is_of_type (CamelObjectClass * class,
-						CamelType ctype);
-	gchar *camel_object_describe (CamelObject * obj);
-	void camel_object_class_declare_event (CamelObjectClass * class,
-					       const gchar * name,
-					       CamelObjectEventPrepFunc prep);
-	void camel_object_hook_event (CamelObject * obj, const gchar * name,
-				      CamelObjectEventHookFunc hook,
-				      gpointer user_data);
-	void camel_object_unhook_event (CamelObject * obj, const gchar * name,
-					CamelObjectEventHookFunc hook,
-					gpointer user_data);
-	void camel_object_trigger_event (CamelObject * obj,
-					 const gchar * name,
-					 gpointer event_data);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif				/* CAMEL_OBJECT_H */
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
deleted file mode 100644
index 03be7cdf1e..0000000000
--- a/camel/camel-provider.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-provider.c: provider framework */
-
-/*
- *
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-/* FIXME: Shouldn't we add a version number to providers ? */
-
-#include "config.h"
-#include "camel-provider.h"
-#include "camel-exception.h"
-#include "hash-table-utils.h"
-
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <gmodule.h>
-
-/**
- * camel_provider_init:
- *
- * Initialize the Camel provider system by reading in the .urls
- * files in the provider directory and creating a hash table mapping
- * URLs to module names.
- *
- * A .urls file has the same initial prefix as the shared library it
- * correspond to, and consists of a series of lines containing the URL
- * protocols that that library handles.
- *
- * Return value: a hash table mapping URLs to module names
- **/
-GHashTable *
-camel_provider_init (void)
-{
-	GHashTable *providers;
-	DIR *dir;
-	struct dirent *d;
-	char *p, *name, buf[80];
-	FILE *f;
-
-	providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-
-	dir = opendir (CAMEL_PROVIDERDIR);
-	if (!dir) {
-		g_error ("Could not open camel provider directory: %s",
-			 g_strerror (errno));
-		return NULL;
-	}
-
-	while ((d = readdir (dir))) {
-		p = strchr (d->d_name, '.');
-		if (!p || strcmp (p, ".urls") != 0)
-			continue;
-
-		name = g_strdup_printf ("%s/%s", CAMEL_PROVIDERDIR, d->d_name);
-		f = fopen (name, "r");
-		if (!f) {
-			g_warning ("Could not read provider info file %s: %s",
-				   name, g_strerror (errno));
-			g_free (name);
-			continue;
-		}
-
-		p = strrchr (name, '.');
-		strcpy (p, ".so");
-		while ((fgets (buf, sizeof (buf), f))) {
-			buf[sizeof (buf) - 1] = '\0';
-			p = strchr (buf, '\n');
-			if (p)
-				*p = '\0';
-
-			g_hash_table_insert (providers, g_strdup (buf), name);
-		}
-		fclose (f);
-	}
-
-	closedir (dir);
-	return providers;
-}
-
-/**
- * camel_provider_load:
- * @session: the current session
- * @path: the path to a shared library
- * @ex: a CamelException
- *
- * Loads the provider at @path, and calls its initialization function,
- * passing @session as an argument. The provider should then register
- * itself with @session.
- **/ 
-void
-camel_provider_load (CamelSession *session, const char *path, CamelException *ex)
-{
-	GModule *module;
-	CamelProvider *(*camel_provider_module_init) ();
-
-	if (!g_module_supported ()) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not load %s: Module loading "
-				      "not supported on this system.",
-				      path);
-		return;
-	}
-
-	module = g_module_open (path, 0);
-	if (!module) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load %s: %s"),
-				      path, g_module_error ());
-		return;
-	}
-
-	if (!g_module_symbol (module, "camel_provider_module_init",
-			      (gpointer *)&camel_provider_module_init)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load %s: No initialization "
-					"code in module."), path);
-		g_module_close (module);
-		return;
-	}
-
-	camel_provider_module_init (session);
-}
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
deleted file mode 100644
index f5a434cde5..0000000000
--- a/camel/camel-provider.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-provider.h :  provider definition  */
-
-/*
- *
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_PROVIDER_H
-#define CAMEL_PROVIDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-types.h>
-#include <camel/camel-object.h>
-
-#define CAMEL_PROVIDER(obj) ((CamelProvider *)(obj))
-
-typedef enum {
-	CAMEL_PROVIDER_STORE,
-	CAMEL_PROVIDER_TRANSPORT,
-	CAMEL_NUM_PROVIDER_TYPES
-} CamelProviderType;
-
-extern char *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
-
-/* _IS_SOURCE means the user can get mail from there.
- * _IS_STORAGE means the user can read mail from there.
- */
-#define CAMEL_PROVIDER_IS_REMOTE	(1 << 0)
-#define CAMEL_PROVIDER_IS_SOURCE	(1 << 1)
-#define CAMEL_PROVIDER_IS_STORAGE	(1 << 2)
-
-
-/* Flags for url_flags. "ALLOW" means the config dialog will let
- * the user configure it. "NEED" implies "ALLOW" but means the user
- * must configure it. Service code can assume that any url part
- * for which it has set the NEED flag will be set when the service
- * is created.
- */
-#define CAMEL_URL_ALLOW_USER	 (1 << 0)
-#define CAMEL_URL_ALLOW_AUTH	 (1 << 1)
-#define CAMEL_URL_ALLOW_PASSWORD (1 << 2)
-#define CAMEL_URL_ALLOW_HOST	 (1 << 3)
-#define CAMEL_URL_ALLOW_PORT	 (1 << 4)
-#define CAMEL_URL_ALLOW_PATH	 (1 << 5)
-
-#define CAMEL_URL_NEED_USER	 (1 << 6 | 1 << 0)
-#define CAMEL_URL_NEED_AUTH	 (1 << 7 | 1 << 1)
-#define CAMEL_URL_NEED_PASSWORD	 (1 << 8 | 1 << 2)
-#define CAMEL_URL_NEED_HOST	 (1 << 9 | 1 << 3)
-#define CAMEL_URL_NEED_PORT	 (1 << 10 | 1 << 4)
-#define CAMEL_URL_NEED_PATH	 (1 << 11 | 1 << 5)
-
-
-typedef struct {
-	/* Provider name used in CamelURLs. */
-	char *protocol;
-
-	/* Provider name as used by people. (May be the same as protocol) */
-	char *name;
-
-	/* Description of the provider. A novice user should be able
-	 * to read this description, and the information provided by
-	 * an ISP, IS department, etc, and determine whether or not
-	 * this provider is relevant to him, and if so, which
-	 * information goes with it.
-	 */
-	char *description;
-
-	/* The category of message that this provider works with.
-	 * (evolution-mail will only list a provider in the store/transport
-	 * config dialogs if its domain is "mail".)
-	 */
-	char *domain;
-
-	int flags, url_flags;
-
-	CamelType object_types [CAMEL_NUM_PROVIDER_TYPES];
-
-	GHashTable *service_cache;
-	
-} CamelProvider;
-
-GHashTable *camel_provider_init (void);
-void camel_provider_load (CamelSession *session, const char *path, CamelException *ex);
-
-/* This is defined by each module, not by camel-provider.c. */
-void camel_provider_module_init (CamelSession *session);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_PROVIDER_H */
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
deleted file mode 100644
index eeca0d4080..0000000000
--- a/camel/camel-remote-store.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-remote-store.c : class for an remote store */
-
-/*
- *  Authors: Peter Williams <peterw@helixcode.com>
- *           based on camel-imap-provider.c
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <gal/util/e-util.h>
-
-#include "camel-remote-store.h"
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-session.h"
-#include "camel-stream.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#define d(x) x
-#if d(!)0
-extern gboolean camel_verbose_debug;
-#endif
-
-#define CSRVC(obj) (CAMEL_SERVICE_CLASS      (CAMEL_OBJECT_GET_CLASS (obj)))
-#define CSTRC(obj) (CAMEL_STORE_CLASS        (CAMEL_OBJECT_GET_CLASS (obj)))
-#define CRSC(obj)  (CAMEL_REMOTE_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (obj)))
-
-static CamelStoreClass *store_class = NULL;
-
-static gboolean remote_connect         (CamelService *service, CamelException *ex);
-static gboolean remote_disconnect      (CamelService *service, gboolean clean, CamelException *ex);
-static GList   *remote_query_auth_types_generic   (CamelService *service, CamelException *ex);
-static GList   *remote_query_auth_types_connected (CamelService *service, CamelException *ex);
-static void     remote_free_auth_types (CamelService *service, GList *authtypes);
-static char    *remote_get_name        (CamelService *service, gboolean brief);
-static char    *remote_get_folder_name (CamelStore *store, 
-					const char *folder_name, 
-					CamelException *ex);
-static gint     remote_send_string     (CamelRemoteStore *store, CamelException *ex, 
-					char *fmt, va_list ap);
-static gint     remote_send_stream     (CamelRemoteStore *store, CamelStream *stream,
-					CamelException *ex);
-static gint     remote_recv_line       (CamelRemoteStore *store, char **dest, 
-					CamelException *ex);
-
-static void
-camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)
-{
-	/* virtual method overload */
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_remote_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_remote_store_class);
-	
-	store_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = remote_connect;
-	camel_service_class->disconnect = remote_disconnect;
-	camel_service_class->query_auth_types_generic = remote_query_auth_types_generic;
-	camel_service_class->query_auth_types_connected = remote_query_auth_types_connected;
-	camel_service_class->free_auth_types = remote_free_auth_types;
-	camel_service_class->get_name = remote_get_name;
-	
-	camel_store_class->get_folder_name = remote_get_folder_name;
-	
-	camel_remote_store_class->send_string = remote_send_string;
-	camel_remote_store_class->send_stream = remote_send_stream;
-	camel_remote_store_class->recv_line = remote_recv_line;
-	camel_remote_store_class->keepalive = NULL;
-}
-
-static void
-camel_remote_store_init (CamelObject *object)
-{
-	CamelStore *store = CAMEL_STORE (object);
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	
-	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	remote_store->istream = NULL;
-	remote_store->ostream = NULL;
-	remote_store->timeout_id = 0;
-}
-
-/*
- *static void
- *camel_remote_store_finalize (CamelObject *object)
- *{
- *	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
- *
- *	g_free (remote_store->nice_name);
- *}
- */
-
-CamelType
-camel_remote_store_get_type (void)
-{
-	static CamelType camel_remote_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_remote_store_type == CAMEL_INVALID_TYPE) {
-		camel_remote_store_type =
-			camel_type_register (CAMEL_STORE_TYPE, "CamelRemoteStore",
-					     sizeof (CamelRemoteStore),
-					     sizeof (CamelRemoteStoreClass),
-					     (CamelObjectClassInitFunc) camel_remote_store_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_remote_store_init,
-					     (CamelObjectFinalizeFunc) NULL);
-	}
-	
-	return camel_remote_store_type;
-}
-
-/* Auth stuff */
-
-/*
-static CamelServiceAuthType password_authtype = {
-	N_("SSH Tunneling"),
-	
-	N_("This option will connect to the server using a "
-	   "SSH tunnel."),
-	
-	"",
-	TRUE
-};
-*/
-
-static GList *
-remote_query_auth_types_connected (CamelService *service, CamelException *ex)
-{
-	return NULL;
-}
-
-static GList *
-remote_query_auth_types_generic (CamelService *service, CamelException *ex)
-{
-	return NULL;
-}
-
-static void
-remote_free_auth_types (CamelService *service, GList *authtypes)
-{
-	g_list_free (authtypes);
-}
-
-static char *
-remote_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf (_("%s server %s"),
-					service->provider->name,
-					service->url->host);
-	else {
-		return g_strdup_printf (_("%s service for %s on %s"),
-					service->provider->name,
-					service->url->user,
-					service->url->host);
-	}
-}
-
-static gboolean
-timeout_cb (gpointer data)
-{
-	CRSC (data)->keepalive (CAMEL_REMOTE_STORE (data));
-	return TRUE;
-}
-
-static gboolean
-remote_connect (CamelService *service, CamelException *ex)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);
-	struct hostent *h;
-	struct sockaddr_in sin;
-	gint fd;
-	gint port;
-	
-	h = camel_service_gethost (service, ex);
-	if (!h)
-		return FALSE;
-	
-	/* connect to the server */
-	sin.sin_family = h->h_addrtype;
-	
-	if (service->url->port)
-		port = service->url->port;
-	else
-		port = store->default_port;	
-	sin.sin_port = htons (port);
-	
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof (sin)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not connect to %s (port %d): %s"),
-				      service->url->host ? service->url->host : _("(unknown host)"),
-				      port, g_strerror (errno));
-		if (fd > -1)
-			close (fd);
-		
-		return FALSE;
-	}
-	
-	/* parent class connect initialization */
-	if (CAMEL_SERVICE_CLASS (store_class)->connect (service, ex) == FALSE)
-		return FALSE;
-	
-	store->ostream = camel_stream_fs_new_with_fd (fd);
-	store->istream = camel_stream_buffer_new (store->ostream, CAMEL_STREAM_BUFFER_READ);
-	
-	/* Okay, good enough for us */
-	CAMEL_SERVICE (store)->connected = TRUE;
-	
-	/* Add a timeout so that we can hopefully prevent getting disconnected */
-	/* (Only if the implementation supports it) */
-	if (CRSC (store)->keepalive) {
-		CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));
-		
-		store->timeout_id = camel_session_register_timeout (session, 10 * 60 * 1000, 
-								    timeout_cb, 
-								    store);
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-remote_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);
-	
-	if (store->timeout_id) {
-		camel_session_remove_timeout (camel_service_get_session (CAMEL_SERVICE (store)),
-					      store->timeout_id);
-		store->timeout_id = 0;
-	}
-	
-	if (!CAMEL_SERVICE_CLASS (store_class)->disconnect (service, clean, ex))
-		return FALSE;
-	
-	if (store->istream) {
-		camel_object_unref (CAMEL_OBJECT (store->istream));
-		store->istream = NULL;
-	}
-	
-	if (store->ostream) {
-		camel_object_unref (CAMEL_OBJECT (store->ostream));
-		store->ostream = NULL;
-	}
-	
-	return TRUE;
-}
-
-static gchar *
-remote_get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	return g_strdup (folder_name);
-}
-
-static gint
-remote_send_string (CamelRemoteStore *store, CamelException *ex, char *fmt, va_list ap)
-{
-	gchar *cmdbuf;
-	
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. */
-	
-	if (store->ostream == NULL) {
-		d(g_message ("remote: (send) disconnected, reconnecting."));
-		
-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))
-			return -1;
-	}
-	
-	/* create the command */
-	cmdbuf = g_strdup_vprintf (fmt, ap);
-
-#if d(!)0
-	if (camel_verbose_debug) {
-		if (strncmp (cmdbuf, "PASS ", 5) == 0)
-			fprintf (stderr, "sending : PASS xxxx\n");
-		else if (strstr (cmdbuf, "LOGIN \""))
-			fprintf (stderr, "sending : ---- LOGIN \"xxxx\" \"xxxx\"\n");
-		else
-			fprintf (stderr, "sending : %s", cmdbuf);
-	}
-#endif
-	
-	if (camel_stream_printf (store->ostream, "%s", cmdbuf) == -1) {
-		g_free (cmdbuf);
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				     g_strerror (errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-	g_free (cmdbuf);
-	
-	return 0;
-}
-
-/**
- * camel_remote_store_send_string: Writes a string to the server
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- * @fmt: the printf-style format to use for creating the string to send
- * @...: the arguments to the printf string @fmt
- * Return value: 0 on success, nonzero on error
- *
- * Formats the string and sends it to the server.
- **/
-
-gint 
-camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,
-				char *fmt, ...)
-{
-	va_list ap;
-	gint ret;
-	
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (fmt, -1);
-	
-	va_start (ap, fmt);
-	ret = CRSC (store)->send_string (store, ex, fmt, ap);
-	va_end (ap);
-	
-	return ret;
-}
-
-static gint
-remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)
-{
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. */
-	
-	if (store->ostream == NULL) {
-		d(g_message ("remote: (sendstream) disconnected, reconnecting."));
-		
-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))
-			return -1;
-	}
-	
-	d(fprintf (stderr, "(sending stream)\n"));
-	
-	if (camel_stream_write_to_stream (stream, store->ostream) < 0) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				     g_strerror (errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-	
-	return 0;
-}
-
-/**
- * camel_remote_store_send_stream: Writes a CamelStream to the server
- * @store: a CamelRemoteStore
- * @stream: the stream to write
- * @ex: a CamelException
- * Return value: 0 on success, nonzero on error
- *
- * Sends the stream to the server.
- **/
-
-gint 
-camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	
-	return CRSC (store)->send_stream (store, stream, ex);
-}
-
-static gint
-remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)
-{
-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store->istream);
-	
-	*dest = NULL;
-	
-	/* Check for connectedness. Failed (or cancelled) operations will
-	 * close the connection. We can't expect a read to have any
-	 * meaning if we reconnect, so always set an exception.
-	 */
-	
-	if (store->istream == NULL) {
-		g_message ("remote: (recv) disconnected, reconnecting.");
-		
-		camel_service_connect (CAMEL_SERVICE (store), ex);
-		
-		if (!camel_exception_is_set (ex))
-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-					     g_strerror (errno));
-		
-		return -1;
-	}
-	
-	*dest = camel_stream_buffer_read_line (stream);
-	
-	if (!*dest) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				     g_strerror (errno));
-		
-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-		return -1;
-	}
-
-#if d(!)0
-	if (camel_verbose_debug)
-		fprintf (stderr, "received: %s\n", *dest);
-#endif
-	
-	return 0;
-}
-
-/**
- * camel_remote_store_recv_line: Reads a line from the server
- * @store: a CamelRemoteStore
- * @dest: a pointer that will be set to the location of a buffer
- *        holding the server's response
- * @ex: a CamelException
- * Return value: 0 on success, -1 on error
- *
- * Reads a line from the server (terminated by \n or \r\n).
- **/
-
-gint 
-camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,
-			      CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);
-	g_return_val_if_fail (dest, -1);
-	
-	return CRSC (store)->recv_line (store, dest, ex);
-}
-
-static void
-refresh_folder_info (gpointer key, gpointer value, gpointer data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (value);
-	
-	camel_folder_refresh_info (folder, (CamelException *) data);
-}
-
-/**
- * camel_remote_store_refresh_folders: Refresh the folders that I
- * contain
- * @store: a CamelRemoteStore
- * @ex: a CamelException
- *
- * Refreshes the folders listed in the folders hashtable.
- **/
-
-void
-camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)
-{
-	g_hash_table_foreach (CAMEL_STORE (store)->folders, refresh_folder_info, ex);
-}	
diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
deleted file mode 100644
index 2d6bc829c2..0000000000
--- a/camel/camel-remote-store.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-remote-store.h : class for a remote store */
-
-/* 
- * Authors: Peter Williams <peterw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_REMOTE_STORE_H
-#define CAMEL_REMOTE_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-store.h"
-
-#define CAMEL_REMOTE_STORE_TYPE     (camel_remote_store_get_type ())
-#define CAMEL_REMOTE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStore))
-#define CAMEL_REMOTE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStoreClass))
-#define CAMEL_IS_REMOTE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_REMOTE_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;	
-	
-	CamelStream *istream, *ostream;
-	guint timeout_id, default_port;
-} CamelRemoteStore;
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-	gint (*send_string)   (CamelRemoteStore *store, CamelException *ex, 
-			       char *fmt, va_list ap);
-	gint (*send_stream)   (CamelRemoteStore *store, CamelStream *stream, 
-			       CamelException *ex);
-	gint (*recv_line)     (CamelRemoteStore *store, char **dest, 
-			       CamelException *ex);
-	void (*keepalive)     (CamelRemoteStore *store);
-} CamelRemoteStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_remote_store_get_type (void);
-
-/* Extra public functions */
-gint camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,
-				     char *fmt, ...);
-gint camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, 
-				     CamelException *ex);
-gint camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,
-				   CamelException *ex);
-void camel_remote_store_refresh_folders (CamelRemoteStore *store, 
-					 CamelException *ex);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_REMOTE_STORE_H */
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
deleted file mode 100644
index c4ca950baa..0000000000
--- a/camel/camel-seekable-stream.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include "camel-seekable-stream.h"
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelSeekableStream */
-#define CSS_CLASS(so) CAMEL_SEEKABLE_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static off_t seek        (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-static off_t stream_tell (CamelSeekableStream *stream);
-static int   reset       (CamelStream *stream);
-static int   set_bounds  (CamelSeekableStream *stream, off_t start, off_t end);
-
-static void
-camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_seekable_stream_class);
-
-	parent_class = CAMEL_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_STREAM_TYPE ) );
-
-	/* seekable stream methods */
-	camel_seekable_stream_class->seek = seek;
-	camel_seekable_stream_class->tell = stream_tell;
-	camel_seekable_stream_class->set_bounds = set_bounds;
-
-	/* camel stream methods overload */
-	camel_stream_class->reset = reset;
-}
-
-static void
-camel_seekable_stream_init (void *o)
-{
-	CamelSeekableStream *stream = (CamelSeekableStream *)o;
-
-	stream->bound_start = 0;
-	stream->bound_end = CAMEL_STREAM_UNBOUND;
-}
-
-CamelType
-camel_seekable_stream_get_type (void)
-{
-	static CamelType camel_seekable_stream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_seekable_stream_type == CAMEL_INVALID_TYPE) {
-		camel_seekable_stream_type = camel_type_register( CAMEL_STREAM_TYPE,
-								  "CamelSeekableStream",
-								  sizeof( CamelSeekableStream ),
-								  sizeof( CamelSeekableStreamClass ),
-								  (CamelObjectClassInitFunc) camel_seekable_stream_class_init,
-								  NULL,
-								  (CamelObjectInitFunc) camel_seekable_stream_init,
-								  NULL );
-	}
-
-	return camel_seekable_stream_type;
-}
-
-
-static off_t
-seek (CamelSeekableStream *stream, off_t offset,
-      CamelStreamSeekPolicy policy)
-{
-	g_warning ("CamelSeekableStream::seek called on default "
-		   "implementation\n");
-	return -1;
-}
-
-/**
- * camel_stream_seek:
- * @stream: a CamelStream object.
- * @offset: offset value
- * @policy: what to do with the offset
- *
- * Seek to the specified position in @stream.
- *
- * If @policy is CAMEL_STREAM_SET, seeks to @offset.
- *
- * If @policy is CAMEL_STREAM_CUR, seeks to the current position plus
- * @offset.
- *
- * If @policy is CAMEL_STREAM_END, seeks to the end of the stream plus
- * @offset.
- *
- * Regardless of @policy, the stream's final position will be clamped
- * to the range specified by its lower and upper bounds, and the
- * stream's eos state will be updated.
- *
- * Return value: new position, -1 if operation failed.
- **/
-off_t
-camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,
-			    CamelStreamSeekPolicy policy)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-
-	return CSS_CLASS (stream)->seek (stream, offset, policy);
-}
-
-
-static off_t
-stream_tell (CamelSeekableStream *stream)
-{
-	return stream->position;
-}
-
-/**
- * camel_seekable_stream_tell:
- * @stream: seekable stream object
- *
- * Get the current position of a seekable stream.
- *
- * Return value: the position.
- **/
-off_t
-camel_seekable_stream_tell (CamelSeekableStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-
-	return CSS_CLASS (stream)->tell (stream);
-}
-
-static int
-set_bounds (CamelSeekableStream *stream, off_t start, off_t end)
-{
-	/* store the bounds */
-	stream->bound_start = start;
-	stream->bound_end = end;
-
-	if (start > stream->position)
-		return camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET);
-
-	return 0;
-}
-
-/**
- * camel_seekable_stream_set_bounds:
- * @stream: a seekable stream
- * @start: the first valid position
- * @end: the first invalid position, or CAMEL_STREAM_UNBOUND
- *
- * Set the range of valid data this stream is allowed to cover.  If
- * there is to be no @end value, then @end should be set to
- * #CAMEL_STREAM_UNBOUND.
- *
- * Return value: -1 on error.
- **/
-int
-camel_seekable_stream_set_bounds (CamelSeekableStream *stream,
-				  off_t start, off_t end)
-{
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
-	g_return_val_if_fail (end == CAMEL_STREAM_UNBOUND || end >= start, -1);
-
-	return CSS_CLASS (stream)->set_bounds (stream, start, end);
-}
-
-/* a default implementation of reset for seekable streams */
-static int
-reset (CamelStream *stream)
-{
-	CamelSeekableStream *seekable_stream;
-
-	seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-
-	return camel_seekable_stream_seek (seekable_stream,
-					   seekable_stream->bound_start,
-					   CAMEL_STREAM_SET);
-}
-
-
-
-
-
-
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
deleted file mode 100644
index 0fc67d59f8..0000000000
--- a/camel/camel-seekable-stream.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.h :stream based on unix filesystem */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SEEKABLE_STREAM_H
-#define CAMEL_SEEKABLE_STREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-stream.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define CAMEL_SEEKABLE_STREAM_TYPE     (camel_seekable_stream_get_type ())
-#define CAMEL_SEEKABLE_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStream))
-#define CAMEL_SEEKABLE_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass))
-#define CAMEL_IS_SEEKABLE_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_STREAM_TYPE))
-
-
-typedef enum
-{
-	CAMEL_STREAM_SET = SEEK_SET,
-	CAMEL_STREAM_CUR = SEEK_CUR,
-	CAMEL_STREAM_END = SEEK_END
-} CamelStreamSeekPolicy;
-
-#define CAMEL_STREAM_UNBOUND (~0)
-
-struct _CamelSeekableStream
-{
-	CamelStream parent_object;
-
-	off_t position;		/* current postion in the stream */
-	off_t bound_start;	/* first valid position */
-	off_t bound_end;	/* first invalid position */
-};
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	off_t (*seek)       (CamelSeekableStream *stream, off_t offset,
-			     CamelStreamSeekPolicy policy);
-	off_t (*tell)	    (CamelSeekableStream *stream);
-	int  (*set_bounds)  (CamelSeekableStream *stream,
-			     off_t start, off_t end);
-} CamelSeekableStreamClass;
-
-/* Standard Camel function */
-CamelType camel_seekable_stream_get_type (void);
-
-/* public methods */
-off_t    camel_seekable_stream_seek            (CamelSeekableStream *stream, off_t offset,
-						CamelStreamSeekPolicy policy);
-off_t	 camel_seekable_stream_tell    	       (CamelSeekableStream *stream);
-int	 camel_seekable_stream_set_bounds      (CamelSeekableStream *, off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SEEKABLE_STREAM_H */
diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
deleted file mode 100644
index 9b197f97bd..0000000000
--- a/camel/camel-seekable-substream.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.c : file system based stream
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-seekable-substream.h"
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelSeekableSubStream */
-#define CSS_CLASS(so) CAMEL_SEEKABLE_SUBSTREAM_CLASS (CAMEL_OBJECT(so)->klass)
-
-static	int	 stream_read  (CamelStream *stream, char *buffer, unsigned int n);
-static	int	 stream_write (CamelStream *stream, const char *buffer, unsigned int n);
-static	int	 stream_flush (CamelStream *stream);
-static	int	 stream_close (CamelStream *stream);
-static	gboolean eos	      (CamelStream *stream);
-static	off_t	 stream_seek  (CamelSeekableStream *stream, off_t offset,
-			       CamelStreamSeekPolicy policy);
-
-static void
-camel_seekable_substream_class_init (CamelSeekableSubstreamClass *camel_seekable_substream_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_seekable_substream_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_seekable_substream_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->eos = eos;
-
-	camel_seekable_stream_class->seek = stream_seek;
-
-}
-
-static void
-camel_seekable_substream_finalize (CamelObject *object)
-{
-	CamelSeekableSubstream *seekable_substream =
-		CAMEL_SEEKABLE_SUBSTREAM (object);
-
-	if (seekable_substream->parent_stream)
-		camel_object_unref (CAMEL_OBJECT (seekable_substream->parent_stream));
-}
-
-
-CamelType
-camel_seekable_substream_get_type (void)
-{
-	static CamelType camel_seekable_substream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_seekable_substream_type == CAMEL_INVALID_TYPE) {
-		camel_seekable_substream_type = camel_type_register (camel_seekable_stream_get_type (), "CamelSeekableSubstream",
-								     sizeof (CamelSeekableSubstream),
-								     sizeof (CamelSeekableSubstreamClass),
-								     (CamelObjectClassInitFunc) camel_seekable_substream_class_init,
-								     NULL,
-								     NULL,
-								     (CamelObjectFinalizeFunc) camel_seekable_substream_finalize);
-	}
-
-	return camel_seekable_substream_type;
-}
-
-/**
- * camel_seekable_substream_new_with_seekable_stream_and_bounds:
- * @parent_stream: a seekable parent stream
- * @inf_bound: a lower bound
- * @sup_bound: an upper bound
- *
- * Creates a new CamelSeekableSubstream that references the portion
- * of @parent_stream from @inf_bound to @sup_bound. (If @sup_bound is
- * #CAMEL_STREAM_UNBOUND, it references to the end of stream, even if
- * the stream grows.)
- *
- * While the substream is open, the caller cannot assume anything about
- * the current position of @parent_stream. After the substream has been
- * closed, @parent_stream will stabilize again.
- *
- * Return value: the substream
- **/
-CamelStream *
-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream,
-							      off_t start, off_t end)
-{
-	CamelSeekableSubstream *seekable_substream;
-
-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (parent_stream), NULL);
-
-	/* Create the seekable substream. */
-	seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (camel_object_new (camel_seekable_substream_get_type ()));
-
-	/* Initialize it. */
-	seekable_substream->parent_stream = parent_stream;
-	camel_object_ref (CAMEL_OBJECT (parent_stream));
-
-	/* Set the bound of the substream. We can ignore any possible error
-	 * here, because if we fail to seek now, it will try again later.
-	 */
-	camel_seekable_stream_set_bounds ((CamelSeekableStream *)seekable_substream, start, end);
-
-	return CAMEL_STREAM (seekable_substream);
-}
-
-static gboolean
-parent_reset (CamelSeekableSubstream *seekable_substream, CamelSeekableStream *parent)
-{
-	CamelSeekableStream *seekable_stream =
-		CAMEL_SEEKABLE_STREAM (seekable_substream);
-
-	if (camel_seekable_stream_tell (parent) == seekable_stream->position)
-		return TRUE;
-
-	return camel_seekable_stream_seek (parent, seekable_stream->position, CAMEL_STREAM_SET)
-		== seekable_stream->position;
-}
-
-static int
-stream_read (CamelStream *stream, char *buffer, unsigned int n)
-{
-	CamelSeekableStream *parent;
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-	CamelSeekableSubstream *seekable_substream =
-		CAMEL_SEEKABLE_SUBSTREAM (stream);
-	int v;
-
-	if (n == 0)
-		return 0;
-
-	parent = seekable_substream->parent_stream;
-
-	/* Go to our position in the parent stream. */
-	if (!parent_reset (seekable_substream, parent)) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	/* Compute how many bytes should be read. */
-	if (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable_stream->bound_end -  seekable_stream->position, n);
-
-	if (n == 0) {
-		stream->eos = TRUE;
-		return 0;
-	}
-
-	v = camel_stream_read (CAMEL_STREAM (parent), buffer, n);
-
-	/* ignore <0 - it's an error, let the caller deal */
-	if (v > 0)
-		seekable_stream->position += v;
-
-	return v;
-}
-
-static int
-stream_write (CamelStream *stream, const char *buffer, unsigned int n)
-{
-	/* NOT VALID ON SEEKABLE SUBSTREAM */
-	/* Well, it's entirely valid, just not implemented */
-	g_warning ("CamelSeekableSubstream:: seekable substream doesn't "
-		   "have a write method yet?\n");
-	return -1;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	/* NOT VALID ON SEEKABLE SUBSTREAM */
-	g_warning ("CamelSeekableSubstream:: seekable substream doesn't "
-		   "have a flush method\n");
-	return -1;
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	/* we dont really want to close the substream ... */
-	return 0;
-}
-
-static gboolean
-eos (CamelStream *stream)
-{
-	CamelSeekableSubstream *seekable_substream =
-		CAMEL_SEEKABLE_SUBSTREAM (stream);
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-	CamelSeekableStream *parent;
-	gboolean eos;
-
-	if (stream->eos)
-		eos = TRUE;
-	else {
-		parent = seekable_substream->parent_stream;
-		if (!parent_reset (seekable_substream, parent))
-			return TRUE;
-
-		eos = camel_stream_eos (CAMEL_STREAM (parent));
-		if (!eos && (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)) {
-			eos = seekable_stream->position >= seekable_stream->bound_end;
-		}
-	}
-
-	return eos;
-}
-
-static off_t
-stream_seek (CamelSeekableStream *seekable_stream, off_t offset,
-	     CamelStreamSeekPolicy policy)
-{
-	CamelSeekableSubstream *seekable_substream =
-		CAMEL_SEEKABLE_SUBSTREAM (seekable_stream);
-	CamelStream *stream = CAMEL_STREAM (seekable_stream);
-	off_t real_offset = 0;
-
-	stream->eos = FALSE;
-
-	switch (policy) {
-	case CAMEL_STREAM_SET:
-		real_offset = offset;
-		break;
-
-	case CAMEL_STREAM_CUR:
-		real_offset = seekable_stream->position + offset;
-		break;
-
-	case CAMEL_STREAM_END:
-		real_offset = camel_seekable_stream_seek (seekable_substream->parent_stream,
-							  offset,
-							  CAMEL_STREAM_END);
-		if (real_offset == -1)
-			return -1;
-		break;
-	}
-
-	if (seekable_stream->bound_end != CAMEL_STREAM_UNBOUND)
-		real_offset = MIN (real_offset, seekable_stream->bound_end);
-
-	if (real_offset<seekable_stream->bound_start)
-		real_offset = seekable_stream->bound_start;
-
-	seekable_stream->position = real_offset;
-	return real_offset;
-}
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
deleted file mode 100644
index 6ac5588a42..0000000000
--- a/camel/camel-seekable-substream.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-seekable-substream.h: stream that piggybacks on another stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SEEKABLE_SUBSTREAM_H
-#define CAMEL_SEEKABLE_SUBSTREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-
-#define CAMEL_SEEKABLE_SUBSTREAM_TYPE       (camel_seekable_substream_get_type ())
-#define CAMEL_SEEKABLE_SUBSTREAM(obj)       (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))
-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k)   (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))
-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o)      (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE))
-
-struct _CamelSeekableSubstream
-{
-	CamelSeekableStream parent_object;
-
-	/*  --**-- Private fields --**--  */
-	CamelSeekableStream *parent_stream;
-};
-
-typedef struct {
-	CamelSeekableStreamClass parent_class;
-
-} CamelSeekableSubstreamClass;
-
-/* Standard Camel function */
-CamelType camel_seekable_substream_get_type (void);
-
-/* public methods */
-
-/* obtain a new seekable substream */
-CamelStream *
-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream    *parent_stream,
-							      off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SEEKABLE_SUBSTREAM_H */
diff --git a/camel/camel-service.c b/camel/camel-service.c
deleted file mode 100644
index 15702db42f..0000000000
--- a/camel/camel-service.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-service.c : Abstract class for an email service */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-service.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelService */
-#define CSERV_CLASS(so) CAMEL_SERVICE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static gboolean service_connect(CamelService *service, CamelException *ex);
-static gboolean service_disconnect(CamelService *service, gboolean clean,
-				   CamelException *ex);
-/*static gboolean is_connected (CamelService *service);*/
-static GList *  query_auth_types_func (CamelService *service, CamelException *ex);
-static void     free_auth_types (CamelService *service, GList *authtypes);
-static char *   get_name (CamelService *service, gboolean brief);
-static char *   get_path (CamelService *service);
-static gboolean check_url (CamelService *service, CamelException *ex);
-
-
-static void
-camel_service_class_init (CamelServiceClass *camel_service_class)
-{
-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);
-
-	/* virtual method definition */
-	camel_service_class->connect = service_connect;
-	camel_service_class->disconnect = service_disconnect;
-	/*camel_service_class->is_connected = is_connected;*/
-	camel_service_class->query_auth_types_connected = query_auth_types_func;
-	camel_service_class->query_auth_types_generic = query_auth_types_func;
-	camel_service_class->free_auth_types = free_auth_types;
-	camel_service_class->get_name = get_name;
-	camel_service_class->get_path = get_path;
-}
-
-static void
-camel_service_finalize (CamelObject *object)
-{
-	CamelService *camel_service = CAMEL_SERVICE (object);
-
-	if (camel_service->connected) {
-		CamelException ex;
-
-		/*g_warning ("camel_service_finalize: finalizing while still connected!");*/
-		camel_exception_init (&ex);
-		CSERV_CLASS (camel_service)->disconnect (camel_service, FALSE, &ex);
-		if (camel_exception_is_set (&ex)) {
-			g_warning ("camel_service_finalize: silent disconnect failure: %s",
-				   camel_exception_get_description(&ex));
-		}
-		camel_exception_clear (&ex);
-	}
-
-	if (camel_service->url)
-		camel_url_free (camel_service->url);
-	if (camel_service->session)
-		camel_object_unref (CAMEL_OBJECT (camel_service->session));
-}
-
-
-
-CamelType
-camel_service_get_type (void)
-{
-	static CamelType camel_service_type = CAMEL_INVALID_TYPE;
-
-	if (camel_service_type == CAMEL_INVALID_TYPE) {
-		camel_service_type = camel_type_register( CAMEL_OBJECT_TYPE, "CamelService",
-							  sizeof (CamelService),
-							  sizeof (CamelServiceClass),
-							  (CamelObjectClassInitFunc) camel_service_class_init,
-							  NULL,
-							  NULL,
-							  camel_service_finalize );
-	}
-
-	return camel_service_type;
-}
-
-static gboolean
-check_url (CamelService *service, CamelException *ex)
-{
-	char *url_string;
-
-	if (((service->provider->url_flags & CAMEL_URL_NEED_USER)
-	     == CAMEL_URL_NEED_USER) &&
-	    (service->url->user == NULL || service->url->user[0] == '\0')) {
-		url_string = camel_url_to_string (service->url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a username component"),
-				      url_string);
-		g_free (url_string);
-		return FALSE;
-	} else if (((service->provider->url_flags & CAMEL_URL_NEED_HOST)
-		    == CAMEL_URL_NEED_HOST) &&
-		   (service->url->host == NULL || service->url->host[0] == '\0')) {
-		url_string = camel_url_to_string (service->url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a host component"),
-				      url_string);
-		g_free (url_string);
-		return FALSE;
-	} else if (((service->provider->url_flags & CAMEL_URL_NEED_PATH)
-		    == CAMEL_URL_NEED_PATH) &&
-		   (service->url->path == NULL || service->url->path[0] == '\0')) {
-		url_string = camel_url_to_string (service->url, FALSE);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL '%s' needs a path component"),
-				      url_string);
-		g_free (url_string);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * camel_service_new: create a new CamelService or subtype
- * @type: the CamelType of the class to create
- * @session: the session for the service
- * @provider: the service's provider
- * @url: the default URL for the service (may be NULL)
- * @ex: a CamelException
- *
- * Creates a new CamelService (or one of its subtypes), initialized
- * with the given parameters.
- *
- * Return value: the CamelService, or NULL.
- **/
-CamelService *
-camel_service_new (CamelType type, CamelSession *session,
-		   CamelProvider *provider, CamelURL *url,
-		   CamelException *ex)
-{
-	CamelService *service;
-
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-
-	service = CAMEL_SERVICE (camel_object_new (type));
-
-	/*service->connect_level = 0;*/
-
-	service->provider = provider;
-	service->url = url;
-	if (!url->empty && !check_url (service, ex)) {
-		camel_object_unref (CAMEL_OBJECT (service));
-		return NULL;
-	}
-
-	service->session = session;
-	camel_object_ref (CAMEL_OBJECT (session));
-
-	service->connected = FALSE;
-
-	return service;
-}
-
-
-static gboolean
-service_connect (CamelService *service, CamelException *ex)
-{
-	/* Things like the CamelMboxStore can validly
-	 * not define a connect function.
-	 */
-	 return TRUE;
-}
-
-/**
- * camel_service_connect:
- * @service: CamelService object
- * @ex: a CamelException
- *
- * Connect to the service using the parameters it was initialized
- * with.
- *
- * Return value: whether or not the connection succeeded
- **/
-
-gboolean
-camel_service_connect (CamelService *service, CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), FALSE);
-	g_return_val_if_fail (service->session != NULL, FALSE);
-	g_return_val_if_fail (service->url != NULL, FALSE);
-
-	if (service->connected) {
-		/* But we're still connected, so no exception
-		 * and return true.
-		 */
-		g_warning ("camel_service_connect: trying to connect to an already connected service");
-		return TRUE;
-	}
-
-	if (CSERV_CLASS (service)->connect (service, ex)) {
-		service->connected = TRUE;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-service_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	/*service->connect_level--;*/
-
-	/* We let people get away with not having a disconnect
-	 * function -- CamelMboxStore, for example. 
-	 */
-
-	return TRUE;
-}
-
-/**
- * camel_service_disconnect:
- * @service: CamelService object
- * @clean: whether or not to try to disconnect cleanly.
- * @ex: a CamelException
- *
- * Disconnect from the service. If @clean is %FALSE, it should not
- * try to do any synchronizing or other cleanup of the connection.
- *
- * Return value: whether or not the disconnection succeeded without
- * errors. (Consult @ex if %FALSE.)
- **/
-gboolean
-camel_service_disconnect (CamelService *service, gboolean clean,
-			  CamelException *ex)
-{
-	gboolean res;
-
-	g_return_val_if_fail (service->connected, FALSE);	
-	res = CSERV_CLASS (service)->disconnect (service, clean, ex);
-	service->connected = FALSE;
-	return res;
-}
-
-/**
- * camel_service_get_url:
- * @service: a service
- *
- * Returns the URL representing a service. The returned URL must be
- * freed when it is no longer needed. For security reasons, this
- * routine does not return the password.
- *
- * Return value: the url name
- **/
-char *
-camel_service_get_url (CamelService *service)
-{
-	return camel_url_to_string(service->url, FALSE);
-}
-
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	g_warning ("CamelService::get_name not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service)));
-	return "???";
-}		
-
-/**
- * camel_service_get_name:
- * @service: the service
- * @brief: whether or not to use a briefer form
- *
- * This gets the name of the service in a "friendly" (suitable for
- * humans) form. If @brief is %TRUE, this should be a brief description
- * such as for use in the folder tree. If @brief is %FALSE, it should
- * be a more complete and mostly unambiguous description.
- *
- * Return value: the description, which the caller must free.
- **/
-char *
-camel_service_get_name (CamelService *service, gboolean brief)
-{
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	g_return_val_if_fail (service->url, NULL);
-
-	return CSERV_CLASS (service)->get_name (service, brief);
-}
-
-
-static char *
-get_path (CamelService *service)
-{
-	GString *gpath;
-	char *path;
-	CamelURL *url = service->url;
-	int flags = service->provider->url_flags;
-
-	/* A sort of ad-hoc default implementation that works for our
-	 * current set of services.
-	 */
-
-	gpath = g_string_new (service->provider->protocol);
-	if (flags & CAMEL_URL_ALLOW_USER) {
-		if (flags & CAMEL_URL_ALLOW_HOST) {
-			g_string_sprintfa (gpath, "/%s@%s",
-					   url->user ? url->user : "",
-					   url->host ? url->host : "");
-		} else {
-			g_string_sprintfa (gpath, "/%s%s",
-			   url->user ? url->user : "",
-			   ((flags & CAMEL_URL_NEED_USER) == CAMEL_URL_NEED_USER) ? "" : "@");
-		}
-	} else if (flags & CAMEL_URL_ALLOW_HOST) {
-		g_string_sprintfa (gpath, "/%s%s",
-		   ((flags & CAMEL_URL_NEED_HOST) == CAMEL_URL_NEED_HOST) ? "" : "@",
-		   url->host ? url->host : "");
-	}
-	if ((flags & CAMEL_URL_NEED_PATH) == CAMEL_URL_NEED_PATH) {
-		g_string_sprintfa (gpath, "%s%s",
-				   *url->path == '/' ? "" : "/",
-				   url->path);
-	}
-
-	path = gpath->str;
-	g_string_free (gpath, FALSE);
-	return path;
-}		
-
-/**
- * camel_service_get_path:
- * @service: the service
- *
- * This gets a valid UNIX relative path describing the service, which
- * is guaranteed to be different from the path returned for any
- * different service. This path MUST start with the name of the
- * provider, followed by a "/", but after that, it is up to the
- * provider.
- *
- * Return value: the path, which the caller must free.
- **/
-char *
-camel_service_get_path (CamelService *service)
-{
-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
-	g_return_val_if_fail (service->url, NULL);
-
-	return CSERV_CLASS (service)->get_path (service);
-}
-
-
-/**
- * camel_service_get_session:
- * @service: a service
- *
- * Returns the CamelSession associated with the service.
- *
- * Return value: the session
- **/
-CamelSession *
-camel_service_get_session (CamelService *service)
-{
-	return service->session;
-}
-
-/**
- * camel_service_get_provider:
- * @service: a service
- *
- * Returns the CamelProvider associated with the service.
- *
- * Return value: the provider
- **/
-CamelProvider *
-camel_service_get_provider (CamelService *service)
-{
-	return service->provider;
-}
-
-GList *
-query_auth_types_func (CamelService *service, CamelException *ex)
-{
-	return NULL;
-}
-
-/**
- * camel_service_query_auth_types:
- * @service: a CamelService
- * @ex: a CamelException
- *
- * This is used by the mail source wizard to get the list of
- * authentication types supported by the protocol, and information
- * about them.
- *
- * This may be called on a service with or without an associated URL.
- * If there is no URL, the routine must return a generic answer. If
- * the service does have a URL, the routine SHOULD connect to the
- * server and query what authentication mechanisms it supports. If
- * it cannot do that for any reason, it should set @ex accordingly.
- *
- * Return value: a list of CamelServiceAuthType records. The caller
- * must free the list by calling camel_service_free_auth_types when
- * it is done.
- **/
-GList *
-camel_service_query_auth_types (CamelService *service, CamelException *ex)
-{
-	if (service->url->empty)
-		return CSERV_CLASS (service)->query_auth_types_generic (service, ex);
-	else
-		return CSERV_CLASS (service)->query_auth_types_connected (service, ex);
-}
-
-static void
-free_auth_types (CamelService *service, GList *authtypes)
-{
-	;
-}
-
-/**
- * camel_service_free_auth_types:
- * @service: the service
- * @authtypes: the list of authtypes
- *
- * This frees the data allocated by camel_service_query_auth_types().
- **/
-void
-camel_service_free_auth_types (CamelService *service, GList *authtypes)
-{
-	CSERV_CLASS (service)->free_auth_types (service, authtypes);
-}
-
-
-/* URL utility routines */
-
-/**
- * camel_service_gethost:
- * @service: a CamelService
- * @ex: a CamelException
- *
- * This is a convenience function to do a gethostbyname on the host
- * for the service's URL.
- *
- * Return value: a (statically-allocated) hostent.
- **/
-struct hostent *
-camel_service_gethost (CamelService *service, CamelException *ex)
-{
-	struct hostent *h;
-	char *hostname;
-
-	if (service->url->host)
-		hostname = service->url->host;
-	else
-		hostname = "localhost";
-	h = gethostbyname (hostname);
-	if (!h) {
-		extern int h_errno;
-
-		if (h_errno == HOST_NOT_FOUND || h_errno == NO_DATA) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("No such host %s."), hostname);
-		} else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Temporarily unable to look "
-						"up hostname %s."), hostname);
-		}
-		return NULL;
-	}
-
-	return h;
-}
diff --git a/camel/camel-service.h b/camel/camel-service.h
deleted file mode 100644
index 3f5acabbb5..0000000000
--- a/camel/camel-service.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-service.h : Abstract class for an email service */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SERVICE_H
-#define CAMEL_SERVICE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-provider.h>
-#include <netdb.h>
-
-#define CAMEL_SERVICE_TYPE     (camel_service_get_type ())
-#define CAMEL_SERVICE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))
-#define CAMEL_SERVICE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))
-#define CAMEL_IS_SERVICE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))
-
-
-struct _CamelService {
-	CamelObject parent_object;
-
-	CamelSession *session;
-	CamelProvider *provider;
-	gboolean connected;
-	CamelURL *url;
-};
-
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	gboolean  (*connect)           (CamelService *service, 
-					CamelException *ex);
-	gboolean  (*disconnect)        (CamelService *service,
-					gboolean clean,
-					CamelException *ex);
-
-	/*gboolean  (*is_connected)      (CamelService *service);*/
-
-	GList *   (*query_auth_types_connected)  (CamelService *service,
-						  CamelException *ex);
-	GList *   (*query_auth_types_generic)  (CamelService *service,
-						CamelException *ex);
-	void      (*free_auth_types)   (CamelService *service,
-					GList *authtypes);
-
-	char *    (*get_name)          (CamelService *service,
-					gboolean brief);
-	char *    (*get_path)          (CamelService *service);
-
-} CamelServiceClass;
-
-
-/* query_auth_types returns a GList of these */
-typedef struct {
-	char *name, *description, *authproto;
-	gboolean need_password;
-} CamelServiceAuthType;
-
-
-/* public methods */
-CamelService *      camel_service_new                (CamelType type, 
-						      CamelSession *session,
-						      CamelProvider *provider,
-						      CamelURL *url, 
-						      CamelException *ex);
-gboolean            camel_service_connect            (CamelService *service, 
-						      CamelException *ex);
-gboolean            camel_service_disconnect         (CamelService *service,
-						      gboolean clean,
-						      CamelException *ex);
-char *              camel_service_get_url            (CamelService *service);
-char *              camel_service_get_name           (CamelService *service,
-						      gboolean brief);
-char *              camel_service_get_path           (CamelService *service);
-CamelSession *      camel_service_get_session        (CamelService *service);
-CamelProvider *     camel_service_get_provider       (CamelService *service);
-GList *             camel_service_query_auth_types   (CamelService *service,
-						      CamelException *ex);
-void                camel_service_free_auth_types    (CamelService *service,
-						      GList *authtypes);
-
-/* convenience functions */
-struct hostent *    camel_service_gethost            (CamelService *service,
-						      CamelException *ex);
-
-
-/* Standard Camel function */
-CamelType camel_service_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SERVICE_H */
-
diff --git a/camel/camel-session.c b/camel/camel-session.c
deleted file mode 100644
index ac85005da2..0000000000
--- a/camel/camel-session.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-session.c : Abstract class for an email session */
-
-/*
- *
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include "camel-session.h"
-#include "camel-store.h"
-#include "camel-transport.h"
-#include "camel-exception.h"
-#include "string-utils.h"
-#include "camel-url.h"
-#include "hash-table-utils.h"
-
-static CamelObjectClass *parent_class;
-
-static void
-camel_session_init (CamelSession *session)
-{
-	session->modules = camel_provider_init ();
-	session->providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
-}
-
-static gboolean
-camel_session_destroy_provider (gpointer key, gpointer value, gpointer user_data)
-{
-	CamelProvider *prov = (CamelProvider *)value;
-
-	g_hash_table_destroy (prov->service_cache);
-
-	return TRUE;
-}
-
-static void
-camel_session_finalise (CamelObject *o)
-{
-	CamelSession *session = (CamelSession *)o;
-
-	g_hash_table_foreach_remove (session->providers,
-				     camel_session_destroy_provider, NULL);
-	g_hash_table_destroy (session->providers);
-}
-
-static void
-camel_session_class_init (CamelSessionClass *camel_session_class)
-{
-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-CamelType
-camel_session_get_type (void)
-{
-	static CamelType camel_session_type = CAMEL_INVALID_TYPE;
-
-	if (camel_session_type == CAMEL_INVALID_TYPE) {
-		camel_session_type = camel_type_register (camel_object_get_type (), "CamelSession",
-							  sizeof (CamelSession),
-							  sizeof (CamelSessionClass),
-							  (CamelObjectClassInitFunc) camel_session_class_init,
-							  NULL,
-							  (CamelObjectInitFunc) camel_session_init,
-							  (CamelObjectFinalizeFunc) camel_session_finalise);
-	}
-
-	return camel_session_type;
-}
-
-/**
- * camel_session_new:
- * @storage_path: Path to a directory Camel can use for persistent storage.
- * (This directory must already exist.)
- * @authenticator: A callback for discussing authentication information
- * @registrar: A callback for registering timeout callbacks
- * @remove: A callback for removing timeout callbacks
- *
- * This creates a new CamelSession object, which represents global state
- * for the Camel library, and contains callbacks that can be used to
- * interact with the main application.
- *
- * Return value: the new CamelSession
- **/
-CamelSession *
-camel_session_new (const char *storage_path,
-		   CamelAuthCallback authenticator,
-		   CamelTimeoutRegisterCallback registrar,
-		   CamelTimeoutRemoveCallback remover)
-{
-	CamelSession *session = CAMEL_SESSION (camel_object_new (CAMEL_SESSION_TYPE));
-
-	session->storage_path = g_strdup (storage_path);
-	session->authenticator = authenticator;
-	session->registrar = registrar;
-	session->remover = remover;
-	return session;
-}
-
-/**
- * camel_session_register_provider:
- * @session: a session object
- * @protocol: the protocol the provider provides for
- * @provider: provider object
- *
- * Registers a protocol to provider mapping for the session.
- **/
-void
-camel_session_register_provider (CamelSession *session,
-				 CamelProvider *provider)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (provider != NULL);
-
-	g_hash_table_insert (session->providers, provider->protocol, provider);
-}
-
-static void
-ensure_loaded (gpointer key, gpointer value, gpointer user_data)
-{
-	CamelSession *session = user_data;
-	char *name = key;
-	char *path = value;
-
-	if (!g_hash_table_lookup (session->providers, name)) {
-		CamelException ex;
-
-		camel_exception_init (&ex);
-		camel_provider_load (session, path, &ex);
-		camel_exception_clear (&ex);
-	}
-}
-
-static gint
-provider_compare (gconstpointer a, gconstpointer b)
-{
-	const CamelProvider *cpa = (const CamelProvider *)a;
-	const CamelProvider *cpb = (const CamelProvider *)b;
-
-	return strcmp (cpa->name, cpb->name);
-}
-
-static void
-add_to_list (gpointer key, gpointer value, gpointer user_data)
-{
-	GList **list = user_data;
-	CamelProvider *prov = value;
-
-	*list = g_list_insert_sorted (*list, prov, provider_compare);
-}
-
-/**
- * camel_session_list_providers:
- * @session: the session
- * @load: whether or not to load in providers that are not already loaded
- *
- * This returns a list of available providers in this session. If @load
- * is %TRUE, it will first load in all available providers that haven't
- * yet been loaded.
- *
- * Return value: a GList of providers, which the caller must free.
- **/
-GList *
-camel_session_list_providers (CamelSession *session, gboolean load)
-{
-	GList *list;
-
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
-
-	if (load) {
-		g_hash_table_foreach (session->modules, ensure_loaded, session);
-	}
-
-	list = NULL;
-	g_hash_table_foreach (session->providers, add_to_list, &list);
-	return list;
-}
-
-static void
-service_cache_remove (CamelService *service, gpointer event_data, gpointer user_data)
-{
-	CamelProvider *provider;
-	CamelSession *session = CAMEL_SESSION (user_data);
-
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (service != NULL);
-	g_return_if_fail (service->url != NULL);
-	
-	provider = g_hash_table_lookup (session->providers, service->url->protocol);
-	g_hash_table_remove (provider->service_cache, service->url);
-}
-
-/**
- * camel_session_get_service:
- * @session: the CamelSession
- * @url_string: a Camel URL describing the service to get
- * @type: the provider type (%CAMEL_PROVIDER_STORE or
- * %CAMEL_PROVIDER_TRANSPORT) to get, since some URLs may be able
- * to specify either type.
- * @ex: a CamelException
- *
- * This resolves a CamelURL into a CamelService, including loading the
- * provider library for that service if it has not already been loaded.
- *
- * Services are cached, and asking for "the same" @url_string multiple
- * times will return the same CamelService (with its reference count
- * incremented by one each time). What constitutes "the same" URL
- * depends in part on the provider.
- *
- * Return value: the requested CamelService, or %NULL
- **/
-CamelService *
-camel_session_get_service (CamelSession *session, const char *url_string,
-			   CamelProviderType type, CamelException *ex)
-{
-	CamelURL *url;
-	CamelProvider *provider;
-	CamelService *service;
-
-	url = camel_url_new (url_string, ex);
-	if (!url)
-		return NULL;
-
-	/* We need to look up the provider so we can then lookup
-	   the service in the provider's cache */
-	provider = g_hash_table_lookup (session->providers, url->protocol);
-	if (!provider) {
-		/* See if there's one we can load. */
-		char *path;
-
-		path = g_hash_table_lookup (session->modules, url->protocol);
-		if (path) {
-			camel_provider_load (session, path, ex);
-			if (camel_exception_get_id (ex) !=
-			    CAMEL_EXCEPTION_NONE) {
-				camel_url_free (url);
-				return NULL;
-			}
-		}
-		provider = g_hash_table_lookup (session->providers, url->protocol);
-	}
-
-	if (!provider || !provider->object_types[type]) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("No provider available for protocol `%s'"),
-				      url->protocol);
-		camel_url_free (url);
-		return NULL;
-	}
-	
-	/* Now look up the service in the provider's cache */
-	service = g_hash_table_lookup (provider->service_cache, url);
-	if (service != NULL) {
-		camel_url_free (url);
-		camel_object_ref (CAMEL_OBJECT (service));
-		return service;
-	}
-
-	service = camel_service_new (provider->object_types[type], session, provider, url, ex);
-	if (service) {
-		g_hash_table_insert (provider->service_cache, url, service);
-		camel_object_hook_event (CAMEL_OBJECT (service), "finalize", (CamelObjectEventHookFunc) service_cache_remove, session);
-	}
-
-	return service;
-}
-
-/**
- * camel_session_get_service_connected:
- * @session: the CamelSession
- * @url_string: a Camel URL describing the service to get
- * @type: the provider type
- * @ex: a CamelException
- *
- * This works like camel_session_get_service(), but also ensures that
- * the returned service will have been successfully connected (via
- * camel_service_connect().)
- *
- * Return value: the requested CamelService, or %NULL
- **/
-CamelService *
-camel_session_get_service_connected (CamelSession *session,
-				     const char *url_string,
-				     CamelProviderType type,
-				     CamelException *ex)
-{
-	CamelService *svc;
-
-	svc = camel_session_get_service (session, url_string, type, ex);
-	if (svc == NULL)
-		return NULL;
-
-	if (svc->connected == FALSE) {
-		if (camel_service_connect (svc, ex) == FALSE) {
-			camel_object_unref (CAMEL_OBJECT (svc));
-			return NULL;
-		}
-	}
-
-	return svc;
-}
-
-/**
- * camel_session_get_storage_path:
- * @session: session object
- * @service: a CamelService
- * @ex: a CamelException
- *
- * This returns the path to a directory which the service can use for
- * its own purposes. Data stored there will remain between Evolution
- * sessions. No code outside of that service should ever touch the
- * files in this directory. If the directory does not exist, it will
- * be created.
- *
- * Return value: the path (which the caller must free), or %NULL if
- * an error occurs.
- **/
-char *
-camel_session_get_storage_path (CamelSession *session, CamelService *service,
-				CamelException *ex)
-{
-	char *path, *p;
-
-	p = camel_service_get_path (service);
-	path = g_strdup_printf ("%s/%s", session->storage_path, p);
-	g_free (p);
-
-	if (access (path, F_OK) == 0)
-		return path;
-
-	if (e_mkdir_hier (path, S_IRWXU) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create directory %s:\n%s"),
-				      path, g_strerror (errno));
-		g_free (path);
-		return NULL;
-	}
-
-	return path;
-}
-
-/**
- * camel_session_query_authenticator: query the session authenticator
- * @session: session object
- * @mode: %CAMEL_AUTHENTICATOR_ASK or %CAMEL_AUTHENTICATOR_TELL
- * @data: prompt to query user with, or data to cache
- * @secret: whether or not the data is secret (eg, a password)
- * @service: the service this query is being made by
- * @item: an identifier, unique within this service, for the information
- * @ex: a CamelException
- *
- * This function is used by a CamelService to discuss authentication
- * information with the application.
- *
- * @service and @item together uniquely identify the piece of data the
- * caller is concerned with.
- *
- * If @mode is %CAMEL_AUTHENTICATOR_ASK, then @data is a question to
- * ask the user (if the application doesn't already have the answer
- * cached). If @secret is set, the user's input should not be echoed
- * back. The authenticator should set @ex to
- * %CAMEL_EXCEPTION_USER_CANCEL if the user did not provide the
- * information. The caller must g_free() the information returned when
- * it is done with it.
- *
- * If @mode is %CAMEL_AUTHENTICATOR_TELL, then @data is information
- * that the application should cache, or %NULL if it should stop
- * caching anything about that datum (eg, because the data is a
- * password that turned out to be incorrect).
- *
- * Return value: the authentication information or %NULL.
- **/
-char *
-camel_session_query_authenticator (CamelSession *session,
-				   CamelAuthCallbackMode mode,
-				   char *prompt, gboolean secret,
-				   CamelService *service, char *item,
-				   CamelException *ex)
-{
-	return session->authenticator (mode, prompt, secret,
-				       service, item, ex);
-}
-
-/**
- * camel_session_register_timeout: Register a timeout to be called
- * periodically.
- *
- * @session: the CamelSession
- * @interval: the number of milliseconds interval between calls
- * @callback: the function to call
- * @user_data: extra data to be passed to the callback
- *
- * This function will use the registrar callback provided upon
- * camel_session_new to register the timeout. The callback will
- * be called every @interval milliseconds until it returns @FALSE.
- * It will be passed one argument, @user_data.
- *
- * Returns a nonzero handle that can be used with 
- * camel_session_remove_timeout on success, and 0 on failure to 
- * register the timeout.
- **/
-guint
-camel_session_register_timeout (CamelSession *session,
-				guint32 interval,
-				CamelTimeoutCallback callback,
-				gpointer user_data)
-{
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
-
-	return session->registrar (interval, callback, user_data);
-}
-
-/**
- * camel_session_remove_timeout: Remove a previously registered
- * timeout.
- *
- * @session: the CamelSession
- * @handle: a value returned from camel_session_register_timeout
- *
- * This function will use the remover callback provided upon
- * camel_session_new to remove the timeout.
- *
- * Returns TRUE on success and FALSE on failure.
- **/
-gboolean
-camel_session_remove_timeout (CamelSession *session, guint handle)
-{
-	return session->remover (handle);
-}
diff --git a/camel/camel-session.h b/camel/camel-session.h
deleted file mode 100644
index fed21be6f1..0000000000
--- a/camel/camel-session.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-session.h : Abstract class for an email session */
-
-/*
- *
- * Author :
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SESSION_H
-#define CAMEL_SESSION_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-provider.h>
-
-#define CAMEL_SESSION_TYPE     (camel_session_get_type ())
-#define CAMEL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))
-#define CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))
-#define CAMEL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SESSION_TYPE))
-
-
-typedef enum {
-	CAMEL_AUTHENTICATOR_ASK, CAMEL_AUTHENTICATOR_TELL
-} CamelAuthCallbackMode;
-
-typedef char *(*CamelAuthCallback) (CamelAuthCallbackMode mode,
-				    char *data, gboolean secret,
-				    CamelService *service, char *item,
-				    CamelException *ex);
-typedef gboolean (*CamelTimeoutCallback) (gpointer data);
-typedef guint (*CamelTimeoutRegisterCallback) (guint32 interval,
-					       CamelTimeoutCallback cb,
-					       gpointer camel_data);
-typedef gboolean (*CamelTimeoutRemoveCallback) (guint id);
-
-struct _CamelSession
-{
-	CamelObject parent_object;
-
-	char *storage_path;
-	CamelAuthCallback authenticator;
-	CamelTimeoutRegisterCallback registrar;
-	CamelTimeoutRemoveCallback remover;
-
-	GHashTable *providers, *modules;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-} CamelSessionClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_session_get_type (void);
-
-
-CamelSession *  camel_session_new (const char *storage_path,
-				   CamelAuthCallback authenticator,
-				   CamelTimeoutRegisterCallback registrar,
-				   CamelTimeoutRemoveCallback remover);
-
-void            camel_session_register_provider       (CamelSession *session,
-						       CamelProvider *provider);
-GList *         camel_session_list_providers          (CamelSession *session,
-						       gboolean load);
-
-CamelService *  camel_session_get_service             (CamelSession *session,
-						       const char *url_string,
-						       CamelProviderType type,
-						       CamelException *ex);
-CamelService *  camel_session_get_service_connected   (CamelSession *session, 
-						       const char *url_string,
-						       CamelProviderType type, 
-						       CamelException *ex);
-
-#define camel_session_get_store(session, url_string, ex) \
-	((CamelStore *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_STORE, ex))
-#define camel_session_get_transport(session, url_string, ex) \
-	((CamelTransport *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))
-
-char *          camel_session_get_storage_path (CamelSession *session,
-						CamelService *service,
-						CamelException *ex);
-
-char *          camel_session_query_authenticator (CamelSession *session,
-						   CamelAuthCallbackMode mode,
-						   char *prompt,
-						   gboolean secret,
-						   CamelService *service,
-						   char *item,
-						   CamelException *ex);
-
-guint           camel_session_register_timeout (CamelSession *session,
-						guint32 interval,
-						CamelTimeoutCallback callback,
-						gpointer user_data);
-
-gboolean        camel_session_remove_timeout (CamelSession *session,
-					      guint handle);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SESSION_H */
diff --git a/camel/camel-store.c b/camel/camel-store.c
deleted file mode 100644
index c9236676b2..0000000000
--- a/camel/camel-store.c
+++ /dev/null
@@ -1,652 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-store.c : Abstract class for an email store */
-
-/* 
- *
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include <string.h>
-
-#include "camel-store.h"
-#include "camel-folder.h"
-#include "camel-exception.h"
-
-static CamelServiceClass *parent_class = NULL;
-
-/* Returns the class for a CamelStore */
-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,
-				guint32 flags, CamelException *ex);
-static void delete_folder (CamelStore *store, const char *folder_name,
-			   CamelException *ex);
-static void rename_folder (CamelStore *store, const char *old_name,
-			   const char *new_name, CamelException *ex);
-
-static char *get_folder_name (CamelStore *store, const char *folder_name,
-			      CamelException *ex);
-static char *get_root_folder_name (CamelStore *store, CamelException *ex);
-static char *get_default_folder_name (CamelStore *store, CamelException *ex);
-
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-static void free_folder_info (CamelStore *store, CamelFolderInfo *tree);
-
-static CamelFolder *lookup_folder (CamelStore *store, const char *folder_name);
-static void cache_folder (CamelStore *store, const char *folder_name,
-			  CamelFolder *folder);
-static void uncache_folder (CamelStore *store, CamelFolder *folder);
-
-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);
-static void subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
-static void unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);
-
-static void
-camel_store_class_init (CamelStoreClass *camel_store_class)
-{
-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-
-	/* virtual method definition */
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_root_folder_name = get_root_folder_name;
-	camel_store_class->get_default_folder_name = get_default_folder_name;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = free_folder_info;
-	camel_store_class->lookup_folder = lookup_folder;
-	camel_store_class->cache_folder = cache_folder;
-	camel_store_class->uncache_folder = uncache_folder;
-	camel_store_class->folder_subscribed = folder_subscribed;
-	camel_store_class->subscribe_folder = subscribe_folder;
-	camel_store_class->unsubscribe_folder = unsubscribe_folder;
-}
-
-static void
-camel_store_init (void *o, void *k)
-{
-	CamelStore *store = o;
-
-	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	store->flags = 0;
-}
-
-static void
-camel_store_finalize (CamelObject *object)
-{
-	CamelStore *store = CAMEL_STORE (object);
-
-	if (store->folders) {
-		if (g_hash_table_size (store->folders) != 0) {
-			g_warning ("Folder cache for store %p contains "
-				   "%d folders at destruction.", store,
-				   g_hash_table_size (store->folders));
-		}
-		g_hash_table_destroy (store->folders);
-	}
-}
-
-
-CamelType
-camel_store_get_type (void)
-{
-	static CamelType camel_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_store_type == CAMEL_INVALID_TYPE) {
-		camel_store_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelStore",
-							sizeof (CamelStore),
-							sizeof (CamelStoreClass),
-							(CamelObjectClassInitFunc) camel_store_class_init,
-							NULL,
-							(CamelObjectInitFunc) camel_store_init,
-							(CamelObjectFinalizeFunc) camel_store_finalize );
-	}
-
-	return camel_store_type;
-}
-
-
-static CamelFolder *
-get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	g_warning("CamelStore::get_folder not implemented for `%s'",
-		  camel_type_to_name(CAMEL_OBJECT_GET_TYPE(store)));
-	return NULL;
-}
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::delete_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-static void
-rename_folder (CamelStore *store, const char *old_name,
-	       const char *new_name, CamelException *ex)
-{
-	g_warning ("CamelStore::rename_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-
-/* CamelStore::get_folder_name should:
- * a) make sure that the provided name is valid
- * b) return it in canonical form, in allocated memory.
- *
- * This is used to make sure that duplicate names for the same folder
- * don't result in duplicate cache entries.
- */
-static char *
-get_folder_name (CamelStore *store, const char *folder_name,
-		 CamelException *ex)
-{
-	g_warning ("CamelStore::get_folder_name not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return NULL;
-}
-
-static char *
-get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	return g_strdup ("/");
-}
-
-static char *
-get_default_folder_name (CamelStore *store, CamelException *ex)
-{
-	return CS_CLASS (store)->get_root_folder_name (store, ex);
-}
-
-static CamelFolder *
-lookup_folder (CamelStore *store, const char *folder_name)
-{
-	if (store->folders) {
-		CamelFolder *folder = g_hash_table_lookup (store->folders, folder_name);
-		if (folder)
-			camel_object_ref(CAMEL_OBJECT(folder));
-		return folder;
-	}
-	return NULL;
-}
-
-static void folder_finalize (CamelObject *folder, gpointer event_data, gpointer user_data)
-{
-	CS_CLASS (user_data)->uncache_folder (CAMEL_STORE(user_data), CAMEL_FOLDER(folder));
-}
-
-static void
-cache_folder (CamelStore *store, const char *folder_name, CamelFolder *folder)
-{
-	if (!store->folders)
-		return;
-
-	if (g_hash_table_lookup (store->folders, folder_name)) {
-		g_warning ("Caching folder %s that already exists.",
-			   folder_name);
-	}
-	g_hash_table_insert (store->folders, g_strdup (folder_name), folder);
-
-	camel_object_hook_event (CAMEL_OBJECT (folder), "finalize", folder_finalize, store);
-
-	/*
-	 * gt_k so as not to get caught by my little gt_k cleanliness detector.
-	 *
-	 * gt_k_signal_connect_object (CAMEL_OBJECT (folder), "destroy",
-	 *			   GT_K_SIGNAL_FUNC (CS_CLASS (store)->uncache_folder),
-	 *			   CAMEL_OBJECT (store));
-	 */
-}
-
-static gboolean
-folder_matches (gpointer key, gpointer value, gpointer user_data)
-{
-	if (value == user_data) {
-		g_free (key);
-		return TRUE;
-	} else
-		return FALSE;
-}
-
-static void
-uncache_folder (CamelStore *store, CamelFolder *folder)
-{
-	g_hash_table_foreach_remove (store->folders, folder_matches, folder);
-}
-
-
-static CamelFolder *
-get_folder_internal(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder = NULL;
-
-	/* Try cache first. */
-	folder = CS_CLASS(store)->lookup_folder(store, folder_name);
-
-	if (!folder) {
-		folder = CS_CLASS(store)->get_folder(store, folder_name, flags, ex);
-		if (!folder)
-			return NULL;
-
-		CS_CLASS(store)->cache_folder(store, folder_name, folder);
-	}
-
-	return folder;
-}
-
-
-
-/** 
- * camel_store_get_folder: Return the folder corresponding to a path.
- * @store: a CamelStore
- * @folder_name: name of the folder to get
- * @create: whether or not to create the folder if it doesn't already exist
- * @ex: a CamelException
- * 
- * Returns the folder corresponding to the path @folder_name. If the
- * path begins with the separator character, it is relative to the
- * root folder. Otherwise, it is relative to the default folder. If
- * @create is %TRUE and the named folder does not already exist, it will
- * be created.
- *
- * Return value: the folder
- **/
-CamelFolder *
-camel_store_get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	char *name;
-	CamelFolder *folder = NULL;
-
-	name = CS_CLASS(store)->get_folder_name(store, folder_name, ex);
-	if (name) {
-		folder = get_folder_internal(store, name, flags, ex);
-		g_free (name);
-	}
-	return folder;
-}
-
-
-/** 
- * camel_store_delete_folder: Delete the folder corresponding to a path.
- * @store: a CamelStore
- * @folder_name: name of the folder to delete
- * @ex: a CamelException
- * 
- * Deletes the named folder. The folder must be empty.
- **/
-void
-camel_store_delete_folder (CamelStore *store, const char *folder_name,
-			   CamelException *ex)
-{
-	char *name;
-
-	name = CS_CLASS (store)->get_folder_name (store, folder_name, ex);
-	if (name) {
-		CS_CLASS (store)->delete_folder (store, name, ex);
-		g_free (name);
-	}
-}
-
-/**
- * camel_store_rename_folder:
- * @store: 
- * @old_name: 
- * @new_name: 
- * @ex: 
- * 
- * Rename a named folder to a new name.
- **/
-void             camel_store_rename_folder      (CamelStore *store,
-						 const char *old_name,
-						 const char *new_name,
-						 CamelException *ex)
-{
-	char *old, *new;
-
-	old = CS_CLASS (store)->get_folder_name(store, old_name, ex);
-	if (old) {
-		new = CS_CLASS (store)->get_folder_name(store, new_name, ex);
-		if (new) {
-			CS_CLASS (store)->rename_folder(store, old, new, ex);
-			g_free(new);
-		}
-		g_free(old);
-	}
-}
-
-
-/**
- * camel_store_get_root_folder: return the top-level folder
- * 
- * Returns the folder which is at the top of the folder hierarchy.
- * This folder may or may not be the same as the default folder.
- * 
- * Return value: the top-level folder.
- **/
-CamelFolder *
-camel_store_get_root_folder (CamelStore *store, CamelException *ex)
-{
-	char *name;
-	CamelFolder *folder = NULL;
-
-	name = CS_CLASS (store)->get_root_folder_name (store, ex);
-	if (name) {
-		folder = get_folder_internal (store, name, TRUE, ex);
-		g_free (name);
-	}
-	return folder;
-}
-
-/** 
- * camel_store_get_default_folder: return the store default folder
- *
- * The default folder is the folder which is presented to the user in
- * the default configuration. This defaults to the root folder if
- * the store doesn't override it.
- *
- * Return value: the default folder.
- **/
-CamelFolder *
-camel_store_get_default_folder (CamelStore *store, CamelException *ex)
-{
-	char *name;
-	CamelFolder *folder = NULL;
-
-	name = CS_CLASS (store)->get_default_folder_name (store, ex);
-	if (name) {
-		folder = get_folder_internal (store, name, TRUE, ex);
-		g_free (name);
-	}
-	return folder;
-}
-
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only,
-		 CamelException *ex)
-{
-	g_warning ("CamelStore::get_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return NULL;
-}
-
-/**
- * camel_store_get_folder_info:
- * @store: a CamelStore
- * @top: the name of the folder to start from
- * @fast: whether or not to do a "fast" scan.
- * @recursive: whether to include information for subfolders
- * @ex: a CamelException
- *
- * This fetches information about the folder structure of @store,
- * starting with @top, and returns a tree of CamelFolderInfo
- * structures. If @fast is %TRUE, the message_count or
- * unread_message_count fields of some or all of the structures may be
- * set to -1, if the store cannot determine that information quickly.
- * If @recursive is %TRUE, the returned tree will include all levels of
- * hierarchy below @top. If it is %FALSE, it will only include the
- * immediate subfolders of @top.
- *
- * Return value: a CamelFolderInfo tree, which must be freed with
- * camel_store_free_folder_info.
- **/
-CamelFolderInfo *
-camel_store_get_folder_info (CamelStore *store, const char *top,
-			     gboolean fast, gboolean recursive,
-			     gboolean subscribed_only,
-			     CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);
-
-	return CS_CLASS (store)->get_folder_info (store, top, fast,
-						  recursive, subscribed_only,
-						  ex);
-}
-
-
-static void
-free_folder_info (CamelStore *store, CamelFolderInfo *fi)
-{
-	g_warning ("CamelStore::free_folder_info not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/**
- * camel_store_free_folder_info:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * Frees the data returned by camel_store_get_folder_info().
- **/
-void
-camel_store_free_folder_info (CamelStore *store, CamelFolderInfo *fi)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-
-	CS_CLASS (store)->free_folder_info (store, fi);
-}
-
-/**
- * camel_store_free_folder_info_full:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * An implementation for CamelStore::free_folder_info. Frees all
- * of the data.
- **/
-void
-camel_store_free_folder_info_full (CamelStore *store, CamelFolderInfo *fi)
-{
-	camel_folder_info_free (fi);
-}
-
-/**
- * camel_store_free_folder_info_nop:
- * @store: a CamelStore
- * @tree: the tree returned by camel_store_get_folder_info()
- *
- * An implementation for CamelStore::free_folder_info. Does nothing.
- **/
-void
-camel_store_free_folder_info_nop (CamelStore *store, CamelFolderInfo *fi)
-{
-	;
-}
-
-
-/**
- * camel_folder_info_free:
- * @fi: the CamelFolderInfo
- *
- * Frees @fi.
- **/
-void
-camel_folder_info_free (CamelFolderInfo *fi)
-{
-	if (fi) {
-		camel_folder_info_free (fi->sibling);
-		camel_folder_info_free (fi->child);
-		g_free (fi->name);
-		g_free (fi->full_name);
-		g_free (fi->url);
-		g_free (fi);
-	}
-}
-
-
-/**
- * camel_folder_info_build:
- * @folders: an array of CamelFolderInfo
- * @top: the top of the folder tree
- * @separator: the hieararchy separator character
- * @short_names: %TRUE if the (short) name of a folder is the part after
- * the last @separator in the full name. %FALSE if it is the full name.
- *
- * This takes an array of folders and attaches them together. @top points
- * to the (or at least, "a") top-level element of the tree: it may or may
- * not also be an element of @folders. If necessary, camel_folder_info_build
- * will create additional CamelFolderInfo with %NULL urls to fill in gaps
- * in the tree. The value of @short_names is used in constructing the
- * names of these intermediate folders.
- **/
-void
-camel_folder_info_build (GPtrArray *folders, CamelFolderInfo *top,
-			 char separator, gboolean short_names)
-{
-	CamelFolderInfo *fi, *pfi;
-	GHashTable *hash;
-	char *p, *pname;
-	int i;
-
-	/* Hash the folders. */
-	hash = g_hash_table_new (g_str_hash, g_str_equal);
-	pfi = top;
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (fi == top)
-			pfi = NULL;
-		g_hash_table_insert (hash, fi->full_name, fi);
-	}
-	if (pfi)
-		g_hash_table_insert (hash, pfi->full_name, pfi);
-
-	/* Now find parents. */
-	for (i = 0; i < folders->len; i++) {
-		fi = folders->pdata[i];
-		if (fi == top)
-			continue;
-
-		p = strrchr (fi->full_name, separator);
-		if (p) {
-			pname = g_strndup (fi->full_name, p - fi->full_name);
-			pfi = g_hash_table_lookup (hash, pname);
-			if (pfi) {
-				g_free (pname);
-			} else {
-				pfi = g_new0 (CamelFolderInfo, 1);
-				pfi->full_name = pname;
-				if (short_names) {
-					pfi->name = strrchr (pname, separator);
-					if (pfi->name)
-						pfi->name = g_strdup (pfi->name + 1);
-					else
-						pfi->name = g_strdup (pname);
-				} else
-					pfi->name = g_strdup (pname);
-				g_hash_table_insert (hash, pname, pfi);
-				g_ptr_array_add (folders, pfi);
-			}
-			fi->sibling = pfi->child;
-			fi->parent = pfi;
-			pfi->child = fi;
-		} else {
-			fi->sibling = top->child;
-			fi->parent = top;
-			top->child = fi;
-		}
-	}
-}
-
-gboolean
-camel_store_supports_subscriptions (CamelStore *store)
-{
-	return (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-}
-
-
-static gboolean
-folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-	return FALSE;
-}
-
-/**
- * camel_store_folder_subscribed: Tell whether or not a folder has been subscribed to.
- * @store: a CamelStore
- * @folder_name: the folder on which we're querying subscribed status.
- * Return value: TRUE if folder is subscribed, FALSE if not.
- **/
-gboolean
-camel_store_folder_subscribed (CamelStore *store,
-			       const char *folder_name)
-{
-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
-	g_return_val_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS, FALSE);
-
-	return CS_CLASS (store)->folder_subscribed (store, folder_name);
-}
-
-static void
-subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-/**
- * camel_store_subscribe_folder: marks a folder as subscribed.
- * @store: a CamelStore
- * @folder_name: the folder to subscribe to.
- **/
-void
-camel_store_subscribe_folder (CamelStore *store,
-			      const char *folder_name,
-			      CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-
-	CS_CLASS (store)->subscribe_folder (store, folder_name, ex);
-}
-
-static void
-unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));
-}
-
-
-/**
- * camel_store_unsubscribe_folder: marks a folder as unsubscribed.
- * @store: a CamelStore
- * @folder_name: the folder to unsubscribe from.
- **/
-void
-camel_store_unsubscribe_folder (CamelStore *store,
-				const char *folder_name,
-				CamelException *ex)
-{
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
-
-	CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex);
-}
-
diff --git a/camel/camel-store.h b/camel/camel-store.h
deleted file mode 100644
index 7558c0eb5a..0000000000
--- a/camel/camel-store.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-store.h : Abstract class for an email store */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STORE_H
-#define CAMEL_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <camel/camel-service.h>
-
-
-typedef struct _CamelFolderInfo {
-	struct _CamelFolderInfo *parent, *sibling, *child;
-	char *url, *full_name, *name;
-	int message_count, unread_message_count;
-} CamelFolderInfo;
-
-
-#define CAMEL_STORE_TYPE     (camel_store_get_type ())
-#define CAMEL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))
-#define CAMEL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))
-#define CAMEL_IS_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STORE_TYPE))
-
-
-/* Flags for store flags */
-#define CAMEL_STORE_SUBSCRIPTIONS (1 << 0)
-
-struct _CamelStore
-{
-	CamelService parent_object;
-
-	GHashTable *folders;
-
-	int flags;
-};
-
-
-/* open mode for folder */
-#define CAMEL_STORE_FOLDER_CREATE (1<<0)
-#define CAMEL_STORE_FOLDER_BODY_INDEX (1<<1)
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	CamelFolder *   (*get_folder)               (CamelStore *store,
-						     const char *folder_name,
-						     guint32 flags,
-						     CamelException *ex);
-
-	void            (*delete_folder)            (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-	void		(*rename_folder)	    (CamelStore *store,
-						     const char *old_name,
-						     const char *new_name,
-						     CamelException *ex);
-	char *          (*get_folder_name)          (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-	char *          (*get_root_folder_name)     (CamelStore *store,
-						     CamelException *ex);
-	char *          (*get_default_folder_name)  (CamelStore *store,
-						     CamelException *ex);
-
-        CamelFolder *   (*lookup_folder)            (CamelStore *store,
-						     const char *folder_name);
-	void            (*cache_folder)             (CamelStore *store,
-						     const char *folder_name,
-						     CamelFolder *folder);
-        void            (*uncache_folder)           (CamelStore *store,
-						     CamelFolder *folder);
-
-	CamelFolderInfo *(*get_folder_info)         (CamelStore *store,
-						     const char *top,
-						     gboolean fast,
-						     gboolean recursive,
-						     gboolean subscribed_only,
-						     CamelException *ex);
-	void            (*free_folder_info)         (CamelStore *store,
-						     CamelFolderInfo *fi);
-
-	gboolean        (*folder_subscribed)        (CamelStore *store,
-						     const char *folder_name);
-	void            (*subscribe_folder)         (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-	void            (*unsubscribe_folder)       (CamelStore *store,
-						     const char *folder_name,
-						     CamelException *ex);
-} CamelStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_store_get_type (void);
-
-/* public methods */
-CamelFolder *    camel_store_get_folder         (CamelStore *store,
-					         const char *folder_name,
-						 guint32 flags,
-					         CamelException *ex);
-CamelFolder *    camel_store_get_root_folder    (CamelStore *store,
-					         CamelException *ex);
-CamelFolder *    camel_store_get_default_folder (CamelStore *store,
-						 CamelException *ex);
-
-void             camel_store_delete_folder      (CamelStore *store,
-						 const char *folder_name,
-						 CamelException *ex);
-void             camel_store_rename_folder      (CamelStore *store,
-						 const char *old_name,
-						 const char *new_name,
-						 CamelException *ex);
-
-CamelFolderInfo *camel_store_get_folder_info    (CamelStore *store,
-						 const char *top,
-						 gboolean fast,
-						 gboolean recursive,
-						 gboolean subscribed_only,
-						 CamelException *ex);
-void             camel_store_free_folder_info   (CamelStore *store,
-						 CamelFolderInfo *fi);
-
-void             camel_store_free_folder_info_full (CamelStore *store,
-						    CamelFolderInfo *fi);
-void             camel_store_free_folder_info_nop  (CamelStore *store,
-						    CamelFolderInfo *fi);
-
-void             camel_folder_info_free            (CamelFolderInfo *fi);
-void             camel_folder_info_build           (GPtrArray *folders,
-						    CamelFolderInfo *top,
-						    char separator,
-						    gboolean short_names);
-
-gboolean         camel_store_supports_subscriptions   (CamelStore *store);
-
-gboolean         camel_store_folder_subscribed        (CamelStore *store,
-						       const char *folder_name);
-void             camel_store_subscribe_folder         (CamelStore *store,
-						       const char *folder_name,
-						       CamelException *ex);
-void             camel_store_unsubscribe_folder       (CamelStore *store,
-						       const char *folder_name,
-						       CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STORE_H */
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
deleted file mode 100644
index c25cda09bc..0000000000
--- a/camel/camel-stream-buffer.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-
-/* camel-stream-buffer.c : Buffer any other other stream
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-#include "camel-stream-buffer.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-static CamelStreamClass *parent_class = NULL;
-
-enum {
-	BUF_USER = 1<<0,	/* user-supplied buffer, do not free */
-};
-
-#define BUF_SIZE 1024
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush (CamelStream *stream);
-static int stream_close (CamelStream *stream);
-static gboolean stream_eos (CamelStream *stream);
-
-static void init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size);
-static void init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode);
-
-static void
-camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_class)
-{
-	CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_stream_buffer_class);
-
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-
-	/* virtual method definition */
-	camel_stream_buffer_class->init = init;
-	camel_stream_buffer_class->init_vbuf = init_vbuf;
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->eos = stream_eos;
-}
-
-static void
-camel_stream_buffer_init (gpointer object, gpointer klass)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
-
-	sbf->flags = 0;
-	sbf->size = BUF_SIZE;
-	sbf->buf = g_malloc(BUF_SIZE);
-	sbf->ptr = sbf->buf;
-	sbf->end = sbf->buf;
-	sbf->mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;
-	sbf->stream = 0;
-	sbf->linesize = 80;
-	sbf->linebuf = g_malloc(sbf->linesize);
-}
-
-static void
-camel_stream_buffer_finalize (CamelObject *object)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
-
-	if (!(sbf->flags & BUF_USER)) {
-		g_free(sbf->buf);
-	}
-	if (sbf->stream)
-		camel_object_unref(CAMEL_OBJECT(sbf->stream));
-
-	g_free(sbf->linebuf);
-}
-
-
-CamelType
-camel_stream_buffer_get_type (void)
-{
-	static CamelType camel_stream_buffer_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_buffer_type == CAMEL_INVALID_TYPE)	{
-		camel_stream_buffer_type = camel_type_register (camel_stream_get_type (), "CamelStreamBuffer",
-								sizeof (CamelStreamBuffer),
-								sizeof (CamelStreamBufferClass),
-								(CamelObjectClassInitFunc) camel_stream_buffer_class_init,
-								NULL,
-								(CamelObjectInitFunc) camel_stream_buffer_init,
-								(CamelObjectFinalizeFunc) camel_stream_buffer_finalize);
-	}
-
-	return camel_stream_buffer_type;
-}
-
-
-static void
-set_vbuf(CamelStreamBuffer *sbf, char *buf, CamelStreamBufferMode mode, int size)
-{
-	if (sbf->buf && !(sbf->flags & BUF_USER)) {
-		g_free(sbf->buf);
-	}
-	if (buf) {
-		sbf->buf = buf;
-		sbf->flags |= BUF_USER;
-	} else {
-		sbf->buf = g_malloc(size);
-		sbf->flags &= ~BUF_USER;
-	}
-	sbf->size = size;
-	sbf->mode = mode;
-}
-
-static void
-init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size)
-{
-	set_vbuf(sbf, buf, mode, size);
-	if (sbf->stream)
-		camel_object_unref(CAMEL_OBJECT(sbf->stream));
-	sbf->stream = s;
-	camel_object_ref(CAMEL_OBJECT(sbf->stream));
-}
-
-static void
-init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)
-{
-	init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);
-}
-
-
-/**
- * camel_stream_buffer_new:
- * @stream: Existing stream to buffer.
- * @mode: Operational mode of buffered stream.
- *
- * Create a new buffered stream of another stream.  A default
- * buffer size (1024 bytes), automatically managed will be used
- * for buffering.
- *
- * See camel_stream_buffer_new_with_vbuf() for details on the
- * @mode parameter.
- *
- * Return value: A newly created buffered stream.
- **/
-CamelStream *
-camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)
-{
-	CamelStreamBuffer *sbf;
-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));
-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))->init (sbf, stream, mode);
-
-	return CAMEL_STREAM (sbf);
-}
-
-/**
- * camel_stream_buffer_new_with_vbuf:
- * @stream: An existing stream to buffer.
- * @mode: Mode to buffer in.
- * @buf: Memory to use for buffering.
- * @size: Size of buffer to use.
- *
- * Create a new stream which buffers another stream, @stream.
- *
- * The following values are available for @mode:
- *
- * CAMEL_STREAM_BUFFER_BUFFER, Buffer the input/output in blocks.
- * CAMEL_STREAM_BUFFER_NEWLINE, Buffer on newlines (for output).
- * CAMEL_STREAM_BUFFER_NONE, Perform no buffering.
- *
- * Note that currently this is ignored and CAMEL_STREAM_BUFFER_BUFFER
- * is always used.
- *
- * In addition, one of the following mode options should be or'd
- * together with the buffering mode:
- *
- * CAMEL_STREAM_BUFFER_WRITE, Buffer in write mode.
- * CAMEL_STREAM_BUFFER_READ, Buffer in read mode.
- *
- * Buffering can only be done in one direction for any
- * buffer instance.
- *
- * If @buf is non-NULL, then use the memory pointed to
- * (for upto @size bytes) as the buffer for all buffering
- * operations.  It is upto the application to free this buffer.
- * If @buf is NULL, then allocate and manage @size bytes
- * for all buffering.
- *
- * Return value: A new stream with buffering applied.
- **/
-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size)
-{
-	CamelStreamBuffer *sbf;
-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));
-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))->init_vbuf (sbf, stream, mode, buf, size);
-
-	return CAMEL_STREAM (sbf);
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-	ssize_t bytes_read = 1;
-	ssize_t bytes_left;
-	char *bptr = buffer;
-
-	g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_READ, 0);
-
-	while (n && bytes_read > 0) {
-		bytes_left = sbf->end - sbf->ptr;
-		if (bytes_left < n) {
-			if (bytes_left > 0) {
-				memcpy(bptr, sbf->ptr, bytes_left);
-				n -= bytes_left;
-				bptr += bytes_left;
-				sbf->ptr += bytes_left;
-			}
-			/* if we are reading a lot, then read directly to the destination buffer */
-			if (n >= sbf->size/3) {
-				bytes_read = camel_stream_read(sbf->stream, bptr, n);
-				if (bytes_read>0) {
-					n -= bytes_read;
-					bptr += bytes_read;
-				}
-			} else {
-				bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
-				if (bytes_read>0) {
-					sbf->ptr = sbf->buf;
-					sbf->end = sbf->buf+bytes_read;
-					memcpy(bptr, sbf->ptr, n);
-					sbf->ptr += n;
-					bptr += n;
-					n -= bytes_read;
-				}
-			}
-		} else {
-			memcpy(bptr, sbf->ptr, bytes_left);
-			sbf->ptr += n;
-			bptr += n;
-			n = 0;
-		}
-	}
-
-	return (ssize_t)(bptr - buffer);
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-	const char *bptr = buffer;
-	ssize_t bytes_written = 1;
-        ssize_t bytes_left;
-	ssize_t total = n;
-
-	g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE, 0);
-
-	while (n && bytes_written > 0) {
-		bytes_left = sbf->size - (sbf->ptr-sbf->buf);
-		if (bytes_left<n) {
-			memcpy(sbf->ptr, bptr, bytes_left);
-			n -= bytes_left;
-			bptr += bytes_left;
-			bytes_written = camel_stream_write(sbf->stream, sbf->buf, sbf->size);
-			sbf->ptr = sbf->buf;
-			/* if we are writing a lot, write directly to the stream */
-			if (n >= sbf->size/3) {
-				bytes_written = camel_stream_write(sbf->stream, bptr, n);
-				if (bytes_written >0) {
-					bytes_written = n;
-					n -= bytes_written;
-					bptr += bytes_written;
-				}
-			} else {
-				memcpy(sbf->ptr, bptr, n);
-				sbf->ptr += n;
-				bptr += n;
-				n = 0;
-			}
-		} else {
-			memcpy(sbf->ptr, bptr, n);
-			sbf->ptr += n;
-			bptr += n;
-			n = 0;
-		}
-	}
-	if (bytes_written == -1)
-		return -1;
-	
-	return total;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	if ((sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE) {
-		int len = sbf->ptr-sbf->buf;
-		int written = camel_stream_write(sbf->stream, sbf->buf, len);
-		if (written > 0)
-			sbf->ptr += written;
-		if (written != len)
-			return -1;
-	} else {
-		/* nothing to do for read mode 'flush' */
-	}
-
-	return camel_stream_flush(sbf->stream);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	if (stream_flush(stream) == -1)
-		return -1;
-	return camel_stream_close(sbf->stream);
-}
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	return camel_stream_eos(sbf->stream) && sbf->ptr == sbf->end;
-}
-
-/**
- * camel_stream_buffer_gets:
- * @sbf: A CamelStreamBuffer.
- * @buf: Memory to write the string to.
- * @max: Maxmimum number of characters to store.
- *
- * Read a line of characters up to the next newline character or
- * @max characters.
- *
- * If the newline character is encountered, then it will be
- * included in the buffer @buf.  The buffer will be #NUL terminated.
- *
- * Return value: The number of characters read, or 0 for end of file,
- * and -1 on error.
- **/
-int camel_stream_buffer_gets(CamelStreamBuffer *sbf, char *buf, unsigned int max)
-{
-	register char *outptr, *inptr, *inend, c, *outend;
-	int bytes_read;
-
-	outptr = buf;
-	inptr = sbf->ptr;
-	inend = sbf->end;
-	outend = buf+max-1;	/* room for NUL */
-
-	do {
-		while (inptr<inend && outptr<outend) {
-			c = *inptr++;
-			*outptr++ = c;
-			if (c == '\n') {
-				*outptr = 0;
-				sbf->ptr = inptr;
-				return outptr-buf;
-			}
-		}
-		if (outptr == outend)
-			break;
-
-		bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
-		if (bytes_read == -1)
-			return -1;
-		inptr = sbf->ptr = sbf->buf;
-		inend = sbf->end = sbf->buf + bytes_read;
-	} while (bytes_read>0);
-
-	sbf->ptr = inptr;
-	if (outptr <= outend)
-		*outptr = 0;
-
-	return (int)(outptr - buf);
-}
-
-/**
- * camel_stream_buffer_read_line: read a complete line from the stream
- * @sbf: A CamelStreamBuffer
- *
- * This function reads a complete newline-terminated line from the stream
- * and returns it in allocated memory. The trailing newline (and carriage
- * return if any) are not included in the returned string.
- *
- * Return value: the line read, which the caller must free when done with,
- * or NULL on eof. If an error occurs, @ex will be set.
- **/
-char *
-camel_stream_buffer_read_line (CamelStreamBuffer *sbf)
-{
-	unsigned char *p;
-	int nread;
-
-	p = sbf->linebuf;
-
-	while (1) {
-		nread = camel_stream_buffer_gets (sbf, p, sbf->linesize - (p - sbf->linebuf));
-		if (nread <=0) {
-			if (p > sbf->linebuf)
-				break;
-			return NULL;
-		}
-
-		p += nread;
-		if (p[-1] == '\n')
-			break;
-
-		nread = p - sbf->linebuf;
-		sbf->linesize *= 2;
-		sbf->linebuf = g_realloc (sbf->linebuf, sbf->linesize);
-		p = sbf->linebuf + nread;
-	}
-
-	p--;
-	if (p[-1] == '\r')
-		p--;
-	p[0] = 0;
-
-	return g_strdup(sbf->linebuf);
-}
-
-
-
-
-
-
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
deleted file mode 100644
index 5c9037595a..0000000000
--- a/camel/camel-stream-buffer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-buffer.h :stream which buffers another stream */
-
-/*
- *
- * Author :
- *  Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 2000 Helix Code Inc. (http://www.helixcode.com) .
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_BUFFER_H
-#define CAMEL_STREAM_BUFFER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-#include <stdio.h>
-
-#define CAMEL_STREAM_BUFFER_TYPE     (camel_stream_buffer_get_type ())
-#define CAMEL_STREAM_BUFFER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))
-#define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))
-#define CAMEL_IS_STREAM_BUFFER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))
-
-typedef enum
-{
-	CAMEL_STREAM_BUFFER_BUFFER = 0,
-	CAMEL_STREAM_BUFFER_NEWLINE,
-	CAMEL_STREAM_BUFFER_NONE,
-	CAMEL_STREAM_BUFFER_READ = 0x00,
-	CAMEL_STREAM_BUFFER_WRITE = 0x80,
-	CAMEL_STREAM_BUFFER_MODE = 0x80
-} CamelStreamBufferMode;
-
-struct _CamelStreamBuffer
-{
-	CamelStream parent_object;
-
-	/* these are all of course, private */
-	CamelStream *stream;
-
-	unsigned char *buf, *ptr, *end;
-	int size;
-
-	unsigned char *linebuf;	/* for reading lines at a time */
-	int linesize;
-
-	CamelStreamBufferMode mode;
-	unsigned int flags;	/* internal flags */
-};
-
-
-typedef struct {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-	void (*init) (CamelStreamBuffer *stream_buffer, CamelStream *stream,
-		      CamelStreamBufferMode mode);
-	void (*init_vbuf) (CamelStreamBuffer *stream_buffer,
-			   CamelStream *stream, CamelStreamBufferMode mode,
-			   char *buf, guint32 size);
-
-} CamelStreamBufferClass;
-
-
-/* Standard Camel function */
-CamelType camel_stream_buffer_get_type (void);
-
-
-/* public methods */
-CamelStream *camel_stream_buffer_new (CamelStream *s,
-				      CamelStreamBufferMode mode);
-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s,
-						CamelStreamBufferMode mode,
-						char *buf, guint32 size);
-
-/* unimplemented
-   CamelStream *camel_stream_buffer_set_vbuf (CamelStreamBuffer *b, CamelStreamBufferMode mode, char *buf, guint32 size); */
-
-/* read a line of characters */
-int camel_stream_buffer_gets (CamelStreamBuffer *b, char *buf, unsigned int max);
-
-char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_BUFFER_H */
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
deleted file mode 100644
index 211db36e7f..0000000000
--- a/camel/camel-stream-filter.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-stream-filter.h"
-
-#define d(x)
-/*#include <stdio.h>*/
-
-struct _filter {
-	struct _filter *next;
-	int id;
-	CamelMimeFilter *filter;
-};
-
-struct _CamelStreamFilterPrivate {
-	struct _filter *filters;
-	int filterid;		/* next filter id */
-	
-	char *realbuffer;	/* buffer - READ_PAD */
-	char *buffer;		/* READ_SIZE bytes */
-
-	char *filtered;		/* the filtered data */
-	size_t filteredlen;
-
-	int last_was_read;	/* was the last op read or write? */
-};
-
-#define READ_PAD (64)		/* bytes padded before buffer */
-#define READ_SIZE (4096)
-
-#define _PRIVATE(o) (((CamelStreamFilter *)(o))->priv)
-
-static void camel_stream_filter_class_init (CamelStreamFilterClass *klass);
-static void camel_stream_filter_init       (CamelStreamFilter *obj);
-
-static	ssize_t   do_read       (CamelStream *stream, char *buffer, size_t n);
-static	ssize_t   do_write      (CamelStream *stream, const char *buffer, size_t n);
-static	int       do_flush      (CamelStream *stream);
-static	int       do_close      (CamelStream *stream);
-static	gboolean  do_eos        (CamelStream *stream);
-static	int       do_reset      (CamelStream *stream);
-
-static CamelStreamClass *camel_stream_filter_parent;
-
-static void
-camel_stream_filter_class_init (CamelStreamFilterClass *klass)
-{
-	CamelStreamClass *camel_stream_class = (CamelStreamClass *) klass;
-
-	camel_stream_filter_parent = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-
-	camel_stream_class->read = do_read;
-	camel_stream_class->write = do_write;
-	camel_stream_class->flush = do_flush;
-	camel_stream_class->close = do_close;
-	camel_stream_class->eos = do_eos; 
-	camel_stream_class->reset = do_reset;
-
-}
-
-static void
-camel_stream_filter_init (CamelStreamFilter *obj)
-{
-	struct _CamelStreamFilterPrivate *p;
-	
-	_PRIVATE(obj) = p = g_malloc0(sizeof(*p));
-	p->realbuffer = g_malloc(READ_SIZE + READ_PAD);
-	p->buffer = p->realbuffer + READ_PAD;
-	p->last_was_read = TRUE;
-}
-
-static void
-camel_stream_filter_finalize(CamelObject *o)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)o;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	f = p->filters;
-	while (f) {
-		fn = f->next;
-		camel_object_unref((CamelObject *)f->filter);
-		g_free(f);
-		f = fn;
-	}
-	g_free(p->realbuffer);
-	g_free(p);
-	camel_object_unref((CamelObject *)filter->source);
-}
-
-
-CamelType
-camel_stream_filter_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (CAMEL_STREAM_TYPE, "CamelStreamFilter",
-					    sizeof (CamelStreamFilter),
-					    sizeof (CamelStreamFilterClass),
-					    (CamelObjectClassInitFunc) camel_stream_filter_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_stream_filter_init,
-					    (CamelObjectFinalizeFunc) camel_stream_filter_finalize);
-	}
-	
-	return type;
-}
-
-
-/**
- * camel_stream_filter_new:
- *
- * Create a new CamelStreamFilter object.
- * 
- * Return value: A new CamelStreamFilter object.
- **/
-CamelStreamFilter *
-camel_stream_filter_new_with_stream(CamelStream *stream)
-{
-	CamelStreamFilter *new = CAMEL_STREAM_FILTER ( camel_object_new (camel_stream_filter_get_type ()));
-
-	new->source = stream;
-	camel_object_ref ((CamelObject *)stream);
-
-	return new;
-}
-
-
-/**
- * camel_stream_filter_add:
- * @filter: Initialised CamelStreamFilter.
- * @mf:  Filter to perform processing on stream.
- * 
- * Add a new CamelMimeFilter to execute during the processing of this
- * stream.  Each filter added is processed after the previous one.
- *
- * Note that a filter should only be added to a single stream
- * at a time, otherwise unpredictable results may occur.
- * 
- * Return value: A filter id for this CamelStreamFilter.
- **/
-int
-camel_stream_filter_add(CamelStreamFilter *filter, CamelMimeFilter *mf)
-{
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	fn = g_malloc(sizeof(*fn));
-	fn->id = p->filterid++;
-	fn->filter = mf;
-	camel_object_ref((CamelObject *)mf);
-
-	/* sure, we could use a GList, but we wouldn't save much */
-	f = (struct _filter *)&p->filters;
-	while (f->next)
-		f = f->next;
-	f->next = fn;
-	fn->next = NULL;
-	return fn->id;
-}
-
-/**
- * camel_stream_filter_remove:
- * @filter: Initialised CamelStreamFilter.
- * @id: Filter id, as returned from camel_stream_filter_add().
- * 
- * Remove a processing filter from the stream, by id.
- **/
-void
-camel_stream_filter_remove(CamelStreamFilter *filter, int id)
-{
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *fn, *f;
-
-	f = (struct _filter *)&p->filters;
-	while (f && f->next) {
-		fn = f->next;
-		if (fn->id == id) {
-			f->next = fn->next;
-			camel_object_unref((CamelObject *)fn->filter);
-			g_free(fn);
-		}
-		f = f->next;
-	}
-}
-
-static ssize_t
-do_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	ssize_t size;
-	struct _filter *f;
-
-	p->last_was_read = TRUE;
-
-	if (p->filteredlen<=0) {
-		int presize = READ_SIZE;
-
-		size = camel_stream_read(filter->source, p->buffer, READ_SIZE);
-		if (size <= 0) {
-			/* this is somewhat untested */
-			if (camel_stream_eos(filter->source)) {
-				f = p->filters;
-				p->filtered = p->buffer;
-				p->filteredlen = 0;
-				while (f) {
-					camel_mime_filter_complete(f->filter, p->filtered, p->filteredlen,
-								   presize, &p->filtered, &p->filteredlen, &presize);
-					f = f->next;
-				}
-				size = p->filteredlen;
-			}
-			if (size <= 0)
-				return size;
-		} else {
-			f = p->filters;
-			p->filtered = p->buffer;
-			p->filteredlen = size;
-
-			d(printf ("\n\nOriginal content: '"));
-			d(fwrite(p->filtered, sizeof(char), p->filteredlen, stdout));
-			d(printf("'\n"));
-
-			while (f) {
-				camel_mime_filter_filter(f->filter, p->filtered, p->filteredlen, presize,
-							 &p->filtered, &p->filteredlen, &presize);
-
-				d(printf ("Filtered content (%s): '",
-					  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-				d(fwrite(p->filtered, sizeof(char), p->filteredlen, stdout));
-				d(printf("'\n"));
-
-				f = f->next;
-			}
-		}
-	}
-
-	size = MIN(n, p->filteredlen);
-	memcpy(buffer, p->filtered, size);
-	p->filteredlen -= size;
-	p->filtered += size;
-
-	return size;
-}
-
-/* Note: Since the caller expects to write out as much as they asked us to
-   write (for 'success'), we return what they asked us to write (for 'success')
-   rather than the true number of written bytes */
-static ssize_t
-do_write (CamelStream *stream, const char *buf, size_t n)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-	int presize;
-	char *buffer = (char *)buf;
-	size_t len = n;
-
-	p->last_was_read = FALSE;
-
-	d(printf ("\n\nWriting: Original content: '"));
-	d(fwrite(buffer, sizeof(char), len, stdout));
-	d(printf("'\n"));
-
-	f = p->filters;
-	presize = 0;
-	while (f) {
-		camel_mime_filter_filter(f->filter, buffer, len, presize, &buffer, &len, &presize);
-
-		d(printf ("Filtered content (%s): '",
-			  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-		d(fwrite(buffer, sizeof(char), len, stdout));
-		d(printf("'\n"));
-
-		f = f->next;
-	}
-
-	if (camel_stream_write(filter->source, buffer, len) != len)
-		return -1;
-
-	return n;
-}
-
-static int
-do_flush (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-	char *buffer;
-	int len, presize;
-
-	if (p->last_was_read) {
-		g_warning("Flushing a filter stream without writing to it");
-		return 0;
-	}
-
-	buffer = "";
-	len = 0;
-	presize = 0;
-	f = p->filters;
-	
-	d(printf ("\n\nFlushing: Original content: '"));
-	d(fwrite(buffer, sizeof(char), len, stdout));
-	d(printf("'\n"));
-
-	while (f) {
-		camel_mime_filter_complete(f->filter, buffer, len, presize, &buffer, &len, &presize);
-
-		d(printf ("Filtered content (%s): '",
-			  camel_type_to_name(((CamelObject *)f->filter)->s.type)));
-		d(fwrite(buffer, sizeof(char), len, stdout));
-		d(printf("'\n"));
-
-		f = f->next;
-	}
-	if (len > 0 && camel_stream_write(filter->source, buffer, len) == -1)
-		return -1;
-	return camel_stream_flush(filter->source);
-}
-
-static int
-do_close (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
-	if (!p->last_was_read) {
-		do_flush(stream);
-	}
-	return camel_stream_close(filter->source);
-}
-
-static gboolean
-do_eos (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
-	if (p->filteredlen > 0)
-		return FALSE;
-
-	return camel_stream_eos(filter->source);
-}
-
-static int
-do_reset (CamelStream *stream)
-{
-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;
-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-	struct _filter *f;
-
-	p->filteredlen = 0;
-
-	/* and reset filters */
-	f = p->filters;
-	while (f) {
-		camel_mime_filter_reset(f->filter);
-		f = f->next;
-	}
-
-	return camel_stream_reset(filter->source);
-}
-
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
deleted file mode 100644
index d0683135c7..0000000000
--- a/camel/camel-stream-filter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_STREAM_FILTER_H
-#define _CAMEL_STREAM_FILTER_H
-
-#include <camel/camel-stream.h>
-#include <camel/camel-mime-filter.h>
-
-#define CAMEL_STREAM_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)
-#define CAMEL_STREAM_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)
-#define IS_CAMEL_STREAM_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_filter_get_type ())
-
-typedef struct _CamelStreamFilterClass CamelStreamFilterClass;
-
-struct _CamelStreamFilter {
-	CamelStream parent;
-
-	CamelStream *source;
-
-	struct _CamelStreamFilterPrivate *priv;
-};
-
-struct _CamelStreamFilterClass {
-	CamelStreamClass parent_class;
-};
-
-guint			camel_stream_filter_get_type	(void);
-
-CamelStreamFilter      *camel_stream_filter_new_with_stream	(CamelStream *stream);
-
-int camel_stream_filter_add	(CamelStreamFilter *filter, CamelMimeFilter *);
-void camel_stream_filter_remove	(CamelStreamFilter *filter, int id);
-
-#endif /* ! _CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
deleted file mode 100644
index 17c6b98e08..0000000000
--- a/camel/camel-stream-fs.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream-fs.c : file system based stream */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-fs.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelStreamFS */
-#define CSFS_CLASS(so) CAMEL_STREAM_FS_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static ssize_t stream_read   (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write  (CamelStream *stream, const char *buffer, size_t n);
-static int stream_flush  (CamelStream *stream);
-static int stream_close  (CamelStream *stream);
-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-
-static void
-camel_stream_fs_class_init (CamelStreamFsClass *camel_stream_fs_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_fs_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_stream_fs_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-
-	camel_seekable_stream_class->seek = stream_seek;
-}
-
-static void
-camel_stream_fs_init (gpointer object, gpointer klass)
-{
-	CamelStreamFs *stream = CAMEL_STREAM_FS (object);
-
-	stream->fd = -1;
-}
-
-static void
-camel_stream_fs_finalize (CamelObject *object)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (object);
-
-	if (stream_fs->fd != -1)
-		close (stream_fs->fd);
-}
-
-
-CamelType
-camel_stream_fs_get_type (void)
-{
-	static CamelType camel_stream_fs_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_fs_type == CAMEL_INVALID_TYPE) {
-		camel_stream_fs_type = camel_type_register (camel_seekable_stream_get_type (), "CamelStreamFs",
-							    sizeof (CamelStreamFs),
-							    sizeof (CamelStreamFsClass),
-							    (CamelObjectClassInitFunc) camel_stream_fs_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_stream_fs_init,
-							    (CamelObjectFinalizeFunc) camel_stream_fs_finalize);
-	}
-
-	return camel_stream_fs_type;
-}
-
-/**
- * camel_stream_fs_new_with_fd:
- * @fd: a file descriptor
- *
- * Returns a stream associated with the given file descriptor.
- * When the stream is destroyed, the file descriptor will be closed.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_fs_new_with_fd (int fd)
-{
-	CamelStreamFs *stream_fs;
-	off_t offset;
-
-	stream_fs = CAMEL_STREAM_FS (camel_object_new (camel_stream_fs_get_type ()));
-	stream_fs->fd = fd;
-	offset = lseek (fd, 0, SEEK_CUR);
-	if (offset == -1)
-		offset = 0;
-	CAMEL_SEEKABLE_STREAM (stream_fs)->position = offset;
-
-	return CAMEL_STREAM (stream_fs);
-}
-
-/**
- * camel_stream_fs_new_with_fd_and_bounds:
- * @fd: a file descriptor
- * @start: the first valid position in the file
- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND
- *
- * Returns a stream associated with the given file descriptor and bounds.
- * When the stream is destroyed, the file descriptor will be closed.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end)
-{
-	CamelStream *stream;
-
-	stream = camel_stream_fs_new_with_fd (fd);
-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream), start, end);
-
-	return stream;
-}
-
-/**
- * camel_stream_fs_new_with_name:
- * @name: a local filename
- * @flags: flags as in open(2)
- * @mode: a file mode
- *
- * Creates a new CamelStream corresponding to the named file, flags,
- * and mode.
- *
- * Return value: the stream, or #NULL on error.
- **/
-CamelStream *
-camel_stream_fs_new_with_name (const char *name, int flags, mode_t mode)
-{
-	int fd;
-
-	fd = open (name, flags, mode);
-	if (fd == -1) {
-		return NULL;
-	}
-
-	return camel_stream_fs_new_with_fd (fd);
-}
-
-/**
- * camel_stream_fs_new_with_name_and_bounds:
- * @name: a local filename
- * @flags: flags as in open(2)
- * @mode: a file mode
- * @start: the first valid position in the file
- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND
- *
- * Creates a new CamelStream corresponding to the given arguments.
- *
- * Return value: the stream, or NULL on error.
- **/
-CamelStream *
-camel_stream_fs_new_with_name_and_bounds (const char *name, int flags,
-					  mode_t mode, off_t start, off_t end)
-{
-	CamelStream *stream;
-
-	stream = camel_stream_fs_new_with_name (name, flags, mode);
-	if (stream == NULL)
-		return NULL;
-
-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream),
-					  start, end);
-
-	return stream;
-}
-
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nread;
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-
-	do {
-		nread = read (stream_fs->fd, buffer, n);
-	} while (nread == -1 && errno == EINTR);
-
-	if (nread > 0)
-		seekable->position += nread;
-	else if (nread == 0)
-		stream->eos = TRUE;
-
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t v, written = 0;
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN (seekable->bound_end - seekable->position, n);
-
-	do {
-		v = write (stream_fs->fd, buffer, n);
-		if (v > 0)
-			written += v;
-	} while (v == -1 && errno == EINTR);
-
-	if (written > 0)
-		seekable->position += written;
-	else if (v == -1)
-		return -1;
-
-	return written;
-}
-
-static int
-stream_flush (CamelStream *stream)
-{
-	return fsync(((CamelStreamFs *)stream)->fd);
-}
-
-static int
-stream_close (CamelStream *stream)
-{
-	return close(((CamelStreamFs *)stream)->fd);
-}
-
-static off_t
-stream_seek (CamelSeekableStream *stream, off_t offset, CamelStreamSeekPolicy policy)
-{
-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);
-	off_t real = 0;
-
-	switch (policy) {
-	case CAMEL_STREAM_SET:
-		real = offset;
-		break;
-	case CAMEL_STREAM_CUR:
-		real = stream->position + offset;
-		break;
-	case CAMEL_STREAM_END:
-		if (stream->bound_end != CAMEL_STREAM_UNBOUND) {
-			real = lseek(stream_fs->fd, offset, SEEK_END);
-			if (real != -1)
-				stream->position = real;
-			return real;
-		}
-		real = stream->bound_end + offset;
-		break;
-	}
-
-	if (stream->bound_end != CAMEL_STREAM_UNBOUND)
-		real = MIN (real, stream->bound_end);
-	real = MAX (real, stream->bound_start);
-
-	real = lseek(stream_fs->fd, real, SEEK_SET);
-	if (real == -1)
-		return -1;
-
-	if (real != stream->position && ((CamelStream *)stream)->eos)
-		((CamelStream *)stream)->eos = FALSE;
-
-	stream->position = real;
-
-	return real;
-}
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
deleted file mode 100644
index ea403f584f..0000000000
--- a/camel/camel-stream-fs.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-fs.h :stream based on unix filesystem */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_FS_H
-#define CAMEL_STREAM_FS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-
-/* for open flags */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define CAMEL_STREAM_FS_TYPE     (camel_stream_fs_get_type ())
-#define CAMEL_STREAM_FS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))
-#define CAMEL_STREAM_FS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))
-#define CAMEL_IS_STREAM_FS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))
-
-struct _CamelStreamFs
-{
-	CamelSeekableStream parent_object;
-
-	int fd;             /* file descriptor on the underlying file */
-};
-
-typedef struct {
-	CamelSeekableStreamClass parent_class;
-
-} CamelStreamFsClass;
-
-/* Standard Camel function */
-CamelType camel_stream_fs_get_type (void);
-
-/* public methods */
-CamelStream * camel_stream_fs_new_with_name            (const char *name, int flags, mode_t mode);
-CamelStream * camel_stream_fs_new_with_name_and_bounds (const char *name, int flags, mode_t mode,
-							off_t start, off_t end);
-
-CamelStream * camel_stream_fs_new_with_fd              (int fd);
-CamelStream * camel_stream_fs_new_with_fd_and_bounds   (int fd, off_t start, off_t end);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_FS_H */
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
deleted file mode 100644
index 77941894b7..0000000000
--- a/camel/camel-stream-mem.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-mem.c: memory buffer based stream */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream-mem.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-static CamelSeekableStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelStreamMem */
-#define CSM_CLASS(so) CAMEL_STREAM_MEM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
-static gboolean stream_eos (CamelStream *stream);
-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,
-			  CamelStreamSeekPolicy policy);
-
-static void camel_stream_mem_finalize (CamelObject *object);
-
-static void
-camel_stream_mem_class_init (CamelStreamMemClass *camel_stream_mem_class)
-{
-	CamelSeekableStreamClass *camel_seekable_stream_class =
-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_mem_class);
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_stream_mem_class);
-
-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_SEEKABLE_STREAM_TYPE ) );
-
-	/* virtual method overload */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->eos = stream_eos;
-
-	camel_seekable_stream_class->seek = stream_seek;
-}
-
-static void
-camel_stream_mem_init (CamelObject *object)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);
-
-	stream_mem->owner = FALSE;
-	stream_mem->buffer = 0;
-}
-
-CamelType
-camel_stream_mem_get_type (void)
-{
-	static CamelType camel_stream_mem_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_mem_type == CAMEL_INVALID_TYPE) {
-		camel_stream_mem_type = camel_type_register( CAMEL_SEEKABLE_STREAM_TYPE,
-							     "CamelStreamMem",
-							     sizeof( CamelStreamMem ),
-							     sizeof( CamelStreamMemClass ),
-							     (CamelObjectClassInitFunc) camel_stream_mem_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_stream_mem_init,
-							     (CamelObjectFinalizeFunc) camel_stream_mem_finalize );
-	}
-
-	return camel_stream_mem_type;
-}
-
-
-CamelStream *
-camel_stream_mem_new (void)
-{
-	return camel_stream_mem_new_with_byte_array (g_byte_array_new ());
-}
-
-CamelStream *
-camel_stream_mem_new_with_buffer (const char *buffer, size_t len)
-{
-	GByteArray *ba;
-
-	ba = g_byte_array_new ();
-	g_byte_array_append (ba, (const guint8 *)buffer, len);
-	return camel_stream_mem_new_with_byte_array (ba);
-}
-
-CamelStream *
-camel_stream_mem_new_with_byte_array (GByteArray *byte_array)
-{
-	CamelStreamMem *stream_mem;
-
-	stream_mem = CAMEL_STREAM_MEM( camel_object_new (CAMEL_STREAM_MEM_TYPE) );
-	stream_mem->buffer = byte_array;
-	stream_mem->owner = TRUE;
-
-	return CAMEL_STREAM (stream_mem);
-}
-
-/* note: with these functions the caller is the 'owner' of the buffer */
-void camel_stream_mem_set_byte_array (CamelStreamMem *s, GByteArray *buffer)
-{
-	if (s->buffer && s->owner)
-		g_byte_array_free(s->buffer, TRUE);
-	s->owner = FALSE;
-	s->buffer = buffer;
-}
-
-void camel_stream_mem_set_buffer (CamelStreamMem *s, const char *buffer,
-				  size_t len)
-{
-	GByteArray *ba;
-
-	ba = g_byte_array_new ();
-	g_byte_array_append (ba, (const guint8 *)buffer, len);
-	camel_stream_mem_set_byte_array(s, ba);
-}
-
-static void
-camel_stream_mem_finalize (CamelObject *object)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);
-
-	if (stream_mem->buffer && stream_mem->owner)
-		g_byte_array_free (stream_mem->buffer, TRUE);
-
-	/* Will be called automagically in the Camel Type System!
-	 * Wheeee!
-	 * G_TK_OBJECT_CLASS (parent_class)->finalize (object);
-	 */
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	CamelStreamMem *camel_stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nread;
-
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		n = MIN(seekable->bound_end - seekable->position, n);
-
-	nread = MIN (n, camel_stream_mem->buffer->len - seekable->position);
-	if (nread > 0) {
-		memcpy (buffer, camel_stream_mem->buffer->data +
-			seekable->position, nread);
-		seekable->position += nread;
-	} else
-		nread = -1;
-
-	return nread;
-}
-
-static ssize_t
-stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);
-	ssize_t nwrite = n;
-	
-	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
-		nwrite = MIN(seekable->bound_end - seekable->position, n);
-
-#ifndef NO_WARNINGS
-#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object"
-#endif
-	if (seekable->position == stream_mem->buffer->len) {
-		stream_mem->buffer =
-			g_byte_array_append (stream_mem->buffer, (const guint8 *)buffer, nwrite);
-	} else {
-		g_byte_array_set_size (stream_mem->buffer,
-				       nwrite + stream_mem->buffer->len);
-		memcpy (stream_mem->buffer->data + seekable->position, buffer, nwrite);
-	}
-	seekable->position += nwrite;
-
-	return nwrite;
-}
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
-
-	return stream_mem->buffer->len <= seekable_stream->position;
-}
-
-static off_t
-stream_seek (CamelSeekableStream *stream, off_t offset,
-	     CamelStreamSeekPolicy policy)
-{
-	off_t position;
-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);
-
-	switch  (policy) {
-	case CAMEL_STREAM_SET:
-		position = offset;
-		break;
-	case CAMEL_STREAM_CUR:
-		position = stream->position + offset;
-		break;
-	case CAMEL_STREAM_END:
-		position = (stream_mem->buffer)->len + offset;
-		break;
-	default:
-		position = offset;
-		break;
-	}
-
-	if (stream->bound_end != CAMEL_STREAM_UNBOUND)
-		position = MIN (position, stream->bound_end);
-	if (stream->bound_start != CAMEL_STREAM_UNBOUND)
-		position = MAX (position, 0);
-	else
-		position = MAX (position, stream->bound_start);
-
-	if (position > stream_mem->buffer->len) {
-		int oldlen = stream_mem->buffer->len;
-		g_byte_array_set_size (stream_mem->buffer, position);
-		memset (stream_mem->buffer->data + oldlen, 0,
-			position - oldlen);
-	}
-
-	stream->position = position;
-
-	return position;
-}
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
deleted file mode 100644
index 422d05426c..0000000000
--- a/camel/camel-stream-mem.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-stream-mem.h: stream based on memory buffer */
-
-/*
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *	    Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_MEM_H
-#define CAMEL_STREAM_MEM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-seekable-stream.h>
-#include <sys/types.h>
-
-#define CAMEL_STREAM_MEM_TYPE     (camel_stream_mem_get_type ())
-#define CAMEL_STREAM_MEM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))
-#define CAMEL_STREAM_MEM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))
-#define CAMEL_IS_STREAM_MEM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))
-
-typedef struct _CamelStreamMemClass CamelStreamMemClass;
-
-struct _CamelStreamMem {
-	CamelSeekableStream parent_object;
-
-	gboolean owner;		/* do we own the buffer? */
-	GByteArray *buffer;
-};
-
-struct _CamelStreamMemClass {
-	CamelSeekableStreamClass parent_class;
-
-	/* Virtual methods */
-};
-
-/* Standard Camel function */
-CamelType camel_stream_mem_get_type (void);
-
-/* public methods */
-CamelStream *camel_stream_mem_new(void);
-CamelStream *camel_stream_mem_new_with_byte_array(GByteArray *buffer);
-CamelStream *camel_stream_mem_new_with_buffer(const char *buffer, size_t len);
-
-/* these are really only here for implementing classes */
-void camel_stream_mem_set_byte_array(CamelStreamMem *, GByteArray *buffer);
-void camel_stream_mem_set_buffer(CamelStreamMem *, const char *buffer, size_t len);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_MEM_H */
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
deleted file mode 100644
index f649494b2d..0000000000
--- a/camel/camel-stream.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream.c : abstract class for a stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel-stream.h"
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelStream */
-#define CS_CLASS(so) CAMEL_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-static int stream_flush   (CamelStream *stream);
-static int stream_close   (CamelStream *stream);
-static gboolean stream_eos (CamelStream *stream);
-
-
-static void
-camel_stream_class_init (CamelStreamClass *camel_stream_class)
-{
-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );
-
-	/* virtual method definition */
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->eos = stream_eos;
-}
-
-CamelType
-camel_stream_get_type (void)
-{
-	static CamelType camel_stream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_stream_type == CAMEL_INVALID_TYPE) {
-		camel_stream_type = camel_type_register( CAMEL_OBJECT_TYPE,
-							 "CamelStream",
-							 sizeof( CamelStream ),
-							 sizeof( CamelStreamClass ),
-							 (CamelObjectClassInitFunc) camel_stream_class_init,
-							 NULL,
-							 NULL,
-							 NULL );
-	}
-
-	return camel_stream_type;
-}
-
-/**
- * camel_stream_read:
- * @stream: a CamelStream.
- * @buffer: buffer where bytes pulled from the stream are stored.
- * @n: max number of bytes to read.
- *
- * Read at most @n bytes from the @stream object and stores them
- * in the buffer pointed at by @buffer.
- *
- * Return value: number of bytes actually read, or -1 on error and
- * set errno.
- **/
-ssize_t
-camel_stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (n == 0 || buffer, -1);
-
-	return CS_CLASS (stream)->read (stream, buffer, n);
-}
-
-/**
- * camel_stream_write:
- * @stream: a CamelStream object.
- * @buffer: buffer to write.
- * @n: number of bytes to write
- *
- * Write @n bytes from the buffer pointed at by @buffer into @stream.
- *
- * Return value: the number of bytes actually written to the stream,
- * or -1 on error.
- **/
-ssize_t
-camel_stream_write (CamelStream *stream, const char *buffer, size_t n)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (n == 0 || buffer, -1);
-
-	return CS_CLASS (stream)->write (stream, buffer, n);
-}
-
-
-static int
-stream_flush (CamelStream *stream)
-{
-	/* nothing */
-	return 0;
-}
-
-/**
- * camel_stream_flush:
- * @stream: a CamelStream object
- *
- * Flushes the contents of the stream to its backing store. Only meaningful
- * on writable streams.
- *
- * Return value: -1 on error.
- **/
-int
-camel_stream_flush (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->flush (stream);
-}
-
-
-static int
-stream_close (CamelStream *stream)
-{
-	/* nothing */
-	return 0;
-}
-
-/**
- * camel_stream_close:
- * @stream: 
- * 
- * Close a stream.
- * 
- * Return value: -1 on error.
- **/
-int
-camel_stream_close (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->close (stream);
-}
-
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	return stream->eos;
-}
-
-/**
- * camel_stream_eos:
- * @stream: a CamelStream object
- *
- * Test if there are bytes left to read on the @stream object.
- *
- * Return value: %TRUE if all the contents on the stream has been read, or
- * %FALSE if information is still available.
- **/
-gboolean
-camel_stream_eos (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), TRUE);
-
-	return CS_CLASS (stream)->eos (stream);
-}
-
-
-/**
- * camel_stream_reset: reset a stream
- * @stream: the stream object
- *
- * Reset a stream. That is, put it in a state where it can be read
- * from the beginning again. Not all streams in Camel are seekable,
- * but they must all be resettable.
- *
- * Return value: -1 on error.
- **/
-int
-camel_stream_reset (CamelStream *stream)
-{
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	return CS_CLASS (stream)->reset (stream);
-}
-
-/***************** Utility functions ********************/
-
-/**
- * camel_stream_write_string:
- * @stream: a stream object
- * @string: a string
- *
- * Writes the string to the stream.
- *
- * Return value: the number of characters output, -1 on error.
- **/
-ssize_t
-camel_stream_write_string (CamelStream *stream, const char *string)
-{
-	return camel_stream_write (stream, string, strlen (string));
-}
-
-/**
- * camel_stream_printf:
- * @stream: a stream object
- * @fmt: a printf-style format string
- *
- * This printfs the given data to @stream.
- *
- * Return value: the number of characters output, -1 on error.
- **/
-ssize_t
-camel_stream_printf (CamelStream *stream, const char *fmt, ... )
-{
-	va_list args;
-	char *string;
-	int ret;
-
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-
-	va_start (args, fmt);
-	string = g_strdup_vprintf (fmt, args);
-	va_end (args);
-
-	if (!string)
-		return -1;
-
-	ret = camel_stream_write (stream, string, strlen (string));
-	g_free (string);
-	return ret;
-}
-
-/**
- * camel_stream_write_to_stream:
- * @stream: Source CamelStream.
- * @output_stream: Destination CamelStream.
- *
- * Write all of a stream (until eos) into another stream, in a blocking
- * fashion.
- *
- * Return value: Returns -1 on error, or the number of bytes succesfully
- * copied across streams.
- **/
-ssize_t
-camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream)
-{
-	char tmp_buf[4096];
-	ssize_t total = 0;
-	ssize_t nb_read;
-	ssize_t nb_written;
-
-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);
-	g_return_val_if_fail (CAMEL_IS_STREAM (output_stream), -1);
-
-	while (!camel_stream_eos (stream)) {
-		nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));
-		if (nb_read < 0)
-			return -1;
-		else if (nb_read > 0) {
-			nb_written = 0;
-
-			while (nb_written < nb_read) {
-				ssize_t len = camel_stream_write (output_stream, tmp_buf + nb_written,
-								  nb_read - nb_written);
-				if (len < 0)
-					return -1;
-				nb_written += len;
-			}
-			total += nb_written;
-		}
-	}
-	return total;
-}
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
deleted file mode 100644
index dec4e638e1..0000000000
--- a/camel/camel-stream.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-stream.h : class for an abstract stream */
-
-/*
- * Author:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_STREAM_H
-#define CAMEL_STREAM_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-object.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#define CAMEL_STREAM_TYPE     (camel_stream_get_type ())
-#define CAMEL_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))
-#define CAMEL_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))
-#define CAMEL_IS_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_TYPE))
-
-struct _CamelStream
-{
-	CamelObject parent_object;
-
-	gboolean eos;
-};
-
-typedef struct {
-	CamelObjectClass parent_class;
-
-	/* Virtual methods */
-
-	ssize_t   (*read)       (CamelStream *stream, char *buffer, size_t n);
-	ssize_t   (*write)      (CamelStream *stream, const char *buffer, size_t n);
-	int       (*close)      (CamelStream *stream);
-	int       (*flush)      (CamelStream *stream);
-	gboolean  (*eos)        (CamelStream *stream);
-	int       (*reset)      (CamelStream *stream);
-
-} CamelStreamClass;
-
-/* Standard Camel function */
-CamelType camel_stream_get_type (void);
-
-/* public methods */
-ssize_t    camel_stream_read       (CamelStream *stream, char *buffer, size_t n);
-ssize_t    camel_stream_write      (CamelStream *stream, const char *buffer, size_t n);
-int        camel_stream_flush      (CamelStream *stream);
-int        camel_stream_close      (CamelStream *stream);
-gboolean   camel_stream_eos        (CamelStream *stream);
-int        camel_stream_reset      (CamelStream *stream);
-
-/* utility macros and funcs */
-ssize_t camel_stream_write_string (CamelStream *stream, const char *string);
-ssize_t camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);
-ssize_t camel_stream_vprintf (CamelStream *stream, const char *fmt, va_list ap);
-
-/* Write a whole stream to another stream, until eof or error on
- * either stream.
- */
-ssize_t camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_STREAM_H */
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
deleted file mode 100644
index ff07728f5f..0000000000
--- a/camel/camel-transport.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-transport.c : Abstract class for an email transport */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#include <config.h>
-#include "camel-transport.h"
-#include "camel-exception.h"
-
-/* Returns the class for a CamelTransport */
-#define CT_CLASS(so) CAMEL_TRANSPORT_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-CamelType
-camel_transport_get_type (void)
-{
-	static CamelType camel_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_transport_type == CAMEL_INVALID_TYPE)	{
-		camel_transport_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelTransport",
-							    sizeof (CamelTransport),
-							    sizeof (CamelTransportClass),
-							    NULL,
-							    NULL,
-							    NULL,
-							    NULL);
-	}
-	
-	return camel_transport_type;
-}
-
-
-/**
- * camel_transport_can_send: Determine if a message is send-able on a transport
- * @transport: the transport
- * @message: the message
- *
- * Determines if a CamelMedium is of an appropriate subclass to send
- * via the given @transport. (Mail transports are not able to send
- * netnews articles, and vice versa.)
- *
- * Return value: TRUE or FALSE
- **/
-gboolean
-camel_transport_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CT_CLASS (transport)->can_send (transport, message);
-}
-
-/**
- * camel_transport_send: Send a message via a transport
- * @transport: the transport
- * @message: the message
- * @ex: a CamelException
- *
- * Sends the message to the recipients indicated in the message.
- *
- * Return value: success or failure.
- **/
-gboolean
-camel_transport_send (CamelTransport *transport, CamelMedium *message,
-		      CamelException *ex)
-{
-	return CT_CLASS (transport)->send (transport, message, ex);
-}
-
-/**
- * camel_transport_send_to: Send a message non-standard recipients
- * @transport: the transport
- * @message: the message
- * @recipients: the recipients
- * @ex: a CamelException
- *
- * Sends the message to the given recipients, rather than to the
- * recipients indicated in the message.
- *
- * Return value: success or failure.
- **/
-gboolean
-camel_transport_send_to (CamelTransport *transport, CamelMedium *message,
-			 GList *recipients, CamelException *ex)
-{
-	return CT_CLASS (transport)->send_to (transport, message,
-					      recipients, ex);
-}
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
deleted file mode 100644
index 48ab0ea1ff..0000000000
--- a/camel/camel-transport.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-transport.h : Abstract class for an email transport */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_TRANSPORT_H
-#define CAMEL_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-service.h>
-
-#define CAMEL_TRANSPORT_TYPE     (camel_transport_get_type ())
-#define CAMEL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TRANSPORT_TYPE, CamelTransport))
-#define CAMEL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass))
-#define CAMEL_IS_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE))
-
-
-struct _CamelTransport
-{
-	CamelService parent_object;
-	
-	gboolean supports_8bit;
-};
-
-
-
-typedef struct {
-	CamelServiceClass parent_class;
-
-	gboolean (*can_send) (CamelTransport *transport, CamelMedium *message);
-	gboolean (*send) (CamelTransport *transport, CamelMedium *message,
-			  CamelException *ex);
-	gboolean (*send_to) (CamelTransport *transport,
-			     CamelMedium *message, GList *recipients,
-			     CamelException *ex);
-} CamelTransportClass;
-
-
-/* public methods */
-gboolean camel_transport_can_send (CamelTransport *transport,
-				   CamelMedium *message);
-
-gboolean camel_transport_send (CamelTransport *transport,
-			       CamelMedium *message,
-			       CamelException *ex);
-
-gboolean camel_transport_send_to (CamelTransport *transport,
-				  CamelMedium *message,
-				  GList *recipients,
-				  CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TRANSPORT_H */
diff --git a/camel/camel-types.h b/camel/camel-types.h
deleted file mode 100644
index 79abc26a7d..0000000000
--- a/camel/camel-types.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_TYPES_H
-#define CAMEL_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-typedef struct _CamelAddress CamelAddress;
-typedef struct _CamelDataWrapper CamelDataWrapper;
-typedef struct _CamelException CamelException;
-typedef struct _CamelFolder CamelFolder;
-typedef struct _CamelFolderSearch CamelFolderSearch;
-typedef struct _CamelFolderSummary CamelFolderSummary;
-typedef struct _CamelInternetAddress CamelInternetAddress;
-typedef struct _CamelMedium CamelMedium;
-typedef struct _CamelMimeFilter CamelMimeFilter;
-typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;
-typedef struct _CamelMimeFilterCharset CamelMimeFilterCharset;
-typedef struct _CamelMimeFilterIndex CamelMimeFilterIndex;
-typedef struct _CamelMimeFilterLinewrap CamelMimeFilterLinewrap;
-typedef struct _CamelMimeFilterSave CamelMimeFilterSave;
-typedef struct _CamelMimeFilterCRLF CamelMimeFilterCRLF;
-typedef struct _CamelMimeMessage CamelMimeMessage;
-typedef struct _CamelMimeParser CamelMimeParser;
-typedef struct _CamelMimePart CamelMimePart;
-typedef struct _CamelMultipart CamelMultipart;
-typedef struct _CamelNewsAddress CamelNewsAddress;
-typedef struct _CamelSeekableStream CamelSeekableStream;
-typedef struct _CamelSeekableSubstream CamelSeekableSubstream;
-typedef struct _CamelService CamelService;
-typedef struct _CamelSession CamelSession;
-typedef struct _CamelSimpleDataWrapper CamelSimpleDataWrapper;
-typedef struct _CamelStore CamelStore;
-typedef struct _CamelStream CamelStream;
-typedef struct _CamelStreamBuffer CamelStreamBuffer;
-typedef struct _CamelStreamDataWrapper CamelStreamDataWrapper;
-typedef struct _CamelStreamFilter CamelStreamFilter;
-typedef struct _CamelStreamFs CamelStreamFs;
-typedef struct _CamelStreamMem CamelStreamMem;
-typedef struct _CamelTransport CamelTransport;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_TYPES_H */
-
-
-
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
deleted file mode 100644
index 2b5faddb91..0000000000
--- a/camel/camel-uid-cache.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-uid-cache.c: UID caching code. */
-
-/* 
- * Authors:
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-uid-cache.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-static void free_uid (gpointer key, gpointer value, gpointer data);
-static void maybe_write_uid (gpointer key, gpointer value, gpointer data);
-
-/**
- * camel_uid_cache_new:
- * @filename: path to load the cache from
- *
- * Creates a new UID cache, initialized from @filename. If @filename
- * doesn't already exist, the UID cache will be empty. Otherwise, if
- * it does exist but can't be read, the function will return %NULL.
- *
- * Return value: a new UID cache, or %NULL
- **/
-CamelUIDCache *
-camel_uid_cache_new (const char *filename)
-{
-	CamelUIDCache *cache;
-	struct stat st;
-	char *buf, **uids;
-	int fd, i;
-
-	fd = open (filename, O_RDWR | O_CREAT, 0700);
-	if (fd == -1)
-		return NULL;
-
-	if (fstat (fd, &st) != 0) {
-		close (fd);
-		return NULL;
-	}
-	buf = g_malloc (st.st_size + 1);
-
-	if (read (fd, buf, st.st_size) == -1) {
-		close (fd);
-		g_free (buf);
-		return NULL;
-	}
-	buf[st.st_size] = '\0';
-
-	cache = g_new (CamelUIDCache, 1);
-	cache->fd = fd;
-	cache->level = 1;
-	cache->uids = g_hash_table_new (g_str_hash, g_str_equal);
-
-	uids = g_strsplit (buf, "\n", 0);
-	g_free (buf);
-	for (i = 0; uids[i]; i++) {
-		g_hash_table_insert (cache->uids, uids[i],
-				     GINT_TO_POINTER (cache->level));
-	}
-	g_free (uids);
-
-	return cache;
-}
-
-/**
- * camel_uid_cache_save:
- * @cache: a CamelUIDCache
- *
- * Attempts to save @cache back to disk.
- *
- * Return value: success or failure
- **/
-gboolean
-camel_uid_cache_save (CamelUIDCache *cache)
-{
-	if (lseek (cache->fd, 0, SEEK_SET) != 0)
-		return FALSE;
-	g_hash_table_foreach (cache->uids, maybe_write_uid, cache);
-	return ftruncate (cache->fd, lseek (cache->fd, 0, SEEK_CUR)) == 0;
-}
-
-static void
-maybe_write_uid (gpointer key, gpointer value, gpointer data)
-{
-	CamelUIDCache *cache = data;
-
-	if (GPOINTER_TO_INT (value) == cache->level) {
-		write (cache->fd, key, strlen (key));
-		write (cache->fd, "\n", 1);
-	}
-}
-
-/**
- * camel_uid_cache_destroy:
- * @cache: a CamelUIDCache
- *
- * Destroys @cache and frees its data.
- **/
-void
-camel_uid_cache_destroy (CamelUIDCache *cache)
-{
-	g_hash_table_foreach (cache->uids, free_uid, NULL);
-	g_hash_table_destroy (cache->uids);
-	close (cache->fd);
-	g_free (cache);
-}
-
-static void
-free_uid (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-}
-
-/**
- * camel_uid_cache_get_new_uids:
- * @cache: a CamelUIDCache
- * @uids: an array of UIDs
- *
- * Returns an array of UIDs from @uids that are not in @cache, and
- * removes UIDs from @cache that aren't in @uids.
- *
- * Return value: an array of new UIDs, which must be freed with
- * camel_uid_cache_free_uids().
- **/
-GPtrArray *
-camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids)
-{
-	GPtrArray *new_uids;
-	char *uid;
-	int i;
-
-	new_uids = g_ptr_array_new ();
-	cache->level++;
-
-	for (i = 0; i < uids->len; i++) {
-		uid = uids->pdata[i];
-		if (g_hash_table_lookup (cache->uids, uid))
-			g_hash_table_remove (cache->uids, uid);
-		else
-			g_ptr_array_add (new_uids, g_strdup (uid));
-		g_hash_table_insert (cache->uids, g_strdup (uid),
-				     GINT_TO_POINTER (cache->level));
-	}
-
-	return new_uids;
-}
-
-/**
- * camel_uid_cache_free_uids:
- * @uids: an array returned from camel_uid_cache_get_new_uids()
- *
- * Frees the array of UIDs.
- **/
-void
-camel_uid_cache_free_uids (GPtrArray *uids)
-{
-	int i;
-
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-}
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
deleted file mode 100644
index 92226a3afd..0000000000
--- a/camel/camel-uid-cache.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-uid-cache.h: UID caching code. */
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_UID_CACHE_H
-#define CAMEL_UID_CACHE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <stdio.h>
-
-typedef struct {
-	int fd, level;
-	GHashTable *uids;
-} CamelUIDCache;
-
-CamelUIDCache *camel_uid_cache_new (const char *filename);
-gboolean camel_uid_cache_save (CamelUIDCache *cache);
-void camel_uid_cache_destroy (CamelUIDCache *cache);
-
-GPtrArray *camel_uid_cache_get_new_uids (CamelUIDCache *cache,
-					 GPtrArray *uids);
-void camel_uid_cache_free_uids (GPtrArray *uids);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* CAMEL_UID_CACHE_H */
diff --git a/camel/camel-url.c b/camel/camel-url.c
deleted file mode 100644
index 18575782dc..0000000000
--- a/camel/camel-url.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-url.c : utility functions to parse URLs */
-
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *  Tiago Antào <tiagoantao@bigfoot.com>
- *  Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "camel-url.h"
-#include "camel-mime-utils.h"
-#include "camel-exception.h"
-#include "camel-object.h"
-
-/**
- * camel_url_new: create a CamelURL object from a string
- * @url_string: The string containing the URL to scan
- * 
- * This routine takes a string and parses it as a URL of the form:
- *
- *   protocol://user;AUTH=mech:password@host:port/path
- *
- * The protocol, followed by a ":" is required. If it is followed by * "//",
- * there must be an "authority" containing at least a host,
- * which ends at the end of the string or at the next "/". If there
- * is an "@" in the authority, there must be a username before it,
- * and the host comes after it. The authmech, password, and port are
- * optional, and the punctuation that preceeds them is omitted if
- * they are. Everything after the authority (or everything after the
- * protocol if there was no authority) is the path. We consider the
- * "/" between the authority and the path to be part of the path,
- * although this is incorrect according to RFC 1738.
- *
- * The port, if present, must be numeric.
- * 
- * If nothing but the protocol (and the ":") is present, the "empty"
- * flag will be set on the returned URL.
- *
- * Return value: a CamelURL structure containing the URL items.
- **/
-CamelURL *
-camel_url_new (const char *url_string, CamelException *ex)
-{
-	CamelURL *url;
-	char *semi, *colon, *at, *slash;
-	char *p;
-	
-	/* Find protocol: initial substring until ":" */
-	colon = strchr (url_string, ':');
-	if (!colon) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("URL string `%s' contains no protocol"),
-				      url_string);
-		return NULL;
-	}
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strndup (url_string, colon - url_string);
-	g_strdown (url->protocol);
-
-	/* Check protocol */
-	p = url->protocol;
-	while (*p) {
-		if (!((*p >= 'a' && *p <= 'z') ||
-		      (*p == '-') || (*p == '+') || (*p == '.'))) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("URL string `%s' contains an invalid protocol"),
-					      url_string);
-			return NULL;
-		}
-		p++;
-	}
-
-	if (strncmp (colon, "://", 3) != 0) {
-		if (*(colon + 1)) {
-			url->path = g_strdup (colon + 1);
-			camel_url_decode (url->path);
-		} else
-			url->empty = TRUE;
-		return url;
-	}
-
-	url_string = colon + 3;
-
-	/* If there is an @ sign in the authority, look for user,
-	 * authmech, and password before it.
-	 */
-	slash = strchr (url_string, '/');
-	at = strchr (url_string, '@');
-	if (at && (!slash || at < slash)) {
-		colon = strchr (url_string, ':');
-		if (colon && colon < at) {
-			url->passwd = g_strndup (colon + 1, at - colon - 1);
-			camel_url_decode (url->passwd);
-		} else {
-			url->passwd = NULL;
-			colon = at;
-		}
-
-		semi = strchr(url_string, ';');
-		if (semi && (semi < colon || (!colon && semi < at)) &&
-		    !strncasecmp (semi, ";auth=", 6)) {
-			url->authmech = g_strndup (semi + 6,
-						     colon - semi - 6);
-			camel_url_decode (url->authmech);
-		} else {
-			url->authmech = NULL;
-			semi = colon;
-		}
-
-		url->user = g_strndup (url_string, semi - url_string);
-		camel_url_decode (url->user);
-		url_string = at + 1;
-	} else
-		url->user = url->passwd = url->authmech = NULL;
-
-	/* Find host and port. */
-	slash = strchr (url_string, '/');
-	colon = strchr (url_string, ':');
-	if (slash && colon > slash)
-		colon = NULL;
-
-	if (colon) {
-		url->host = g_strndup (url_string, colon - url_string);
-		url->port = strtoul (colon + 1, &colon, 10);
-		if (*colon && colon != slash) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-					      _("Port number in URL `%s' is non-"
-						"numeric"), url_string);
-			camel_url_free (url);
-			return NULL;
-		}
-	} else if (slash) {
-		url->host = g_strndup (url_string, slash - url_string);
-		camel_url_decode (url->host);
-		url->port = 0;
-	} else {
-		url->host = g_strdup (url_string);
-		camel_url_decode (url->host);
-		url->port = 0;
-	}
-
-	if (!slash)
-		slash = "/";
-	url->path = g_strdup (slash);
-	camel_url_decode (url->path);
-
-	return url;
-}
-
-char *
-camel_url_to_string (CamelURL *url, gboolean show_passwd)
-{
-	char *return_result;
-	char *user = NULL, *authmech = NULL, *passwd = NULL;
-	char *host = NULL, *path = NULL;
-	char port[20];
-
-	if (url->user)
-		user = camel_url_encode (url->user, TRUE, ":;@/");
-	
-	if (url->authmech)
-		authmech = camel_url_encode (url->authmech, TRUE, ":@/");
-	
-	if (show_passwd && url->passwd)
-		passwd = camel_url_encode (url->passwd, TRUE, "@/");
-	
-	if (url->host)
-		host = camel_url_encode (url->host, TRUE, ":/");
-	
-	if (url->port)
-		g_snprintf (port, sizeof (port), "%d", url->port);
-	else
-		*port = '\0';
-	
-	if (url->path)
-		path = camel_url_encode (url->path, FALSE, NULL);
-
-	return_result = g_strdup_printf ("%s:%s%s%s%s%s%s%s%s%s%s%s%s",
-					 url->protocol,
-					 host ? "//" : "",
-					 user ? user : "",
-					 authmech ? ";auth=" : "",
-					 authmech ? authmech : "",
-					 passwd ? ":" : "",
-					 passwd ? passwd : "",
-					 user ? "@" : "",
-					 host ? host : "",
-					 *port ? ":" : "",
-					 port,
-					 path && host && *path != '/' ? "/" : "",
-					 path ? path : "");
-	g_free (user);
-	g_free (authmech);
-	g_free (passwd);
-	g_free (host);
-	g_free (path);
-
-	return return_result;
-}
-
-void
-camel_url_free (CamelURL *url)
-{
-	g_assert (url);
-
-	g_free (url->protocol);
-	g_free (url->user);
-	g_free (url->authmech);
-	g_free (url->passwd);
-	g_free (url->host);
-	g_free (url->path);
-
-	g_free (url);
-}
-
-void camel_url_set_protocol(CamelURL *url, const char *p)
-{
-	g_free(url->protocol);
-	url->protocol = g_strdup(p);
-}
-
-void camel_url_set_host(CamelURL *url, const char *h)
-{
-	g_free(url->host);
-	url->host = g_strdup(h);
-}
-
-void camel_url_set_port(CamelURL *url, int port)
-{
-	url->port = port;
-}
-void camel_url_set_path(CamelURL *url, const char *p)
-{
-	g_free(url->path);
-	url->path = g_strdup(p);
-}
-
-
-/**
- * camel_url_encode:
- * @part: a URL part
- * @escape_unsafe: whether or not to %-escape "unsafe" characters.
- * ("%#<>{}|\^~[]`)
- * @escape_extra: additional characters to escape.
- *
- * This %-encodes the given URL part and returns the escaped version
- * in allocated memory, which the caller must free when it is done.
- **/
-char *
-camel_url_encode (char *part, gboolean escape_unsafe, char *escape_extra)
-{
-	char *work, *p;
-
-	/* worst case scenario = 3 times the initial */
-	p = work = g_malloc (3 * strlen (part) + 1);
-
-	while (*part) {
-		if (((guchar) *part >= 127) || ((guchar) *part <= ' ') ||
-		    (escape_unsafe && strchr ("\"%#<>{}|\\^~[]`", *part)) ||
-		    (escape_extra && strchr (escape_extra, *part))) {
-			sprintf (p, "%%%.02hX", (guchar) *part++);
-			p += 3;
-		} else
-			*p++ = *part++;
-	}
-	*p = '\0';
-
-	return work;
-}
-
-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)
-
-/**
- * camel_url_decode:
- * @part: a URL part
- *
- * %-decodes the passed-in URL *in place*. The decoded version is
- * never longer than the encoded version, so there does not need to
- * be any additional space at the end of the string.
- */
-void
-camel_url_decode (char *part)
-{
-	guchar *s, *d;
-
-	s = d = (guchar *)part;
-	while (*s) {
-		if (*s == '%') {
-			if (isxdigit (s[1]) && isxdigit (s[2])) {
-				*d++ = HEXVAL (s[1]) * 16 + HEXVAL (s[2]);
-				s += 3;
-			} else
-				*d++ = *s++;
-		} else
-			*d++ = *s++;
-	}
-	*d = '\0';
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-guint camel_url_hash (const void *v)
-{
-	const CamelURL *u = v;
-	guint hash = 0;
-
-	add_hash (&hash, u->protocol);
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
-	add_hash (&hash, u->host);
-	add_hash (&hash, u->path);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static int
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-int camel_url_equal(const void *v, const void *v2)
-{
-	const CamelURL *u1 = v, *u2 = v2;
-	
-	return check_equal(u1->protocol, u2->protocol)
-		&& check_equal(u1->user, u2->user)
-		&& check_equal(u1->authmech, u2->authmech)
-		&& check_equal(u1->host, u2->host)
-		&& check_equal(u1->path, u2->path)
-		&& u1->port == u2->port;
-}
diff --git a/camel/camel-url.h b/camel/camel-url.h
deleted file mode 100644
index aba903c08b..0000000000
--- a/camel/camel-url.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-url.h : utility functions to parse URLs */
-
-/* 
- * Authors:
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_URL_H
-#define CAMEL_URL_H 1
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-typedef struct {
-	char *protocol;
-	char *user;
-	char *authmech;
-	char *passwd;
-	char *host;
-	int   port;
-	char *path;
-
-	/* This is set if the URL contained only a protocol. */
-	gboolean empty;
-} CamelURL;
-
-CamelURL *camel_url_new (const char *url_string, CamelException *ex);
-char *camel_url_to_string (CamelURL *url, gboolean show_password);
-void camel_url_free (CamelURL *url);
-
-char *camel_url_encode (char *part, gboolean escape_unsafe, char *escape_extra);
-void camel_url_decode (char *part);
-
-/* for editing url's */
-void camel_url_set_protocol(CamelURL *url, const char *);
-void camel_url_set_host(CamelURL *url, const char *);
-void camel_url_set_port(CamelURL *url, int port);
-void camel_url_set_path(CamelURL *url, const char *);
-
-/* for putting url's into hash tables */
-guint camel_url_hash (const void *v);
-int camel_url_equal(const void *v, const void *v2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* URL_UTIL_H */
diff --git a/camel/camel.c b/camel/camel.c
deleted file mode 100644
index 846d946b9a..0000000000
--- a/camel/camel.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "camel.h"
-#include <unicode.h>
-
-gboolean camel_verbose_debug = FALSE;
-
-gint
-camel_init(void)
-{
-#ifdef ENABLE_THREADS
-#ifdef G_THREADS_ENABLED	
-	g_thread_init (NULL);
-#else  /* G_THREADS_ENABLED */
-	printf ("Threads are not supported by your version of glib\n");
-#endif /* G_THREADS_ENABLED */
-#endif /* ENABLE_THREADS */
-
-	if (getenv ("CAMEL_VERBOSE_DEBUG"))
-		camel_verbose_debug = TRUE;
-
-	unicode_init ();
-
-	return 0;
-}
diff --git a/camel/camel.h b/camel/camel.h
deleted file mode 100644
index fefadafb18..0000000000
--- a/camel/camel.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_H
-#define CAMEL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-index.h>
-#include <camel/camel-mime-filter-save.h>
-#include <camel/camel-mime-filter-crlf.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-mime-part-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-movemail.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-provider.h>
-#include <camel/camel-seekable-stream.h>
-#include <camel/camel-seekable-substream.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-transport.h>
-#include <camel/camel-uid-cache.h>
-#include <camel/camel-url.h>
-#include <camel/gmime-content-field.h>
-#include <camel/gstring-util.h>
-#include <camel/hash-table-utils.h>
-#include <camel/string-utils.h>
-
-gint camel_init (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_H */
diff --git a/camel/devel-docs/camel_data_wrapper.dia b/camel/devel-docs/camel_data_wrapper.dia
deleted file mode 100644
index 301563d1ee..0000000000
--- a/camel/devel-docs/camel_data_wrapper.dia
+++ /dev/null
diff --git a/camel/devel-docs/camel_parser_states.dia b/camel/devel-docs/camel_parser_states.dia
deleted file mode 100644
index 556a5b1c49..0000000000
--- a/camel/devel-docs/camel_parser_states.dia
+++ /dev/null
diff --git a/camel/devel-docs/camel_stream.dia b/camel/devel-docs/camel_stream.dia
deleted file mode 100644
index d91d1bb153..0000000000
--- a/camel/devel-docs/camel_stream.dia
+++ /dev/null
diff --git a/camel/gmime-content-field.c b/camel/gmime-content-field.c
deleted file mode 100644
index 4d38314873..0000000000
--- a/camel/gmime-content-field.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mime-content_field.c : mime content type field utilities  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "gmime-content-field.h"
-#include "string-utils.h"
-#include <string.h>
-#include "camel-mime-utils.h"
-
-/**
- * gmime_content_field_new: Creates a new GMimeContentField object
- * @type: mime type
- * @subtype: mime subtype 
- * 
- * Creates a GMimeContentField object and initialize it with
- * a mime type and a mime subtype. For example, 
- * gmime_content_field_new ("application", "postcript");
- * will create a content field with complete mime type 
- * "application/postscript"
- * 
- * Return value: The newly created GMimeContentField object
- **/
-GMimeContentField *
-gmime_content_field_new (const gchar *type, const gchar *subtype)
-{
-	GMimeContentField *ctf;
-
-	ctf = g_new (GMimeContentField, 1);
-	ctf->content_type = header_content_type_new(type, subtype);
-	ctf->type = ctf->content_type->type;
-	ctf->subtype = ctf->content_type->subtype;
-	ctf->ref = 1;
-	return ctf;
-} 
-
-/**
- * gmime_content_field_ref: add a reference to a GMimeContentField object
- * @content_field: GMimeContentField object
- * 
- * Tell a GMimeContentField object that something holds a reference
- * on him. This, coupled with the corresponding 
- * gmime_content_field_unref() method allow several 
- * objects to use the same GMimeContentField object.
- **/
-void 
-gmime_content_field_ref (GMimeContentField *content_field)
-{
-	content_field->ref += 1;
-	header_content_type_ref (content_field->content_type);
-}
-
-/**
- * gmime_content_field_unref: remove a reference to a GMimeContentField object
- * @content_field: GMimeContentField object
- * 
- * Tell a GMimeContentField object that something which 
- * was holding a reference to him does not need it anymore.
- * When no more reference exist, the GMimeContentField object
- * is freed using gmime_content_field_free().
- *
- **/
-void 
-gmime_content_field_unref (GMimeContentField *content_field)
-{
-	if (!content_field) return;
-	
-	content_field->ref -= 1;
-	header_content_type_unref (content_field->content_type);
-	if (content_field->ref <= 0)
-		g_free (content_field);
-}
-
-
-
-/**
- * gmime_content_field_set_parameter: set a parameter for a GMimeContentField object
- * @content_field: content field
- * @attribute: parameter name 
- * @value: paramteter value
- * 
- * set a parameter (called attribute in RFC 2045) of a content field. Meaningfull
- * or valid parameters name depend on the content type object. For example, 
- * gmime_content_field_set_parameter (cf, "charset", "us-ascii");
- * will make sense for a "text/plain" content field but not for a 
- * "image/gif". This routine does not check parameter validity.
- **/
-void 
-gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value)
-{
-	header_content_type_set_param(content_field->content_type, attribute, value);
-}
-
-/**
- * gmime_content_field_write_to_stream: write a mime content type to a stream
- * @content_field: content type object
- * @stream: the stream
- * 
- * 
- **/
-void
-gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStream *stream)
-{
-	char *txt;
-
-	if (!content_field)
-		return;
-
-	txt = header_content_type_format(content_field->content_type);
-	if (txt) {
-		camel_stream_printf (stream, "Content-Type: %s\n", txt);
-		g_free(txt);
-	}
-}
-
-/**
- * gmime_content_field_get_mime_type: return the mime type of the content field object
- * @content_field: content field object
- * 
- * A RFC 2045 content type field contains the mime type in the
- * form "type/subtype" (example : "application/postscript") and some
- * parameters (attribute/value pairs). This routine returns the mime type 
- * in a gchar object. THIS OBJECT MUST BE FREED BY THE CALLER.
- * 
- * Return value: the mime type in the form "type/subtype" or NULL if not defined.
- **/
-gchar * 
-gmime_content_field_get_mime_type (GMimeContentField *content_field)
-{
-	gchar *mime_type;
-
-	if (!content_field->content_type->type) return NULL;
-
-	if (content_field->content_type->subtype) 
-		mime_type = g_strdup_printf ("%s/%s", content_field->content_type->type, content_field->content_type->subtype);
-	else 
-		mime_type = g_strdup (content_field->content_type->type);
-	return mime_type;
-}
-
-/**
- * gmime_content_field_get_parameter: return the value of a mime type parameter
- * @content_field: content field object
- * @name: name of the parameter
- * 
- * Returns the value of a parameter contained in the content field 
- * object. The content type is formed of a mime type, a mime subtype,
- * and a parameter list. Each parameter is a name/value pair. This 
- * routine returns the value assiciated to a given name. 
- * When the parameter does not exist, NULL is returned. 
- * 
- * Return value: parameter value, or NULL if not found.
- **/
-const gchar *
-gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar *name)
-{
-	g_assert (content_field);
-
-	g_assert (name);
-	return header_content_type_param(content_field->content_type, name);
-}
-
-
-
-
-/**
- * gmime_content_field_construct_from_string: construct a ContentType object by parsing a string.
- *
- * @content_field: content type object to construct 
- * @string: string containing the content type field 
- * 
- * Parse a string containing a content type field as defined in
- * RFC 2045, and construct the corresponding ContentType object.
- * The string is not modified and not used in the ContentType 
- * object. It can and must be freed by the calling part.
- **/
-void
-gmime_content_field_construct_from_string (GMimeContentField *content_field, const gchar *string)
-{
-	struct _header_content_type *new;
-
-	g_assert (string);
-	g_assert (content_field);
-
-	new = header_content_type_decode(string);
-	if (content_field->content_type)
-		header_content_type_unref(content_field->content_type);
-
-	if (new == NULL) {
-		new = header_content_type_new(NULL, NULL);
-		g_warning("Cannot parse content-type string: %s", string);
-	}
-	content_field->content_type = new;
-	content_field->type = new->type;
-	content_field->subtype = new->subtype;
-}
-
-/**
- * gmime_content_field_is_type:
- * @content_field: An initialised GMimeContentField.
- * @type: MIME Major type name.
- * @subtype: MIME subtype.
- * 
- * Returns true if the content_field is of the type @type and subtype @subtype.
- * If @subtype is the special wildcard "*", then it will match any type.
- *
- * If the @content_field is empty, then it will match "text/plain", or "text/ *".
- * 
- * Return value: 
- **/
-int
-gmime_content_field_is_type (GMimeContentField *content_field, const char *type, const char *subtype)
-{
-	return header_content_type_is(content_field->content_type, type, subtype);
-}
diff --git a/camel/gmime-content-field.h b/camel/gmime-content-field.h
deleted file mode 100644
index 5a28d0fedb..0000000000
--- a/camel/gmime-content-field.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mime-content_field.h : mime content type field utilities  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef GMIME_CONTENT_FIELD_H
-#define GMIME_CONTENT_FIELD_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <stdio.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-mime-utils.h>
-
-typedef struct {
-	struct _header_content_type *content_type;
-
-	/* these should be deprecated (use the accessors) */
-	char *type;		/* these are only copies of the ones in content_type */
-	char *subtype;
-
-	gint ref;
-
-} GMimeContentField;
-
-GMimeContentField *gmime_content_field_new (const gchar *type, const gchar *subtype);
-void gmime_content_field_ref (GMimeContentField *content_field);
-void gmime_content_field_unref (GMimeContentField *content_field);
-
-void gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value);
-void gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStream *stream);
-void gmime_content_field_construct_from_string (GMimeContentField *content_field, const gchar *string);
-void gmime_content_field_free (GMimeContentField *content_field);
-gchar * gmime_content_field_get_mime_type (GMimeContentField *content_field);
-const gchar *gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar *name);
-
-int gmime_content_field_is_type (GMimeContentField *content_field, const char *type, const char *subtype);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GMIME_CONTENT_FIELD_H */
diff --git a/camel/gstring-util.c b/camel/gstring-util.c
deleted file mode 100644
index a0c1345b71..0000000000
--- a/camel/gstring-util.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gstring-util : utilities for gstring object  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#include <config.h>
-#include "gstring-util.h"
-#include <string.h>
-
-/**
- * g_string_equals : test if two string are equal
- *
- * @string1 : first string
- * @string2 : second string
- *
- * @Return Value : true if the strings equal, false otherwise
- **/
-gboolean
-g_string_equals (GString *string1, GString *string2)
-{
-	g_assert (string1);
-	g_assert (string2);
-	return !strcmp (string1->str, string2->str);
-}
-
-
-
-
-/**
- * g_string_clone : clone a GString
- *
- * @string : the string to clone
- *
- * @Return Value : the clone ...
- **/
-GString *
-g_string_clone (GString *string)
-{
-	return g_string_new (string->str);
-}
-
-/**
- * g_string_append_g_string : append a GString to another  GString
- *
- * @dest_string : string which will be appended
- * @other_string : string to append
- *
- **/
-void 
-g_string_append_g_string(GString *dest_string, GString *other_string)
-{
-	g_assert(other_string);
-	g_assert(dest_string);
-
-	if (other_string->len)
-		g_string_append(dest_string, other_string->str);
-}
-
-/**
- * g_string_equal_for_hash: test equality of two GStrings for hash tables
- * @v: string 1
- * @v2: string 2
- * 
- * 
- * 
- * Return value: 
- **/
-gint
-g_string_equal_for_hash (gconstpointer v, gconstpointer v2)
-{
-  return strcmp ( ((const GString*)v)->str, ((const GString*)v2)->str) == 0;
-}
-
-gint
-g_string_equal_for_glist (gconstpointer v, gconstpointer v2)
-{
-  return !strcmp ( ((const GString*)v)->str, ((const GString*)v2)->str) == 0;
-}
-
-
-/**
- * g_string_hash: computes a hash value for a Gstring
- * @v: Gstring object
- * 
- * 
- * 
- * Return value: 
- **/
-guint 
-g_string_hash (gconstpointer v)
-{
-	return g_str_hash(((const GString*)v)->str);
-}
-
-
-
-
-/* utility func : frees a GString element in a GList */
-static void 
-__g_string_list_free_string (gpointer data, gpointer user_data)
-{
-	GString *string = (GString *)data;
-	g_string_free(string, TRUE);
-}
-
-
-void 
-g_string_list_free (GList *string_list)
-{
-	g_list_foreach(string_list, __g_string_list_free_string, NULL);
-	g_list_free(string_list);
-}
-
-
-
-
-
-
-GList *
-g_string_split (GString *string, char sep, gchar *trim_chars, GStringTrimOption trim_options)
-{
-	GList *result = NULL;
-	gint first, last, pos;
-	gchar *str;
-	gchar *new_str;
-	GString *new_gstring;
-
-	g_assert (string);
-	str = string->str;
-	if (!str) return NULL;
-
-	first = 0;
-	last = strlen(str) - 1;
-	
-	/* strip leading and trailing separators */
-	while ( (first<=last) && (str[first]==sep) )
-		first++;
-	while ( (first<=last) && (str[last]==sep) )
-		last--;
-
-	
-	while (first<=last)  {
-		pos = first;
-		/* find next separator */
-		while ((pos<=last) && (str[pos]!=sep)) pos++;
-		if (first != pos) {
-			new_str = g_strndup (str+first, pos-first);
-			new_gstring = g_string_new (new_str);
-			g_free (new_str);
-			/* could do trimming in line to speed up this code */
-			if (trim_chars) g_string_trim (new_gstring, trim_chars, trim_options);
-			result = g_list_append (result, new_gstring);
-		}	
-		first = pos + 1;
-	}
-
-	return result;
-}
-
-
-void 
-g_string_trim (GString *string, gchar *chars, GStringTrimOption options)
-{
-	gint first_ok;
-	gint last_ok;
-	guint length;
-	gchar *str;
-
-	if ((!string) || (!string->str))
-		return; 
-	str = string->str;
-	length = strlen (str);
-	if (!length)
-		return;
-
-	first_ok = 0;
-	last_ok = length - 1;
-	
-	if (options & GSTRING_TRIM_STRIP_LEADING)
-		while  ( (first_ok <= last_ok) && (strchr (chars, str[first_ok])) )
-			first_ok++;
-
-	if (options & GSTRING_TRIM_STRIP_TRAILING)
-		while  ( (first_ok <= last_ok) && (strchr (chars, str[last_ok])) )
-			last_ok++;
-
-	if (first_ok > 0)
-		g_string_erase (string, 0, first_ok);
-
-	if (last_ok < length-1)
-		g_string_truncate (string, last_ok - first_ok +1);
-	
-}
diff --git a/camel/gstring-util.h b/camel/gstring-util.h
deleted file mode 100644
index 487bbc8a3b..0000000000
--- a/camel/gstring-util.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gstring-util : utilities for gstring object  */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef GSTRING_UTIL_H
-#define GSTRING_UTIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-typedef enum {
-    GSTRING_TRIM_NONE            =     0,
-    GSTRING_TRIM_STRIP_TRAILING  =     1,
-    GSTRING_TRIM_STRIP_LEADING   =     2
-} GStringTrimOption;
-
-
-gboolean g_string_equals          (GString *string1, GString *string2);
-GString *g_string_clone           (GString *string);
-void     g_string_append_g_string (GString *dest_string,
-				   GString *other_string);
-
-gboolean g_string_equal_for_hash  (gconstpointer v, gconstpointer v2);
-gboolean g_string_equal_for_glist (gconstpointer v, gconstpointer v2);
-guint    g_string_hash            (gconstpointer v);
-void     g_string_list_free       (GList *string_list);
-
-GList   *g_string_split           (GString *string, char sep,
-				   gchar *trim_chars, GStringTrimOption trim_options);
-void     g_string_trim            (GString *string, gchar *chars,
-				   GStringTrimOption options);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GSTRING_UTIL_H */
diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c
deleted file mode 100644
index b04eaa3ce7..0000000000
--- a/camel/hash-table-utils.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* generic utilities for hash tables */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <ctype.h>
-#include "glib.h"
-#include "hash-table-utils.h"
-
-
-/* 
- * free a (key/value) hash table pair.
- * to be called in a g_hash_table_foreach()
- * before g_hash_table_destroy().
- */
-void
-g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-
-
-/***/
-/* use these two funcs for case insensitive hash table */
-
-gint 
-g_strcase_equal (gconstpointer a, gconstpointer b)
-{
-	return (g_strcasecmp ((gchar *)a, (gchar *)b) == 0);
-}
-
-
-/* modified g_str_hash from glib/gstring.c
-   because it would have been too slow to
-   us g_strdown() on the string */
-/* a char* hash function from ASU */
-guint
-g_strcase_hash (gconstpointer v)
-{
-	const char *s = (char*)v;
-	const char *p;
-	guint h=0, g;
-	
-	for(p = s; *p != '\0'; p += 1) {
-		h = ( h << 4 ) + toupper(*p);
-		if ( ( g = h & 0xf0000000 ) ) {
-			h = h ^ (g >> 24);
-			h = h ^ g;
-		}
-  }
-
-  return h /* % M */;
-}
-
-
-
-/***/
diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h
deleted file mode 100644
index 2904991848..0000000000
--- a/camel/hash-table-utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* generic utilities for hash tables */
-
-/* 
- *
- * Author : 
- *  Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef HASH_TABLE_UTILS_H
-#define HASH_TABLE_UTILS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data);
-
-gint g_strcase_equal (gconstpointer a, gconstpointer b);
-guint g_strcase_hash (gconstpointer v);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* HASH_TABLE_UTILS_H */
diff --git a/camel/providers/.cvsignore b/camel/providers/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/camel/providers/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
deleted file mode 100644
index dedeaa0b3b..0000000000
--- a/camel/providers/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# SUBDIRS = mbox pop3 sendmail smtp vee
-SUBDIRS = mbox pop3 sendmail smtp vee imap mh nntp
-
-# these ones are disabled for the moment.
-# maildir
diff --git a/camel/providers/cache/.cvsignore b/camel/providers/cache/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/providers/cache/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/cache/Makefile.am b/camel/providers/cache/Makefile.am
deleted file mode 100644
index 7f9f6a9df5..0000000000
--- a/camel/providers/cache/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = 
-
-libcamelcacheincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelcache.la
-provider_DATA = libcamelcache.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-        -I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	$(GTK_INCLUDEDIR)			\
-	-I$(top_srcdir)/camel			\
-	-DG_LOG_DOMAIN=\"camel-cache-provider\"
-
-libcamelcache_la_SOURCES = 			\
-	camel-cache-folder.c			\
-	camel-cache-provider.c			\
-	camel-cache-store.c			\
-	camel-cache-map.c
-
-libcamelcacheinclude_HEADERS =			\
-	camel-cache-folder.h			\
-	camel-cache-store.h
-
-
-libcamelcache_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelcache.urls
diff --git a/camel/providers/cache/camel-cache-folder.c b/camel/providers/cache/camel-cache-folder.c
deleted file mode 100644
index c4379f8135..0000000000
--- a/camel/providers/cache/camel-cache-folder.c
+++ /dev/null
@@ -1,810 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-folder.c : class for a cache folder */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-/*
- * Notes on the cache provider:
- *
- * We require that the remote folder have persistent UIDs, and nothing
- * else. We require that the local store folder have persistent UIDs
- * and summary capability.
- *
- * If the remote folder does not have summary capability, we will need
- * to sync any new messages over to the local folder when the folder
- * is opened or when it changes. If the remote folder does have
- * summary capability, we can be more relaxed about doing this.
- *
- * If the remote folder has search capability, we will use it, at
- * least when the folder isn't synced. Otherwise if the local folder
- * has search capability, we will use that (but it will require
- * syncing the remote folder locally to use). Otherwise the cache
- * folder won't have search capability.
- *
- * CamelCacheFolder UIDs are remote UIDs, because we need to be able
- * to return a complete list of them at get_uids time, and the
- * messages might not all be present in the local folder, and we can't
- * predict what UIDs will be assigned to them when they are cached
- * there. We keep hash tables mapping remote to local UIDs and vice
- * versa, and a map file to cache this information between sessions.
- * The maps must always be 100% accurate.
- *
- * The messages in the local folder may not be in the same order as
- * the messages in the remote folder.
- *
- *
- * Many operations on the local folder are done with a NULL
- * CamelException, because having them fail only results in efficiency
- * problems, not actual permanent failures. (Eg, get_message will
- * try to append the message to the local folder, but doesn't check
- * for failure, because it already has the message to pass back to the
- * user.)
- */
-
-#include "camel-cache-folder.h"
-#include "camel-cache-store.h"
-#include <camel/camel-exception.h>
-#include <camel/camel-medium.h>
-
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-static CamelFolderClass *folder_class = NULL;
-
-static void init (CamelFolder *folder, CamelStore *parent_store,
-		  CamelFolder *parent_folder, const gchar *name,
-		  gchar *separator, gboolean path_begins_with_sep,
-		  CamelException *ex);
-
-static void refresh_info (CamelFolder *folder, CamelException *ex);
-
-static void cache_sync (CamelFolder *folder, gboolean expunge, 
-			CamelException *ex);
-
-static void expunge (CamelFolder *folder, CamelException *ex);
-
-static gint get_message_count (CamelFolder *folder);
-
-static void append_message (CamelFolder *folder, CamelMimeMessage *message, 
-			    const CamelMessageInfo *info, CamelException *ex);
-
-static guint32 get_message_flags (CamelFolder *folder, const char *uid);
-static void set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set);
-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid,
-				       const char *name);
-static void set_message_user_flag (CamelFolder *folder, const char *uid,
-				   const char *name, gboolean value);
-static const char *get_message_user_tag (CamelFolder *folder, const char *uid,
-					 const char *name);
-static void set_message_user_tag (CamelFolder *folder, const char *uid,
-				  const char *name, const char *value);
-
-static CamelMimeMessage *get_message (CamelFolder *folder, 
-				      const gchar *uid,
-				      CamelException *ex);
-
-static GPtrArray *get_uids (CamelFolder *folder);
-static GPtrArray *get_summary (CamelFolder *folder);
-static GPtrArray *get_subfolder_names (CamelFolder *folder);
-static void free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders);
-
-static GPtrArray *search_by_expression (CamelFolder *folder,
-					const char *expression,
-					CamelException *ex);
-
-static const CamelMessageInfo *get_message_info (CamelFolder *folder,
-						 const char *uid);
-
-static void copy_message_to (CamelFolder *source, const char *uid,
-			     CamelFolder *destination, CamelException *ex);
-
-static void move_message_to (CamelFolder *source, const char *uid,
-			     CamelFolder *destination, CamelException *ex);
-
-static void finalize (CamelObject *object);
-
-static void
-camel_cache_folder_class_init (CamelCacheFolderClass *camel_cache_folder_class)
-{
-	CamelFolderClass *camel_folder_class =
-		CAMEL_FOLDER_CLASS (camel_cache_folder_class);
-
-	folder_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	/* virtual method overload */
-	camel_folder_class->init = init;
-	camel_folder_class->refresh_info = refresh_info;
-	camel_folder_class->sync = cache_sync;
-	camel_folder_class->expunge = expunge;
-	camel_folder_class->get_message_count = get_message_count;
-	camel_folder_class->append_message = append_message;
-	camel_folder_class->get_message_flags = get_message_flags;
-	camel_folder_class->set_message_flags = set_message_flags;
-	camel_folder_class->get_message_user_flag = get_message_user_flag;
-	camel_folder_class->set_message_user_flag = set_message_user_flag;
-	camel_folder_class->get_message_user_tag = get_message_user_tag;
-	camel_folder_class->set_message_user_tag = set_message_user_tag;
-	camel_folder_class->get_message = get_message;
-	camel_folder_class->get_uids = get_uids;
-	camel_folder_class->free_uids = camel_folder_free_nop;
-	camel_folder_class->get_summary = get_summary;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	camel_folder_class->get_subfolder_names = get_subfolder_names;
-	camel_folder_class->free_subfolder_names = free_subfolder_names;
-	camel_folder_class->search_by_expression = search_by_expression;
-	camel_folder_class->get_message_info = get_message_info;
-	camel_folder_class->copy_message_to = copy_message_to;
-	camel_folder_class->move_message_to = move_message_to;
-}
-
-CamelType
-camel_cache_folder_get_type (void)
-{
-	static CamelType camel_cache_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_cache_folder_type == CAMEL_INVALID_TYPE) {
-		camel_cache_folder_type = camel_type_register (
-			CAMEL_FOLDER_TYPE, "CamelCacheFolder",
-			sizeof (CamelCacheFolder),
-			sizeof (CamelCacheFolderClass),
-			(CamelObjectClassInitFunc) camel_cache_folder_class_init,
-			NULL,
-			NULL,
-			(CamelObjectFinalizeFunc) finalize);
-	}
-
-	return camel_cache_folder_type;
-}
-
-
-static void
-cache_free_summary (CamelCacheFolder *cache_folder)
-{
-	if (cache_folder->remote_summary) {
-		camel_folder_free_summary (cache_folder->remote,
-					   cache_folder->summary);
-	} else {
-		int i;
-
-		for (i = 0; i < cache_folder->summary->len; i++) {
-			camel_message_info_free (
-				cache_folder->summary->pdata[i]);
-		}
-		g_ptr_array_free (cache_folder->summary, TRUE);
-		g_hash_table_destroy (cache_folder->summary_uids);
-	}
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelCacheFolder *cache_folder = CAMEL_CACHE_FOLDER (object);
-
-	if (cache_folder->uids) {
-		camel_folder_free_uids (cache_folder->remote,
-					cache_folder->uids);
-	}
-	if (cache_folder->summary)
-		cache_free_summary (cache_folder);
-
-	if (cache_folder->uidmap)
-		camel_cache_map_destroy (cache_folder->uidmap);
-
-	camel_object_unref (CAMEL_OBJECT (cache_folder->local));
-	camel_object_unref (CAMEL_OBJECT (cache_folder->remote));
-
-	g_free (cache_folder->mapfile);
-}
-
-
-static void
-update (CamelCacheFolder *cache_folder, CamelException *ex)
-{
-	if (cache_folder->uids) {
-		camel_folder_free_uids (cache_folder->remote,
-					cache_folder->uids);
-	}
-	cache_folder->uids = camel_folder_get_uids (cache_folder->remote);
-
-	if (cache_folder->summary)
-		cache_free_summary (cache_folder);
-
-	if (cache_folder->remote_summary) {
-		cache_folder->summary =
-			camel_folder_get_summary (cache_folder->remote);
-	} else {
-		CamelMessageInfo *mi;
-		GPtrArray *lsummary;
-		const char *ruid;
-		int i;
-
-		if (!cache_folder->is_synced) {
-			camel_cache_folder_sync (cache_folder, ex);
-			if (camel_exception_is_set (ex))
-				return;
-		}
-
-		cache_folder->summary = g_ptr_array_new ();
-		cache_folder->summary_uids = g_hash_table_new (g_str_hash,
-							       g_str_equal);
-
-		lsummary = camel_folder_get_summary (cache_folder->local);
-
-		/* For each local message, duplicate its info, replace
-		 * the uid with the remote one, and add it to the
-		 * uid->info cache.
-		 */
-		for (i = 0; i < lsummary->len; i++) {
-			mi = lsummary->pdata[i];
-			ruid = camel_cache_map_get_remote (cache_folder->uidmap, mi->uid);
-			if (!ruid) {
-				/* Stale message. Delete it from cache. */
-				camel_folder_delete_message (
-					cache_folder->local, mi->uid);
-				continue;
-			}
-
-			mi = g_new (CamelMessageInfo, 1);
-			camel_message_info_dup_to (lsummary->pdata[i], mi);
-			g_free (mi->uid);
-			mi->uid = g_strdup (ruid);
-			g_hash_table_insert (cache_folder->summary_uids,
-					     mi->uid, mi);
-		}
-		camel_folder_free_summary (cache_folder->local, lsummary);
-
-		/* Now build the summary array in remote UID order. */
-		for (i = 0; i < cache_folder->uids->len; i++) {
-			mi = g_hash_table_lookup (cache_folder->summary_uids,
-						  cache_folder->uids->pdata[i]);
-			g_ptr_array_add (cache_folder->summary, mi);
-		}
-	}
-	
-}
-
-static void
-init (CamelFolder *folder, CamelStore *parent_store,
-      CamelFolder *parent_folder, const gchar *name, gchar *separator,
-      gboolean path_begins_with_sep, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	char *path;
-
-	CF_CLASS (folder)->init (folder, parent_store, parent_folder,
-				 name, separator, path_begins_with_sep, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	folder->permanent_flags =
-		camel_folder_get_permanent_flags (cache_folder->local);
-	folder->can_hold_folders = cache_folder->remote->can_hold_folders;
-	folder->can_hold_messages = cache_folder->remote->can_hold_messages;
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability =
-		camel_folder_has_search_capability (cache_folder->local) ||
-		camel_folder_has_search_capability (cache_folder->remote);
-
-	cache_folder->remote_summary =
-		camel_folder_has_summary_capability (cache_folder->remote);
-
-	/* Load UIDs, summary, etc. */
-	path = CAMEL_SERVICE (cache_folder->local->parent_store)->url->path;
-	cache_folder->mapfile = g_strdup_printf ("%s/%s.map", path, name);
-	cache_folder->uidmap = camel_cache_map_new ();
-	camel_cache_map_read (cache_folder->uidmap, cache_folder->mapfile, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	update (cache_folder, ex);
-
-	return;
-}
-
-/* If the remote folder changes, cache the new messages if necessary,
- * update the summary, and propagate the signal.
- */
-static void
-remote_folder_changed (CamelObject *remote_folder, gpointer type,
-		       gpointer user_data)
-{
-	CamelCacheFolder *cache_folder = user_data;
-
-	update (cache_folder, NULL);
-	camel_object_trigger_event (CAMEL_OBJECT (cache_folder),
-				    "folder_changed", type);
-}
-
-/* If the local folder changes, it's because we just cached a message
- * or expunged messages. Look for new messages and update the UID maps.
- */
-static void
-local_folder_changed (CamelObject *local, gpointer type, gpointer data)
-{
-	CamelFolder *local_folder = CAMEL_FOLDER (local);
-	CamelCacheFolder *cache_folder = data;
-	CamelMimeMessage *msg;
-	GPtrArray *new_luids;
-	char *luid;
-	const char *ruid;
-	int i;
-
-	/* Get the updated list of local UIDs. For any that we didn't
-	 * already know about, figure out the corresponding remote
-	 * UID.
-	 */
-	new_luids = camel_folder_get_uids (local_folder);
-	for (i = 0; i < new_luids->len; i++) {
-		luid = new_luids->pdata[i];
-		if (!camel_cache_map_get_remote (cache_folder->uidmap, luid)) {
-			msg = camel_folder_get_message (local_folder,
-							luid, NULL);
-			if (!msg)
-				continue; /* Hrmph. */
-			ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),
-							"X-Evolution-Remote-UID");
-			if (!ruid) {
-				/* How'd that get here? */
-				camel_folder_delete_message (local_folder,
-							     luid);
-				continue;
-			}
-
-			camel_cache_map_update (cache_folder->uidmap,
-						luid, ruid);
-		}
-	}
-	camel_folder_free_uids (local_folder, new_luids);
-
-	/* FIXME: the uidmaps contain bad data now. */
-}
-
-/* DONE */
-static void
-refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_refresh_info (cache_folder->remote, ex);
-}
-
-/* DONE */
-static void
-cache_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_sync (cache_folder->remote, expunge, ex);
-	if (!camel_exception_is_set (ex)) {
-		camel_folder_sync (cache_folder->local, expunge, NULL);
-		camel_cache_map_write (cache_folder->uidmap,
-				       cache_folder->mapfile, ex);
-	}
-}
-
-/* DONE */
-static void
-expunge (CamelFolder *folder, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_expunge (cache_folder->remote, ex);
-	if (!camel_exception_is_set (ex))
-		camel_folder_expunge (cache_folder->local, NULL);
-}
-
-/* DONE */
-static gint
-get_message_count (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->summary->len;
-}
-
-/* DONE */
-static void
-append_message (CamelFolder *folder, CamelMimeMessage *message, 
-		const CamelMessageInfo *info, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	/* We'd like to cache this locally as well, but we have no
-	 * 100% reliable way to determine the UID assigned to the
-	 * remote message, so we can't.
-	 */
-	camel_folder_append_message (cache_folder->remote, message, info, ex);
-}
-
-/* DONE */
-static guint32
-get_message_flags (CamelFolder *folder, const char *uid)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, 0);
-	return mi->flags;
-}
-
-/* DONE */
-static void
-set_message_flags (CamelFolder *folder, const char *uid,
-		   guint32 flags, guint32 set)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_flags (cache_folder->local, luid,
-						flags, set);
-	}
-	camel_folder_set_message_flags (cache_folder->remote, uid, flags, set);
-}
-
-/* DONE */
-static gboolean
-get_message_user_flag (CamelFolder *folder, const char *uid, const char *name)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, 0);
-	return camel_flag_get ((CamelFlag **)&mi->user_flags, name);
-}
-
-/* DONE */
-static void
-set_message_user_flag (CamelFolder *folder, const char *uid,
-		       const char *name, gboolean value)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_user_flag (cache_folder->local, luid,
-						    name, value);
-	}
-	camel_folder_set_message_user_flag (cache_folder->remote, uid,
-					    name, value);
-}
-
-
-/* DONE */
-static const char *
-get_message_user_tag (CamelFolder *folder, const char *uid, const char *name)
-{
-	const CamelMessageInfo *mi;
-
-	mi = get_message_info (folder, uid);
-	g_return_val_if_fail (mi != NULL, NULL);
-	return camel_tag_get ((CamelTag **)&mi->user_tags, name);
-}
-
-/* DONE */
-static void
-set_message_user_tag (CamelFolder *folder, const char *uid,
-		      const char *name, const char *value)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	const char *luid;
-
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		camel_folder_set_message_user_tag (cache_folder->local, luid,
-						   name, value);
-	}
-	camel_folder_set_message_user_tag (cache_folder->remote, uid,
-					   name, value);
-}
-
-
-/* DONE */
-static CamelMimeMessage *
-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-	CamelMimeMessage *msg;
-	const CamelMessageInfo *info;
-	const char *luid;
-
-	/* Check if we have it cached first. */
-	luid = camel_cache_map_get_local (cache_folder->uidmap, uid);
-	if (luid) {
-		msg = camel_folder_get_message (cache_folder->local,
-						luid, NULL);
-		if (msg)
-			return msg;
-
-		/* Hm... Oh well. Update the map and try for real. */
-		camel_cache_map_remove (cache_folder->uidmap, NULL, uid);
-	}
-
-	/* OK. It's not cached. Get the remote message. */
-	msg = camel_folder_get_message (cache_folder->remote, uid, ex);
-	if (!msg)
-		return NULL;
-	info = camel_folder_get_message_info (cache_folder->remote, uid);
-
-	/* Add a header giving the remote UID and append it to the
-	 * local folder. (This should eventually invoke
-	 * local_folder_changed(), which will take care of updating
-	 * the uidmaps.)
-	 */
-	camel_medium_add_header (CAMEL_MEDIUM (msg), "X-Evolution-Remote-UID",
-				 uid);
-	camel_folder_append_message (cache_folder->local, msg, info, NULL);
-
-	return msg;
-}
-
-/* DONE */
-static GPtrArray *
-get_uids (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->uids;
-}
-
-/* DONE */
-static GPtrArray *
-get_summary (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return cache_folder->summary;
-}
-
-/* DONE */
-static GPtrArray *
-get_subfolder_names (CamelFolder *folder)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	return camel_folder_get_subfolder_names (cache_folder->remote);
-}
-
-/* DONE */
-static void
-free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	camel_folder_free_subfolder_names (cache_folder->remote, subfolders);
-}
-
-/* DONE */
-static GPtrArray *
-search_by_expression (CamelFolder *folder, const char *expression,
-		      CamelException *ex)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	/* Search on the remote folder if we're not synced. */
-	if (!cache_folder->is_synced &&
-	    camel_folder_has_search_capability (cache_folder->remote)) {
-		return camel_folder_search_by_expression (cache_folder->remote,
-							  expression, ex);
-	} else {
-		GPtrArray *matches;
-		const char *ruid;
-		int i;
-
-		if (!cache_folder->is_synced)
-			camel_cache_folder_sync (cache_folder, ex);
-		if (camel_exception_is_set (ex))
-			return NULL;
-		matches = search_by_expression (cache_folder->local,
-						expression, ex);
-		if (camel_exception_is_set (ex))
-			return NULL;
-
-		/* Convert local uids to remote. */
-		for (i = 0; i < matches->len; i++) {
-			ruid = camel_cache_map_get_remote (cache_folder->uidmap,
-							   matches->pdata[i]);
-			g_free (matches->pdata[i]);
-			matches->pdata[i] = g_strdup (ruid);
-		}
-
-		return matches;
-	}
-}
-
-/* DONE */
-static const CamelMessageInfo *
-get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;
-
-	if (cache_folder->remote_summary) {
-		return camel_folder_get_message_info (cache_folder->remote,
-						      uid);
-	} else
-		return g_hash_table_lookup (cache_folder->summary_uids, uid);
-}
-
-/* DONE */
-static void
-copy_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *destination, CamelException *ex)
-{
-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;
-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;
-
-	/* If we are here, we know that the folders have the same parent
-	 * store, which implies their remote and local folders have the
-	 * same parent store as well.
-	 */
-
-	if (CF_CLASS (source_cache_folder->remote)->copy_message_to !=
-	    folder_class->copy_message_to) {
-		/* The remote store has a non-default copy method, so
-		 * use it to avoid unnecessary network traffic.
-		 */
-		CF_CLASS (source_cache_folder->remote)->copy_message_to (
-			source_cache_folder->remote, uid,
-			dest_cache_folder->remote, ex);
-	} else {
-		/* The remote store uses the default copy method,
-		 * meaning if we proxy the copy_message_to over to it,
-		 * it will suck the message over the network. We may
-		 * already have a local copy, and if we don't, we want
-		 * to, and if we're going to have the message in
-		 * memory, then we should get it into the destination
-		 * cache too. So do this by hand.
-		 */
-		CamelMimeMessage *msg;
-		const CamelMessageInfo *info;
-
-		msg = get_message (source, uid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (source, uid);
-
-		camel_medium_remove_header (CAMEL_MEDIUM (msg),
-					    "X-Evolution-Remote-UID");
-		append_message (destination, msg, info, ex);
-	}
-}
-
-/* DONE */
-static void
-move_message_to (CamelFolder *source, const char *uid,
-		 CamelFolder *destination, CamelException *ex)
-{
-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;
-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;
-
-	/* See comments in copy_message_to. */
-
-	if (CF_CLASS (source_cache_folder)->move_message_to !=
-	    folder_class->move_message_to) {
-		CF_CLASS (source_cache_folder)->move_message_to (
-			source_cache_folder->remote, uid,
-			dest_cache_folder->remote, ex);
-	} else {
-		CamelMimeMessage *msg;
-		const CamelMessageInfo *info;
-
-		msg = get_message (source, uid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (source, uid);
-
-		camel_medium_remove_header (CAMEL_MEDIUM (msg),
-					    "X-Evolution-Remote-UID");
-		append_message (destination, msg, info, ex);
-		if (!camel_exception_is_set (ex))
-			camel_folder_delete_message (source, uid);
-	}
-}
-
-
-CamelFolder *
-camel_cache_folder_new (CamelStore *store, CamelFolder *parent,
-			CamelFolder *remote, CamelFolder *local,
-			CamelException *ex)
-{
-	CamelCacheFolder *cache_folder;
-	CamelFolder *folder;
-
-	cache_folder = CAMEL_CACHE_FOLDER (camel_object_new (CAMEL_CACHE_FOLDER_TYPE));
-	folder = (CamelFolder *)cache_folder;
-
-	cache_folder->local = local;
-	camel_object_ref (CAMEL_OBJECT (local));
-	camel_object_hook_event (CAMEL_OBJECT (local), "folder_changed",
-				 local_folder_changed, cache_folder);
-
-	cache_folder->remote = remote;
-	camel_object_ref (CAMEL_OBJECT (remote));
-	camel_object_hook_event (CAMEL_OBJECT (remote), "folder_changed",
-				 remote_folder_changed, cache_folder);
-
-	/* XXX */
-
-	return folder;
-}
-
-void
-camel_cache_folder_sync (CamelCacheFolder *cache_folder, CamelException *ex)
-{
-	CamelMimeMessage *msg;
-	const char *ruid, *luid;
-	int lsize, i;
-	const CamelMessageInfo *info;
-
-	lsize = camel_folder_get_message_count (cache_folder->local);
-
-	camel_folder_freeze (cache_folder->local);
-	for (i = 0; i < cache_folder->uids->len; i++) {
-		ruid = cache_folder->uids->pdata[i];
-		luid = camel_cache_map_get_local (cache_folder->uidmap, ruid);
-
-		/* Don't re-copy messages we already have. */
-		if (luid &&
-		    camel_folder_get_message_info (cache_folder->local, luid))
-			continue;
-
-		msg = camel_folder_get_message (cache_folder->remote,
-						ruid, ex);
-		if (camel_exception_is_set (ex))
-			return;
-		info = camel_folder_get_message_info (cache_folder->remote,
-						      ruid);
-
-		camel_medium_add_header (CAMEL_MEDIUM (msg),
-					 "X-Evolution-Remote-UID", ruid);
-		camel_folder_append_message (cache_folder->local, msg,
-					     info, ex);
-		if (camel_exception_is_set (ex))
-			return;
-	}
-	camel_folder_thaw (cache_folder->local);
-}
-
-static void
-get_mappings (CamelCacheFolder *cache_folder, int first, CamelException *ex)
-{
-	GPtrArray *uids;
-	CamelMimeMessage *msg;
-	const char *ruid;
-	int i;
-
-	uids = camel_folder_get_uids (cache_folder->local);
-	for (i = first; i < uids->len; i++) {
-		msg = camel_folder_get_message (cache_folder->local,
-						uids->pdata[i], ex);
-		if (!msg)
-			break;
-		ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),
-						"X-Evolution-Remote-UID");
-
-		camel_cache_map_add (cache_folder->uidmap,
-				     uids->pdata[i], ruid);
-	}
-	camel_folder_free_uids (cache_folder->local, uids);
-}
diff --git a/camel/providers/cache/camel-cache-folder.h b/camel/providers/cache/camel-cache-folder.h
deleted file mode 100644
index 3609de4d67..0000000000
--- a/camel/providers/cache/camel-cache-folder.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-folder.h: Class for a cache folder */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_FOLDER_H
-#define CAMEL_CACHE_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-folder.h>
-#include "camel-cache-map.h"
-
-#define CAMEL_CACHE_FOLDER_TYPE     (camel_cache_folder_get_type ())
-#define CAMEL_CACHE_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolder))
-#define CAMEL_CACHE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolderClass))
-#define IS_CAMEL_CACHE_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	/* Remote and local folders */
-	CamelFolder *remote, *local;
-
-	/* Remote UIDs, in order, summary, and uid->info map if
-	 * summary is from local info.
-	 */
-	GPtrArray *uids, *summary;
-	GHashTable *summary_uids;
-
-	/* UID map */
-	CamelCacheMap *uidmap;
-	char *mapfile;
-
-	/* Is the summary remote? Is the folder known to be synced? */
-	gboolean remote_summary, is_synced;
-
-} CamelCacheFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelCacheFolderClass;
-
-
-CamelFolder *camel_cache_folder_new (CamelStore *store, CamelFolder *parent,
-				     CamelFolder *remote, CamelFolder *local,
-				     CamelException *ex);
-
-void camel_cache_folder_sync (CamelCacheFolder *cache_folder,
-			      CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_cache_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_FOLDER_H */
diff --git a/camel/providers/cache/camel-cache-map.c b/camel/providers/cache/camel-cache-map.c
deleted file mode 100644
index d3cece6f60..0000000000
--- a/camel/providers/cache/camel-cache-map.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-map.c : functions for a local<->remote uid map */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-cache-map.h"
-#include <camel/camel-exception.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/**
- * camel_cache_map_new:
- *
- * Return value: a new CamelCacheMap
- **/
-CamelCacheMap *
-camel_cache_map_new (void)
-{
-	CamelCacheMap *map = g_new (CamelCacheMap, 1);
-
-	map->l2r = g_hash_table_new (g_str_hash, g_str_equal);
-	map->r2l = g_hash_table_new (g_str_hash, g_str_equal);
-
-	return map;
-}
-
-static void
-free_mapping (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-	g_free (data);
-}
-
-/**
- * camel_cache_map_destroy:
- * @map: a CamelCacheMap
- *
- * Frees @map and all of the data stored in it.
- **/
-void
-camel_cache_map_destroy (CamelCacheMap *map)
-{
-	g_hash_table_foreach (map->l2r, free_mapping, NULL);
-	g_hash_table_destroy (map->l2r);
-	g_hash_table_destroy (map->r2l);
-	g_free (map);
-}
-
-/**
- * camel_cache_map_add:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Adds a mapping between @luid and @ruid. If either already exists
- * in the map, this may leak memory and result in incorrect map entries.
- * Use camel_cache_map_update() in that case instead.
- **/
-void
-camel_cache_map_add (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	char *map_luid = g_strdup (luid);
-	char *map_ruid = g_strdup (ruid);
-
-	g_hash_table_insert (map->l2r, map_luid, map_ruid);
-	g_hash_table_insert (map->r2l, map_ruid, map_luid);
-}
-
-/**
- * camel_cache_map_remove:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Removes the mapping between @luid and @ruid. Either (but not both)
- * of the uids can be %NULL if they are not both known.
- **/
-void
-camel_cache_map_remove (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	gpointer map_luid, map_ruid;
-
-	if ((luid && g_hash_table_lookup_extended (map->l2r, luid,
-						   &map_luid, &map_ruid)) ||
-	    (ruid && g_hash_table_lookup_extended (map->r2l, ruid,
-						  &map_luid, &map_ruid))) {
-		g_hash_table_remove (map->l2r, map_luid);
-		g_hash_table_remove (map->r2l, map_ruid);
-		g_free (map_luid);
-		g_free (map_ruid);
-	}
-}
-
-/**
- * camel_cache_map_update:
- * @map: a CamelCacheMap
- * @luid: the local uid
- * @ruid: the remote uid
- *
- * Updates the mappings to associate @luid with @ruid, clearing any
- * previous mappings for both of them.
- **/
-void
-camel_cache_map_update (CamelCacheMap *map, const char *luid, const char *ruid)
-{
-	camel_cache_map_remove (map, luid, ruid);
-	camel_cache_map_add (map, luid, ruid);
-}
-
-/**
- * camel_cache_map_get_local
- * @map: a CamelCacheMap
- * @ruid: the remote uid
- *
- * Return value: the corresponding local uid, or %NULL
- **/
-const char *
-camel_cache_map_get_local (CamelCacheMap *map, const char *ruid)
-{
-	return g_hash_table_lookup (map->r2l, ruid);
-}
-
-/**
- * camel_cache_map_get_remote
- * @map: a CamelCacheMap
- * @luid: the local uid
- *
- * Return value: the corresponding remote uid, or %NULL
- **/
-const char *
-camel_cache_map_get_remote (CamelCacheMap *map, const char *luid)
-{
-	return g_hash_table_lookup (map->l2r, luid);
-}
-
-
-
-static void
-write_mapping (gpointer key, gpointer value, gpointer user_data)
-{
-	int fd = *(int *)user_data;
-
-	/* FIXME: We assume the local UID has no ':'s in it. */
-	write (fd, key, strlen (key));
-	write (fd, ":", 1);
-	write (fd, value, strlen (value));
-	write (fd, "\n", 1);
-}
-
-/**
- * camel_cache_map_write:
- * @map: a CamelCacheMap
- * @file: the filename to write the map to
- * @ex: a CamelException
- *
- * Writes @map out to @file, setting @ex if something goes wrong.
- **/
-void
-camel_cache_map_write (CamelCacheMap *map, const char *file,
-		       CamelException *ex)
-{
-	int fd;
-	char *tmpfile;
-
-	tmpfile = g_strdup_printf ("%s~", file);
-	fd = open (tmpfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
-	if (fd == -1) {
-		g_free (tmpfile);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not create cache map file: %s",
-				      g_strerror (errno));
-		return;
-	}
-
-	g_hash_table_foreach (map->l2r, write_mapping, &fd);
-
-	if (close (fd) == -1 ||
-	    rename (tmpfile, file) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not save cache map file: %s",
-				      g_strerror (errno));
-		unlink (tmpfile);
-	}
-	g_free (tmpfile);
-}
-
-/**
- * camel_cache_map_read:
- * @map: a CamelCacheMap
- * @file: the filename to read the map from
- * @ex: a CamelException
- *
- * Reads @map from @file, setting @ex if something goes wrong. @map
- * should be a freshly-created CamelCacheMap.
- **/
-void
-camel_cache_map_read (CamelCacheMap *map, const char *file, CamelException *ex)
-{
-	FILE *f;
-	char buf[1024], *p, *q;
-
-	/* FIXME: lazy implementation. We could make this work with
-	 * lines longer than 1024 chars. :)
-	 */
-
-	f = fopen (file, "r");
-	if (!f) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not open cache map file: %s",
-				      g_strerror (errno));
-		return;
-	}
-
-	while (fgets (buf, sizeof (buf), f)) {
-		p = strchr (buf, ':');
-		if (p)
-			q = strchr (buf, '\n');
-		if (!p || !q) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-					     "Bad cache file.");
-			return;
-		}
-		*p++ = *q = '\0';
-
-		/* Local uid at buf, remote at p. */
-		camel_cache_map_add (map, buf, p);
-	}
-
-	fclose (f);
-}
diff --git a/camel/providers/cache/camel-cache-map.h b/camel/providers/cache/camel-cache-map.h
deleted file mode 100644
index a15c9afe1a..0000000000
--- a/camel/providers/cache/camel-cache-map.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-map.h: functions for dealing with UID maps */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_MAP_H
-#define CAMEL_CACHE_MAP_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-#include <camel/camel-types.h>
-
-typedef struct {
-	GHashTable *l2r, *r2l;
-} CamelCacheMap;
-
-CamelCacheMap *camel_cache_map_new (void);
-void camel_cache_map_destroy (CamelCacheMap *map);
-
-void camel_cache_map_add (CamelCacheMap *map, const char *luid,
-			  const char *ruid);
-void camel_cache_map_remove (CamelCacheMap *map, const char *luid,
-			     const char *ruid);
-void camel_cache_map_update (CamelCacheMap *map, const char *luid,
-			     const char *ruid);
-
-const char *camel_cache_map_get_local (CamelCacheMap *map, const char *ruid);
-const char *camel_cache_map_get_remote (CamelCacheMap *map, const char *luid);
-
-void camel_cache_map_write (CamelCacheMap *map, const char *file,
-			    CamelException *ex);
-void camel_cache_map_read (CamelCacheMap *map, const char *file,
-			   CamelException *ex);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_MAP_H */
diff --git a/camel/providers/cache/camel-cache-provider.c b/camel/providers/cache/camel-cache-provider.c
deleted file mode 100644
index 217f06816a..0000000000
--- a/camel/providers/cache/camel-cache-provider.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-provider.c: cache provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-cache-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-
-static CamelProvider cache_provider = {
-	"cache",
-	"Cache",
-
-	"For caching remote mail into a local store.",
-
-	"cache",
-
-	0,
-
-	{ 0, 0 }
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	cache_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_cache_store_get_type();
-
-	camel_session_register_provider (session, &cache_provider);
-}
diff --git a/camel/providers/cache/camel-cache-store.c b/camel/providers/cache/camel-cache-store.c
deleted file mode 100644
index 544cca69a1..0000000000
--- a/camel/providers/cache/camel-cache-store.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-store.c : class for a cache store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "camel-cache-store.h"
-#include "camel-cache-folder.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "md5-utils.h"
-
-static CamelServiceClass *service_class = NULL;
-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void finalize (CamelObject *object);
-
-static gboolean cache_connect (CamelService *service, CamelException *ex);
-static gboolean cache_disconnect (CamelService *service, CamelException *ex);
-static char *get_path (CamelService *service);
-static char *get_name (CamelService *service, gboolean brief);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, 
-				gboolean create, CamelException *ex);
-static void delete_folder (CamelStore *store, const char *folder_name, 
-			   CamelException *ex);
-static void rename_folder (CamelStore *store, const char *old_name,
-			   const char *new_name, CamelException *ex);
-static char *get_folder_name (CamelStore *store, const char *folder_name, 
-			      CamelException *ex);
-static char *get_root_folder_name (CamelStore *store, CamelException *ex);
-static char *get_default_folder_name (CamelStore *store, CamelException *ex);
-
-
-static void
-camel_cache_store_class_init (CamelCacheStoreClass *camel_cache_store_class)
-{
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_cache_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_cache_store_class);
-	
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-
-	/* virtual method overload */
-	camel_service_class->connect = cache_connect;
-	camel_service_class->disconnect = cache_disconnect;
-	camel_service_class->get_path = get_path;
-	camel_service_class->get_name = get_name;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_root_folder_name = get_root_folder_name;
-	camel_store_class->get_default_folder_name = get_default_folder_name;
-}
-
-
-CamelType
-camel_cache_store_get_type (void)
-{
-	static CamelType camel_cache_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_cache_store_type == CAMEL_INVALID_TYPE) {
-		camel_cache_store_type = camel_type_register (
-			CAMEL_STORE_TYPE, "CamelCacheStore",
-			sizeof (CamelCacheStore),
-			sizeof (CamelCacheStoreClass),
-			(CamelObjectClassInitFunc) camel_cache_store_class_init,
-			NULL,
-			NULL,
-			(CamelObjectFinalizeFunc) finalize);
-	}
-
-	return camel_cache_store_type;
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (object);
-
-	camel_object_unref (CAMEL_OBJECT (cache_store->local));
-	camel_object_unref (CAMEL_OBJECT (cache_store->remote));
-	g_free (cache_store->local_base);
-}
-
-
-static gboolean
-cache_connect (CamelService *service, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_connect (CAMEL_SERVICE (cache_store->remote), ex) &&
-		camel_service_connect (CAMEL_SERVICE (cache_store->local), ex);
-}
-
-static gboolean
-cache_disconnect (CamelService *service, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_disconnect (CAMEL_SERVICE (cache_store->local), ex) &&
-		camel_service_disconnect (CAMEL_SERVICE (cache_store->remote), ex);
-}
-
-static char *
-get_path (CamelService *service)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-	char *path, *subpath;
-
-	subpath = camel_service_get_path (CAMEL_SERVICE (cache_store->remote));
-	path = g_strdup_printf ("cache/%s", subpath);
-	g_free (subpath);
-	return path;
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);
-
-	return camel_service_get_name (CAMEL_SERVICE (cache_store->remote),
-				       brief);
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name,
-	    gboolean create, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-	CamelFolder *parent, *rf, *lf;
-
-	rf = camel_store_get_folder (cache_store->remote, folder_name,
-				     create, ex);
-	if (!rf)
-		return NULL;
-
-	lf = camel_store_get_folder (cache_store->local, folder_name,
-				     TRUE, ex);
-	if (!lf) {
-		camel_object_unref (CAMEL_OBJECT (rf));
-		camel_exception_setv (ex, camel_exception_get_id (ex),
-				      "Could not create cache folder:\n%s",
-				      camel_exception_get_description (ex));
-		return NULL;
-	}
-
-	return camel_cache_folder_new (store, parent, rf, lf, ex);
-}
-
-/* XXX these two need to be better about failure recovery. */
-static void
-delete_folder (CamelStore *store, const char *folder_name,
-	       CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	camel_store_delete_folder (cache_store->remote, folder_name, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	camel_store_delete_folder (cache_store->local, folder_name, NULL);
-}
-
-static void
-rename_folder (CamelStore *store, const char *old_name,
-	       const char *new_name, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	camel_store_rename_folder (cache_store->remote, old_name,
-				   new_name, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	camel_store_rename_folder (cache_store->local, old_name,
-				   new_name, NULL);
-}
-
-static char *
-get_folder_name (CamelStore *store, const char *folder_name,
-		 CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_folder_name (
-		cache_store->remote, folder_name, ex);
-}
-
-static char *
-get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_root_folder_name (
-		cache_store->remote, ex);
-}
-
-static char *
-get_default_folder_name (CamelStore *store, CamelException *ex)
-{
-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);
-
-	return CS_CLASS (cache_store->remote)->get_default_folder_name (
-		cache_store->remote, ex);
-}
-
-
-/**
- * camel_cache_store_new:
- * @remote: a remote store
- * @ex: a CamelException
- *
- * Return value: a CamelCacheStore for the given remote store.
- **/
-CamelStore *
-camel_cache_store_new (CamelStore *remote, CamelException *ex)
-{
-	CamelCacheStore *cache_store;
-	CamelService *remote_service = (CamelService *)remote;
-	CamelSession *session;
-	char *url_string;
-	CamelURL *url;
-
-	session = camel_service_get_session (remote_service);
-
-	url_string = camel_service_get_url (remote_service);
-	url = camel_url_new (url_string, ex);
-	g_free (url_string);
-
-	if (!url)
-		return NULL;
-
-	cache_store = (CamelCacheStore *)
-		camel_service_new (CAMEL_CACHE_STORE_TYPE, session,
-				   camel_service_get_provider (remote_service),
-				   url, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_url_free (url);
-		return NULL;
-	}
-
-	cache_store->remote = remote;
-	camel_object_ref (CAMEL_OBJECT (remote));
-
-	cache_store->local_base = camel_session_get_storage_path (
-		session, (CamelService *)cache_store, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (cache_store));
-		return NULL;
-	}
-
-	url_string = g_strdup_printf ("mbox:%s", cache_store->local_base);
-	cache_store->local = camel_session_get_store (session, url_string, ex);
-	g_free (url_string);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (cache_store));
-		return NULL;
-	}
-
-	return (CamelStore *)cache_store;
-}
diff --git a/camel/providers/cache/camel-cache-store.h b/camel/providers/cache/camel-cache-store.h
deleted file mode 100644
index 7339d8a9f3..0000000000
--- a/camel/providers/cache/camel-cache-store.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-cache-store.h: class for a cache store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_CACHE_STORE_H
-#define CAMEL_CACHE_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-store.h>
-
-#define CAMEL_CACHE_STORE_TYPE     (camel_cache_store_get_type ())
-#define CAMEL_CACHE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_STORE_TYPE, CamelCacheStore))
-#define CAMEL_CACHE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_STORE_TYPE, CamelCacheStoreClass))
-#define IS_CAMEL_CACHE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;
-
-	char *local_base;
-	CamelStore *remote, *local;
-
-} CamelCacheStore;
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-} CamelCacheStoreClass;
-
-
-/* support functions */
-CamelStore *camel_cache_store_new (CamelStore *remote, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_cache_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_CACHE_STORE_H */
-
-
diff --git a/camel/providers/cache/libcamelcache.urls b/camel/providers/cache/libcamelcache.urls
deleted file mode 100644
index 06cf65390f..0000000000
--- a/camel/providers/cache/libcamelcache.urls
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/camel/providers/imap/.cvsignore b/camel/providers/imap/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/providers/imap/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
deleted file mode 100644
index 19646f1960..0000000000
--- a/camel/providers/imap/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelimapincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelimap.la
-provider_DATA = libcamelimap.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	$(KRB4_CFLAGS)				\
-	-DG_LOG_DOMAIN=\"camel-imap-provider\"	
-
-libcamelimap_la_SOURCES = 			\
-	camel-imap-auth.c			\
-	camel-imap-command.c			\
-	camel-imap-folder.c			\
-	camel-imap-provider.c			\
-	camel-imap-store.c			\
-	camel-imap-summary.c			\
-	camel-imap-utils.c
-
-libcamelimapinclude_HEADERS =			\
-	camel-imap-auth.h			\
-	camel-imap-command.h			\
-	camel-imap-folder.h			\
-	camel-imap-store.h			\
-	camel-imap-stream.h			\
-	camel-imap-summary.h			\
-	camel-imap-utils.h
-
-libcamelimap_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
-
-EXTRA_DIST = libcamelimap.urls
-
-
-
-
-
diff --git a/camel/providers/imap/camel-imap-auth.c b/camel/providers/imap/camel-imap-auth.c
deleted file mode 100644
index 3bf1af6535..0000000000
--- a/camel/providers/imap/camel-imap-auth.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-auth.c: IMAP AUTHENTICATE implementations */
-
-/*
- *  Authors: Dan Winship <danw@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#ifdef HAVE_KRB4
-#include <krb.h>
-/* MIT krb4 des.h #defines _. Sigh. We don't need it. */
-#undef _
-#endif
-
-#include "camel-exception.h"
-#include "camel-mime-utils.h"
-
-#include "camel-imap-auth.h"
-#include "camel-imap-command.h"
-#include "camel-imap-utils.h"
-
-static char *
-base64_encode_simple (const char *data, int len)
-{
-	unsigned char *out;
-	int state = 0, outlen;
-	unsigned int save = 0;
-
-	out = g_malloc (len * 4 / 3 + 5);
-	outlen = base64_encode_close ((unsigned char *)data, len, FALSE,
-				      out, &state, &save);
-	out[outlen] = '\0';
-	return (char *)out;
-}
-
-static int
-base64_decode_simple (char *data, int len)
-{
-	int state = 0;
-	unsigned int save = 0;
-
-	return base64_decode_step ((unsigned char *)data, len,
-				   (unsigned char *)data, &state, &save);
-}
-
-#ifdef HAVE_KRB4
-#define IMAP_KERBEROS_V4_PROTECTION_NONE      1
-#define IMAP_KERBEROS_V4_PROTECTION_INTEGRITY 2
-#define IMAP_KERBEROS_V4_PROTECTION_PRIVACY   4
-
-gboolean
-imap_try_kerberos_v4_auth (CamelImapStore *store, CamelException *ex)
-{
-	CamelImapResponse *response;
-	char *resp, *data;
-	int status, len;
-	char *inst, *realm, *buf, *username;
-	guint32 nonce_n, nonce_h, plus1;
-	struct hostent *h;
-	KTEXT_ST authenticator;
-	CREDENTIALS credentials;
-	des_cblock session;
-	des_key_schedule schedule;
-
-	/* The kickoff. */
-	response = camel_imap_command (store, NULL, ex,
-				       "AUTHENTICATE KERBEROS_V4");
-	if (!response)
-		return FALSE;
-	resp = camel_imap_response_extract_continuation (response, ex);
-	if (!resp)
-		return FALSE;
-	data = imap_next_word (resp);
-
-	/* First server response is a base64-encoded 32-bit random number
-	 * ("nonce") in network byte order.
-	 */
-	if (strlen (data) != 8 || base64_decode_simple (data, 8) != 4) {
-		g_free (resp);
-		goto lose;
-	}
-	memcpy (&nonce_n, data, 4);
-	g_free (resp);
-	nonce_h = ntohl (nonce_n);
-
-	/* Our response is an authenticator including that number. */
-	h = camel_service_gethost (CAMEL_SERVICE (store), ex);
-	if (!h)
-		goto lose;
-	inst = g_strndup (h->h_name, strcspn (h->h_name, "."));
-	g_strdown (inst);
-	realm = g_strdup (krb_realmofhost (h->h_name));
-	status = krb_mk_req (&authenticator, "imap", inst, realm, nonce_h);
-	if (status == KSUCCESS) {
-		status = krb_get_cred ("imap", inst, realm, &credentials);
-		memcpy (session, credentials.session, sizeof (session));
-		memset (&credentials, 0, sizeof (credentials));
-	}
-	g_free (inst);
-	g_free (realm);
-
-	if (status != KSUCCESS) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Could not get Kerberos ticket:\n%s"),
-				      krb_err_txt[status]);
-		goto lose;
-	}
-	des_key_sched (&session, schedule);
-
-	buf = base64_encode_simple (authenticator.dat, authenticator.length);
-	response = camel_imap_command_continuation (store, ex, buf);
-	g_free (buf);
-	if (!response)
-		goto lose;
-	resp = camel_imap_response_extract_continuation (response, ex);
-	if (!resp)
-		goto lose;
-	data = imap_next_word (resp);
-
-	len = strlen (data);
-	base64_decode_simple (data, strlen (data));
-
-	/* This one is encrypted. */
-	des_ecb_encrypt ((des_cblock *)data, (des_cblock *)data, schedule, 0);
-
-	/* Check that the returned value is the original nonce plus one. */
-	memcpy (&plus1, data, 4);
-	if (ntohl (plus1) != nonce_h + 1) {
-		g_free (resp);
-		goto lose;
-	}
-
-	/* "the fifth octet contain[s] a bit-mask specifying the
-	 * protection mechanisms supported by the server"
-	 */
-	if (!(data[4] & IMAP_KERBEROS_V4_PROTECTION_NONE)) {
-		g_warning ("Server does not support `no protection' :-(");
-		g_free (resp);
-		goto lose;
-	}
-	g_free (resp);
-
-	username = CAMEL_SERVICE (store)->url->user;
-	len = strlen (username) + 9;
-	len += 8 - len % 8;
-	data = g_malloc0 (len);
-	memcpy (data, &nonce_n, 4);
-	data[4] = IMAP_KERBEROS_V4_PROTECTION_NONE;
-	data[5] = data[6] = data[7] = 0;
-	strcpy (data + 8, username);
-
-	des_pcbc_encrypt ((des_cblock *)data, (des_cblock *)data, len,
-			  schedule, &session, 1);
-	memset (&session, 0, sizeof (session));
-	buf = base64_encode_simple (data, len);
-	g_free (data);
-
-	response = camel_imap_command_continuation (store, ex, buf);
-	if (!response)
-		goto lose;
-	camel_imap_response_free (response);
-	return TRUE;
-
- lose:
-	memset (&session, 0, sizeof (session));
-
-	/* Get the server out of "waiting for continuation data" mode.
-	 */
-	response = camel_imap_command_continuation (store, NULL, "*");
-	if (response)
-		camel_imap_response_free (response);
-
-	return FALSE;
-}
-#endif /* HAVE_KRB4 */
diff --git a/camel/providers/imap/camel-imap-auth.h b/camel/providers/imap/camel-imap-auth.h
deleted file mode 100644
index fbbc5ef709..0000000000
--- a/camel/providers/imap/camel-imap-auth.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-auth.h: IMAP AUTHENTICATE implementations */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_IMAP_AUTH_H
-#define CAMEL_IMAP_AUTH_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-imap-store.h"
-
-gboolean imap_try_kerberos_v4_auth (CamelImapStore *store, CamelException *ex);
-gboolean imap_try_gssapi_auth      (CamelImapStore *store, CamelException *ex);
-
-#endif /* CAMEL_IMAP_AUTH_H */
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
deleted file mode 100644
index e9808d5a1f..0000000000
--- a/camel/providers/imap/camel-imap-command.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-command.c: IMAP command sending/parsing routines */
-
-/*
- *  Authors:
- *    Dan Winship <danw@helixcode.com>
- *    Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "camel-imap-command.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-folder.h"
-#include <camel/camel-exception.h>
-
-static char *imap_read_untagged (CamelImapStore *store, char *line,
-				 CamelException *ex);
-static CamelImapResponse *imap_read_response (CamelImapStore *store,
-					      CamelException *ex);
-
-/**
- * camel_imap_command: Send a command to a IMAP server and get a response
- * @store: the IMAP store
- * @folder: The folder to perform the operation in (or %NULL if not
- * relevant).
- * @ex: a CamelException
- * @fmt: a printf-style format string, followed by arguments
- *
- * This function makes sure that @folder (if non-%NULL) is the
- * currently-selected folder on @store and then sends the IMAP command
- * specified by @fmt and the following arguments. It then reads the
- * server's response(s) and parses the final result.
- *
- * As a special case, if @fmt is %NULL, it will just select @folder
- * and return the response from doing so.
- * 
- * Return value: %NULL if an error occurred (in which case @ex will
- * be set). Otherwise, a CamelImapResponse describing the server's
- * response, which the caller must free with camel_imap_response_free().
- **/
-CamelImapResponse *
-camel_imap_command (CamelImapStore *store, CamelFolder *folder,
-		    CamelException *ex, const char *fmt, ...)
-{
-	gchar *cmdbuf;
-	va_list ap;
-
-	/* Check for current folder */
-	if (folder && (!fmt || folder != store->current_folder)) {
-		CamelImapResponse *response;
-
-		store->current_folder = NULL;
-		response = camel_imap_command (store, NULL, ex,
-					       "SELECT \"%s\"",
-					       folder->full_name);
-		if (!response)
-			return NULL;
-		store->current_folder = folder;
-
-		if (!fmt)
-			return response;
-
-		camel_imap_response_free (response);
-	}
-
-	/* Send the command */
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (fmt, ap);
-	va_end (ap);
-
-	camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,
-					"A%.5d %s\r\n", store->command++,
-					cmdbuf);
-	g_free (cmdbuf);
-	if (camel_exception_is_set (ex))
-		return NULL;
-
-	/* Read the response. */
-	return imap_read_response (store, ex);
-}
-
-/**
- * camel_imap_command_continuation: Send more command data to the IMAP server
- * @store: the IMAP store
- * @ex: a CamelException
- * @cmdbuf: buffer containing the response/request data
- *
- * This method is for sending continuing responses to the IMAP server
- * after camel_imap_command returns a CAMEL_IMAP_PLUS response.
- * 
- * Return value: as for camel_imap_command()
- **/
-CamelImapResponse *
-camel_imap_command_continuation (CamelImapStore *store, CamelException *ex,
-				 const char *cmdbuf)
-{
-	if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,
-					    "%s\r\n", cmdbuf) < 0)
-		return NULL;
-
-	return imap_read_response (store, ex);
-}
-
-/* Read the response to an IMAP command. */
-static CamelImapResponse *
-imap_read_response (CamelImapStore *store, CamelException *ex)
-{
-	CamelImapResponse *response;
-	int number, exists = 0;
-	GArray *expunged = NULL;
-	char *respbuf, *retcode, *word, *p;
-
-	/* Read first line */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),
-					  &respbuf, ex) < 0)
-		return NULL;
-
-	response = g_new0 (CamelImapResponse, 1);
-	response->untagged = g_ptr_array_new ();
-
-	/* Check for untagged data */
-	while (!strncmp (respbuf, "* ", 2)) {
-		/* Read the rest of the response if it is multi-line. */
-		respbuf = imap_read_untagged (store, respbuf, ex);
-		if (camel_exception_is_set (ex))
-			break;
-
-		/* If it starts with a number, we might deal with
-		 * it ourselves.
-		 */
-		word = imap_next_word (respbuf);
-		number = strtoul (word, &p, 10);
-		if (p != word && store->current_folder) {
-			word = imap_next_word (p);
-			if (!g_strcasecmp (word, "EXISTS")) {
-				exists = number;
-				g_free (respbuf);
-				goto next;
-			} else if (!g_strcasecmp (word, "EXPUNGE")) {
-				if (!expunged) {
-					expunged = g_array_new (FALSE, FALSE,
-								sizeof (int));
-				}
-				g_array_append_val (expunged, number);
-				g_free (respbuf);
-				goto next;
-			}
-		} else {
-			if (!g_strncasecmp (word, "BYE", 3)) {
-				/* connection was lost, no more data to fetch */
-				store->connected = FALSE;
-				g_free (respbuf);
-				respbuf = NULL;
-				break;
-			}
-		}
-
-		g_ptr_array_add (response->untagged, respbuf);
-	next:
-		if (camel_remote_store_recv_line (
-			CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0)
-			break;
-	}
-
-	/* Update the summary */
-	if (store->current_folder && (exists > 0 || expunged)) {
-		camel_imap_folder_changed (store->current_folder, exists,
-					   expunged, NULL);
-	}
-	if (expunged)
-		g_array_free (expunged, TRUE);
-
-	if (!respbuf || camel_exception_is_set (ex)) {
-		camel_imap_response_free (response);
-		return NULL;
-	}
-
-	response->status = respbuf;
-
-	/* Check for OK or continuation response. */
-	if (!strncmp (respbuf, "+ ", 2))
-		return response;
-	retcode = imap_next_word (respbuf);
-	if (!strncmp (retcode, "OK", 2))
-		return response;
-
-	/* We should never get BAD, or anything else but +, OK, or NO
-	 * for that matter.
-	 */
-	if (strncmp (retcode, "NO", 2) != 0) {
-		g_warning ("Unexpected response from IMAP server: %s",
-			   respbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unexpected response from IMAP "
-					"server: %s"), respbuf);
-		camel_imap_response_free (response);
-		return NULL;
-	}
-
-	retcode = imap_next_word (retcode);
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-			      _("IMAP command failed: %s"),
-			      retcode ? retcode : _("Unknown error"));
-	camel_imap_response_free (response);
-	return NULL;
-}
-
-/* Given a line that is the start of an untagged response, read and
- * return the complete response. (This will be a no-op if the line
- * in question doesn't end with a literal.)
- *
- * FIXME: this won't deal with multiple literals in a single response.
- */
-static char *
-imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)
-{
-	int fulllen, length, left, i;
-	GPtrArray *data;
-	char *end, *p;
-
-	p = strrchr (line, '{');
-	if (!p)
-		return line;
-
-	length = strtoul (p + 1, &end, 10);
-	if (*end != '}' || *(end + 1) || end == p + 1)
-		return line;
-
-	fulllen = length + strlen (line) + 1;
-
-	/* OK. We have a literal. @length is the length including CRLF
-	 * pairs, which camel_remote_store_recv_line won't return.
-	 */
-	data = g_ptr_array_new ();
-	g_ptr_array_add (data, line);
-	left = length;
-	while (1) {
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),
-						  &line, ex) < 0) {
-			for (i = 0; i < data->len; i++)
-				g_free (data->pdata[i]);
-			g_ptr_array_free (data, TRUE);
-			return NULL;
-		}
-		g_ptr_array_add (data, line);
-
-		if (left <= 0)
-			break;
-
-		left -= strlen (line) + 2;
-
-		/* The output string will have only LF, not CRLF, so
-		 * decrement the length by one.
-		 */
-		length--;
-	}
-
-	/* Add the length of the post-literal line. */
-	fulllen += strlen (line);
-
-	/* p points to the "{" in the line that starts the literal.
-	 * The length of the CR-less response must be less than or
-	 * equal to the length of the response with CRs, therefore
-	 * overwriting the old value with the new value cannot cause
-	 * an overrun.
-	 */
-	sprintf (p, "{%d}", length);
-
-	/* Now reassemble the data. */
-	p = line = g_malloc (fulllen + 1);
-	for (i = 0; i < data->len; i++) {
-		length = strlen (data->pdata[i]);
-		memcpy (p, data->pdata[i], length);
-		g_free (data->pdata[i]);
-		p += length;
-		*p++ = '\n';
-	}
-	*p = '\0';
-	g_ptr_array_free (data, TRUE);
-	return line;
-}
-
-
-/**
- * camel_imap_response_free:
- * response: a CamelImapResponse:
- *
- * Frees all of the data in @response.
- **/
-void
-camel_imap_response_free (CamelImapResponse *response)
-{
-	int i;
-
-	if (!response)
-		return;
-	for (i = 0; i < response->untagged->len; i++)
-		g_free (response->untagged->pdata[i]);
-	g_ptr_array_free (response->untagged, TRUE);
-	g_free (response->status);
-	g_free (response);
-}
-
-/**
- * camel_imap_response_extract:
- * @response: the response data returned from camel_imap_command
- * @type: the response type to extract
- * @ex: a CamelException
- *
- * This checks that @response contains a single untagged response of
- * type @type and returns just that response data. If @response
- * doesn't contain the right information, the function will set @ex and
- * return %NULL. Either way, @response will be freed.
- *
- * Return value: the desired response string, which the caller must free.
- **/
-char *
-camel_imap_response_extract (CamelImapResponse *response, const char *type,
-			     CamelException *ex)
-{
-	int len = strlen (type), i;
-	char *resp;
-
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i];
-		/* Skip "* ", and initial sequence number, if present */
-		strtoul (resp + 2, &resp, 10);
-		if (*resp == ' ')
-			resp = imap_next_word (resp);
-
-		if (!g_strncasecmp (resp, type, len))
-			break;
-		
-		g_free (response->untagged->pdata[i]);
-	}
-
-	if (i < response->untagged->len) {
-		resp = response->untagged->pdata[i];
-		for (i++; i < response->untagged->len; i++)
-			g_free (response->untagged->pdata[i]);
-	} else {
-		resp = NULL;
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("IMAP server response did not contain "
-					"%s information"), type);
-	}
-
-	g_ptr_array_free (response->untagged, TRUE);
-	g_free (response->status);
-	g_free (response);
-	return resp;
-}
-
-/**
- * camel_imap_response_extract_continuation:
- * @response: the response data returned from camel_imap_command
- * @ex: a CamelException
- *
- * This checks that @response contains a continuation response, and
- * returns just that data. If @response doesn't contain a continuation
- * response, the function will set @ex and return %NULL. Either way,
- * @response will be freed.
- *
- * Return value: the desired response string, which the caller must free.
- **/
-char *
-camel_imap_response_extract_continuation (CamelImapResponse *response,
-					  CamelException *ex)
-{
-	char *status;
-
-	if (response->status && !strncmp (response->status, "+ ", 2)) {
-		status = response->status;
-		response->status = NULL;
-		camel_imap_response_free (response);
-		return status;
-	}
-
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-			      _("Unexpected OK response from IMAP server: %s"),
-			      response->status);
-	camel_imap_response_free (response);
-	return NULL;
-}
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
deleted file mode 100644
index 38e290c379..0000000000
--- a/camel/providers/imap/camel-imap-command.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-command.h: IMAP command sending/parsing routines */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *   Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_COMMAND_H
-#define CAMEL_IMAP_COMMAND_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-imap-store.h"
-
-typedef struct {
-	GPtrArray *untagged;
-	char *status;
-} CamelImapResponse;
-
-CamelImapResponse *camel_imap_command              (CamelImapStore *store,
-						    CamelFolder *folder,
-						    CamelException *ex,
-						    const char *fmt, ...);
-CamelImapResponse *camel_imap_command_continuation (CamelImapStore *store,
-						    CamelException *ex,
-						    const char *cmdbuf);
-
-void  camel_imap_response_free                 (CamelImapResponse *response);
-char *camel_imap_response_extract              (CamelImapResponse *response,
-						const char *type,
-						CamelException *ex);
-char *camel_imap_response_extract_continuation (CamelImapResponse *response,
-						CamelException *ex);
-
-#endif /* CAMEL_IMAP_COMMAND_H */
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
deleted file mode 100644
index a4b8b459de..0000000000
--- a/camel/providers/imap/camel-imap-folder.c
+++ /dev/null
@@ -1,850 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-folder.c: Abstract class for an imap folder */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h> 
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include <gal/util/e-util.h>
-
-#include "camel-imap-folder.h"
-#include "camel-imap-command.h"
-#include "camel-imap-store.h"
-#include "camel-imap-stream.h"
-#include "camel-imap-summary.h"
-#include "camel-imap-utils.h"
-#include "string-utils.h"
-#include "camel-stream.h"
-#include "camel-stream-fs.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-buffer.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-exception.h"
-#include "camel-mime-utils.h"
-
-#define d(x) x
-
-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))
-
-static CamelFolderClass *parent_class = NULL;
-
-static void imap_finalize (CamelObject *object);
-static void imap_refresh_info (CamelFolder *folder, CamelException *ex);
-static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static const char *imap_get_full_name (CamelFolder *folder);
-static void imap_expunge (CamelFolder *folder, CamelException *ex);
-
-/* message counts */
-static gint imap_get_message_count (CamelFolder *folder);
-static gint imap_get_unread_message_count (CamelFolder *folder);
-
-/* message manipulation */
-static CamelMimeMessage *imap_get_message (CamelFolder *folder, const gchar *uid,
-					   CamelException *ex);
-static void imap_append_message (CamelFolder *folder, CamelMimeMessage *message,
-				 const CamelMessageInfo *info, CamelException *ex);
-static void imap_copy_message_to (CamelFolder *source, const char *uid,
-				  CamelFolder *destination, CamelException *ex);
-static void imap_move_message_to (CamelFolder *source, const char *uid,
-				  CamelFolder *destination, CamelException *ex);
-
-/* summary info */
-static GPtrArray *imap_get_uids (CamelFolder *folder);
-static GPtrArray *imap_get_summary (CamelFolder *folder);
-static const CamelMessageInfo *imap_get_message_info (CamelFolder *folder, const char *uid);
-
-static void imap_update_summary (CamelFolder *folder, int first, int last,
-				 CamelException *ex);
-
-/* searching */
-static GPtrArray *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex);
-
-/* flag methods */
-static guint32  imap_get_message_flags     (CamelFolder *folder, const char *uid);
-static void     imap_set_message_flags     (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);
-static gboolean imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);
-static void     imap_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name,
-					    gboolean value);
-
-
-static void
-camel_imap_folder_class_init (CamelImapFolderClass *camel_imap_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_imap_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-	
-	/* virtual method definition */
-	
-	/* virtual method overload */
-	camel_folder_class->refresh_info = imap_refresh_info;
-	camel_folder_class->sync = imap_sync;
-	camel_folder_class->expunge = imap_expunge;
-	camel_folder_class->get_full_name = imap_get_full_name;
-	
-	camel_folder_class->get_uids = imap_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_nop;
-	
-	camel_folder_class->get_message_count = imap_get_message_count;
-	camel_folder_class->get_unread_message_count = imap_get_unread_message_count;
-	camel_folder_class->get_message = imap_get_message;
-	camel_folder_class->append_message = imap_append_message;
-	camel_folder_class->copy_message_to = imap_copy_message_to;
-	camel_folder_class->move_message_to = imap_move_message_to;
-	
-	camel_folder_class->get_summary = imap_get_summary;
-	camel_folder_class->get_message_info = imap_get_message_info;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	
-	camel_folder_class->search_by_expression = imap_search_by_expression;
-	
-	camel_folder_class->get_message_flags = imap_get_message_flags;
-	camel_folder_class->set_message_flags = imap_set_message_flags;
-	camel_folder_class->get_message_user_flag = imap_get_message_user_flag;
-	camel_folder_class->set_message_user_flag = imap_set_message_user_flag;
-}
-
-static void
-camel_imap_folder_init (gpointer object, gpointer klass)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);
-	CamelFolder *folder = CAMEL_FOLDER (object);
-	
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-	
-	imap_folder->summary = NULL;
-}
-
-CamelType
-camel_imap_folder_get_type (void)
-{
-	static CamelType camel_imap_folder_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_folder_type == CAMEL_INVALID_TYPE) {
-		camel_imap_folder_type =
-			camel_type_register (CAMEL_FOLDER_TYPE, "CamelImapFolder",
-					     sizeof (CamelImapFolder),
-					     sizeof (CamelImapFolderClass),
-					     (CamelObjectClassInitFunc) camel_imap_folder_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_imap_folder_init,
-					     (CamelObjectFinalizeFunc) imap_finalize);
-	}
-	
-	return camel_imap_folder_type;
-}
-
-CamelFolder *
-camel_imap_folder_new (CamelStore *parent, const char *folder_name,
-		       const char *short_name, const char *summary_file,
-		       CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (parent);
-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (camel_imap_folder_get_type ()));
-	CamelImapFolder *imap_folder = (CamelImapFolder *)folder;
-	CamelImapResponse *response;
-	const char *resp;
-	guint32 validity = 0;
-	int i;
-
-	camel_folder_construct (folder, parent, folder_name, short_name);
-
-	response = camel_imap_command (imap_store, folder, ex, NULL);
-	if (!response) {
-		camel_object_unref ((CamelObject *)folder);
-		return NULL;
-	}
-
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i] + 2;
-		if (!g_strncasecmp (resp, "FLAGS ", 6)) {
-			folder->permanent_flags =
-				imap_parse_flag_list (resp + 6);
-		} else if (!g_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {
-			folder->permanent_flags =
-				imap_parse_flag_list (resp + 19);
-		} else if (!g_strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {
-			validity = strtoul (resp + 16, NULL, 10);
-		} else if (isdigit ((unsigned char)*resp)) {
-			unsigned long num = strtoul (resp, (char **)&resp, 10);
-
-			if (!g_strncasecmp (resp, " EXISTS", 7))
-				imap_folder->exists = num;
-		}
-	}
-	camel_imap_response_free (response);
-
-	imap_folder->summary = camel_imap_summary_new (summary_file, validity);
-	if (!imap_folder->summary) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not load summary for %s"),
-				      folder_name);
-		return NULL;
-	}
-
-	imap_refresh_info (folder, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-static void           
-imap_finalize (CamelObject *object)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);
-
-	camel_object_unref ((CamelObject *)imap_folder->summary);
-}
-
-static void
-imap_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	CamelImapResponse *response;
-	struct {
-		char *uid;
-		guint32 flags;
-	} *new;
-	char *resp, *uid, *p, *flags;
-	int i, seq, summary_len;
-	CamelMessageInfo *info;
-	gboolean folder_changed = FALSE;
-
-	if (imap_folder->exists == 0) {
-		if (camel_folder_summary_count != 0) {
-			camel_folder_summary_clear (imap_folder->summary);
-			camel_object_trigger_event (CAMEL_OBJECT (folder),
-						    "folder_changed", NULL);
-		}
-		return;
-	}
-
-	/* Get UIDs and flags of all messages. */
-	response = camel_imap_command (store, folder, ex,
-				       "FETCH 1:%d (UID FLAGS)",
-				       imap_folder->exists);
-	if (!response)
-		return;
-
-	new = g_malloc0 (imap_folder->exists * sizeof (*new));
-	for (i = 0; i < response->untagged->len; i++) {
-		resp = response->untagged->pdata[i];
-
-		seq = strtoul (resp + 2, &resp, 10);
-		if (g_strncasecmp (resp, " FETCH ", 7) != 0)
-			continue;
-
-		uid = e_strstrcase (resp, "UID ");
-		if (uid) {
-			uid += 4;
-			strtoul (uid, &p, 10);
-			new[seq - 1].uid = g_strndup (uid, p - uid);
-		}
-
-		flags = e_strstrcase (resp, "FLAGS ");
-		if (flags) {
-			flags += 6;
-			new[seq - 1].flags = imap_parse_flag_list (flags);
-		}
-	}
-
-	/* If we find a UID in the summary that doesn't correspond to
-	 * the UID in the folder, that it means the message was
-	 * deleted on the server, so we remove it from the summary.
-	 */
-	summary_len = camel_folder_summary_count (imap_folder->summary);
-	for (i = 0; i < summary_len && i < imap_folder->exists; i++) {
-		info = camel_folder_summary_index (imap_folder->summary, i);
-
-		/* Shouldn't happen, but... */
-		if (!new[i].uid)
-			continue;
-
-		if (strcmp (info->uid, new[i].uid) != 0) {
-			camel_folder_summary_remove (imap_folder->summary,
-						     info);
-			folder_changed = TRUE;
-			i--;
-			summary_len--;
-			continue;
-		}
-
-		/* Update summary flags */
-		if (info->flags != new[i].flags) {
-			info->flags = new[i].flags;
-			camel_object_trigger_event (CAMEL_OBJECT (folder),
-						    "message_changed",
-						    info->uid);
-		}
-
-		g_free (new[i].uid);
-	}
-
-	/* Remove any leftover cached summary messages. */
-	while (summary_len > i + 1) {
-		camel_folder_summary_remove_index (imap_folder->summary,
-						   --summary_len);
-		folder_changed = TRUE;
-	}
-
-	/* Add any new folder messages. */
-	if (i < imap_folder->exists) {
-		/* Fetch full summary for the remaining messages. */
-		imap_update_summary (folder, i + 1, imap_folder->exists, ex);
-		folder_changed = TRUE;
-
-		while (i < imap_folder->exists)
-			g_free (new[i++].uid);
-	}
-	g_free (new);
-
-	if (folder_changed) {
-		camel_object_trigger_event (CAMEL_OBJECT (folder),
-					    "folder_changed", NULL);
-	}
-}
-
-static void
-imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	CamelImapResponse *response;
-	int i, max;
-
-	/* Set the flags on any messages that have changed this session */
-	max = camel_folder_summary_count (imap_folder->summary);
-	for (i = 0; i < max; i++) {
-		CamelMessageInfo *info;
-
-		info = camel_folder_summary_index (imap_folder->summary, i);
-		if (info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) {
-			char *flags;
-
-			flags = imap_create_flag_list (info->flags);
-			if (flags) {
-				response = camel_imap_command (
-					store, folder, ex,
-					"UID STORE %s FLAGS.SILENT %s",
-					info->uid, flags);
-				g_free (flags);
-				if (!response)
-					return;
-				camel_imap_response_free (response);
-			}
-			info->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
-		}
-	}
-
-	if (expunge) {
-		response = camel_imap_command (store, folder, ex, "EXPUNGE");
-		camel_imap_response_free (response);
-	}
-
-	camel_folder_summary_save (imap_folder->summary);
-}
-
-static void
-imap_expunge (CamelFolder *folder, CamelException *ex)
-{
-	imap_sync (folder, TRUE, ex);
-}
-
-static const char *
-imap_get_full_name (CamelFolder *folder)
-{
-	CamelURL *url = ((CamelService *)folder->parent_store)->url;
-	int len;
-
-	if (!url->path || !*url->path || !strcmp (url->path, "/"))
-		return folder->full_name;
-	len = strlen (url->path + 1);
-	if (!strncmp (url->path + 1, folder->full_name, len) &&
-	    strlen (folder->full_name) > len + 1)
-		return folder->full_name + len + 1;
-	return folder->full_name;
-}	
-
-static gint
-imap_get_message_count (CamelFolder *folder)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	
-	return camel_folder_summary_count (imap_folder->summary);
-}
-
-static gint
-imap_get_unread_message_count (CamelFolder *folder)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	CamelMessageInfo *info;
-	int i, max, count = 0;
-
-	max = camel_folder_summary_count (imap_folder->summary);
-	for (i = 0; i < max; i++) {
-		info = camel_folder_summary_index (imap_folder->summary, i);
-		if (!(info->flags & CAMEL_MESSAGE_SEEN))
-			count++;
-	}
-
-	return count;
-}
-
-static void
-imap_append_message (CamelFolder *folder, CamelMimeMessage *message,
-		     const CamelMessageInfo *info, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	CamelStream *memstream;
-	CamelMimeFilter *crlf_filter;
-	CamelStreamFilter *streamfilter;
-	GByteArray *ba;
-	char *flagstr, *result;
-	
-	/* create flag string param */
-	if (info && info->flags)
-		flagstr = imap_create_flag_list (info->flags);
-	else
-		flagstr = NULL;
-
-	/* FIXME: We could avoid this if we knew how big the message was. */
-	memstream = camel_stream_mem_new ();
-	ba = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);
-
-	streamfilter = camel_stream_filter_new_with_stream (memstream);
-	crlf_filter = camel_mime_filter_crlf_new (
-		CAMEL_MIME_FILTER_CRLF_ENCODE,
-		CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
-	camel_stream_filter_add (streamfilter, crlf_filter);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
-					    CAMEL_STREAM (streamfilter));
-	camel_object_unref (CAMEL_OBJECT (streamfilter));
-	camel_object_unref (CAMEL_OBJECT (crlf_filter));
-	camel_object_unref (CAMEL_OBJECT (memstream));
-
-	response = camel_imap_command (store, NULL, ex, "APPEND %s%s%s {%d}",
-				       folder->full_name, flagstr ? " " : "",
-				       flagstr ? flagstr : "", ba->len);
-	g_free (flagstr);
-	
-	if (!response) {
-		g_byte_array_free (ba, TRUE);
-		return;
-	}
-	result = camel_imap_response_extract_continuation (response, ex);
-	if (!result) {
-		g_byte_array_free (ba, TRUE);
-		return;
-	}
-	g_free (result);
-
-	/* send the rest of our data - the mime message */
-	g_byte_array_append (ba, "\0", 3);
-	response = camel_imap_command_continuation (store, ex, ba->data);
-	g_byte_array_free (ba, TRUE);
-	if (!response)
-		return;
-	camel_imap_response_free (response);
-}
-
-static void
-imap_copy_message_to (CamelFolder *source, const char *uid,
-		      CamelFolder *destination, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (source->parent_store);
-	CamelImapResponse *response;
-	
-	response = camel_imap_command (store, source, ex, "UID COPY %s \"%s\"",
-				       uid, destination->full_name);
-	camel_imap_response_free (response);
-
-	/* FIXME: This should go away once folder_changed is being
-	 * emitted by camel_imap_folder_changed on appends again.
-	 */
-	if (!camel_exception_is_set (ex)) {
-		camel_object_trigger_event (CAMEL_OBJECT (destination),
-					    "folder_changed", NULL);
-	}
-}
-
-static void
-imap_move_message_to (CamelFolder *source, const char *uid,
-		      CamelFolder *destination, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (source->parent_store);
-	CamelImapResponse *response;
-
-	response = camel_imap_command (store, source, ex, "UID COPY %s \"%s\"",
-				       uid, destination->full_name);
-	camel_imap_response_free (response);
-
-	if (camel_exception_is_set (ex))
-		return;
-
-	/* FIXME: This should go away once folder_changed is being
-	 * emitted by camel_imap_folder_changed on appends again.
-	 */
-	camel_object_trigger_event (CAMEL_OBJECT (destination),
-				    "folder_changed", NULL);
-
-	camel_folder_delete_message (source, uid);
-}
-
-static GPtrArray *
-imap_get_uids (CamelFolder *folder) 
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	const CamelMessageInfo *info;
-	GPtrArray *array;
-	int i, count;
-
-	count = camel_folder_summary_count (imap_folder->summary);
-
-	array = g_ptr_array_new ();
-	g_ptr_array_set_size (array, count);
-
-	for (i = 0; i < count; i++) {
-		info = camel_folder_summary_index (imap_folder->summary, i);
-		array->pdata[i] = g_strdup (info->uid);
-	}
-
-	return array;
-}
-
-static CamelMimeMessage *
-imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapResponse *response;
-	CamelStream *msgstream;
-	CamelMimeMessage *msg;
-	char *result, *mesg, *p;
-	int len;
-
-	response = camel_imap_command (store, folder, ex,
-				       "UID FETCH %s RFC822", uid);
-	if (!response)
-		return NULL;
-	result = camel_imap_response_extract (response, "FETCH", ex);
-	if (!result)
-		return NULL;
-
-	p = strstr (result, "RFC822");
-	if (p) {
-		p += 7;
-		mesg = imap_parse_nstring (&p, &len);
-	}
-	if (!p) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not find message body in FETCH "
-					"response."));
-		g_free (result);
-		return NULL;
-	}
-	g_free (result);
-
-	msgstream = camel_stream_mem_new_with_buffer (mesg, len);
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
-						  msgstream);
-	camel_object_unref (CAMEL_OBJECT (msgstream));
-	g_free (mesg);
-
-	return msg;
-}
-
-/**
- * imap_protocol_get_summary_specifier
- *
- * Make a data item specifier for the header lines we need,
- * appropriate to the server level.
- *
- * IMAP4rev1:  UID FLAGS BODY.PEEK[HEADER.FIELDS (SUBJECT FROM .. IN-REPLY-TO)]
- * IMAP4:      UID FLAGS RFC822.HEADER.LINES (SUBJECT FROM .. IN-REPLY-TO)
- **/
-static char *
-imap_protocol_get_summary_specifier (CamelImapStore *store)
-{
-	char *sect_begin, *sect_end;
-	char *headers_wanted = "SUBJECT FROM TO CC DATE MESSAGE-ID REFERENCES IN-REPLY-TO";
-	
-	if (store->server_level >= IMAP_LEVEL_IMAP4REV1) {
-		sect_begin = "BODY.PEEK[HEADER.FIELDS";
-		sect_end = "]";
-	} else {
-		sect_begin = "RFC822.HEADER.LINES";
-		sect_end   = "";
-	}
-	
-	return g_strdup_printf ("UID FLAGS %s (%s)%s", sect_begin,
-				headers_wanted, sect_end);
-}
-
-static void
-imap_update_summary (CamelFolder *folder, int first, int last,
-		     CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	CamelImapResponse *response;
-	GPtrArray *headers = NULL;
-	char *q, *summary_specifier;
-	struct _header_raw *h = NULL;
-	int i;
-
-	/* If the range we're updating overlaps with the range we already
-	 * know about, then fetch just flags + uids first. If uids
-	 * aren't "right", reorder them. Update flags appropriately.
-	 * If that returned unknown UIDs, or we're updating unknown
-	 * sequence numbers, do the full fetch for those.
-	 */
-
-	summary_specifier = imap_protocol_get_summary_specifier (store);
-	if (first == last) {
-		response = camel_imap_command (store, folder, ex,
-					       "FETCH %d (%s)", first,
-					       summary_specifier);
-	} else {
-		response = camel_imap_command (store, folder, ex,
-					       "FETCH %d:%d (%s)", first,
-					       last, summary_specifier);
-	}
-	g_free (summary_specifier);
-
-	if (!response)
-		return;
-
-	headers = response->untagged;
-	for (i = 0; i < headers->len; i++) {
-		CamelMessageInfo *info;
-		char *uid, *flags, *header;
-
-		/* Grab the UID... */
-		if (!(uid = strstr (headers->pdata[i], "UID "))) {
-			d(fprintf (stderr, "Cannot get a uid for %d\n\n%s\n\n", i+1, (char *) headers->pdata[i]));
-			break;
-		}
-
-		for (uid += 4; *uid && (*uid < '0' || *uid > '9'); uid++)
-			;
-		for (q = uid; *q && *q >= '0' && *q <= '9'; q++)
-			;
-
-		/* construct the header list */
-		/* fast-forward to beginning of header info... */
-		header = strchr (headers->pdata[i], '\n') + 1;
-		h = NULL;
-		do {
-			char *line;
-			int len;
-
-			len = strcspn (header, "\n");
-			while (header[len + 1] == ' ' ||
-			       header[len + 1] == '\t')
-				len += 1 + strcspn (header + len + 1, "\n");
-			line = g_strndup (header, len);
-			header_raw_append_parse (&h, line, -1);
-			g_free (line);
-
-			header += len;
-		} while (*header++ == '\n' && *header != '\n');
-
-		/* We can't just call camel_folder_summary_add_from_parser
-		 * because it will assign the wrong UID, and thus get the
-		 * uid hash table wrong and all that. FIXME some day.
-		 */
-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(imap_folder->summary)))->message_info_new(imap_folder->summary, h);
-		header_raw_clear (&h);
-		info->uid = g_strndup (uid, q - uid);
-
-		/* now lets grab the FLAGS */
-		if (!(flags = strstr (headers->pdata[i], "FLAGS "))) {
-			d(fprintf (stderr, "We didn't seem to get any flags for %d...\n", i));
-		} else {		
-			for (flags += 6; *flags && *flags != '('; flags++)
-				;
-			info->flags = imap_parse_flag_list (flags);
-		}
-
-		camel_folder_summary_add (imap_folder->summary, info);
-	}
-	camel_imap_response_free (response);
-}
-
-static GPtrArray *
-imap_get_summary (CamelFolder *folder)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-
-	return imap_folder->summary->messages;
-}
-
-/* get a single message info, by uid */
-static const CamelMessageInfo *
-imap_get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-	
-	return camel_folder_summary_uid (imap_folder->summary, uid);
-}
-
-static GPtrArray *
-imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	CamelImapResponse *response;
-	GPtrArray *uids = NULL;
-	char *result, *sexp, *p;
-	
-	d(fprintf (stderr, "camel sexp: '%s'\n", expression));
-	sexp = imap_translate_sexp (expression);
-	d(fprintf (stderr, "imap sexp: '%s'\n", sexp));
-	
-	uids = g_ptr_array_new ();
-	
-	if (!folder->has_search_capability) {
-		g_free (sexp);
-		return uids;
-	}
-	
-	response = camel_imap_command (CAMEL_IMAP_STORE (folder->parent_store),
-				       folder, NULL, "UID SEARCH %s", sexp);
-	g_free (sexp);
-	if (!response)
-		return uids;
-
-	result = camel_imap_response_extract (response, "SEARCH", NULL);
-	if (!result)
-		return uids;
-	
-	if ((p = strstr (result, "* SEARCH"))) {
-		char *word;
-		
-		word = imap_next_word (p); /* word now points to SEARCH */
-		
-		for (word = imap_next_word (word); *word && *word != '*'; word = imap_next_word (word)) {
-			gboolean word_is_numeric = TRUE;
-			char *ep;
-			
-			/* find the end of this word and make sure it's a numeric uid */
-			for (ep = word; *ep && *ep != ' ' && *ep != '\n'; ep++)
-				if (*ep < '0' || *ep > '9')
-					word_is_numeric = FALSE;
-			
-			if (word_is_numeric)
-				g_ptr_array_add (uids, g_strndup (word, (gint)(ep - word)));
-		}
-	}
-	
-	g_free (result);
-	
-	return uids;
-}
-
-static guint32
-imap_get_message_flags (CamelFolder *folder, const char *uid)
-{
-	const CamelMessageInfo *info;
-	
-	info = imap_get_message_info (folder, uid);
-	g_return_val_if_fail (info != NULL, 0);
-	
-	return info->flags;
-}
-
-static void
-imap_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelImapFolder *imap_folder = (CamelImapFolder *)folder;
-	CamelMessageInfo *info;
-
-	info = camel_folder_summary_uid (imap_folder->summary, uid);
-	g_return_if_fail (info != NULL);
-
-	if ((info->flags & set) == flags)
-		return;
-
-	info->flags = (info->flags & ~flags) | (set & flags) | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch (imap_folder->summary);
-
-	camel_object_trigger_event (CAMEL_OBJECT (folder), "message_changed",
-				    (gpointer)uid);
-}
-
-static gboolean
-imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name)
-{
-	/* FIXME */
-	return FALSE;
-}
-
-static void
-imap_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	/* FIXME */
-	camel_object_trigger_event (CAMEL_OBJECT (folder), "message_changed",
-				    (gpointer)uid);
-}
-
-void
-camel_imap_folder_changed (CamelFolder *folder, int exists,
-			   GArray *expunged, CamelException *ex)
-{
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-
-	if (expunged) {
-		int i, id;
-
-		for (i = 0; i < expunged->len; i++) {
-			id = g_array_index (expunged, int, i);
-			camel_folder_summary_remove_index (
-				imap_folder->summary, id - 1);
-		}
-		camel_object_trigger_event (CAMEL_OBJECT (folder),
-					    "folder_changed", NULL);
-	}
-
-	if (exists != 0)
-		imap_folder->exists = exists;
-}
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
deleted file mode 100644
index 109cc76506..0000000000
--- a/camel/providers/imap/camel-imap-folder.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-folder.h : Abstract class for an imap folder */
-
-/* 
- * Author: 
- *   Jeffrey Stedfast <fejj@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_FOLDER_H
-#define CAMEL_IMAP_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-#include <camel/camel-folder-search.h>
-
-#define CAMEL_IMAP_FOLDER_TYPE     (camel_imap_folder_get_type ())
-#define CAMEL_IMAP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))
-#define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))
-#define IS_CAMEL_IMAP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE))
-
-typedef struct {
-	CamelFolder parent_object;
-
-	CamelFolderSummary *summary;
-	int exists;
-} CamelImapFolder;
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelImapFolderClass;
-
-
-/* public methods */
-CamelFolder *camel_imap_folder_new (CamelStore *parent,
-				    const char *folder_name,
-				    const char *short_name,
-				    const char *summary_file,
-				    CamelException *ex);
-
-void camel_imap_folder_changed (CamelFolder *folder, int exists,
-				GArray *expunged, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_imap_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_FOLDER_H */
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
deleted file mode 100644
index 9b962df5f4..0000000000
--- a/camel/providers/imap/camel-imap-provider.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-provider.c: imap provider registration code */
-
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include "config.h"
-#include "camel-imap-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static void add_hash (guint *hash, char *s);
-static guint imap_url_hash (gconstpointer key);
-static gint check_equal (char *s1, char *s2);
-static gint imap_url_equal (gconstpointer a, gconstpointer b);
-
-static CamelProvider imap_provider = {
-	"imap",
-	N_("IMAPv4"),
-
-	N_("For reading and storing mail on IMAP servers."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
-	CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST |
-	CAMEL_URL_ALLOW_PATH | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	imap_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_imap_store_get_type();
-
-	imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
-
-	camel_session_register_provider (session, &imap_provider);
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-static guint
-imap_url_hash (gconstpointer key)
-{
-	const CamelURL *u = (CamelURL *)key;
-	guint hash = 0;
-
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
-	add_hash (&hash, u->host);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static gint
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-static gint
-imap_url_equal (gconstpointer a, gconstpointer b)
-{
-	const CamelURL *u1 = a, *u2 = b;
-	
-	return check_equal (u1->user, u2->user)
-		&& check_equal (u1->authmech, u2->authmech)
-		&& check_equal (u1->host, u2->host)
-		&& u1->port == u2->port;
-}
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
deleted file mode 100644
index 0a8618ff90..0000000000
--- a/camel/providers/imap/camel-imap-store.c
+++ /dev/null
@@ -1,788 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-store.c : class for an imap store */
-
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <gal/util/e-util.h>
-
-#include "camel-imap-store.h"
-#include "camel-imap-auth.h"
-#include "camel-imap-folder.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-command.h"
-#include "camel-folder.h"
-#include "camel-exception.h"
-#include "camel-session.h"
-#include "camel-stream.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#define d(x) x
-
-/* Specified in RFC 2060 */
-#define IMAP_PORT 143
-
-static CamelRemoteStoreClass *remote_store_class = NULL;
-
-static gboolean imap_connect (CamelService *service, CamelException *ex);
-static gboolean imap_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);
-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static char *get_folder_name (CamelStore *store, const char *folder_name,
-			      CamelException *ex);
-static char *get_root_folder_name (CamelStore *store, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);
-static void subscribe_folder (CamelStore *store, const char *folder_name,
-			      CamelException *ex);
-static void unsubscribe_folder (CamelStore *store, const char *folder_name,
-				CamelException *ex);
-static void imap_keepalive (CamelRemoteStore *store);
-
-static void
-camel_imap_store_class_init (CamelImapStoreClass *camel_imap_store_class)
-{
-	/* virtual method overload */
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_imap_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_imap_store_class);
-	CamelRemoteStoreClass *camel_remote_store_class =
-		CAMEL_REMOTE_STORE_CLASS (camel_imap_store_class);
-	
-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						      (camel_remote_store_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->query_auth_types_generic = query_auth_types_generic;
-	camel_service_class->query_auth_types_connected = query_auth_types_connected;
-	camel_service_class->connect = imap_connect;
-	camel_service_class->disconnect = imap_disconnect;
-	
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_root_folder_name = get_root_folder_name;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->folder_subscribed = folder_subscribed;
-	camel_store_class->subscribe_folder = subscribe_folder;
-	camel_store_class->unsubscribe_folder = unsubscribe_folder;
-
-	camel_remote_store_class->keepalive = imap_keepalive;
-}
-
-static gboolean
-free_sub (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	return TRUE;
-}
-
-static void
-camel_imap_store_finalize (CamelObject *object)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
-
-	g_hash_table_foreach_remove (imap_store->subscribed_folders,
-				     free_sub, NULL);
-	g_hash_table_destroy (imap_store->subscribed_folders);
-}
-
-static void
-camel_imap_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-	
-	remote_store->default_port = 143;
-
-	imap_store->dir_sep = '\0';
-	imap_store->current_folder = NULL;
-
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-	
-	imap_store->connected = FALSE;
-	imap_store->subscribed_folders = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-CamelType
-camel_imap_store_get_type (void)
-{
-	static CamelType camel_imap_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_store_type == CAMEL_INVALID_TYPE)	{
-		camel_imap_store_type =
-			camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelImapStore",
-					     sizeof (CamelImapStore),
-					     sizeof (CamelImapStoreClass),
-					     (CamelObjectClassInitFunc) camel_imap_store_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_imap_store_init,
-					     (CamelObjectFinalizeFunc) camel_imap_store_finalize);
-	}
-	
-	return camel_imap_store_type;
-}
-
-static struct {
-	const char *name;
-	guint32 flag;
-} capabilities[] = {
-	{ "IMAP4",		IMAP_CAPABILITY_IMAP4 },
-	{ "IMAP4REV1",		IMAP_CAPABILITY_IMAP4REV1 },
-	{ "STATUS",		IMAP_CAPABILITY_STATUS },
-	{ "NAMESPACE",		IMAP_CAPABILITY_NAMESPACE },
-	{ "AUTH=KERBEROS_V4",	IMAP_CAPABILITY_AUTH_KERBEROS_V4 },
-	{ "AUTH=GSSAPI",	IMAP_CAPABILITY_AUTH_GSSAPI },
-	{ "UIDPLUS",		IMAP_CAPABILITY_UIDPLUS },
-	{ "LITERAL+",		IMAP_CAPABILITY_LITERALPLUS },
-	{ NULL, 0 }
-};
-
-static gboolean
-connect_to_server (CamelService *service, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelImapResponse *response;
-	char *result, *buf, *capa, *lasts;
-	int i;
-
-	if (!CAMEL_SERVICE_CLASS (remote_store_class)->connect (service, ex))
-		return FALSE;
-
-	store->command = 0;
-
-	/* Read the greeting, if any. FIXME: deal with PREAUTH */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service),
-					  &buf, ex) < 0) {
-		return FALSE;
-	}
-	g_free (buf);
-	store->connected = TRUE;
-	
-	/* Find out the IMAP capabilities */
-	store->capabilities = 0;
-	response = camel_imap_command (store, NULL, ex, "CAPABILITY");
-	if (!response)
-		return FALSE;
-	result = camel_imap_response_extract (response, "CAPABILITY", ex);
-	if (!result)
-		return FALSE;
-
-	/* Skip over "* CAPABILITY". */
-	capa = imap_next_word (result + 2);
-
-	for (capa = strtok_r (capa, " ", &lasts); capa;
-	     capa = strtok_r (NULL, " ", &lasts)) {
-		for (i = 0; capabilities[i].name; i++) {
-			if (g_strcasecmp (capa, capabilities[i].name) == 0) {
-				store->capabilities |= capabilities[i].flag;
-				break;
-			}
-		}
-	}
-	g_free (result);
-
-	if (store->capabilities & IMAP_CAPABILITY_IMAP4REV1) {
-		store->server_level = IMAP_LEVEL_IMAP4REV1;
-		store->capabilities |= IMAP_CAPABILITY_STATUS;
-	} else if (store->capabilities & IMAP_CAPABILITY_IMAP4)
-		store->server_level = IMAP_LEVEL_IMAP4;
-	else
-		store->server_level = IMAP_LEVEL_UNKNOWN;
-
-	return TRUE;
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-	
-	N_("This option will connect to the IMAP server using a "
-	   "plaintext password."),
-	
-	"",
-	TRUE
-};
-
-#ifdef HAVE_KRB4
-static CamelServiceAuthType kerberos_v4_authtype = {
-	N_("Kerberos 4"),
-
-	N_("This option will connect to the IMAP server using "
-	   "Kerberos 4 authentication."),
-
-	"KERBEROS_V4",
-	FALSE
-};
-#endif
-
-static GList *
-query_auth_types_connected (CamelService *service, CamelException *ex)
-{
-	GList *types;
-
-	if (!connect_to_server (service, ex))
-		return NULL;
-
-	types = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types_connected (service, ex);
-#ifdef HAVE_KRB4
-	if (CAMEL_IMAP_STORE (service)->capabilities &
-	    IMAP_CAPABILITY_AUTH_KERBEROS_V4)
-		types = g_list_prepend (types, &kerberos_v4_authtype);
-#endif
-	return g_list_prepend (types, &password_authtype);
-}
-
-static GList *
-query_auth_types_generic (CamelService *service, CamelException *ex)
-{
-	GList *types;
-	
-	types = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types_generic (service, ex);
-#ifdef HAVE_KRB4
-	types = g_list_prepend (types, &kerberos_v4_authtype);
-#endif
-	return g_list_prepend (types, &password_authtype);
-}
-
-static gboolean
-imap_connect (CamelService *service, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));
-	gchar *result, *errbuf = NULL, *namespace;
-	CamelImapResponse *response;
-	gboolean authenticated = FALSE;
-	int len;
-
-	if (connect_to_server (service, ex) == 0)
-		return FALSE;
-	
-	/* authenticate the user */
-#ifdef HAVE_KRB4
-	if (service->url->authmech &&
-	    !g_strcasecmp (service->url->authmech, "KERBEROS_V4")) {
-		if (!(store->capabilities & IMAP_CAPABILITY_AUTH_KERBEROS_V4)) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      "IMAP server %s does not "
-					      "support requested "
-					      "authentication type %s",
-					      service->url->host,
-					      service->url->authmech);
-			camel_service_disconnect (service, TRUE, NULL);
-			return FALSE;
-		}
-
-		authenticated = imap_try_kerberos_v4_auth (store, ex);
-		if (camel_exception_is_set (ex)) {
-			camel_service_disconnect (service, TRUE, NULL);
-			return FALSE;
-		}
-	}
-#endif
-
-	while (!authenticated) {
-		if (errbuf) {
-			/* We need to un-cache the password before prompting again */
-			camel_session_query_authenticator (
-				session, CAMEL_AUTHENTICATOR_TELL, NULL,
-				TRUE, service, "password", ex);
-			g_free (service->url->passwd);
-			service->url->passwd = NULL;
-		}
-
-		if (!service->url->authmech && !service->url->passwd) {
-			char *prompt;
-
-			prompt = g_strdup_printf (_("%sPlease enter the IMAP "
-						    "password for %s@%s"),
-						  errbuf ? errbuf : "",
-						  service->url->user,
-						  service->url->host);
-			service->url->passwd =
-				camel_session_query_authenticator (
-					session, CAMEL_AUTHENTICATOR_ASK,
-					prompt, TRUE, service, "password", ex);
-			g_free (prompt);
-			g_free (errbuf);
-			errbuf = NULL;
-
-			if (!service->url->passwd) {
-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-						     "You didn\'t enter a password.");
-				camel_service_disconnect (service, TRUE, NULL);
-				return FALSE;
-			}
-		}
-
-		response = camel_imap_command (store, NULL, ex,
-					       "LOGIN \"%s\" \"%s\"",
-					       service->url->user,
-					       service->url->passwd);
-		if (!response) {
-			errbuf = g_strdup_printf (_("Unable to authenticate "
-						    "to IMAP server.\n%s\n\n"),
-						  camel_exception_get_description (ex));
-			camel_exception_clear (ex);
-		} else {
-			authenticated = TRUE;
-			camel_imap_response_free (response);
-		}
-	}
-
-	/* Find our storage path. */
-	if (!store->storage_path) {
-		store->storage_path =
-			camel_session_get_storage_path (session, service, ex);
-		if (camel_exception_is_set (ex)) 
-			return FALSE;
-	}
-
-	/* Find the hierarchy separator for our namespace. */
-	namespace = service->url->path;
-	if (namespace)
-		namespace++;
-	else
-		namespace = "";
-	if (store->server_level >= IMAP_LEVEL_IMAP4REV1) {
-		/* This idiom means "tell me the hierarchy separator
-		 * for the given path, even if that path doesn't exist.
-		 */
-		response = camel_imap_command (store, NULL, ex,
-					       "LIST \"%s\" \"\"",
-					       namespace);
-	} else {
-		/* Plain IMAP4 doesn't have that idiom, so we fall back
-		 * to "tell me about this folder", which will fail if
-		 * the folder doesn't exist (eg, if namespace is "").
-		 */
-		response = camel_imap_command (store, NULL, ex,
-					       "LIST \"\" \"%s\"",
-					       namespace);
-	}
-        if (!response)
-		return FALSE;
-
-	result = camel_imap_response_extract (response, "LIST", NULL);
-	if (result) {
-		imap_parse_list_response (result, NULL, &store->dir_sep, NULL);
-		g_free (result);
-	}
-	if (!store->dir_sep)
-		store->dir_sep = '/';	/* Guess */
-
-	/* Generate base URL */
-	store->base_url = camel_url_to_string (service->url, FALSE);
-	len = strlen (store->base_url);
-	if (service->url->path)
-		store->base_url[len - strlen (service->url->path) + 1] = '\0';
-	else {
-		store->base_url = g_realloc (store->base_url, len + 2);
-		store->base_url[len] = '/';
-		store->base_url[len + 1] = '\0';
-	}
-
-	camel_remote_store_refresh_folders (CAMEL_REMOTE_STORE (store), ex);
-
-	return !camel_exception_is_set (ex);
-}
-
-static gboolean
-imap_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelImapStore *store = CAMEL_IMAP_STORE (service);
-	CamelImapResponse *response;
-	
-	if (store->connected && clean) {
-		/* send the logout command */
-		response = camel_imap_command (store, NULL, ex, "LOGOUT");
-		camel_imap_response_free (response);
-	}
-	
-	store->current_folder = NULL;
-	
-	return CAMEL_SERVICE_CLASS (remote_store_class)->disconnect (service, clean, ex);
-}
-
-static gboolean
-imap_folder_exists (CamelImapStore *store, const char *folder_name,
-		    gboolean *selectable, char **short_name,
-		    CamelException *ex)
-{
-	CamelImapResponse *response;
-	char *result, sep;
-	int flags;
-
-	if (!g_strcasecmp (folder_name, "INBOX")) {
-		if (selectable)
-			*selectable = TRUE;
-		if (short_name)
-			*short_name = g_strdup ("INBOX");
-		return TRUE;
-	}
-
-	response = camel_imap_command (store, NULL, ex, "LIST \"\" \"%s\"",
-				       folder_name);
-	if (!response)
-		return FALSE;
-	result = camel_imap_response_extract (response, "LIST", ex);
-	if (!result)
-		return FALSE;
-
-	if (!imap_parse_list_response (result, &flags, &sep, NULL))
-		return FALSE;
-
-	if (selectable)
-		*selectable = !(flags & IMAP_LIST_FLAG_NOSELECT);
-	if (short_name) {
-		*short_name = strrchr (folder_name, sep);
-		if (*short_name)
-			*short_name = g_strdup (*short_name + 1);
-		else
-			*short_name = g_strdup (folder_name);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-imap_create (CamelImapStore *store, const char *folder_name,
-	     CamelException *ex)
-{
-	CamelImapResponse *response;
-
-	response = camel_imap_command (store, NULL, ex, "CREATE \"%s\"",
-				       folder_name);
-	camel_imap_response_free (response);
-
-	return !camel_exception_is_set (ex);
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name, guint32 flags,
-	    CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelFolder *new_folder = NULL;
-	char *short_name, *summary_file, *p;
-	gboolean selectable;
-
-	if (!imap_folder_exists (imap_store, folder_name,
-				 &selectable, &short_name, ex)) {
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0)
-			return NULL;
-
-		if (!imap_create (imap_store, folder_name, ex))
-			return NULL;
-
-		if (!imap_folder_exists (imap_store, folder_name,
-					 &selectable, &short_name, ex))
-			return NULL;
-	}
-
-	if (!selectable) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      "%s is not a selectable folder",
-				      folder_name);
-		g_free (short_name);
-		return NULL;
-	}
-
-	summary_file = g_strdup_printf ("%s/%s/#summary",
-					imap_store->storage_path,
-					folder_name);
-	p = strrchr (summary_file, '/');
-	*p = '\0';
-	if (e_mkdir_hier (summary_file, S_IRWXU) == 0) {
-		*p = '/';
-		new_folder = camel_imap_folder_new (store, folder_name,
-						    short_name, summary_file,
-						    ex);
-	} else {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create directory %s: %s"),
-				      summary_file, g_strerror (errno));
-	}
-	g_free (summary_file);
-	g_free (short_name);
-
-	if (camel_exception_is_set (ex))
-		return NULL;
-
-	return new_folder;
-}
-
-static char *
-get_folder_name (CamelStore *store, const char *folder_name,
-		 CamelException *ex)
-{
-	/* INBOX is case-insensitive */
-	if (g_strcasecmp (folder_name, "INBOX") == 0)
-		return g_strdup ("INBOX");
-	else
-		return g_strdup (folder_name);
-}
-
-static char *
-get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	return g_strdup ("");
-}
-
-static CamelFolderInfo *
-parse_list_response_as_folder_info (CamelImapStore *imap_store,
-				    const char *response)
-{
-	CamelFolderInfo *fi;
-	int flags;
-	char sep, *dir, *name;
-
-	if (!imap_parse_list_response (response, &flags, &sep, &dir))
-		return NULL;
-
-	if (sep) {
-		name = strrchr (dir, sep);
-		if (name && !*++name) {
-			g_free (dir);
-			return NULL;
-		}
-	}
-
-	fi = g_new0 (CamelFolderInfo, 1);
-	fi->full_name = dir;
-	if (sep && name)
-		fi->name = g_strdup (name);
-	else
-		fi->name = g_strdup (dir);
-	if (!(flags & IMAP_LIST_FLAG_NOSELECT))
-		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, dir);
-
-	return fi;
-}
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top, gboolean fast,
-		 gboolean recursive, gboolean subscribed_only,
-		 CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	gboolean need_inbox = FALSE;
-	int i;
-	CamelImapResponse *response;
-	GPtrArray *folders;
-	const char *name;
-	char *pattern, *list;
-	char *status, *p;
-	CamelFolderInfo *topfi, *fi;
-
-	name = top;
-	if (!name) {
-		need_inbox = !subscribed_only;
-		if (url->path)
-			name = url->path + 1;
-		else
-			name = "";
-	}
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "LIST \"\" \"%s\"", name);
-	if (!response)
-		return FALSE;
-	list = camel_imap_response_extract (response, "LIST", ex);
-	if (!list)
-		return FALSE;
-	topfi = parse_list_response_as_folder_info (imap_store, list);
-	g_free (list);
-	if (!topfi) {
-		topfi = g_new0 (CamelFolderInfo, 1);
-		topfi->full_name = g_strdup (name);
-		topfi->name = g_strdup (name);
-	}
-
-	if (!top && subscribed_only)
-		pattern = g_strdup ("");
- 	else if (*name)
-		pattern = g_strdup_printf ("%s%c", name, imap_store->dir_sep);
-	else
-		pattern = g_strdup (name);
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "%s \"\" \"%s%c\"",
-				       subscribed_only ? "LSUB" : "LIST",
-				       pattern, recursive ? '*' : '%');
-	g_free (pattern);
-	if (!response)
-		return NULL;
-
-	if (subscribed_only) {
-		g_hash_table_foreach_remove (imap_store->subscribed_folders,
-					     free_sub, NULL);
-	}
-
-	/* Turn responses into CamelFolderInfo and remove any
-	 * extraneous responses.
-	 */
-	folders = g_ptr_array_new ();
-	for (i = 0; i < response->untagged->len; i++) {
-		list = response->untagged->pdata[i];
-		fi = parse_list_response_as_folder_info (imap_store, list);
-		if (!fi)
-			continue;
-		g_ptr_array_add (folders, fi);
-
-		if (subscribed_only) {
-			g_hash_table_insert (imap_store->subscribed_folders,
-					     g_strdup (fi->full_name),
-					     GUINT_TO_POINTER (1));
-		}
-
-		if (!g_strcasecmp (fi->full_name, "INBOX"))
-			need_inbox = FALSE;
-	}
-	camel_imap_response_free (response);
-
-	/* Add INBOX, if necessary */
-	if (need_inbox) {
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->full_name = g_strdup ("INBOX");
-		fi->name = g_strdup ("INBOX");
-		fi->url = g_strdup_printf ("%sINBOX", imap_store->base_url);
-
-		g_ptr_array_add (folders, fi);
-	}
-
-	if (!fast) {
-		/* Get read/unread counts */
-		for (i = 0; i < folders->len; i++) {
-			fi = folders->pdata[i];
-			if (!fi->url)
-				continue;
-
-			response = camel_imap_command (
-				imap_store, NULL, NULL,
-				"STATUS \"%s\" (MESSAGES UNSEEN)",
-				fi->full_name);
-			if (!response)
-				continue;
-			status = camel_imap_response_extract (
-				response, "STATUS", NULL);
-			if (!status)
-				continue;
-
-			p = e_strstrcase (status, "MESSAGES");
-			if (p)
-				fi->message_count = strtoul (p + 8, NULL, 10);
-			p = e_strstrcase (status, "UNSEEN");
-			if (p)
-				fi->unread_message_count = strtoul (p + 6, NULL, 10);
-			g_free (status);
-		}
-	}
-
-	/* And assemble */
-	camel_folder_info_build (folders, topfi, imap_store->dir_sep, TRUE);
-	g_ptr_array_free (folders, TRUE);
-
-	/* Remove the top if it's the root of the store. */
-	if (!top && !topfi->sibling && !topfi->url) {
-		fi = topfi;
-		topfi = topfi->child;
-		fi->child = NULL;
-		camel_folder_info_free (fi);
-		for (fi = topfi; fi; fi = fi->sibling)
-			fi->parent = NULL;
-	}
-
-	return topfi;
-}
-
-static gboolean
-folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-
-	return g_hash_table_lookup (imap_store->subscribed_folders,
-				    folder_name) != NULL;
-}
-
-static void
-subscribe_folder (CamelStore *store, const char *folder_name,
-		  CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "SUBSCRIBE \"%s\"", folder_name);
-	if (response) {
-		g_hash_table_insert (imap_store->subscribed_folders,
-				     g_strdup (folder_name),
-				     GUINT_TO_POINTER (1));
-	}
-	camel_imap_response_free (response);
-}
-
-static void
-unsubscribe_folder (CamelStore *store, const char *folder_name,
-		    CamelException *ex)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-	gpointer key, value;
-
-	response = camel_imap_command (imap_store, NULL, ex,
-				       "UNSUBSCRIBE \"%s\"", folder_name);
-	if (response) {
-		g_hash_table_lookup_extended (imap_store->subscribed_folders,
-					      folder_name, key, value);
-		g_hash_table_remove (imap_store->subscribed_folders,
-				     folder_name);
-		g_free (key);
-	}
-	camel_imap_response_free (response);
-}
-
-static void
-imap_keepalive (CamelRemoteStore *store)
-{
-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-	CamelImapResponse *response;
-
-	response = camel_imap_command (imap_store, NULL, NULL, "NOOP");
-	camel_imap_response_free (response);
-}
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
deleted file mode 100644
index 8fd996c420..0000000000
--- a/camel/providers/imap/camel-imap-store.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-imap-store.h : class for an imap store */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_IMAP_STORE_H
-#define CAMEL_IMAP_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-remote-store.h"
-
-#define CAMEL_IMAP_STORE_TYPE     (camel_imap_store_get_type ())
-#define CAMEL_IMAP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STORE_TYPE, CamelImapStore))
-#define CAMEL_IMAP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass))
-#define IS_CAMEL_IMAP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STORE_TYPE))
-
-typedef enum {
-	IMAP_LEVEL_UNKNOWN,
-	IMAP_LEVEL_IMAP4,
-	IMAP_LEVEL_IMAP4REV1
-} CamelImapServerLevel;
-
-#define IMAP_CAPABILITY_IMAP4			(1 << 0)
-#define IMAP_CAPABILITY_IMAP4REV1		(1 << 1)
-#define IMAP_CAPABILITY_STATUS			(1 << 2)
-#define IMAP_CAPABILITY_NAMESPACE		(1 << 3)
-#define IMAP_CAPABILITY_AUTH_KERBEROS_V4	(1 << 4)
-#define IMAP_CAPABILITY_AUTH_GSSAPI		(1 << 5)
-#define IMAP_CAPABILITY_UIDPLUS			(1 << 6)
-#define IMAP_CAPABILITY_LITERALPLUS		(1 << 7)
-
-typedef struct {
-	CamelRemoteStore parent_object;	
-	
-	CamelFolder *current_folder;
-	
-	guint32 command;
-	
-	CamelImapServerLevel server_level;
-	guint32 capabilities;
-	
-	gchar dir_sep, *storage_path, *base_url;
-	
-	gboolean connected;
-
-	GHashTable *subscribed_folders;
-} CamelImapStore;
-
-
-typedef struct {
-	CamelRemoteStoreClass parent_class;
-
-} CamelImapStoreClass;
-
-
-/* Standard Camel function */
-CamelType camel_imap_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_STORE_H */
diff --git a/camel/providers/imap/camel-imap-stream.c b/camel/providers/imap/camel-imap-stream.c
deleted file mode 100644
index 4e9ee046d7..0000000000
--- a/camel/providers/imap/camel-imap-stream.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include "camel-imap-stream.h"
-#include "camel/camel-exception.h"
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-
-static CamelStreamClass *parent_class = NULL;
-
-/* Returns the class for a CamelImapStream */
-#define CIS_CLASS(so) CAMEL_IMAP_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);
-static int stream_reset (CamelStream *stream);
-static gboolean stream_eos (CamelStream *stream);
-
-static void finalize (CamelObject *object);
-
-static void
-camel_imap_stream_class_init (CamelImapStreamClass *camel_imap_stream_class)
-{
-	CamelStreamClass *camel_stream_class =
-		CAMEL_STREAM_CLASS (camel_imap_stream_class);
-	
-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));
-	
-	/* virtual method overload */
-	camel_stream_class->read  = stream_read;
-	camel_stream_class->reset = stream_reset;
-	camel_stream_class->eos   = stream_eos;
-}
-
-static void
-camel_imap_stream_init (gpointer object, gpointer klass)
-{
-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (object);
-	
-	imap_stream->cache = NULL;
-	imap_stream->cache_ptr = NULL;
-}
-
-CamelType
-camel_imap_stream_get_type (void)
-{
-	static CamelType camel_imap_stream_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_imap_stream_type == CAMEL_INVALID_TYPE) {
-		camel_imap_stream_type =
-			camel_type_register (camel_stream_get_type (), "CamelImapStream",
-					     sizeof (CamelImapStream),
-					     sizeof (CamelImapStreamClass),
-					     (CamelObjectClassInitFunc) camel_imap_stream_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_imap_stream_init,
-					     (CamelObjectFinalizeFunc) finalize);
-	}
-	
-	return camel_imap_stream_type;
-}
-
-CamelStream *
-camel_imap_stream_new (CamelImapFolder *folder, char *command)
-{
-	CamelImapStream *imap_stream;
-	
-	imap_stream = CAMEL_IMAP_STREAM(camel_object_new (camel_imap_stream_get_type ()));
-	
-	imap_stream->folder = folder;
-	camel_object_ref (CAMEL_OBJECT (imap_stream->folder));
-	
-	imap_stream->command = g_strdup (command);
-	
-	return CAMEL_STREAM (imap_stream);
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (object);
-	
-	g_free (imap_stream->cache);
-	g_free (imap_stream->command);
-	
-	if (imap_stream->folder)
-		camel_object_unref (CAMEL_OBJECT (imap_stream->folder));
-}
-
-static ssize_t
-stream_read (CamelStream *stream, char *buffer, size_t n)
-{
-	ssize_t nread;
-	
-	/* do we want to do any IMAP specific parsing in here? If not, maybe rename to camel-stream-cache? */
-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);
-	
-	if (!imap_stream->cache) {
-		/* We need to send the IMAP command since this is our first fetch */
-		CamelFolder *folder = CAMEL_FOLDER (imap_stream->folder);
-		CamelException ex;
-		gchar *result, *p, *q;
-		gint status, part_len;
-		
-		camel_exception_init (&ex);
-		status = camel_imap_fetch_command (CAMEL_IMAP_STORE (folder->parent_store),
-						   CAMEL_FOLDER (imap_stream->folder),
-						   &result, &ex, "%s\r\n",
-						   imap_stream->command);
-		/* FIXME: exception is ignored */
-		camel_exception_clear (&ex);
-		
-		if (!result || status != CAMEL_IMAP_OK) {
-			/* we got an error, dump this stuff */
-			g_free (result);
-			imap_stream->cache = NULL;
-			camel_object_unref (CAMEL_OBJECT (imap_stream->folder));
-			
-			return -1;
-		}
-		
-		/* we don't need the folder anymore... */
-		camel_object_unref (CAMEL_OBJECT (imap_stream->folder));
-		
-		/* parse out the message part */
-		for (p = result; *p && *p != '{' && *p != '"' && *p != '\n'; p++);
-		switch (*p) {
-		case '"':
-			/* a quoted string - section 4.3 */
-			p++;
-			for (q = p; *q && *q != '"' && *q != '\n'; q++);
-			part_len = (gint) (q - p);
-			
-			break;
-		case '{':
-			/* a literal string - section 4.3 */
-			part_len = atoi (p + 1);
-			for ( ; *p && *p != '\n'; p++);
-			if (*p != '\n') {
-				g_free (result);
-				return -1;
-			}
-			
-			/* advance to the beginning of the actual data */
-			p++;
-			
-			/* calculate the new part-length */
-			for (q = p; *q && (q - p) <= part_len; q++) {
-				if (*q == '\n')
-					part_len--;
-			}
-			
-			/* FIXME: This is a hack for IMAP daemons that send us a UID at the end of each FETCH */
-			for ( ; q > p && *(q-1) != '\n'; q--, part_len--);
-			part_len++;
-			
-			break;
-		default:
-			/* Bad input */
-			g_free (result);
-			return -1;
-		}
-		
-		imap_stream->cache = g_strndup (p, part_len);
-		g_free (result);
-		
-		imap_stream->cache_ptr = imap_stream->cache;
-	}
-	
-	/* we've already read this stream, so return whats in the cache */
-	nread = MIN (n, strlen (imap_stream->cache_ptr));
-	
-	if (nread > 0) {
-		memcpy (buffer, imap_stream->cache_ptr, nread);
-		imap_stream->cache_ptr += nread;
-	} else {
-		nread = -1;
-	}
-	
-	return nread;
-}
-
-static int
-stream_reset (CamelStream *stream)
-{
-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);
-	
-	imap_stream->cache_ptr = imap_stream->cache;
-	
-	return 1;
-}
-
-static gboolean
-stream_eos (CamelStream *stream)
-{
-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);
-	
-	return (imap_stream->cache_ptr && strlen (imap_stream->cache_ptr));
-}
diff --git a/camel/providers/imap/camel-imap-stream.h b/camel/providers/imap/camel-imap-stream.h
deleted file mode 100644
index 88881e7c1f..0000000000
--- a/camel/providers/imap/camel-imap-stream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef CAMEL_IMAP_STREAM_H
-#define CAMEL_IMAP_STREAM_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-stream.h>
-#include "camel-imap-folder.h"
-#include "camel-imap-store.h"
-#include <sys/types.h>
-
-#define CAMEL_IMAP_STREAM_TYPE     (camel_imap_stream_get_type ())
-#define CAMEL_IMAP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STREAM_TYPE, CamelImapStream))
-#define CAMEL_IMAP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STREAM_TYPE, CamelImapStreamClass))
-#define CAMEL_IS_IMAP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STREAM_TYPE))
-
-typedef struct _CamelImapStream CamelImapStream;
-typedef struct _CamelImapStreamClass CamelImapStreamClass;
-
-struct _CamelImapStream {
-	CamelStream parent_object;
-
-	CamelImapFolder *folder;
-	char *command;
-	char *cache;
-	char *cache_ptr;
-};
-
-struct _CamelImapStreamClass {
-	CamelStreamClass parent_class;
-
-	/* Virtual methods */
-};
-
-/* Standard Camel function */
-CamelType camel_imap_stream_get_type (void);
-
-/* public methods */
-CamelStream *camel_imap_stream_new (CamelImapFolder *folder, char *command);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_STREAM_H */
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
deleted file mode 100644
index ebdf8b9842..0000000000
--- a/camel/providers/imap/camel-imap-summary.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-imap-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define CAMEL_IMAP_SUMMARY_VERSION (0x1000)
-
-static int summary_header_load (CamelFolderSummary *, FILE *);
-static int summary_header_save (CamelFolderSummary *, FILE *);
-
-static void camel_imap_summary_class_init (CamelImapSummaryClass *klass);
-static void camel_imap_summary_init       (CamelImapSummary *obj);
-
-static CamelFolderSummaryClass *camel_imap_summary_parent;
-
-CamelType
-camel_imap_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(
-			camel_folder_summary_get_type(), "CamelImapSummary",
-			sizeof (CamelImapSummary),
-			sizeof (CamelImapSummaryClass),
-			(CamelObjectClassInitFunc) camel_imap_summary_class_init,
-			NULL,
-			(CamelObjectInitFunc) camel_imap_summary_init,
-			NULL);
-	}
-
-	return type;
-}
-
-static void
-camel_imap_summary_class_init (CamelImapSummaryClass *klass)
-{
-	CamelFolderSummaryClass *cfs_class = (CamelFolderSummaryClass *) klass;
-
-	camel_imap_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs (camel_folder_summary_get_type()));
-
-	cfs_class->summary_header_load = summary_header_load;
-	cfs_class->summary_header_save = summary_header_save;
-}
-
-static void
-camel_imap_summary_init (CamelImapSummary *obj)
-{
-	CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelImapMessageInfo);
-	s->content_info_size = sizeof(CamelImapMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_IMAP_SUMMARY_VERSION;
-}
-
-/**
- * camel_imap_summary_new:
- * @filename: the file to store the summary in.
- * @validity: the current UIDVALIDITY value of the folder
- *
- * This will create a new CamelImapSummary object and read in the
- * summary data from disk, if it exists and has the right UIDVALIDITY
- * value.
- *
- * Return value: A new CamelImapSummary object.
- **/
-CamelFolderSummary *
-camel_imap_summary_new (const char *filename, guint32 validity)
-{
-	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (
-		camel_object_new (camel_imap_summary_get_type ()));
-	CamelImapSummary *imap_summary = (CamelImapSummary *)summary;
-
-	camel_folder_summary_set_build_content (summary, FALSE);
-	camel_folder_summary_set_filename (summary, filename);
-
-	if (camel_folder_summary_load (summary) == -1) {
-		if (errno == ENOENT) {
-			imap_summary->validity = validity;
-			return summary;
-		} else {
-			camel_object_unref ((CamelObject *)summary);
-			return NULL;
-		}
-	}
-	if (imap_summary->validity != validity) {
-		camel_folder_summary_clear (summary);
-		imap_summary->validity = validity;
-	}
-
-	return summary;
-}
-
-
-static int
-summary_header_load (CamelFolderSummary *s, FILE *in)
-{
-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY (s);
-
-	if (camel_imap_summary_parent->summary_header_load (s, in) == -1)
-		return -1;
-
-	return camel_folder_summary_decode_uint32 (in, &ims->validity);
-}
-
-static int
-summary_header_save (CamelFolderSummary *s, FILE *out)
-{
-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY(s);
-
-	if (camel_imap_summary_parent->summary_header_save (s, out) == -1)
-		return -1;
-
-	return camel_folder_summary_encode_uint32 (out, ims->validity);
-}
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
deleted file mode 100644
index 0b844fdd7e..0000000000
--- a/camel/providers/imap/camel-imap-summary.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors:
- *    Michael Zucchi <notzed@helixcode.com>
- *    Dan Winship <danw@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_IMAP_SUMMARY_H
-#define _CAMEL_IMAP_SUMMARY_H
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
-
-#define CAMEL_IMAP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_imap_summary_get_type (), CamelImapSummary)
-#define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass)
-#define CAMEL_IS_IMAP_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_summary_get_type ())
-
-typedef struct _CamelImapSummary      CamelImapSummary;
-typedef struct _CamelImapSummaryClass CamelImapSummaryClass;
-
-typedef struct _CamelImapMessageContentInfo {
-	CamelMessageContentInfo info;
-
-} CamelImapMessageContentInfo;
-
-typedef struct _CamelImapMessageInfo {
-	CamelMessageInfo info;
-
-} CamelImapMessageInfo;
-
-struct _CamelImapSummary {
-	CamelFolderSummary parent;
-
-	guint32 validity;
-};
-
-struct _CamelImapSummaryClass {
-	CamelFolderSummaryClass parent_class;
-
-};
-
-guint               camel_imap_summary_get_type     (void);
-CamelFolderSummary *camel_imap_summary_new          (const char *filename,
-						     guint32 validity);
-
-#endif /* ! _CAMEL_IMAP_SUMMARY_H */
-
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
deleted file mode 100644
index b38024ecc6..0000000000
--- a/camel/providers/imap/camel-imap-utils.c
+++ /dev/null
@@ -1,688 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include <gtk/gtk.h>
-#include "camel-imap-utils.h"
-#include "string-utils.h"
-#include <e-sexp.h>
-#include "camel/camel-folder-summary.h"
-
-#define d(x) x
-
-char *
-imap_next_word (const char *buf)
-{
-	char *word;
-	
-	/* skip over current word */
-	for (word = (char *)buf; *word && *word != ' '; word++);
-	
-	/* skip over white space */
-	for ( ; *word && *word == ' '; word++);
-	
-	return word;
-}
-
-/**
- * imap_parse_list_response:
- * @buf: the LIST or LSUB response
- * @flags: a pointer to a variable to store the flags in, or %NULL
- * @sep: a pointer to a variable to store the hierarchy separator in, or %NULL
- * @folder: a pointer to a variable to store the folder name in, or %NULL
- *
- * Parses a LIST or LSUB response and returns the desired parts of it.
- * If @folder is non-%NULL, its value must be freed by the caller.
- *
- * Return value: whether or not the response was successfully parsed.
- **/
-gboolean
-imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder)
-{
-	char *word;
-	int len;
-
-	if (*buf != '*')
-		return FALSE;
-
-	word = imap_next_word (buf);
-	if (g_strncasecmp (word, "LIST", 4) && g_strncasecmp (word, "LSUB", 4))
-		return FALSE;
-
-	/* get the flags */
-	word = imap_next_word (word);
-	if (*word != '(')
-		return FALSE;
-
-	if (flags)
-		*flags = 0;
-
-	word++;
-	while (*word != ')') {
-		len = strcspn (word, " )");
-		if (flags) {
-			if (!g_strncasecmp (word, "\\Noinferiors", len))
-				*flags |= IMAP_LIST_FLAG_NOINFERIORS;
-			else if (!g_strncasecmp (word, "\\Noselect", len))
-				*flags |= IMAP_LIST_FLAG_NOSELECT;
-			else if (!g_strncasecmp (word, "\\Marked", len))
-				*flags |= IMAP_LIST_FLAG_MARKED;
-			else if (!g_strncasecmp (word, "\\Unmarked", len))
-				*flags |= IMAP_LIST_FLAG_UNMARKED;
-		}
-
-		word += len;
-		while (*word == ' ')
-			word++;
-	}
-
-	/* get the directory separator */
-	word = imap_next_word (word);
-	if (!strncmp (word, "NIL", 3)) {
-		if (sep)
-			*sep = '\0';
-	} else if (*word++ == '"') {
-		if (*word == '\\')
-			word++;
-		if (sep)
-			*sep = *word;
-		word++;
-		if (*word++ != '"')
-			return FALSE;
-	} else
-		return FALSE;
-
-	if (folder) {
-		/* get the folder name */
-		word = imap_next_word (word);
-		*folder = imap_parse_astring (&word, &len);
-		return *folder != NULL;
-	}
-
-	return TRUE;
-}
-
-static ESExpResult *
-func_and (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in AND func (argc = %d)\n", argc));
-	if (argc > 0) {
-		char **strings;
-		int i;
-		
-		strings = g_new (char*, argc+1);
-		strings[argc] = NULL;
-		
-		for (i = 0; i < argc; i++) {
-			GList *list_head = *list;
-			
-			d(fprintf (stderr, "\tAND func: %s\n", (*list) ? (char *) (*list)->data : "(null)"));
-			strings[argc - (i+1)] = (*list) ? (*list)->data : g_strdup ("");
-			*list = g_list_remove_link (*list, *list);
-			g_list_free_1 (list_head);
-		}
-		
-		*list = g_list_prepend (*list, g_strjoinv (" ", strings));
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		
-		for (i = 0 ; i < argc; i ++)
-			g_free (strings[i]);
-		
-		g_free (strings);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_or (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in OR func (argc = %d)\n", argc));
-	if (argc == 2 && (*list)->data && (*list)->next && (*list)->next->data) {
-		char **strings;
-		int i;
-		
-		strings = g_new (char*, argc+2);
-		strings[0] = g_strdup ("OR");
-		strings[argc+2 - 1] = NULL;
-		
-		for (i = 0; i < 2; i++) {
-			GList *list_head = *list;
-			
-			d(fprintf (stderr, "\tOR func: %s\n", (*list) ? (char *) (*list)->data : "(null)"));
-			strings[argc - i] = (*list) ? (*list)->data : g_strdup ("");
-			*list = g_list_remove_link (*list, *list);
-			g_list_free_1 (list_head);
-		}
-		
-		*list = g_list_prepend (*list, g_strjoinv (" ", strings));
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-		
-		g_free (strings);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_not (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in NOT func\n"));
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		
-		(*list)->data = g_strdup_printf ("NOT %s", term);
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		g_free (term);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *
-format_date (time_t time, int offset)
-{
-	struct tm tm;
-	
-	time += ((offset / 100) * (60*60)) + (offset % 100)*60;
-	
-	d(printf("converting date %s", ctime (&time)));
-	
-	memcpy (&tm, gmtime (&time), sizeof (tm));
-
-	return g_strdup_printf ("%d-%s-%04d",
-				tm.tm_mday, tz_months[tm.tm_mon],
-				tm.tm_year + 1900);
-}
-
-static ESExpResult *
-func_lt (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in less-than func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTBEFORE \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("BEFORE \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_gt (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in greater-than func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTSINCE \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("SINCE \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_eq (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in equal-to func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTON \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("ON \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_match_all (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* match-all doesn't have a IMAP equiv */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *value = (*argv)->value.string;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		char *string;
-		
-		string = g_strdup_printf ("BODY \"%s\"", value);
-		
-		*list = g_list_prepend (*list, string);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *header = (argv[0])->value.string;
-	char *match = (argv[1])->value.string;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *string;
-		string = g_strdup_printf ("HEADER %s \"%s\"", header, match);
-		
-		*list = g_list_prepend (*list, string);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* FIXME: what do I do here? */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* FIXME: what do I do here? */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	*list = g_list_prepend (*list, g_strdup ("SENT"));
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	*list = g_list_prepend (*list, g_strdup ("RECEIVED"));
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	
-	return r;
-}
-
-/* builtin functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and",               (ESExpFunc *) func_and,               0 },
-	{ "or",                (ESExpFunc *) func_or,                0 },
-	{ "not",               (ESExpFunc *) func_not,               0 },
-	{ "<",                 (ESExpFunc *) func_lt,                0 },
-	{ ">",                 (ESExpFunc *) func_gt,                0 },
-	{ "=",                 (ESExpFunc *) func_eq,                0 },
-	{ "match-all",         (ESExpFunc *) func_match_all,         0 },
-	{ "body-contains",     (ESExpFunc *) func_body_contains,     0 },
-	{ "header-contains",   (ESExpFunc *) func_header_contains,   0 },
-	{ "user-tag",          (ESExpFunc *) func_user_tag,          1 },
-	{ "user-flag",         (ESExpFunc *) func_user_flag,         1 },
-	{ "get-sent-date",     (ESExpFunc *) func_get_sent_date,     1 },
-	{ "get-received-date", (ESExpFunc *) func_get_received_date, 1 },
-	{ "get-current-date",  (ESExpFunc *) func_get_current_date,  1 }
-};
-
-char *
-imap_translate_sexp (const char *expression)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-	
-	sexp = e_sexp_new ();
-	
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (sexp, 0, symbols[i].name,
-					      (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function (sexp, 0, symbols[i].name,
-					     symbols[i].func, &list);
-		}
-	}
-	
-	e_sexp_input_text (sexp, expression, strlen (expression));
-	
-	e_sexp_parse (sexp);
-	
-	r = e_sexp_eval (sexp);
-	
-	gtk_object_unref (GTK_OBJECT (sexp));
-	e_sexp_result_free (r);
-	
-	if (list->next) {
-		g_warning ("conversion to IMAP SEARCH string failed");
-		retval = NULL;
-		g_list_foreach (list, (GFunc)g_free, NULL);
-	} else {
-		retval = list->data;
-	}
-	
-	g_list_free (list);
-	
-	return retval;
-}
-
-char *
-imap_create_flag_list (guint32 flags)
-{
-	GString *gstr;
-	char *flag_list;
-	
-	gstr = g_string_new ("(");
-	
-	if (flags & CAMEL_MESSAGE_ANSWERED)
-		g_string_append (gstr, "\\Answered ");
-	if (flags & CAMEL_MESSAGE_DELETED)
-		g_string_append (gstr, "\\Deleted ");
-	if (flags & CAMEL_MESSAGE_DRAFT)
-		g_string_append (gstr, "\\Draft ");
-	if (flags & CAMEL_MESSAGE_FLAGGED)
-		g_string_append (gstr, "\\Flagged ");
-	if (flags & CAMEL_MESSAGE_SEEN)
-		g_string_append (gstr, "\\Seen ");
-	
-	if (gstr->str[gstr->len - 1] == ' ')
-		gstr->str[gstr->len - 1] = ')';
-	else
-		g_string_append_c (gstr, ')');
-	
-	flag_list = gstr->str;
-	g_string_free (gstr, FALSE);
-	return flag_list;
-}
-
-guint32
-imap_parse_flag_list (const char *flag_list)
-{
-	guint32 flags = 0;
-	int len;
-	
-	if (*flag_list++ != '(')
-		return 0;
-	
-	while (*flag_list != ')') {
-		len = strcspn (flag_list, " )");
-		if (!g_strncasecmp (flag_list, "\\Answered", len))
-			flags |= CAMEL_MESSAGE_ANSWERED;
-		else if (!g_strncasecmp (flag_list, "\\Deleted", len))
-			flags |= CAMEL_MESSAGE_DELETED;
-		else if (!g_strncasecmp (flag_list, "\\Draft", len))
-			flags |= CAMEL_MESSAGE_DRAFT;
-		else if (!g_strncasecmp (flag_list, "\\Flagged", len))
-			flags |= CAMEL_MESSAGE_FLAGGED;
-		else if (!g_strncasecmp (flag_list, "\\Seen", len))
-			flags |= CAMEL_MESSAGE_SEEN;
-		
-		flag_list += len;
-		if (*flag_list == ' ')
-			flag_list++;
-	}
-	
-	return flags;
-}
-
-/**
- * imap_parse_nstring:
- * @str_p: a pointer to a string
- * @len: a pointer to an int to return the length in
- *
- * This parses an "nstring" (NIL, a quoted string, or a literal)
- * starting at *@str_p. On success, *@str_p will point to the first
- * character after the end of the nstring, and *@len will contain
- * the length of the returned string. On failure, *@str_p will be
- * set to %NULL.
- *
- * This assumes that the string is in the form returned by
- * camel_imap_command(): that line breaks are indicated by LF rather
- * than CRLF.
- *
- * Return value: the parsed string, or %NULL if a NIL or no string
- * was parsed. (In the former case, *@str_p will be %NULL; in the
- * latter, it will point to the character after the NIL.)
- **/
-char *
-imap_parse_nstring (char **str_p, int *len)
-{
-	char *str = *str_p;
-	char *out;
-
-	if (!str)
-		return NULL;
-	else if (*str == '"') {
-		char *p;
-		int size;
-
-		str++;
-		size = strcspn (str, "\"") + 1;
-		p = out = g_malloc (size);
-
-		while (*str && *str != '"') {
-			if (*str == '\\')
-				str++;
-			*p++ = *str++;
-			if (p - out == size) {
-				out = g_realloc (out, size * 2);
-				p = out + size;
-				size *= 2;
-			}
-		}
-		if (*str != '"') {
-			*str_p = NULL;
-			g_free (out);
-			return NULL;
-		}
-		*p = '\0';
-		*str_p = str + 1;
-		*len = strlen (out);
-		return out;
-	} else if (*str == '{') {
-		*len = strtoul (str + 1, (char **)&str, 10);
-		if (*str++ != '}' || *str++ != '\n' || strlen (str) < *len) {
-			*str_p = NULL;
-			return NULL;
-		}
-		out = g_strndup (str, *len);
-		*str_p = str + *len;
-		return out;
-	} else if (!g_strncasecmp (str, "nil", 3)) {
-		*str_p += 3;
-		*len = 0;
-		return NULL;
-	} else {
-		*str_p = NULL;
-		return NULL;
-	}
-}
-
-/**
- * imap_parse_astring:
- * @str_p: a pointer to a string
- * @len: a pointer to an int to return the length in
- *
- * This parses an "astring" (an atom, a quoted string, or a literal)
- * starting at *@str_p. On success, *@str_p will point to the first
- * character after the end of the astring, and *@len will contain
- * the length of the returned string. On failure, *@str_p will be
- * set to %NULL.
- *
- * This assumes that the string is in the form returned by
- * camel_imap_command(): that line breaks are indicated by LF rather
- * than CRLF.
- *
- * Return value: the parsed string, or %NULL if no string
- * was parsed. (In this case, *@str_p will also be %NULL.)
- **/
-char *
-imap_parse_astring (char **str_p, int *len)
-{
-	char *p;
-
-	if (**str_p == '{' || **str_p == '"')
-		return imap_parse_nstring (str_p, len);
-
-	p = *str_p;
-	while (isascii ((unsigned char)*p) &&
-	       !strchr ("(){ \"\\%*", *p))
-		p++;
-
-	*len = p - *str_p;
-	p = g_strndup (*str_p, *len);
-	*str_p += *len;
-	return p;
-}
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
deleted file mode 100644
index d0cc05832d..0000000000
--- a/camel/providers/imap/camel-imap-utils.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef CAMEL_IMAP_UTILS_H
-#define CAMEL_IMAP_UTILS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-char *imap_next_word (const char *buf);
-
-#define IMAP_LIST_FLAG_NOINFERIORS	(1 << 0)
-#define IMAP_LIST_FLAG_NOSELECT		(1 << 1)
-#define IMAP_LIST_FLAG_MARKED		(1 << 2)
-#define IMAP_LIST_FLAG_UNMARKED		(1 << 3)
-gboolean imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder);
-
-char *imap_translate_sexp (const char *expression);
-
-char *imap_create_flag_list (guint32 flags);
-guint32 imap_parse_flag_list (const char *flag_list);
-
-char *imap_parse_nstring (char **str_p, int *len);
-char *imap_parse_astring (char **str_p, int *len);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_IMAP_UTILS_H */
diff --git a/camel/providers/imap/libcamelimap.urls b/camel/providers/imap/libcamelimap.urls
deleted file mode 100644
index c301c0ffac..0000000000
--- a/camel/providers/imap/libcamelimap.urls
+++ /dev/null
@@ -1 +0,0 @@
-imap
diff --git a/camel/providers/maildir/.cvsignore b/camel/providers/maildir/.cvsignore
deleted file mode 100644
index 2e7b174532..0000000000
--- a/camel/providers/maildir/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-*.lo
-*.la
-.libs
diff --git a/camel/providers/maildir/Makefile.am b/camel/providers/maildir/Makefile.am
deleted file mode 100644
index 80b41a2d45..0000000000
--- a/camel/providers/maildir/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelmaildirincludedir = $(includedir)/camel
-
-lib_LTLIBRARIES = libcamelmaildir.la
-
-INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir)/intl -I$(top_srcdir)/camel \
-	$(GTK_INCLUDEDIR) -I$(includedir)		\
-	-DG_LOG_DOMAIN=\"camel-maildir-provider\"		
-
-libcamelmaildir_la_SOURCES = \
-	camel-maildir-folder.c \
-	camel-maildir-provider.c \
-	camel-maildir-store.c
-
-libcamelmaildirinclude_HEADERS = \
-	camel-maildir-folder.h \
-	camel-maildir-store.h
-
-libcamelmaildir_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = 
diff --git a/camel/providers/maildir/camel-maildir-folder.c b/camel/providers/maildir/camel-maildir-folder.c
deleted file mode 100644
index 2cb81f3e81..0000000000
--- a/camel/providers/maildir/camel-maildir-folder.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-maildir-folder.c : camel-folder subclass for maildir folders */
-
-/* 
- *
- * Copyright (C) 1999 Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr> .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * AUTHORS : Jukka Zitting 
- *  
- */
-
-
-#include <config.h> 
-#include <sys/stat.h> 
-#include <sys/param.h> 
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
-#include <string.h>
-#include "camel-maildir-folder.h"
-#include "camel-maildir-store.h"
-#include "camel-stream-fs.h"
-#include "camel-log.h"
-
-static CamelFolderClass *parent_class=NULL;
-
-/* Returns the class for a CamelMaildirFolder */
-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (GTK_OBJECT(so)->klass)
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass)
-#define CMAILDIRS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass)
-
-static void _init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex);
-static void _set_name (CamelFolder *folder, const gchar *name, CamelException *ex);
-static gboolean _exists (CamelFolder *folder, CamelException *ex);
-static gboolean _create (CamelFolder *folder, CamelException *ex);
-static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);
-static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);
-static CamelMimeMessage *_get_message (CamelFolder *folder, gint number, CamelException *ex);
-static gint _get_message_count (CamelFolder *folder, CamelException *ex);
-static void _expunge (CamelFolder *folder, CamelException *ex);
-static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);
-
-/* fs utility functions */
-static DIR * _xopendir (const gchar *path);
-static gboolean _xstat (const gchar *path, struct stat *buf);
-static gboolean _xmkdir (const gchar *path);
-static gboolean _xrename (const gchar *from, const gchar *to);
-static gboolean _xunlink (const gchar *path);
-static gboolean _xrmdir (const gchar *path);
-/* ** */
-
-static void
-camel_maildir_folder_class_init (CamelMaildirFolderClass *camel_maildir_folder_class)
-{
-	CamelFolderClass *camel_folder_class =
-		CAMEL_FOLDER_CLASS (camel_maildir_folder_class);
-
-	parent_class = gtk_type_class (camel_folder_get_type ());
-
-	/* virtual method definition */
-	/* virtual method overload */
-	camel_folder_class->init_with_store   = _init_with_store;
-	camel_folder_class->set_name          = _set_name;
-	camel_folder_class->exists            = _exists;
-	camel_folder_class->create            = _create;
-	camel_folder_class->delete            = _delete;
-	camel_folder_class->delete_messages   = _delete_messages;
-	camel_folder_class->expunge           = _expunge;
-	camel_folder_class->get_message       = _get_message;
-	camel_folder_class->get_message_count = _get_message_count;
-	camel_folder_class->list_subfolders   = _list_subfolders;
-}
-
-GtkType
-camel_maildir_folder_get_type (void)
-{
-	static GtkType camel_maildir_folder_type = 0;
-	
-	if (!camel_maildir_folder_type)	{
-		GtkTypeInfo camel_maildir_folder_info =	
-		{
-			"CamelMaildirFolder",
-			sizeof (CamelMaildirFolder),
-			sizeof (CamelMaildirFolderClass),
-			(GtkClassInitFunc) camel_maildir_folder_class_init,
-			(GtkObjectInitFunc) NULL,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		camel_maildir_folder_type =
-			gtk_type_unique (CAMEL_FOLDER_TYPE, &camel_maildir_folder_info);
-	}
-	
-	return camel_maildir_folder_type;
-}
-
-
-
-
-
-
-/**
- * CamelMaildirFolder::init_with_store: initializes the folder object
- * @folder:       folder object to initialize
- * @parent_store: parent store object of the folder
- *
- * Simply tells that the folder can contain messages but not subfolders.
- * Perhaps we'll later implement subfolders too...
- */
-static void 
-_init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex)
-{
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::init_with_store\n");
-	g_assert (folder);
-	g_assert (parent_store);
-	
-	/* call parent method */
-	parent_class->init_with_store (folder, parent_store, ex);
-	
-	folder->can_hold_messages = TRUE;
-	folder->can_hold_folders = TRUE;
-	folder->has_summary_capability = FALSE;
-
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::init_with_store\n");
-}
-
-/**
- * CamelMaildirFolder::set_name: sets the name of the folder
- * @folder: folder object
- * @name:   name of the folder
- *
- * Sets the name of the folder object. The existence of a folder with
- * the given name is not checked in this function.
- */
-static void
-_set_name (CamelFolder *folder, const gchar *name, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder;
-	CamelMaildirStore *maildir_store;
-	
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::set_name\n");
-	g_assert (folder);
-	g_assert (name);
-	g_assert (folder->parent_store);
-
-	maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	maildir_store = CAMEL_MAILDIR_STORE (folder->parent_store);
-
-	/* call default implementation */
-	parent_class->set_name (folder, name, ex);
-	
-	if (maildir_folder->directory_path)
-		g_free (maildir_folder->directory_path);
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name full_name is %s\n", folder->full_name);
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name toplevel_dir is %s\n", maildir_store->toplevel_dir);
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name separator is %c\n", camel_store_get_separator (folder->parent_store));
-
-	if (folder->full_name && folder->full_name[0])
-		maildir_folder->directory_path =
-			g_strconcat (maildir_store->toplevel_dir, G_DIR_SEPARATOR_S,
-				     folder->full_name, NULL);
-	else
-		maildir_folder->directory_path = g_strdup (maildir_store->toplevel_dir);
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name: name set to %s\n", name);
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::set_name\n");
-}
-
-/**
- * CamelMaildirFolder::exists: tests whether the named maildir exists
- * @folder: folder object
- *
- * A created maildir folder object doesn't necessarily exist yet in the
- * filesystem. This function checks whether the maildir exists.
- * The structure of the maildir is stated in the maildir.5 manpage.
- *
- * maildir.5:
- *     A directory in maildir format  has  three  subdirectories,
- *     all on the same filesystem: tmp, new, and cur.
- *
- * Return value: TRUE if the maildir exists, FALSE otherwise
- */
-static gboolean
-_exists (CamelFolder *folder, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	static const gchar *dir[3] = { "new", "cur", "tmp" };
-	gint i;
-	struct stat statbuf;
-	const gchar *maildir;
-	gchar *path;
-	gboolean rv = TRUE;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::exists\n");
-	g_assert (folder);
-	g_return_val_if_fail (maildir_folder->directory_path, FALSE);
-
-	maildir = maildir_folder->directory_path;
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::exists: checking maildir %s\n",
-			      maildir);
-
-	/* check whether the toplevel directory exists */
-	rv = _xstat (maildir, &statbuf) && S_ISDIR (statbuf.st_mode);
-
-	/* check whether the maildir subdirectories exist */
-	for (i = 0; rv && i < 3; i++) {
-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);
-
-		rv = _xstat (path, &statbuf) && S_ISDIR (statbuf.st_mode);
-
-		g_free (path);
-	}
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::exists: %s\n",
-			      (rv) ? "maildir found" : "maildir not found");
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::exists\n");
-	return rv;
-}
-
-/**
- * CamelMaildirFolder::create: creates the named maildir
- * @folder: folder object
- *
- * A created maildir folder object doesn't necessarily exist yet in the
- * filesystem. This function creates the maildir if it doesn't yet exist.
- * The structure of the maildir is stated in the maildir.5 manpage.
- *
- * maildir.5:
- *     A directory in maildir format  has  three  subdirectories,
- *     all on the same filesystem: tmp, new, and cur.
- *
- * Return value: TRUE if the maildir existed already or was created,
- *               FALSE otherwise
- */
-static gboolean
-_create (CamelFolder *folder, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	static const gchar *dir[3] = { "new", "cur", "tmp" };
-	gint i;
-	const gchar *maildir;
-	gchar *path;
-	gboolean rv = TRUE;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::create\n");
-	g_assert (folder);
-
-	/* check whether the maildir already exists */
-	if (camel_folder_exists (folder, ex)) return TRUE;
-
-	maildir = maildir_folder->directory_path;
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::create: creating maildir %s\n",
-			      maildir);
-
-	/* create the toplevel directory */
-	rv = _xmkdir (maildir);
-
-	/* create the maildir subdirectories */
-	for (i = 0; rv && i < 3; i++) {
-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);
-
-		rv = _xmkdir (path);
-
-		g_free (path);
-	}
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::create: %s\n",
-			      rv ? "maildir created" : "an error occurred");
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::create\n");
-	return rv;
-}
-
-/**
- * CamelMaildirFolder::delete: delete the maildir folder
- * @folder: the folder object
- * @recurse:
- *
- * This function empties and deletes the maildir folder. The subdirectories
- * "tmp", "cur", and "new" are removed first and then the toplevel maildir
- * directory is deleted. All files from the directories are deleted as well, 
- * so you should be careful when using this function. If a subdirectory cannot
- * be deleted, then the operation it is stopped. Thus if an error occurs, the
- * maildir directory won't be removed, but it might no longer be a valid maildir.
- */
-static gboolean
-_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	static const gchar *dir[3] = { "new", "cur", "tmp" };
-	gint i;
-	const gchar *maildir;
-	gchar *path;
-	gboolean rv = TRUE;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::create\n");
-	g_assert (folder);
-
-	/* check whether the maildir already exists */
-	if (!camel_folder_exists (folder, ex)) return TRUE;
-
-	maildir = maildir_folder->directory_path;
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::delete: deleting maildir %s\n",
-			      maildir);
-
-	/* delete the maildir subdirectories */
-	for (i = 0; rv && i < 3; i++) {
-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);
-
-		rv = _xrmdir (path);
-
-		g_free (path);
-	}
-
-	/* create the toplevel directory */
-	if (rv)
-		rv = _xrmdir (maildir);
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete: %s\n",
-			      rv ? "maildir deleted" : "an error occurred");
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::delete\n");
-	return rv;
-}
-
-/**
- * CamelMaildirFolder::delete_messages: empty the maildir folder
- * @folder:  the folder object
- *
- * This function empties the maildir folder. All messages from the
- * "cur" subdirectory are deleted. If a message cannot be deleted, then
- * it is just skipped and the rest of the messages are still deleted.
- * Files with names starting with a dot are skipped as described in the
- * maildir.5 manpage.
- *
- * maildir.5:
- *     It is a good idea for readers to skip all filenames in new
- *     and cur starting with a dot. Other than this, readers
- *     should not attempt to parse filenames.
- *
- * Return value: FALSE on error and if some messages could not be deleted.
- *               TRUE otherwise.
- */
-static gboolean 
-_delete_messages (CamelFolder *folder, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	const gchar *maildir;
-	gchar *curdir, *file;
-	DIR *dir_handle;
-	struct dirent *dir_entry;
-	gboolean rv = TRUE;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::delete_messages\n");
-	g_assert (folder);
-
-	/* call default implementation */
-	parent_class->delete_messages (folder, ex);
-
-	/* Check if the folder didn't exist */
-	if (!camel_folder_exists (folder, ex)) return TRUE;
-
-	maildir = maildir_folder->directory_path;
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete_messages: "
-			      "deleting messages from %s\n", maildir);
-
-	/* delete messages from the maildir subdirectory "cur" */
-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);
-
-	dir_handle = _xopendir (curdir);
-	if (dir_handle) {
-		while ((dir_entry = readdir (dir_handle))) {
-			if (dir_entry->d_name[0] == '.') continue;
-			file = g_strconcat (curdir, G_DIR_SEPARATOR_S,
-					    dir_entry->d_name, NULL);
-
-			if (!_xunlink (file)) rv = FALSE;
-
-			g_free (file);
-		}
-		closedir (dir_handle);
-	} else
-		rv = FALSE;
-
-	g_free (curdir);
-	
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete_messages: %s\n",
-			      rv ? "messages deleted" : "an error occurred");
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::delete_messages\n");
-	return rv;
-}
-
-/**
- * CamelMaildirFolder::get_message: get a message from maildir
- * @folder: the folder object
- * @number: number of the message within the folder
- *
- * Return value: the message, NULL on error
- */
-static CamelMimeMessage *
-_get_message (CamelFolder *folder, gint number, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);
-	DIR *dir_handle;
-	struct dirent *dir_entry;
-	CamelStream *stream;
-	CamelMimeMessage *message = NULL;
-	const gchar *maildir;
-	gchar *curdir, *file = NULL;
-	gint count = -1;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::get_message\n");
-	g_assert(folder);
-
-	/* Check if the folder exists */
-	if (!camel_folder_exists (folder, ex)) return NULL;
-
-	maildir = maildir_folder->directory_path;
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message: "
-			      "getting message #%d from %s\n", number, maildir);
-
-	/* Count until the desired message is reached */
-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);
-	if ((dir_handle = _xopendir (curdir))) {
-		while ((count < number) && (dir_entry = readdir (dir_handle)))
-			if (dir_entry->d_name[0] != '.') count++;
-
-		if (count == number)
-			file = g_strconcat (curdir, G_DIR_SEPARATOR_S,
-					    dir_entry->d_name, NULL);
-
-		closedir (dir_handle);
-	}
-	g_free (curdir);
-	if (!file) return NULL;
-
-	/* Create the message object */
-	message = camel_mime_message_new ();
-	stream = camel_stream_fs_new_with_name (file, CAMEL_STREAM_FS_READ);
-
-	if (!message || !stream) {
-		g_free (file);
-		if (stream) gtk_object_unref (GTK_OBJECT (stream));
-		if (message) gtk_object_unref (GTK_OBJECT (message));
-		return NULL;
-	}
-
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (message),
-						  stream);
-	gtk_object_unref (GTK_OBJECT (stream));
-	gtk_object_set_data_full (GTK_OBJECT (message),
-				  "fullpath", file, g_free);
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message: "
-			      "message %p created from %s\n", message, file);
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::get_message\n");
-	return message;
-}
-
-/**
- * CamelMaildirFolder::get_message_count: count messages in maildir
- * @folder:  the folder object
- *
- * Returns the number of messages in the maildir folder. New messages
- * are included in this count. 
- *
- * Return value: number of messages in the maildir, -1 on error
- */
-static gint
-_get_message_count (CamelFolder *folder, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);
-	const gchar *maildir;
-	gchar *newdir, *curdir, *newfile, *curfile;
-	DIR *dir_handle;
-	struct dirent *dir_entry;
-	guint count = 0;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering "
-			      "CamelMaildirFolder::get_message_count\n");
-	g_assert(folder);
-
-	/* check if the maildir exists */
-	if (!camel_folder_exists (folder, ex)) return -1;
-
-	maildir = maildir_folder->directory_path;
-
-	newdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "new", NULL);
-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);
-
-	/* Check new messages */
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "
-			      "getting new messages from %s\n", newdir);
-	if ((dir_handle = _xopendir (newdir))) {
-		while ((dir_entry = readdir (dir_handle))) {
-			if (dir_entry->d_name[0] == '.') continue;
-			newfile = g_strconcat (newdir, G_DIR_SEPARATOR_S,
-					       dir_entry->d_name, NULL);
-			curfile = g_strconcat (curdir, G_DIR_SEPARATOR_S,
-					       dir_entry->d_name, ":2,", NULL);
-			
-			_xrename (newfile, curfile);
-			
-			g_free (curfile);
-			g_free (newfile);
-		}
-		closedir (dir_handle);
-	}
-
-	/* Count messages */
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "
-			      "counting messages in %s\n", curdir);
-	if ((dir_handle = _xopendir (curdir))) {
-		while ((dir_entry = readdir (dir_handle)))
-			if (dir_entry->d_name[0] != '.') count++;
-		closedir (dir_handle);
-	}
-
-	g_free (curdir);
-	g_free (newdir);
-
-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "
-			      " found %d messages\n", count);
-	CAMEL_LOG_FULL_DEBUG ("Leaving "
-			      "CamelMaildirFolder::get_message_count\n");
-	return count;
-}
-
-
-
-
-/**
- * CamelMaildirFolder::expunge: expunge messages marked as deleted
- * @folder:  the folder object
- *
- * Physically deletes the messages marked as deleted in the folder.
- */
-static void
-_expunge (CamelFolder *folder, CamelException *ex)
-{
-	CamelMimeMessage *message;
-	GList *node;
-	gchar *fullpath;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::expunge\n");
-	g_assert(folder);
-
-	/* expunge messages marked for deletion */
-	for (node = folder->message_list; node; node = g_list_next(node)) {
-		message = CAMEL_MIME_MESSAGE (node->data);
-		if (!message) {
-			CAMEL_LOG_WARNING ("CamelMaildirFolder::expunge: "
-					   "null message in node %p\n", node);
-			continue;
-		}
-				
-		if (camel_mime_message_get_flag (message, "DELETED")) {
-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "
-					      "expunging message #%d\n",
-					      message->message_number);
-
-			/* expunge the message */
-			fullpath = gtk_object_get_data (GTK_OBJECT (message),
-							"fullpath");
-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "
-					      "message fullpath is %s\n",
-					      fullpath);
-
-			if (_xunlink (fullpath))
-				message->expunged = TRUE;
-		} else {
-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "
-					      "skipping message #%d\n",
-					      message->message_number);
-		}
-	}
-	
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::expunge\n");
-}
-
-
-
-
-/**
- * CamelMaildirFolder::list_subfolders: return a list of subfolders
- * @folder:  the folder object
- *
- * Returns the names of the maildir subfolders in a list.
- *
- * Return value: list of subfolder names
- */
-static GList *
-_list_subfolders (CamelFolder *folder, CamelException *ex)
-{
-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
-	const gchar *maildir;
-	gchar *subdir;
-	struct stat statbuf;
-	struct dirent *dir_entry;
-	DIR *dir_handle;
-	GList *subfolders = NULL;
-
-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::list_subfolders\n");
-	g_assert (folder);
-
-	/* check if the maildir exists */
-	if (!camel_folder_exists (folder, ex)) return NULL;
-
-	/* scan through the maildir toplevel directory */
-	maildir = maildir_folder->directory_path;
-	if ((dir_handle = _xopendir (maildir))) {
-		while ((dir_entry = readdir (dir_handle))) {
-			if (dir_entry->d_name[0] == '.') continue;
-			if (strcmp (dir_entry->d_name, "new") == 0) continue;
-			if (strcmp (dir_entry->d_name, "cur") == 0) continue;
-			if (strcmp (dir_entry->d_name, "tmp") == 0) continue;
-
-			subdir = g_strconcat (maildir, G_DIR_SEPARATOR_S,
-					      dir_entry->d_name, NULL);
-			
-			if (_xstat (subdir, &statbuf)
-			    && S_ISDIR (statbuf.st_mode))
-				subfolders =
-					g_list_append (
-						subfolders,
-						g_strdup (dir_entry->d_name));
-			
-			g_free (subdir);
-		}
-		closedir (dir_handle);
-	}
-
-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::list_subfolders\n");
-	return subfolders;
-}
-
-
-
-
-
-
-
-/*
- * fs utility function 
- *
- */
-
-static DIR *
-_xopendir (const gchar *path)
-{
-	DIR *handle;
-	g_assert (path);
-
-	handle = opendir (path);
-	if (!handle) {
-		CAMEL_LOG_WARNING ("ERROR: opendir (%s);\n", path);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-	}
-
-	return handle;
-}
-
-static gboolean
-_xstat (const gchar *path, struct stat *buf)
-{
-	gint stat_error;
-	g_assert (path);
-	g_assert (buf);
-
-	stat_error = stat (path, buf);
-	if (stat_error == 0) {
-		return TRUE;
-	} else if (errno == ENOENT) {
-		buf->st_mode = 0;
-		return TRUE;
-	} else {
-		CAMEL_LOG_WARNING ("ERROR: stat (%s, %p);\n", path, buf);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	}
-}
-
-static gboolean
-_xmkdir (const gchar *path)
-{
-	g_assert (path);
-
-	if (mkdir (path, S_IRWXU) == -1) {
-		CAMEL_LOG_WARNING ("ERROR: mkdir (%s, S_IRWXU);\n", path);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	} 
-
-	return TRUE;
-}
-
-static gboolean
-_xrename (const gchar *from, const gchar *to)
-{
-	g_assert (from);
-	g_assert (to);
-
-	if (rename (from, to) == 0) {
-		return TRUE;
-	} else {
-		CAMEL_LOG_WARNING ("ERROR: rename (%s, %s);\n", from, to);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	}
-}
-
-static gboolean
-_xunlink (const gchar *path)
-{
-	g_assert (path);
-
-	if (unlink (path) == 0) {
-		return TRUE;
-	} else if (errno == ENOENT) {
-		return TRUE;
-	} else {
-		CAMEL_LOG_WARNING ("ERROR: unlink (%s);\n", path);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	}
-}
-
-static gboolean
-_xrmdir (const gchar *path)
-{
-	DIR *dir_handle;
-	struct dirent *dir_entry;
-	gchar *file;
-	struct stat statbuf;
-	g_assert (path);
-
-	dir_handle = opendir (path);
-	if (!dir_handle && errno == ENOENT) {
-		return TRUE;
-	} else if (!dir_handle) {
-		CAMEL_LOG_WARNING ("ERROR: opendir (%s);\n", path);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	}
-
-	while ((dir_entry = readdir (dir_handle))) {
-		file = g_strconcat (path, G_DIR_SEPARATOR_S, dir_entry->d_name,
-				    NULL);
-		if (_xstat (file, &statbuf) && S_ISREG (statbuf.st_mode))
-			_xunlink (file);
-		g_free (file);
-	}
-
-	closedir (dir_handle);
-
-	if (rmdir (path) == 0) {
-		return TRUE;
-	} else if (errno == ENOENT) {
-		return TRUE;
-	} else {
-		CAMEL_LOG_WARNING ("ERROR: rmdir (%s);\n", path);
-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",
-				      errno, strerror(errno));
-		return FALSE;
-	} 
-}
-
-/** *** **/
-
diff --git a/camel/providers/maildir/camel-maildir-folder.h b/camel/providers/maildir/camel-maildir-folder.h
deleted file mode 100644
index 5997da2011..0000000000
--- a/camel/providers/maildir/camel-maildir-folder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-maildir-folder.h : Abstract class for an email folder */
-
-/* 
- *
- * Copyright (C) 1999 Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr> .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef CAMEL_MAILDIR_FOLDER_H
-#define CAMEL_MAILDIR_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <gtk/gtk.h>
-#include "camel-folder.h"
-/*  #include "camel-store.h" */
-
-#define CAMEL_MAILDIR_FOLDER_TYPE     (camel_maildir_folder_get_type ())
-#define CAMEL_MAILDIR_FOLDER(obj)     (GTK_CHECK_CAST((obj), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolder))
-#define CAMEL_MAILDIR_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolderClass))
-#define IS_CAMEL_MAILDIR_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_MAILDIR_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-	
-	gchar *directory_path;
-} CamelMaildirFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-
-} CamelMaildirFolderClass;
-
-
-/* public methods */
-
-/* Standard Gtk function */
-GtkType camel_maildir_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MAILDIR_FOLDER_H */
diff --git a/camel/providers/maildir/camel-maildir-provider.c b/camel/providers/maildir/camel-maildir-provider.c
deleted file mode 100644
index cd5521adc0..0000000000
--- a/camel/providers/maildir/camel-maildir-provider.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-maildir-provider.c: maildir provider registration code */
-
-/* 
- *
- * Copyright (C) 1999 Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr> .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-maildir-store.h"
-#include "camel-provider.h"
-#include "camel-log.h"
-
-
-static CamelProvider _maildir_provider = {
-	(GtkType) 0,
-	PROVIDER_STORE,
-	"maildir",
-	"Maildir provider for Camel",
-	"This maildir provider is based on the default MH provider of Camel",
-	(GModule *) NULL
-};
-
-
-
-CamelProvider *
-camel_provider_module_init ()
-{
-	_maildir_provider.object_type = camel_maildir_store_get_type();
-	return &_maildir_provider;
-}
diff --git a/camel/providers/maildir/camel-maildir-store.c b/camel/providers/maildir/camel-maildir-store.c
deleted file mode 100644
index 8f37494003..0000000000
--- a/camel/providers/maildir/camel-maildir-store.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-maildir-store.c : class for an maildir store */
-
-/* 
- *
- * Copyright (C) 1999 Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr> .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-maildir-store.h"
-#include "camel-maildir-folder.h"
-#include "url-util.h"
-
-static CamelStoreClass *parent_class=NULL;
-
-/* Returns the class for a CamelMaildirStore */
-#define CMAILDIRS_CLASS(so) CAMEL_MAILDIR_STORE_CLASS (GTK_OBJECT(so)->klass)
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass)
-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (GTK_OBJECT(so)->klass)
-
-static void _init (CamelStore *store, CamelSession *session,
-		   const gchar *url_name);
-static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name);
-
-static void
-camel_maildir_store_class_init (
-	CamelMaildirStoreClass *camel_maildir_store_class)
-{
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_maildir_store_class);
-
-	parent_class = gtk_type_class (camel_store_get_type ());
-	
-	/* virtual method definition */
-	/* virtual method overload */
-	camel_store_class->init = _init;
-	camel_store_class->get_folder = _get_folder;
-}
-
-static void
-camel_maildir_store_init (gpointer object, gpointer klass)
-{
-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-	
-	store->separator = G_DIR_SEPARATOR;
-}
-
-GtkType
-camel_maildir_store_get_type (void)
-{
-	static GtkType camel_maildir_store_type = 0;
-	
-	if (!camel_maildir_store_type)	{
-		GtkTypeInfo camel_maildir_store_info =	
-		{
-			"CamelMaildirStore",
-			sizeof (CamelMaildirStore),
-			sizeof (CamelMaildirStoreClass),
-			(GtkClassInitFunc) camel_maildir_store_class_init,
-			(GtkObjectInitFunc) camel_maildir_store_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		camel_maildir_store_type =
-			gtk_type_unique (CAMEL_STORE_TYPE,
-					 &camel_maildir_store_info);
-	}
-	
-	return camel_maildir_store_type;
-}
-
-static void 
-_init (CamelStore *store, CamelSession *session, const gchar *url_name)
-{
-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (store);
-	Gurl *store_url;
-	g_assert (url_name);
-
-	/* call parent implementation */
-	parent_class->init (store, session, url_name);
-	
-	/* find the path in the URL*/
-	store_url = g_url_new (url_name);
-
-	g_return_if_fail (store_url);
-	g_return_if_fail (store_url->path); 
-	
-	maildir_store->toplevel_dir = g_strdup (store_url->path); 
-
-	g_url_free (store_url);
-}
-
-static CamelFolder *
-_get_folder (CamelStore *store, const gchar *folder_name)
-{
-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (store);
-	CamelMaildirFolder *new_maildir_folder;
-	CamelFolder *new_folder;
-
-	new_maildir_folder = gtk_type_new (CAMEL_MAILDIR_FOLDER_TYPE);
-	new_folder = CAMEL_FOLDER (new_maildir_folder);
-
-	CF_CLASS (new_folder)->init_with_store (new_folder, store, NULL);
-	CF_CLASS (new_folder)->set_name (new_folder, folder_name, NULL);
-	
-	return new_folder;
-}
diff --git a/camel/providers/maildir/camel-maildir-store.h b/camel/providers/maildir/camel-maildir-store.h
deleted file mode 100644
index 1a95ed1436..0000000000
--- a/camel/providers/maildir/camel-maildir-store.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-maildirstore.h : class for an maildir store */
-
-/* 
- *
- * Copyright (C) 1999 Bertrand Guiheneuf <Bertrand.Guiheneuf@inria.fr> .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MAILDIR_STORE_H
-#define CAMEL_MAILDIR_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <gtk/gtk.h>
-#include "camel-store.h"
-
-#define CAMEL_MAILDIR_STORE_TYPE     (camel_maildir_store_get_type ())
-#define CAMEL_MAILDIR_STORE(obj)     (GTK_CHECK_CAST((obj), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStore))
-#define CAMEL_MAILDIR_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStoreClass))
-#define IS_CAMEL_MAILDIR_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_MAILDIR_STORE_TYPE))
-
-
-typedef struct {
-	CamelStore parent_object;	
-	
-	gchar *toplevel_dir;	
-} CamelMaildirStore;
-
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-
-} CamelMaildirStoreClass;
-
-
-/* public methods */
-
-/* Standard Gtk function */
-GtkType camel_maildir_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MAILDIR_STORE_H */
-
-
diff --git a/camel/providers/mbox/.cvsignore b/camel/providers/mbox/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/providers/mbox/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
deleted file mode 100644
index 073d9830de..0000000000
--- a/camel/providers/mbox/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelmboxincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelmbox.la
-provider_DATA = libcamelmbox.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-mbox-provider\"	
-
-libcamelmbox_la_SOURCES = 			\
-	camel-mbox-folder.c			\
-	camel-mbox-provider.c			\
-	camel-mbox-store.c			\
-	camel-mbox-summary.c
-
-libcamelmboxinclude_HEADERS =			\
-	camel-mbox-folder.h			\
-	camel-mbox-store.h			\
-	camel-mbox-summary.h
-
-libcamelmbox_la_LDFLAGS = -version-info 0:0:0
-
-libcamelmbox_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-#libcamelmbox_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelmbox.urls
-
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
deleted file mode 100644
index 44dfc7c6a4..0000000000
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mbox-folder.c : Abstract class for an email folder */
-
-/* 
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com> 
- *          Michael Zucchi <notzed@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-mbox-folder.h"
-#include "camel-mbox-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-mbox-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-exception.h"
-
-#define d(x)
-
-static CamelFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelMboxFolder */
-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void mbox_sync(CamelFolder *folder, gboolean expunge, CamelException *ex);
-static gint mbox_get_message_count(CamelFolder *folder);
-static gint mbox_get_unread_message_count(CamelFolder *folder);
-static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,
-
-				CamelException *ex);
-static GPtrArray *mbox_get_uids(CamelFolder *folder);
-static GPtrArray *mbox_get_summary(CamelFolder *folder);
-static CamelMimeMessage *mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);
-
-static void mbox_expunge(CamelFolder *folder, CamelException *ex);
-
-static const CamelMessageInfo *mbox_get_message_info(CamelFolder *folder, const char *uid);
-
-static GPtrArray *mbox_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);
-static void mbox_search_free(CamelFolder *folder, GPtrArray * result);
-
-static guint32 mbox_get_message_flags(CamelFolder *folder, const char *uid);
-static void mbox_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set);
-static gboolean mbox_get_message_user_flag(CamelFolder *folder, const char *uid, const char *name);
-static void mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);
-static const char *mbox_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);
-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
-
-
-static void mbox_finalize(CamelObject * object);
-
-static void
-camel_mbox_folder_class_init(CamelMboxFolderClass * camel_mbox_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mbox_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs(camel_folder_get_type()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = mbox_sync;
-	camel_folder_class->get_message_count = mbox_get_message_count;
-	camel_folder_class->get_unread_message_count = mbox_get_unread_message_count;
-	camel_folder_class->append_message = mbox_append_message;
-	camel_folder_class->get_uids = mbox_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_deep;
-	camel_folder_class->get_summary = mbox_get_summary;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	camel_folder_class->expunge = mbox_expunge;
-
-	camel_folder_class->get_message = mbox_get_message;
-
-	camel_folder_class->search_by_expression = mbox_search_by_expression;
-	camel_folder_class->search_free = mbox_search_free;
-
-	camel_folder_class->get_message_info = mbox_get_message_info;
-
-	camel_folder_class->get_message_flags = mbox_get_message_flags;
-	camel_folder_class->set_message_flags = mbox_set_message_flags;
-	camel_folder_class->get_message_user_flag = mbox_get_message_user_flag;
-	camel_folder_class->set_message_user_flag = mbox_set_message_user_flag;
-	camel_folder_class->get_message_user_tag = mbox_get_message_user_tag;
-	camel_folder_class->set_message_user_tag = mbox_set_message_user_tag;
-}
-
-static void
-mbox_init(gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-	CamelMboxFolder *mbox_folder = object;
-
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-
-	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
-	    CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |
-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;
-	/* FIXME: we don't actually preserve user flags right now. */
-
-	mbox_folder->summary = NULL;
-	mbox_folder->search = NULL;
-}
-
-static void
-mbox_finalize(CamelObject * object)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(object);
-
-	if (mbox_folder->index)
-		ibex_close(mbox_folder->index);
-
-	g_free(mbox_folder->folder_file_path);
-	g_free(mbox_folder->summary_file_path);
-	g_free(mbox_folder->folder_dir_path);
-	g_free(mbox_folder->index_file_path);
-
-	camel_folder_change_info_free(mbox_folder->changes);
-}
-
-CamelType camel_mbox_folder_get_type(void)
-{
-	static CamelType camel_mbox_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mbox_folder_type == CAMEL_INVALID_TYPE) {
-		camel_mbox_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelMboxFolder",
-							     sizeof(CamelMboxFolder),
-							     sizeof(CamelMboxFolderClass),
-							     (CamelObjectClassInitFunc) camel_mbox_folder_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) mbox_init,
-							     (CamelObjectFinalizeFunc) mbox_finalize);
-	}
-
-	return camel_mbox_folder_type;
-}
-
-CamelFolder *
-camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder;
-	CamelMboxFolder *mbox_folder;
-	const char *root_dir_path, *name;
-	struct stat st;
-	int forceindex;
-
-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_MBOX_FOLDER_TYPE));
-	mbox_folder = (CamelMboxFolder *)folder;
-
-	name = strrchr(full_name, '/');
-	if (name)
-		name++;
-	else
-		name = full_name;
-
-	camel_folder_construct(folder, parent_store, full_name, name);
-
-	root_dir_path = camel_mbox_store_get_toplevel_dir(CAMEL_MBOX_STORE(folder->parent_store));
-
-	mbox_folder->folder_file_path = g_strdup_printf("%s/%s", root_dir_path, full_name);
-	mbox_folder->summary_file_path = g_strdup_printf("%s/%s-ev-summary", root_dir_path, full_name);
-	mbox_folder->folder_dir_path = g_strdup_printf("%s/%s.sdb", root_dir_path, full_name);
-	mbox_folder->index_file_path = g_strdup_printf("%s/%s.ibex", root_dir_path, full_name);
-
-	mbox_folder->changes = camel_folder_change_info_new();
-
-	/* if we have no index file, force it */
-	forceindex = stat(mbox_folder->index_file_path, &st) == -1;
-	if (flags & CAMEL_STORE_FOLDER_BODY_INDEX) {
-
-		mbox_folder->index = ibex_open(mbox_folder->index_file_path, O_CREAT | O_RDWR, 0600);
-		if (mbox_folder->index == NULL) {
-			/* yes, this isn't fatal at all */
-			g_warning("Could not open/create index file: %s: indexing not performed", strerror(errno));
-			forceindex = FALSE;
-		}
-	} else {
-		/* if we do have an index file, remove it */
-		if (forceindex == FALSE) {
-			unlink(mbox_folder->index_file_path);
-		}
-		forceindex = FALSE;
-	}
-	/* no summary (disk or memory), and we're proverbially screwed */
-	mbox_folder->summary = camel_mbox_summary_new(mbox_folder->summary_file_path,
-						      mbox_folder->folder_file_path, mbox_folder->index);
-	if (mbox_folder->summary == NULL || camel_mbox_summary_load(mbox_folder->summary, forceindex) == -1) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_FOLDER_INVALID,	/* FIXME: right error code */
-				    _("Could not create summary"));
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-static void
-mbox_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	if (expunge)
-		mbox_expunge(folder, ex);
-	else {
-		camel_mbox_summary_sync(mbox_folder->summary, FALSE, mbox_folder->changes, ex);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder->changes);
-		camel_folder_change_info_clear(mbox_folder->changes);
-	}
-
-	/* save index */
-	if (mbox_folder->index)
-		ibex_save(mbox_folder->index);
-	if (mbox_folder->summary)
-		camel_folder_summary_save(CAMEL_FOLDER_SUMMARY(mbox_folder->summary));
-}
-
-static void
-mbox_expunge(CamelFolder *folder, CamelException *ex)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	camel_mbox_summary_sync(mbox_folder->summary, TRUE, mbox_folder->changes, ex);
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder->changes);
-	camel_folder_change_info_clear(mbox_folder->changes);
-}
-
-static gint
-mbox_get_message_count(CamelFolder *folder)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	g_return_val_if_fail(mbox_folder->summary != NULL, -1);
-
-	return camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mbox_folder->summary));
-}
-
-static gint
-mbox_get_unread_message_count(CamelFolder *folder)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-	CamelMessageInfo *info;
-	GPtrArray *infolist;
-	gint i, max, count = 0;
-
-	g_return_val_if_fail(mbox_folder->summary != NULL, -1);
-
-	max = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mbox_folder->summary));
-	if (max == -1)
-		return -1;
-
-	infolist = mbox_get_summary(folder);
-
-	for (i = 0; i < infolist->len; i++) {
-		info = (CamelMessageInfo *) g_ptr_array_index(infolist, i);
-		if (!(info->flags & CAMEL_MESSAGE_SEEN))
-			count++;
-	}
-
-	return count;
-}
-
-/* FIXME: this may need some tweaking for performance? */
-static void
-mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, CamelException *ex)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-	CamelStream *output_stream = NULL, *filter_stream = NULL;
-	CamelMimeFilter *filter_from = NULL;
-	CamelMessageInfo *newinfo;
-	struct stat st;
-	off_t seek = -1;
-	char *xev;
-	guint32 uid;
-	char *fromline = NULL;
-
-	if (stat(mbox_folder->folder_file_path, &st) != 0)
-		goto fail;
-
-	output_stream = camel_stream_fs_new_with_name(mbox_folder->folder_file_path, O_WRONLY|O_APPEND, 0600);
-	if (output_stream == NULL)
-		goto fail;
-
-	seek = st.st_size;
-
-	/* assign a new x-evolution header/uid */
-	camel_medium_remove_header(CAMEL_MEDIUM(message), "X-Evolution");
-	uid = camel_folder_summary_next_uid(CAMEL_FOLDER_SUMMARY(mbox_folder->summary));
-	/* important that the header matches exactly 00000000-0000 */
-	xev = g_strdup_printf("%08x-%04x", uid, info ? info->flags & 0xFFFF : 0);
-	camel_medium_add_header(CAMEL_MEDIUM(message), "X-Evolution", xev);
-	g_free(xev);
-
-	/* we must write this to the non-filtered stream ... */
-	fromline = camel_mbox_summary_build_from(CAMEL_MIME_PART(message)->headers);
-	if (camel_stream_printf(output_stream, seek==0?"%s":"\n%s", fromline) == -1)
-		goto fail;
-
-	/* and write the content to the filtering stream, that translated '\nFrom' into '\n>From' */
-	filter_stream = (CamelStream *) camel_stream_filter_new_with_stream(output_stream);
-	filter_from = (CamelMimeFilter *) camel_mime_filter_from_new();
-	camel_stream_filter_add((CamelStreamFilter *) filter_stream, filter_from);
-	if (camel_data_wrapper_write_to_stream(CAMEL_DATA_WRAPPER(message), filter_stream) == -1)
-		goto fail;
-
-	if (camel_stream_close(filter_stream) == -1)
-		goto fail;
-
-	/* filter stream ref's the output stream itself, so we need to unref it too */
-	camel_object_unref(CAMEL_OBJECT(filter_from));
-	camel_object_unref(CAMEL_OBJECT(filter_stream));
-	camel_object_unref(CAMEL_OBJECT(output_stream));
-	g_free(fromline);
-
-	/* force a summary update - will only update from the new position, if it can */
-	if (camel_mbox_summary_update(mbox_folder->summary, seek==0?seek:seek+1, mbox_folder->changes) == 0) {
-		char uidstr[16];
-
-		sprintf(uidstr, "%u", uid);
-		newinfo = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mbox_folder->summary), uidstr);
-
-		if (info && newinfo) {
-			CamelFlag *flag = info->user_flags;
-			CamelTag *tag = info->user_tags;
-
-			while (flag) {
-				camel_flag_set(&(newinfo->user_flags), flag->name, TRUE);
-				flag = flag->next;
-			}
-
-			while (tag) {
-				camel_tag_set(&(newinfo->user_tags), tag->name, tag->value);
-				tag = tag->next;
-			}
-		}
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder->changes);
-		camel_folder_change_info_clear(mbox_folder->changes);
-	}
-
-	return;
-
-      fail:
-	if (camel_exception_is_set(ex)) {
-		camel_exception_setv(ex, camel_exception_get_id(ex),
-				     _("Cannot append message to mbox file: %s"), camel_exception_get_description(ex));
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to mbox file: %s"), g_strerror(errno));
-	}
-	if (filter_stream) {
-		/*camel_stream_close (filter_stream); */
-		camel_object_unref(CAMEL_OBJECT(filter_stream));
-	}
-	if (output_stream)
-		camel_object_unref(CAMEL_OBJECT(output_stream));
-
-	if (filter_from)
-		camel_object_unref(CAMEL_OBJECT(filter_from));
-
-	g_free(fromline);
-
-	/* make sure the file isn't munged by us */
-	if (seek != -1) {
-		int fd = open(mbox_folder->folder_file_path, O_WRONLY, 0600);
-
-		if (fd != -1) {
-			ftruncate(fd, st.st_size);
-			close(fd);
-		}
-	}
-}
-
-static GPtrArray *
-mbox_get_uids(CamelFolder *folder)
-{
-	GPtrArray *array;
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-	int i, count;
-
-	count = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mbox_folder->summary));
-	array = g_ptr_array_new();
-	g_ptr_array_set_size(array, count);
-	for (i = 0; i < count; i++) {
-		CamelMboxMessageInfo *info =
-		    (CamelMboxMessageInfo *) camel_folder_summary_index(CAMEL_FOLDER_SUMMARY(mbox_folder->summary), i);
-
-		array->pdata[i] = g_strdup(info->info.uid);
-	}
-
-	return array;
-}
-
-static CamelMimeMessage *
-mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelMboxMessageInfo *info;
-	CamelMimeParser *parser = NULL;
-	char *buffer;
-	int len;
-
-	/* get the message summary info */
-	info = (CamelMboxMessageInfo *) camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mbox_folder->summary), uid);
-
-	if (info == NULL) {
-		errno = ENOENT;
-		goto fail;
-	}
-
-	/* if this has no content, its an error in the library */
-	g_assert(info->info.content);
-	g_assert(info->frompos != -1);
-
-	/* where we read from */
-	message_stream = camel_stream_fs_new_with_name(mbox_folder->folder_file_path, O_RDONLY, 0);
-	if (message_stream == NULL)
-		goto fail;
-
-	/* we use a parser to verify the message is correct, and in the correct position */
-	parser = camel_mime_parser_new();
-	camel_mime_parser_init_with_stream(parser, message_stream);
-	camel_object_unref(CAMEL_OBJECT(message_stream));
-	camel_mime_parser_scan_from(parser, TRUE);
-
-	camel_mime_parser_seek(parser, info->frompos, SEEK_SET);
-	if (camel_mime_parser_step(parser, &buffer, &len) != HSCAN_FROM) {
-		g_warning("File appears truncated");
-		goto fail;
-	}
-
-	if (camel_mime_parser_tell_start_from(parser) != info->frompos) {
-		/* TODO: This should probably perform a re-sync/etc, and try again? */
-		g_warning("Summary doesn't match the folder contents!  eek!\n"
-			  "  expecting offset %ld got %ld", (long int)info->frompos,
-			  (long int)camel_mime_parser_tell_start_from(parser));
-		errno = EINVAL;
-		goto fail;
-	}
-
-	message = camel_mime_message_new();
-	if (camel_mime_part_construct_from_parser(CAMEL_MIME_PART(message), parser) == -1) {
-		g_warning("Construction failed");
-		goto fail;
-	}
-	camel_object_unref(CAMEL_OBJECT(parser));
-
-	return message;
-
-      fail:
-	camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s"), g_strerror(errno));
-
-	if (parser)
-		camel_object_unref(CAMEL_OBJECT(parser));
-	if (message)
-		camel_object_unref(CAMEL_OBJECT(message));
-
-	return NULL;
-}
-
-GPtrArray *
-mbox_get_summary(CamelFolder *folder)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	return CAMEL_FOLDER_SUMMARY(mbox_folder->summary)->messages;
-}
-
-/* get a single message info, by uid */
-static const CamelMessageInfo *
-mbox_get_message_info(CamelFolder *folder, const char *uid)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	return camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mbox_folder->summary), uid);
-}
-
-static GPtrArray *
-mbox_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	if (mbox_folder->search == NULL) {
-		mbox_folder->search = camel_folder_search_new();
-	}
-
-	camel_folder_search_set_folder(mbox_folder->search, folder);
-	if (mbox_folder->summary) {
-		/* FIXME: dont access summary array directly? */
-		camel_folder_search_set_summary(mbox_folder->search,
-						CAMEL_FOLDER_SUMMARY(mbox_folder->summary)->messages);
-	}
-
-	camel_folder_search_set_body_index(mbox_folder->search, mbox_folder->index);
-
-	return camel_folder_search_execute_expression(mbox_folder->search, expression, ex);
-}
-
-static void
-mbox_search_free(CamelFolder *folder, GPtrArray * result)
-{
-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
-
-	camel_folder_search_free_result(mbox_folder->search, result);
-}
-
-static guint32
-mbox_get_message_flags(CamelFolder *folder, const char *uid)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, 0);
-
-	return info->flags;
-}
-
-static void
-mbox_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	info->flags = (info->flags & ~flags) | (set & flags) | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-static gboolean
-mbox_get_message_user_flag(CamelFolder *folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	return camel_flag_get(&info->user_flags, name);
-}
-
-static void
-mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	camel_flag_set(&info->user_flags, name, value);
-	info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-static const char *mbox_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	return camel_tag_get(&info->user_tags, name);
-}
-
-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	CamelMessageInfo *info;
-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	camel_tag_set(&info->user_tags, name, value);
-	info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-
diff --git a/camel/providers/mbox/camel-mbox-folder.h b/camel/providers/mbox/camel-mbox-folder.h
deleted file mode 100644
index 73f51a6d85..0000000000
--- a/camel/providers/mbox/camel-mbox-folder.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-folder.h : Abstract class for an email folder */
-
-/* 
- *
- * Author : Bertrand Guiheneuf <bertrand@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MBOX_FOLDER_H
-#define CAMEL_MBOX_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-search.h>
-#include <libibex/ibex.h>
-#include "camel-mbox-summary.h"
-
-/*  #include "camel-store.h" */
-
-#define CAMEL_MBOX_FOLDER_TYPE     (camel_mbox_folder_get_type ())
-#define CAMEL_MBOX_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolder))
-#define CAMEL_MBOX_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass))
-#define IS_CAMEL_MBOX_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE))
-
-typedef struct {
-	CamelFolder parent_object;
-
-	gchar *folder_file_path;   /* contains the messages */
-	gchar *summary_file_path;  /* contains the messages summary */
-	gchar *folder_dir_path;    /* contains the subfolders */
-	gchar *index_file_path;	   /* index of body contents */
-
-	ibex *index;		   /* index for this folder */
-	CamelMboxSummary *summary;
-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */
-	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */
-} CamelMboxFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelMboxFolderClass;
-
-
-/* public methods */
-/* flags are taken from CAMEL_STORE_FOLDER_* flags */
-CamelFolder *camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_mbox_folder_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MBOX_FOLDER_H */
diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c
deleted file mode 100644
index bfce8b5ada..0000000000
--- a/camel/providers/mbox/camel-mbox-provider.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-provider.c: mbox provider registration code */
-
-/* 
- * Authors :
- *   Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright (C) 2000 HelixCode (www.helixcode.com).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-mbox-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider mbox_provider = {
-	"mbox",
-	N_("UNIX mbox-format mail files"),
-
-	N_("For reading mail delivered by the local system, and for "
-	   "storing mail on local disk."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_PATH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	mbox_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_mbox_store_get_type();
-
-	mbox_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-
-	camel_session_register_provider (session, &mbox_provider);
-}
diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c
deleted file mode 100644
index e3110ef3d3..0000000000
--- a/camel/providers/mbox/camel-mbox-store.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-store.c : class for an mbox store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <bertrand@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "camel-mbox-store.h"
-#include "camel-mbox-folder.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-/* Returns the class for a CamelMboxStore */
-#define CMBOXS_CLASS(so) CAMEL_MBOX_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static char *get_name(CamelService *service, gboolean brief);
-static CamelFolder *get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);
-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);
-static char *get_folder_name(CamelStore *store, const char *folder_name, CamelException *ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-
-static void
-camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_mbox_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_mbox_store_class);
-	
-	/* virtual method overload */
-	camel_service_class->get_name = get_name;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-}
-
-static void
-camel_mbox_store_init (gpointer object, gpointer klass)
-{
-	CamelStore *store = CAMEL_STORE (object);
-
-	/* mbox names are filenames, so they are case-sensitive. */
-	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-CamelType
-camel_mbox_store_get_type (void)
-{
-	static CamelType camel_mbox_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_mbox_store_type == CAMEL_INVALID_TYPE)	{
-		camel_mbox_store_type = camel_type_register (CAMEL_STORE_TYPE, "CamelMboxStore",
-							     sizeof (CamelMboxStore),
-							     sizeof (CamelMboxStoreClass),
-							     (CamelObjectClassInitFunc) camel_mbox_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_mbox_store_init,
-							     NULL);
-	}
-	
-	return camel_mbox_store_type;
-}
-
-const gchar *
-camel_mbox_store_get_toplevel_dir (CamelMboxStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-
-	g_assert (url != NULL);
-	return url->path;
-}
-
-static CamelFolder *
-get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	char *name;
-	struct stat st;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-
-	if (stat(name, &st) == -1) {
-		int fd;
-
-		if (errno != ENOENT) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not open file `%s':\n%s"),
-					     name, g_strerror(errno));
-			g_free(name);
-			return NULL;
-		}
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s' does not exist."),
-					     folder_name);
-			g_free(name);
-			return NULL;
-		}
-
-		fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0600);
-		if (fd == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not create file `%s':\n%s"),
-					     name, g_strerror(errno));
-			g_free(name);
-			return NULL;
-		}
-		g_free(name);
-		close(fd);
-	} else if (!S_ISREG(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a regular file."),
-				     name);
-		g_free(name);
-		return NULL;
-	} else
-		g_free(name);
-
-	return camel_mbox_folder_new(store, folder_name, flags, ex);
-}
-
-static void
-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	char *name, *name2;
-	struct stat st;
-	int status;
-
-	name = g_strdup_printf ("%s%s", CAMEL_SERVICE (store)->url->path, folder_name);
-	if (stat (name, &st) == -1) {
-		if (errno == ENOENT) {
-			/* file doesn't exist - it's kinda like deleting it ;-) */
-			g_free (name);
-			return;
-		}
-
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s':\n%s"),
-				      folder_name, g_strerror (errno));
-		g_free (name);
-		return;
-	}
-	
-	if (!S_ISREG (st.st_mode)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      _("`%s' is not a regular file."), name);
-		g_free (name);
-		return;
-	}
-	
-	if (st.st_size != 0) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
-				      _("Folder `%s' is not empty. Not deleted."),
-				      folder_name);
-		g_free (name);
-		return;
-	}
-
-	/* Delete index and summary first, then the main file. */
-	name2 = g_strdup_printf ("%s.ibex", name);
-	status = unlink (name2);
-	g_free (name2);
-	if (status == 0 || errno == ENOENT) {
-		name2 = g_strdup_printf ("%s-ev-summary", name);
-		status = unlink (name2);
-		g_free (name2);
-	}
-	if (status == 0 || errno == ENOENT)
-		status = unlink (name);
-	g_free (name);
-
-	if (status == -1 && errno != ENOENT) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s':\n%s"),
-				      folder_name, g_strerror (errno));
-	}
-}
-
-static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, CamelException *ex)
-{
-	struct stat st;
-	char *old = g_strconcat(prefix, oldp, suffix, 0);
-	char *new = g_strconcat(prefix, newp, suffix, 0);
-	int ret = -1;
-
-	printf("renaming %s%s to %s%s\n", oldp, suffix, newp, suffix);
-
-	/* FIXME: this has races ... */
-	if (!(stat(new, &st) == -1 && errno==ENOENT)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not rename folder %s to %s: destination exists"),
-				     old, new);
-	} else if (rename(old, new) == 0 || errno==ENOENT) {
-		ret = 0;
-	} else if (stat(old, &st) == -1 && errno==ENOENT && stat(new, &st) == 0) {
-		/* for nfs, check if the rename worked anyway ... */
-		ret = 0;
-	}
-
-	g_free(old);
-	g_free(new);
-	return ret;
-}
-
-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)
-{
-	char *path = CAMEL_SERVICE (store)->url->path;
-
-	/* try to rollback failures, has obvious races */
-	if (xrename(old, new, path, ".ibex", ex)) {
-		return;
-	}
-	if (xrename(old, new, path, "-ev-summary", ex)) {
-		xrename(new, old, path, ".ibex", ex);
-		return;
-	}
-	if (xrename(old, new, path, "", ex)) {
-		xrename(new, old, path, "-ev-summary", ex);
-		xrename(new, old, path, ".ibex", ex);
-	}
-}
-
-static char *
-get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	/* For now, we don't allow hieararchy. FIXME. */
-	if (strchr (folder_name + 1, '/')) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("Mbox folders may not be nested."));
-		return NULL;
-	}
-
-	return *folder_name == '/' ? g_strdup (folder_name) :
-		g_strdup_printf ("/%s", folder_name);
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup (service->url->path);
-	else
-		return g_strdup_printf (_("Local mail file %s"), service->url->path);
-}
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only,
-		 CamelException *ex)
-{
-	/* FIXME: This is broken, but it corresponds to what was
-	 * there before.
-	 */
-	return NULL;
-}
diff --git a/camel/providers/mbox/camel-mbox-store.h b/camel/providers/mbox/camel-mbox-store.h
deleted file mode 100644
index 7b298b67f6..0000000000
--- a/camel/providers/mbox/camel-mbox-store.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-store.h : class for an mbox store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <bertrand@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_MBOX_STORE_H
-#define CAMEL_MBOX_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-store.h"
-
-#define CAMEL_MBOX_STORE_TYPE     (camel_mbox_store_get_type ())
-#define CAMEL_MBOX_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_STORE_TYPE, CamelMboxStore))
-#define CAMEL_MBOX_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass))
-#define IS_CAMEL_MBOX_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_STORE_TYPE))
-
-
-typedef struct {
-	CamelStore parent_object;	
-	
-} CamelMboxStore;
-
-
-
-typedef struct {
-	CamelStoreClass parent_class;
-
-} CamelMboxStoreClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_mbox_store_get_type (void);
-
-const gchar *camel_mbox_store_get_toplevel_dir (CamelMboxStore *store);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_MBOX_STORE_H */
-
-
diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c
deleted file mode 100644
index 8856d37ee8..0000000000
--- a/camel/providers/mbox/camel-mbox-summary.c
+++ /dev/null
@@ -1,894 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-mbox-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define io(x)
-#define d(x)
-
-#define CAMEL_MBOX_SUMMARY_VERSION (0x1000)
-
-struct _CamelMboxSummaryPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMboxSummary *)(o))->priv)
-
-static int summary_header_load (CamelFolderSummary *, FILE *);
-static int summary_header_save (CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
-static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
-static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *);
-static int		  message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *);
-/*static void		  message_info_free (CamelFolderSummary *, CamelMessageInfo *);*/
-
-static void camel_mbox_summary_class_init (CamelMboxSummaryClass *klass);
-static void camel_mbox_summary_init       (CamelMboxSummary *obj);
-static void camel_mbox_summary_finalise   (CamelObject *obj);
-
-static CamelFolderSummaryClass *camel_mbox_summary_parent;
-
-CamelType
-camel_mbox_summary_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_folder_summary_get_type(), "CamelMboxSummary",
-					   sizeof (CamelMboxSummary),
-					   sizeof (CamelMboxSummaryClass),
-					   (CamelObjectClassInitFunc) camel_mbox_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_mbox_summary_init,
-					   (CamelObjectFinalizeFunc) camel_mbox_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_mbox_summary_class_init(CamelMboxSummaryClass *klass)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;
-	
-	camel_mbox_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));
-
-	sklass->summary_header_load = summary_header_load;
-	sklass->summary_header_save = summary_header_save;
-
-	sklass->message_info_new  = message_info_new;
-	sklass->message_info_new_from_parser = message_info_new_from_parser;
-	sklass->message_info_load = message_info_load;
-	sklass->message_info_save = message_info_save;
-	/*sklass->message_info_free = message_info_free;*/
-}
-
-static void
-camel_mbox_summary_init(CamelMboxSummary *obj)
-{
-	struct _CamelMboxSummaryPrivate *p;
-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelMboxMessageInfo);
-	s->content_info_size = sizeof(CamelMboxMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_MBOX_SUMMARY_VERSION;
-}
-
-static void
-camel_mbox_summary_finalise(CamelObject *obj)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(obj);
-
-	g_free(mbs->folder_path);
-}
-
-/**
- * camel_mbox_summary_new:
- *
- * Create a new CamelMboxSummary object.
- * 
- * Return value: A new CamelMboxSummary widget.
- **/
-CamelMboxSummary *
-camel_mbox_summary_new(const char *filename, const char *mbox_name, ibex *index)
-{
-	CamelMboxSummary *new = CAMEL_MBOX_SUMMARY(camel_object_new(camel_mbox_summary_get_type()));
-	
-	if (new) {
-		/* ?? */
-		camel_folder_summary_set_build_content(CAMEL_FOLDER_SUMMARY(new), TRUE);
-		camel_folder_summary_set_filename(CAMEL_FOLDER_SUMMARY(new), filename);
-		new->folder_path = g_strdup(mbox_name);
-		new->index = index;
-	}
-	return new;
-}
-
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->summary_header_load(s, in) == -1)
-		return -1;
-
-	return camel_folder_summary_decode_uint32(in, &mbs->folder_size);
-}
-
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
-{
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->summary_header_save(s, out) == -1)
-		return -1;
-
-	return camel_folder_summary_encode_uint32(out, mbs->folder_size);
-}
-
-static int
-header_evolution_decode(const char *in, guint32 *uid, guint32 *flags)
-{
-        char *header;
-	
-        if (in && (header = header_token_decode(in))) {
-                if (strlen (header) == strlen ("00000000-0000")
-                    && sscanf (header, "%08x-%04x", uid, flags) == 2) {
-                        g_free(header);
-                        return *uid;
-                }
-                g_free(header);
-        }
-
-        return -1;
-}
-
-static char *
-header_evolution_encode(guint32 uid, guint32 flags)
-{
-	return g_strdup_printf("%08x-%04x", uid, flags & 0xffff);
-}
-
-static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_new(s, h);
-	if (mi) {
-		const char *xev;
-		guint32 uid, flags;
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-		xev = header_raw_find(&h, "X-Evolution", NULL);
-		if (xev && header_evolution_decode(xev, &uid, &flags) != -1) {
-			g_free(mi->uid);
-			mi->uid = g_strdup_printf("%u", uid);
-			if (camel_folder_summary_uid(s, mi->uid)) {
-				g_free(mi->uid);
-				mi->uid = camel_folder_summary_next_uid_string(s);
-			} else {
-				/* so we dont get clashes later on */
-				camel_folder_summary_set_uid(s, uid+1);
-			}
-			mi->flags = flags;
-		} else {
-			/* to indicate it has no xev header? */
-			mi->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV;
-			mi->uid = g_strdup_printf("%u", camel_folder_summary_next_uid(s));
-		}
-		mbi->frompos = -1;
-	}
-	
-	return mi;
-}
-
-static CamelMessageInfo *
-message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
-{
-	CamelMessageInfo *mi;
-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_new_from_parser(s, mp);
-	if (mi) {
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-		mbi->frompos = camel_mime_parser_tell_start_from(mp);
-
-		/* do we want to index this message as we add it, as well? */
-		if (mbs->index
-		    && (mbs->index_force
-			|| (mi->flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0
-			|| !ibex_contains_name(mbs->index, mi->uid))) {
-			camel_folder_summary_set_index(s, mbs->index);
-		} else {
-			camel_folder_summary_set_index(s, NULL);
-		}
-	}
-	
-	return mi;
-}
-
-static CamelMessageInfo *
-message_info_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelMessageInfo *mi;
-
-	io(printf("loading mbox message info\n"));
-
-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_load(s, in);
-	if (mi) {
-		guint32 position;
-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-		camel_folder_summary_decode_uint32(in, &position);
-		mbi->frompos = position;
-	}
-	
-	return mi;
-}
-
-static int
-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
-{
-	CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;
-
-	io(printf("saving mbox message info\n"));
-
-	((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_save(s, out, mi);
-
-	return camel_folder_summary_encode_uint32(out, mbi->frompos);
-}
-
-static int
-summary_rebuild(CamelMboxSummary *mbs, off_t offset)
-{
-	CamelFolderSummary *s = CAMEL_FOLDER_SUMMARY(mbs);
-	CamelMimeParser *mp;
-	int fd;
-	int ok = 0;
-
-	fd = open(mbs->folder_path, O_RDONLY);
-	if (fd == -1) {
-		printf("%s failed to open: %s", mbs->folder_path, strerror(errno));
-		return -1;
-	}
-	
-	mp = camel_mime_parser_new();
-	camel_mime_parser_init_with_fd(mp, fd);
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_seek(mp, offset, SEEK_SET);
-
-	if (offset > 0) {
-		if (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {
-			if (camel_mime_parser_tell_start_from(mp) != offset) {
-				g_warning ("The next message didn't start where I expected\nbuilding summary from start");
-				camel_mime_parser_drop_step(mp);
-				offset = 0;
-				camel_mime_parser_seek(mp, offset, SEEK_SET);
-				camel_folder_summary_clear(CAMEL_FOLDER_SUMMARY(mbs));
-			} else {
-				camel_mime_parser_unstep(mp);
-			}
-		} else {
-			camel_object_unref(CAMEL_OBJECT(mp));
-			/* end of file - no content? */
-			return -1;
-		}
-	}
-
-	while (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {
-		CamelMessageInfo *info;
-
-		info = camel_folder_summary_add_from_parser(CAMEL_FOLDER_SUMMARY(mbs), mp);
-		if (info == NULL) {
-			printf ("Could not build info from file?\n");
-			ok = -1;
-			break;
-		}
-
-		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);
-	}
-
-	camel_object_unref(CAMEL_OBJECT (mp));
-	
-	/* update the file size/mtime in the summary */
-	if (ok != -1) {
-		struct stat st;
-
-		if (stat(mbs->folder_path, &st) == 0) {
-			mbs->folder_size = st.st_size;
-			s->time = st.st_mtime;
-		}
-	}
-
-	return ok;
-}
-
-int
-camel_mbox_summary_update(CamelMboxSummary *mbs, off_t offset, CamelFolderChangeInfo *changeinfo)
-{
-	int ret, i, count;
-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;
-
-	/* we use the diff function of the change_info to build the update list. */
-	for (i = 0; i < camel_folder_summary_count(s); i++) {
-		CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-
-		camel_folder_change_info_add_source(changeinfo, mi->uid);
-	}
-
-	/* do the actual work */
-	mbs->index_force = FALSE;
-	ret = summary_rebuild(mbs, offset);
-
-	count = camel_folder_summary_count(s);
-	for (i = 0; i < count; i++) {
-		CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-		camel_folder_change_info_add_update(changeinfo, mi->uid);
-	}
-	camel_folder_change_info_build_diff(changeinfo);
-	
-#if 0
-#warning "Saving full summary and index after every summarisation is slow ..."
-	if (ret != -1) {
-		if (camel_folder_summary_save((CamelFolderSummary *)mbs) == -1)
-			g_warning("Could not save summary: %s", strerror(errno));
-		if (mbs->index)
-			ibex_save(mbs->index);
-	}
-#endif
-	return ret;
-}
-
-int
-camel_mbox_summary_load(CamelMboxSummary *mbs, int forceindex)
-{
-	CamelFolderSummary *s = CAMEL_FOLDER_SUMMARY(mbs);
-	struct stat st;
-	int ret = 0;
-	off_t minstart;
-
-	mbs->index_force = forceindex;
-
-	/* is the summary out of date? */
-	if (stat(mbs->folder_path, &st) == -1) {
-		camel_folder_summary_clear(s);
-		printf("Cannot summarise folder: '%s': %s\n", mbs->folder_path, strerror(errno));
-		return -1;
-	}
-
-	if (forceindex || camel_folder_summary_load(s) == -1) {
-		camel_folder_summary_clear(s);
-		ret = summary_rebuild(mbs, 0);
-	} else {
-		minstart = st.st_size;
-#if 0
-		/* find out the first unindexed message ... */
-		/* TODO: For this to work, it has to check that the message is
-		   indexable, and contains content ... maybe it cannot be done 
-		   properly? */
-		for (i = 0; i < camel_folder_summary_count(s); i++) {
-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-
-			if (mbs->index && !ibex_contains_name(mbs->index, mi->uid)) {
-				minstart = ((CamelMboxMessageInfo *) mi)->frompos;
-				printf("Found unindexed message: %s\n", mi->uid);
-				break;
-			}
-		}
-#endif
-		/* is the summary uptodate? */
-		if (st.st_size == mbs->folder_size && st.st_mtime == s->time) {
-			if (minstart < st.st_size) {
-				/* FIXME: Only clear the messages and reindex from this point forward */
-				camel_folder_summary_clear(s);
-				ret = summary_rebuild(mbs, 0);
-			}
-		} else {
-			if (mbs->folder_size < st.st_size) {
-				if (minstart < mbs->folder_size) {
-					/* FIXME: only make it rebuild as necessary */
-					camel_folder_summary_clear(s);
-					ret = summary_rebuild(mbs, 0);
-				} else {
-					ret = summary_rebuild(mbs, mbs->folder_size);
-					/* If that fails, it might be because a message was changed
-					 * rather than appended... so try again from the beginning.
-					 */
-					if (ret == -1) {
-						camel_folder_summary_clear(s);
-						ret = summary_rebuild(mbs, 0);
-					}
-				}
-			} else {
-				camel_folder_summary_clear(s);
-				ret = summary_rebuild(mbs, 0);
-			}
-		}
-	}
-
-	if (ret != -1) {
-		mbs->folder_size = st.st_size;
-		s->time = st.st_mtime;
-		if (camel_folder_summary_save(s) == -1)
-			g_warning("Could not save summary: %s", strerror(errno));
-		if (mbs->index)
-			ibex_save(mbs->index);
-	}
-
-	return ret;
-}
-
-static int
-header_write(int fd, struct _header_raw *header, char *xevline)
-{
-	struct iovec iv[4];
-	int outlen = 0, len;
-
-	iv[1].iov_base = ":";
-	iv[1].iov_len = 1;
-	iv[3].iov_base = "\n";
-	iv[3].iov_len = 1;
-
-	while (header) {
-		if (strcasecmp(header->name, "X-Evolution")) {
-			iv[0].iov_base = header->name;
-			iv[0].iov_len = strlen(header->name);
-			iv[2].iov_base = header->value;
-			iv[2].iov_len = strlen(header->value);
-
-			do {
-				len = writev(fd, iv, 4);
-			} while (len == -1 && errno == EINTR);
-
-			if (len == -1)
-				return -1;
-			outlen += len;
-		}
-		header = header->next;
-	}
-
-	iv[0].iov_base = "X-Evolution: ";
-	iv[0].iov_len = strlen(iv[0].iov_base);
-	iv[1].iov_base = xevline;
-	iv[1].iov_len = strlen(xevline);
-	iv[2].iov_base = "\n\n";
-	iv[2].iov_len = 2;
-
-	do {
-		len = writev(fd, iv, 3);
-	} while (len == -1 && errno == EINTR);
-
-	if (len == -1)
-		return -1;
-
-	outlen += 1;
-
-	d(printf("Wrote %d bytes of headers\n", outlen));
-
-	return outlen;
-}
-
-static int
-copy_block(int fromfd, int tofd, off_t start, size_t bytes)
-{
-	char buffer[4096];
-	int written = 0;
-
-	d(printf("writing %d bytes ... ", bytes));
-
-	if (lseek(fromfd, start, SEEK_SET) != start)
-		return -1;
-
-	while (bytes > 0) {
-		int toread, towrite;
-
-		toread = bytes;
-		if (bytes > 4096)
-			toread = 4096;
-		else
-			toread = bytes;
-		do {
-			towrite = read(fromfd, buffer, toread);
-		} while (towrite == -1 && errno == EINTR);
-
-		if (towrite == -1)
-			return -1;
-
-		/* check for 'end of file' */
-		if (towrite == 0) {
-			d(printf("end of file?\n"));
-			break;
-		}
-
-		do {
-			toread = write(tofd, buffer, towrite);
-		} while (toread == -1 && errno == EINTR);
-
-		if (toread == -1)
-			return -1;
-
-		written += toread;
-		bytes -= toread;
-	}
-
-	d(printf("written %d bytes\n", written));
-
-	return written;
-}
-
-static char *tz_months[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *tz_days[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-/* tries to build a From line, based on message headers */
-char *
-camel_mbox_summary_build_from(struct _header_raw *header)
-{
-	GString *out = g_string_new("From ");
-	char *ret;
-	const char *tmp;
-	time_t thetime;
-	int offset;
-	struct tm tm;
-
-	tmp = header_raw_find(&header, "Sender", NULL);
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "From", NULL);
-	if (tmp != NULL) {
-		struct _header_address *addr = header_address_decode(tmp);
-
-		tmp = NULL;
-		if (addr) {
-			if (addr->type == HEADER_ADDRESS_NAME) {
-				g_string_append(out, addr->v.addr);
-				tmp = "";
-			}
-			header_address_unref(addr);
-		}
-	}
-	if (tmp == NULL) {
-		g_string_append(out, "unknown@nodomain.now.au");
-	}
-
-	/* try use the received header to get the date */
-	tmp = header_raw_find(&header, "Received", NULL);
-	if (tmp) {
-		tmp = strrchr(tmp, ';');
-		if (tmp)
-			tmp++;
-	}
-
-	/* if there isn't one, try the Date field */
-	if (tmp == NULL)
-		tmp = header_raw_find(&header, "Date", NULL);
-
-	thetime = header_decode_date(tmp, &offset);
-
-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;
-
-	/* a pseudo, but still bogus attempt at thread safing the function */
-	/*memcpy(&tm, gmtime(&thetime), sizeof(tm));*/
-	gmtime_r(&thetime, &tm);
-
-	g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n",
-			  tz_days[tm.tm_wday],
-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);
-
-	ret = out->str;
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-int
-camel_mbox_summary_sync(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
-{
-	CamelMimeParser *mp = NULL;
-	int i, count;
-	CamelMboxMessageInfo *info;
-	CamelFolderSummary *s = CAMEL_FOLDER_SUMMARY(mbs);
-	int fd = -1, fdout = -1;
-	off_t offset = 0;
-	char *tmpname = NULL;
-	char *buffer, *xevnew = NULL;
-	const char *xev;
-	int len;
-	guint32 uid, flags;
-	int quick = TRUE, work = FALSE;
-	struct stat st;
-	char *fromline;
-
-	/* make sure we're in sync, after this point we at least have a complete list of id's */
-	count = camel_folder_summary_count (s);
-	if (count > 0) {
-		CamelMessageInfo *mi = camel_folder_summary_index(s, count - 1);
-		camel_mbox_summary_update(mbs, mi->content->endpos, changeinfo);
-	} else {
-		camel_mbox_summary_update(mbs, 0, changeinfo);
-	}
-
-	/* check if we have any work to do */
-	d(printf("Performing sync, %d messages in inbox\n", count));
-	for (i = 0; quick && i < count; i++) {
-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);
-		if ((expunge && (info->info.flags & CAMEL_MESSAGE_DELETED)) ||
-		    (info->info.flags & CAMEL_MESSAGE_FOLDER_NOXEV))
-			quick = FALSE;
-		else
-			work |= (info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) != 0;
-	}
-
-	d(printf("Options: %s %s %s\n", expunge ? "expunge" : "", quick ? "quick" : "", work ? "Work" : ""));
-
-	if (quick && !work)
-		return 0;
-
-	fd = open(mbs->folder_path, O_RDWR);
-	if (fd == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not open summary %s"), mbs->folder_path);
-		return -1;
-	}
-
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, TRUE);
-	camel_mime_parser_init_with_fd(mp, fd);
-
-	if (!quick) {
-		tmpname = alloca(strlen (mbs->folder_path) + 5);
-		sprintf(tmpname, "%s.tmp", mbs->folder_path);
-		d(printf("Writing tmp file to %s\n", tmpname));
-	retry_out:
-		fdout = open(tmpname, O_WRONLY|O_CREAT|O_EXCL, 0600);
-		if (fdout == -1) {
-			if (errno == EEXIST)
-				if (unlink(tmpname) != -1)
-					goto retry_out;
-			
-			tmpname = NULL;
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot open temporary mailbox: %s"), strerror(errno));
-			goto error;
-		}
-	}
-
-	for (i = 0; i < count; i++) {
-		off_t frompos, bodypos, lastpos;
-		/* This has to be an int, not an off_t, because that's
-		 * what camel_mime_parser_header returns... FIXME.
-		 */
-		int xevoffset;
-
-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);
-
-		g_assert(info);
-
-		d(printf("Looking at message %s\n", info->info.uid));
-
-		if (expunge && info->info.flags & CAMEL_MESSAGE_DELETED) {
-			d(printf("Deleting %s\n", info->info.uid));
-
-			g_assert(!quick);
-			offset -= (info->info.content->endpos - info->frompos);
-			if (mbs->index)
-				ibex_unindex(mbs->index, info->info.uid);
-			/* remove it from teh change list */
-			camel_folder_change_info_remove_uid(changeinfo, info->info.uid);
-			camel_folder_summary_remove(s, (CamelMessageInfo *)info);
-			count--;
-			i--;
-			info = NULL;
-		} else if (info->info.flags & (CAMEL_MESSAGE_FOLDER_NOXEV | CAMEL_MESSAGE_FOLDER_FLAGGED)) {
-			int xevok = FALSE;
-
-			d(printf("Updating header for %s flags = %08x\n", info->info.uid, info->info.flags));
-
-			/* find the next message, header parts */
-			camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
-			if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM) {
-				g_warning("camel_mime_parser_step failed (1)");
-				goto error;
-			}
-
-			if (camel_mime_parser_tell_start_from (mp) != info->frompos) {
-				g_warning("Summary/mbox mismatch, aborting sync");
-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Summary mismatch, aborting sync"));
-				goto error;
-			}
-			
-			if (camel_mime_parser_step (mp, &buffer, &len) == HSCAN_FROM_END) {
-				g_warning("camel_mime_parser_step failed (2)");
-				goto error;
-			}
-
-			/* Check if the X-Evolution header is valid.  */
-
-			xev = camel_mime_parser_header(mp, "X-Evolution", &xevoffset);
-			if (xev && header_evolution_decode (xev, &uid, &flags) != -1)
-				xevok = TRUE;
-
-			xevnew = header_evolution_encode(strtoul (info->info.uid, NULL, 10), info->info.flags & 0xffff);
-			if (quick) {
-				if (!xevok) {
-					g_warning("The summary told me I had an X-Evolution header, but i dont!");
-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Summary mismatch, X-Evolution header missing"));
-					goto error;
-				}
-				buffer = g_strdup_printf("X-Evolution: %s", xevnew);
-				lastpos = lseek(fd, 0, SEEK_CUR);
-				lseek(fd, xevoffset, SEEK_SET);
-				do {
-					len = write(fd, buffer, strlen (buffer));
-				} while (len == -1 && errno == EINTR);
-				lseek(fd, lastpos, SEEK_SET);
-				g_free(buffer);
-				if (len == -1) {
-					goto error;
-				}
-			} else {
-				frompos = lseek(fdout, 0, SEEK_CUR);
-				fromline = camel_mbox_summary_build_from(camel_mime_parser_headers_raw (mp));
-				write(fdout, fromline, strlen(fromline));
-				g_free(fromline);
-				if (header_write(fdout, camel_mime_parser_headers_raw(mp), xevnew) == -1) {
-					d(printf("Error writing to tmp mailbox\n"));
-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Error writing to temp mailbox: %s"),
-							     strerror(errno));
-					goto error;
-				}
-				bodypos = lseek(fdout, 0, SEEK_CUR);
-				d(printf("pos = %d, endpos = %d, bodypos = %d\n",
-					 (int) info->info.content->pos,
-					 (int) info->info.content->endpos,
-					 (int) info->info.content->bodypos));
-				if (copy_block(fd, fdout, info->info.content->bodypos,
-					       info->info.content->endpos - info->info.content->bodypos) == -1) {
-					g_warning("Cannot copy data to output fd");
-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Cannot copy data to output file: %s"),
-							     strerror (errno));
-					goto error;
-				}
-				info->frompos = frompos;
-				offset = bodypos - info->info.content->bodypos;
-			}
-			info->info.flags &= 0xffff;
-			g_free(xevnew);
-			xevnew = NULL;
-			camel_mime_parser_drop_step(mp);
-			camel_mime_parser_drop_step(mp);
-		} else {
-			if (!quick) {
-				if (copy_block(fd, fdout, info->frompos,
-					       info->info.content->endpos - info->frompos) == -1) {
-					g_warning("Cannot copy data to output fd");
-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-							     _("Cannot copy data to output file: %s"),
-							     strerror(errno));
-					goto error;
-				}
-				/* update from pos here? */
-				info->frompos += offset;
-			} else {
-				d(printf("Nothing to do for this message\n"));
-			}
-		}
-		if (!quick && info != NULL && offset != 0) {
-			d(printf("offsetting content: %d\n", (int)offset));
-			camel_folder_summary_offset_content(info->info.content, offset);
-			d(printf("pos = %d, endpos = %d, bodypos = %d\n",
-				 (int) info->info.content->pos,
-				 (int) info->info.content->endpos,
-				 (int) info->info.content->bodypos));
-		}
-	}
-
-	d(printf("Closing folders\n"));
-
-	if (close(fd) == -1) {
-		g_warning("Cannot close source folder: %s", strerror(errno));
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not close source folder %s: %s"),
-				     mbs->folder_path, strerror(errno));
-		goto error;
-	}
-
-	if (!quick) {
-		if (close(fdout) == -1) {
-			g_warning("Cannot close tmp folder: %s", strerror(errno));
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not close temp folder: %s"),
-					     strerror(errno));
-			goto error;
-		}
-
-		if (rename(tmpname, mbs->folder_path) == -1) {
-			g_warning("Cannot rename folder: %s", strerror(errno));
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not rename folder: %s"),
-					     strerror(errno));
-			goto error;
-		}
-		tmpname = NULL;
-
-		if (mbs->index)
-			ibex_save(mbs->index);
-	}
-
-	if (stat(mbs->folder_path, &st) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Unknown error: %s"),
-				     strerror(errno));
-		goto error;
-	}
-
-	camel_folder_summary_touch(s);
-	s->time = st.st_mtime;
-	mbs->folder_size = st.st_size;
-	camel_folder_summary_save(s);
-
-	camel_object_unref(CAMEL_OBJECT(mp));
-	
-	return 0;
- error:
-	if (fd != -1)
-		close(fd);
-	
-	if (fdout != -1)
-		close(fdout);
-	
-	g_free(xevnew);
-	
-	if (tmpname)
-		unlink(tmpname);
-	if (mp)
-		camel_object_unref(CAMEL_OBJECT(mp));
-
-	return -1;
-}
-
-	
-	
-	
-	
diff --git a/camel/providers/mbox/camel-mbox-summary.h b/camel/providers/mbox/camel-mbox-summary.h
deleted file mode 100644
index f90acc4f35..0000000000
--- a/camel/providers/mbox/camel-mbox-summary.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_MBOX_SUMMARY_H
-#define _CAMEL_MBOX_SUMMARY_H
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MBOX_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_mbox_summary_get_type (), CamelMboxSummary)
-#define CAMEL_MBOX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass)
-#define IS_CAMEL_MBOX_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mbox_summary_get_type ())
-
-typedef struct _CamelMboxSummary      CamelMboxSummary;
-typedef struct _CamelMboxSummaryClass CamelMboxSummaryClass;
-
-/* extra summary flags */
-enum {
-	CAMEL_MESSAGE_FOLDER_NOXEV = 1<<17,
-};
-
-typedef struct _CamelMboxMessageContentInfo {
-	CamelMessageContentInfo info;
-} CamelMboxMessageContentInfo;
-
-typedef struct _CamelMboxMessageInfo {
-	CamelMessageInfo info;
-
-	off_t frompos;
-} CamelMboxMessageInfo;
-
-struct _CamelMboxSummary {
-	CamelFolderSummary parent;
-
-	struct _CamelMboxSummaryPrivate *priv;
-
-	char *folder_path;	/* name of matching folder */
-	size_t folder_size;	/* size of the mbox file, last sync */
-
-	ibex *index;
-	int index_force;	/* do we force index during creation? */
-};
-
-struct _CamelMboxSummaryClass {
-	CamelFolderSummaryClass parent_class;
-};
-
-guint		camel_mbox_summary_get_type	(void);
-CamelMboxSummary      *camel_mbox_summary_new	(const char *filename, const char *mbox_name, ibex *index);
-
-/* load/check the summary */
-int camel_mbox_summary_load(CamelMboxSummary *mbs, int forceindex);
-/* incremental update */
-int camel_mbox_summary_update(CamelMboxSummary *mbs, off_t offset, CamelFolderChangeInfo *changeinfo);
-/* perform a folder sync or expunge, if needed */
-int camel_mbox_summary_sync (CamelMboxSummary *mbs, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);
-/* generate a From line from headers */
-char *camel_mbox_summary_build_from(struct _header_raw *header);
-
-#endif /* ! _CAMEL_MBOX_SUMMARY_H */
-
diff --git a/camel/providers/mbox/libcamelmbox.urls b/camel/providers/mbox/libcamelmbox.urls
deleted file mode 100644
index e021190356..0000000000
--- a/camel/providers/mbox/libcamelmbox.urls
+++ /dev/null
@@ -1 +0,0 @@
-mbox
diff --git a/camel/providers/mh/.cvsignore b/camel/providers/mh/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/providers/mh/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/mh/Makefile.am b/camel/providers/mh/Makefile.am
deleted file mode 100644
index 62f447171b..0000000000
--- a/camel/providers/mh/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelmhincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelmh.la
-provider_DATA = libcamelmh.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-mh-provider\"	
-
-libcamelmh_la_SOURCES = 			\
-	camel-mh-folder.c			\
-	camel-mh-provider.c			\
-	camel-mh-store.c			\
-	camel-mh-summary.c
-
-libcamelmhinclude_HEADERS =			\
-	camel-mh-folder.h			\
-	camel-mh-store.h			\
-	camel-mh-summary.h
-
-libcamelmh_la_LDFLAGS = -version-info 0:0:0
-
-libcamelmh_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-#libcamelmh_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelmh.urls
-
diff --git a/camel/providers/mh/camel-mh-folder.c b/camel/providers/mh/camel-mh-folder.c
deleted file mode 100644
index a56de4a9c1..0000000000
--- a/camel/providers/mh/camel-mh-folder.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/* camel-mh-folder.c : Abstract class for an email folder */
-
-/* 
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999, 2000 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-mh-folder.h"
-#include "camel-mh-store.h"
-#include "string-utils.h"
-#include "camel-stream-fs.h"
-#include "camel-mh-summary.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-filter-from.h"
-#include "camel-exception.h"
-
-#define d(x)
-
-static CamelFolderClass *parent_class = NULL;
-
-/* Returns the class for a CamelMhFolder */
-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMHS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static void mh_sync(CamelFolder * folder, gboolean expunge, CamelException * ex);
-static gint mh_get_message_count(CamelFolder * folder);
-static gint mh_get_unread_message_count(CamelFolder * folder);
-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);
-static GPtrArray *mh_get_uids(CamelFolder * folder);
-static GPtrArray *mh_get_summary(CamelFolder * folder);
-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);
-
-static void mh_expunge(CamelFolder * folder, CamelException * ex);
-
-static const CamelMessageInfo *mh_get_message_info(CamelFolder * folder, const char *uid);
-
-static GPtrArray *mh_search_by_expression(CamelFolder * folder, const char *expression, CamelException * ex);
-static void mh_search_free(CamelFolder *folder, GPtrArray *result);
-
-static guint32 mh_get_message_flags(CamelFolder * folder, const char *uid);
-static void mh_set_message_flags(CamelFolder * folder, const char *uid, guint32 flags, guint32 set);
-static gboolean mh_get_message_user_flag(CamelFolder * folder, const char *uid, const char *name);
-static void mh_set_message_user_flag(CamelFolder * folder, const char *uid, const char *name, gboolean value);
-static const char *mh_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);
-static void mh_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
-
-static void mh_finalize(CamelObject * object);
-
-static void camel_mh_folder_class_init(CamelObjectClass * camel_mh_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mh_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_folder_get_type()));
-
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = mh_sync;
-	camel_folder_class->get_message_count = mh_get_message_count;
-	camel_folder_class->get_unread_message_count = mh_get_unread_message_count;
-	camel_folder_class->append_message = mh_append_message;
-	camel_folder_class->get_uids = mh_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_deep;
-	camel_folder_class->get_summary = mh_get_summary;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	camel_folder_class->expunge = mh_expunge;
-
-	camel_folder_class->get_message = mh_get_message;
-
-	camel_folder_class->search_by_expression = mh_search_by_expression;
-	camel_folder_class->search_free = mh_search_free;
-
-	camel_folder_class->get_message_info = mh_get_message_info;
-
-	camel_folder_class->get_message_flags = mh_get_message_flags;
-	camel_folder_class->set_message_flags = mh_set_message_flags;
-	camel_folder_class->get_message_user_flag = mh_get_message_user_flag;
-	camel_folder_class->set_message_user_flag = mh_set_message_user_flag;
-	camel_folder_class->get_message_user_tag = mh_get_message_user_tag;
-	camel_folder_class->set_message_user_tag = mh_set_message_user_tag;
-}
-
-static void mh_init(gpointer object, gpointer klass)
-{
-	CamelFolder *folder = object;
-	CamelMhFolder *mh_folder = object;
-
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-
-	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
-	    CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |
-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;
-
-	mh_folder->summary = NULL;
-	mh_folder->search = NULL;
-	mh_folder->changes = camel_folder_change_info_new();
-}
-
-static void mh_finalize(CamelObject * object)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(object);
-
-	if (mh_folder->index)
-		ibex_close(mh_folder->index);
-
-	g_free(mh_folder->folder_file_path);
-	g_free(mh_folder->summary_file_path);
-	g_free(mh_folder->folder_dir_path);
-	g_free(mh_folder->index_file_path);
-	camel_folder_change_info_free(mh_folder->changes);
-}
-
-CamelType camel_mh_folder_get_type(void)
-{
-	static CamelType camel_mh_folder_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mh_folder_type == CAMEL_INVALID_TYPE) {
-		camel_mh_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelMhFolder",
-							   sizeof(CamelMhFolder),
-							   sizeof(CamelMhFolderClass),
-							   (CamelObjectClassInitFunc) camel_mh_folder_class_init,
-							   NULL,
-							   (CamelObjectInitFunc) mh_init,
-							   (CamelObjectFinalizeFunc) mh_finalize);
-	}
-
-	return camel_mh_folder_type;
-}
-
-CamelFolder *
-camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder;
-	CamelMhFolder *mh_folder;
-	const char *root_dir_path, *name;
-	int forceindex;
-	struct stat st;
-
-	folder = CAMEL_FOLDER (camel_object_new(CAMEL_MH_FOLDER_TYPE));
-	mh_folder = (CamelMhFolder *)folder;
-
-	name = strrchr(full_name, '/');
-	if (name)
-		name++;
-	else
-		name = full_name;
-	camel_folder_construct (folder, parent_store, full_name, name);
-
-	root_dir_path = camel_mh_store_get_toplevel_dir(CAMEL_MH_STORE(folder->parent_store));
-
-	mh_folder->folder_file_path = g_strdup_printf("%s/%s", root_dir_path, full_name);
-	mh_folder->summary_file_path = g_strdup_printf("%s/%s/ev-summary", root_dir_path, full_name);
-	mh_folder->folder_dir_path = g_strdup_printf("%s/%s", root_dir_path, full_name);
-	mh_folder->index_file_path = g_strdup_printf("%s/%s/ev-index.ibex", root_dir_path, full_name);
-
-	/* if we have no index file, force it */
-	forceindex = stat(mh_folder->index_file_path, &st) == -1;
-	/* check if we need to setup an index */
-	if (flags & CAMEL_STORE_FOLDER_BODY_INDEX) {
-		mh_folder->index = ibex_open(mh_folder->index_file_path, O_CREAT | O_RDWR, 0600);
-		if (mh_folder->index == NULL) {
-			/* yes, this isn't fatal at all */
-			g_warning("Could not open/create index file: %s: indexing not performed", strerror(errno));
-			forceindex = FALSE;
-		}
-	} else {
-		/* if we do have an index file, remove it */
-		if (forceindex == FALSE) {
-			unlink(mh_folder->index_file_path);
-		}
-		forceindex = FALSE;
-	}
-
-	/* no summary (disk or memory), and we're proverbially screwed */
-	mh_folder->summary = camel_mh_summary_new(mh_folder->summary_file_path,
-						  mh_folder->folder_file_path,
-						  mh_folder->index);
-
-	if (camel_mh_summary_load(mh_folder->summary, forceindex) == -1) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_FOLDER_INVALID,	/* FIXME: right error code */
-				    _("Could not load or create summary"));
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-static void mh_sync(CamelFolder * folder, gboolean expunge, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	if (expunge)
-		mh_expunge(folder, ex);
-	else {
-		camel_mh_summary_sync(mh_folder->summary, FALSE, mh_folder->changes, ex);
-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder->changes);
-		camel_folder_change_info_clear(mh_folder->changes);
-	}
-
-	/* save index */
-	if (mh_folder->index)
-		ibex_save(mh_folder->index);
-	if (mh_folder->summary)
-		camel_folder_summary_save(CAMEL_FOLDER_SUMMARY(mh_folder->summary));
-}
-
-static void mh_expunge(CamelFolder * folder, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	camel_mh_summary_sync(mh_folder->summary, TRUE, mh_folder->changes, ex);
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder->changes);
-	camel_folder_change_info_clear(mh_folder->changes);
-}
-
-static gint mh_get_message_count(CamelFolder * folder)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	g_return_val_if_fail(mh_folder->summary != NULL, -1);
-
-	return camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mh_folder->summary));
-}
-
-static gint mh_get_unread_message_count(CamelFolder * folder)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-	CamelMessageInfo *info;
-	GPtrArray *infolist;
-	gint i, count = 0;
-
-	g_return_val_if_fail(mh_folder->summary != NULL, -1);
-
-	infolist = mh_get_summary(folder);
-
-	for (i = 0; i < infolist->len; i++) {
-		info = (CamelMessageInfo *) g_ptr_array_index(infolist, i);
-		if (!(info->flags & CAMEL_MESSAGE_SEEN))
-			count++;
-	}
-
-	return count;
-}
-
-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-	CamelStream *output_stream = NULL;
-	char *name = NULL;
-	char *uid = NULL;
-	CamelMessageInfo *newinfo;
-
-	/* FIXME: probably needs additional locking */
-
-	/* keep trying uid's until we find one thats ok */
-	do {
-		g_free(uid);
-		g_free(name);
-		uid = camel_folder_summary_next_uid_string((CamelFolderSummary *)mh_folder->summary);
-		name = g_strdup_printf("%s/%s", mh_folder->folder_file_path, uid);
-		output_stream = camel_stream_fs_new_with_name(name, O_WRONLY|O_CREAT|O_EXCL, 0600);
-	} while (output_stream == NULL && errno == EEXIST);
-
-	if (output_stream == NULL)
-		goto fail;
-
-	/* write the message */
-	if (camel_data_wrapper_write_to_stream(CAMEL_DATA_WRAPPER(message), output_stream) == -1)
-		goto fail;
-
-	if (camel_stream_close(output_stream) == -1)
-		goto fail;
-
-	/* index/summarise the message.  Yes this re-reads it, its just simpler */
-	camel_mh_summary_add(mh_folder->summary, uid, TRUE);
-
-	if (info
-	    && (newinfo = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_folder->summary), uid))) {
-		CamelFlag *flag = info->user_flags;
-		CamelTag *tag = info->user_tags;
-
-		newinfo->flags = info->flags;
-		while (flag) {
-			camel_flag_set(&newinfo->user_flags, flag->name, TRUE);
-			flag = flag->next;
-		}
-		while (tag) {
-			camel_tag_set(&newinfo->user_tags, tag->name, tag->value);
-			tag = tag->next;
-		}
-	}
-
-	camel_folder_change_info_add_uid(mh_folder->changes, uid);
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder->changes);
-	camel_folder_change_info_clear(mh_folder->changes);
-	g_free(name);
-	g_free(uid);
-	return;
-
-fail:
-	if (camel_exception_is_set(ex)) {
-		camel_exception_setv(ex, camel_exception_get_id(ex),
-				     _("Cannot append message to mh folder: %s"), camel_exception_get_description(ex));
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot append message to mh folder: %s"), g_strerror(errno));
-	}
-	if (output_stream)
-		camel_object_unref(CAMEL_OBJECT(output_stream));
-	if (name) {
-		unlink(name);
-		g_free(name);
-	}
-	g_free(uid);
-}
-
-static GPtrArray *mh_get_uids(CamelFolder * folder)
-{
-	GPtrArray *array;
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-	int i, count;
-
-	count = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mh_folder->summary));
-	array = g_ptr_array_new();
-	g_ptr_array_set_size(array, count);
-	for (i = 0; i < count; i++) {
-		CamelMessageInfo *info =
-			camel_folder_summary_index(CAMEL_FOLDER_SUMMARY(mh_folder->summary), i);
-
-		array->pdata[i] = g_strdup(info->uid);
-	}
-
-	return array;
-}
-
-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelMessageInfo *info;
-	char *name;
-
-	name = g_strdup_printf("%s/%s", mh_folder->folder_file_path, uid);
-
-	/* get the message summary info */
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_folder->summary), uid);
-
-	if (info == NULL) {
-		errno = ENOENT;
-		goto fail;
-	}
-
-	message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0);
-
-	/* where we read from */
-	if (message_stream == NULL)
-		goto fail;
-
-	message = camel_mime_message_new();
-	if (camel_data_wrapper_construct_from_stream(CAMEL_DATA_WRAPPER(message), message_stream) == -1) {
-		g_warning("Construction failed");
-		errno = EINVAL;
-		goto fail;
-	}
-	camel_object_unref(CAMEL_OBJECT(message_stream));
-	g_free(name);
-
-	return message;
-
-fail:
-	camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),
-			     name, g_strerror(errno));
-
-	if (message_stream)
-		camel_object_unref(CAMEL_OBJECT(message_stream));
-
-	if (message)
-		camel_object_unref(CAMEL_OBJECT(message));
-
-	g_free(name);
-
-	return NULL;
-}
-
-GPtrArray *mh_get_summary(CamelFolder * folder)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	return CAMEL_FOLDER_SUMMARY(mh_folder->summary)->messages;
-}
-
-/* get a single message info, by uid */
-static const CamelMessageInfo *mh_get_message_info(CamelFolder * folder, const char *uid)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	return camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_folder->summary), uid);
-}
-
-static GPtrArray *mh_search_by_expression(CamelFolder * folder, const char *expression, CamelException * ex)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
-
-	if (mh_folder->search == NULL) {
-		mh_folder->search = camel_folder_search_new();
-	}
-
-	camel_folder_search_set_folder(mh_folder->search, folder);
-	if (mh_folder->summary) {
-		/* FIXME: dont access summary array directly? */
-		camel_folder_search_set_summary(mh_folder->search,
-						CAMEL_FOLDER_SUMMARY(mh_folder->summary)->messages);
-	}
-
-	camel_folder_search_set_body_index(mh_folder->search, mh_folder->index);
-
-	return camel_folder_search_execute_expression(mh_folder->search, expression, ex);
-}
-
-static void mh_search_free(CamelFolder *folder, GPtrArray *result)
-{
-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
-
-	camel_folder_search_free_result(mh_folder->search, result);
-}
-
-static guint32 mh_get_message_flags(CamelFolder * folder, const char *uid)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, 0);
-
-	return info->flags;
-}
-
-static void mh_set_message_flags(CamelFolder * folder, const char *uid, guint32 flags, guint32 set)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	info->flags = (info->flags & ~flags) | (set & flags) | CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-
-	camel_object_trigger_event (CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-static gboolean mh_get_message_user_flag(CamelFolder * folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	return camel_flag_get(&info->user_flags, name);
-}
-
-static void mh_set_message_user_flag(CamelFolder * folder, const char *uid, const char *name, gboolean value)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	camel_flag_set(&info->user_flags, name, value);
-	info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-	camel_object_trigger_event (CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
-
-static const char *mh_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_val_if_fail(info != NULL, FALSE);
-
-	return camel_tag_get(&info->user_tags, name);
-}
-
-static void mh_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	CamelMessageInfo *info;
-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);
-
-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf->summary), uid);
-	g_return_if_fail(info != NULL);
-
-	camel_tag_set(&info->user_tags, name, value);
-	info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf->summary));
-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);
-}
diff --git a/camel/providers/mh/camel-mh-folder.h b/camel/providers/mh/camel-mh-folder.h
deleted file mode 100644
index ddfdf2b4aa..0000000000
--- a/camel/providers/mh/camel-mh-folder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mh-folder.h : MH folder. */
-
-/* 
- *
- * Authors:
- * 	Michael Zucchi <notzed@helixcode.com>
- *
- * Copyright (C) 1999 Helix Code Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MH_FOLDER_H
-#define CAMEL_MH_FOLDER_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-search.h>
-#include <libibex/ibex.h>
-#include "camel-mh-summary.h"
-
-#define CAMEL_MH_FOLDER_TYPE     (camel_mh_folder_get_type ())
-#define CAMEL_MH_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_FOLDER_TYPE, CamelMhFolder))
-#define CAMEL_MH_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass))
-#define IS_CAMEL_MH_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE))
-
-typedef struct {
-	CamelFolder parent_object;
-
-	gchar *folder_file_path;	/* contains the messages */
-	gchar *summary_file_path;	/* contains the messages summary */
-	gchar *folder_dir_path;	/* contains the subfolders */
-	gchar *index_file_path;	/* index of body contents */
-
-	ibex *index;	/* index for this folder */
-	CamelMhSummary *summary;
-	CamelFolderSearch *search;	/* used to run searches, we just use the real thing (tm) */
-	CamelFolderChangeInfo *changes;	/* mass changes to the folder */
-} CamelMhFolder;
-
-typedef struct {
-	CamelFolderClass parent_class;
-	
-	/* Virtual methods */
-	
-} CamelMhFolderClass;
-
-/* public methods */
-CamelFolder *camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_mh_folder_get_type(void);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MH_FOLDER_H */
diff --git a/camel/providers/mh/camel-mh-provider.c b/camel/providers/mh/camel-mh-provider.c
deleted file mode 100644
index 74329a3203..0000000000
--- a/camel/providers/mh/camel-mh-provider.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-provider.c: mbox provider registration code */
-
-/* 
- * Authors :
- *   Bertrand Guiheneuf <bertrand@helixcode.com>
- *
- * Copyright (C) 2000 HelixCode (www.helixcode.com).
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-mh-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider mh_provider = {
-	"mh",
-	N_("UNIX MH-format mail directories"),
-
-	N_("For storing local mail in MH-like mail directories"),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_PATH,
-
-	{0, 0},
-
-	NULL
-};
-
-void camel_provider_module_init(CamelSession * session)
-{
-	mh_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mh_store_get_type();
-
-	mh_provider.service_cache = g_hash_table_new(camel_url_hash, camel_url_equal);
-
-	camel_session_register_provider(session, &mh_provider);
-}
diff --git a/camel/providers/mh/camel-mh-store.c b/camel/providers/mh/camel-mh-store.c
deleted file mode 100644
index 0a6da11162..0000000000
--- a/camel/providers/mh/camel-mh-store.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mbox-store.c : class for an mbox store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "camel-mh-store.h"
-#include "camel-mh-folder.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-
-/* Returns the class for a CamelMhStore */
-#define CMHS_CLASS(so) CAMEL_MH_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static char *get_name(CamelService * service, gboolean brief);
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);
-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);
-static char *get_folder_name(CamelStore * store, const char *folder_name, CamelException * ex);
-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,
-					 gboolean fast, gboolean recursive,
-					 gboolean subscribed_only,
-					 CamelException *ex);
-
-static void camel_mh_store_class_init(CamelObjectClass * camel_mh_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_mh_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_mh_store_class);
-
-	/* virtual method overload */
-	camel_service_class->get_name = get_name;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->delete_folder = delete_folder;
-	camel_store_class->rename_folder = rename_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_folder_info = get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-}
-
-static void camel_mh_store_init(CamelObject * object)
-{
-	CamelStore *store = CAMEL_STORE(object);
-
-	/* mh names are filenames, so they are case-sensitive. */
-	store->folders = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-CamelType camel_mh_store_get_type(void)
-{
-	static CamelType camel_mh_store_type = CAMEL_INVALID_TYPE;
-
-	if (camel_mh_store_type == CAMEL_INVALID_TYPE) {
-		camel_mh_store_type = camel_type_register(CAMEL_STORE_TYPE, "CamelMhStore",
-							  sizeof(CamelMhStore),
-							  sizeof(CamelMhStoreClass),
-							  (CamelObjectClassInitFunc) camel_mh_store_class_init,
-							  NULL,
-							  (CamelObjectInitFunc) camel_mh_store_init,
-							  NULL);
-	}
-
-	return camel_mh_store_type;
-}
-
-const gchar *camel_mh_store_get_toplevel_dir(CamelMhStore * store)
-{
-	CamelURL *url = CAMEL_SERVICE(store)->url;
-
-	g_assert(url != NULL);
-	return url->path;
-}
-
-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)
-{
-	char *name;
-	struct stat st;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-
-	if (stat(name, &st) == -1) {
-		if (errno != ENOENT) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not open folder `%s':\n%s"),
-					     folder_name, g_strerror(errno));
-			g_free (name);
-			return NULL;
-		}
-		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s' does not exist."), folder_name);
-			g_free (name);
-			return NULL;
-		}
-		printf("creating ...\n");
-
-		if (mkdir(name, 0700) != 0) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not create folder `%s':\n%s"),
-					     folder_name, g_strerror(errno));
-			g_free (name);
-			return NULL;
-		}
-		printf("created ok?\n");
-
-	} else if (!S_ISDIR(st.st_mode)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a directory."), name);
-		g_free (name);
-		return NULL;
-	}
-	g_free(name);
-
-	return camel_mh_folder_new(store, folder_name, flags, ex);
-}
-
-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)
-{
-	char *name;
-	struct stat st;
-	char *str;
-
-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
-	if (stat(name, &st) == -1) {
-		if (errno != ENOENT)
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not delete folder `%s': %s"),
-					     folder_name, strerror(errno));
-	} else {
-		/* this will 'fail' if there are still messages in the directory -
-		   but only the metadata is lost */
-		str = g_strdup_printf("%s/ev-summary", name);
-		unlink(str);
-		g_free(str);
-		str = g_strdup_printf("%s/ev-index.ibex", name);
-		unlink(str);
-		g_free(str);
-		if (rmdir(name) == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not delete folder `%s': %s"),
-					     folder_name, strerror(errno));
-		}
-	}
-	g_free(name);
-}
-
-static void rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
-{
-	char *old, *new;
-	struct stat st;
-
-	old = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, old_name);
-	new = g_strdup_printf("%s%s", CAMEL_SERVICE(store)->url->path, new_name);
-	if (stat(new, &st) == -1 && errno == ENOENT) {
-		if (stat(old, &st) == 0 && S_ISDIR(st.st_mode)) {
-			if (rename(old, new) != 0) {
-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Could not rename folder `%s': %s"), old_name, strerror(errno));
-			}
-		} else {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not rename folder `%s': %s"), old_name, strerror(errno));
-		}
-	} else {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not rename folder `%s': %s exists"), old_name, new_name);
-	}
-}
-
-static char *get_folder_name(CamelStore * store, const char *folder_name, CamelException * ex)
-{
-	/* For now, we don't allow hieararchy. FIXME. */
-	if (strchr(folder_name + 1, '/')) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER, _("MH folders may not be nested."));
-		return NULL;
-	}
-
-	return *folder_name == '/' ? g_strdup(folder_name) : g_strdup_printf("/%s", folder_name);
-}
-
-static char *get_name(CamelService * service, gboolean brief)
-{
-	if (brief)
-		return g_strdup(service->url->path);
-	else
-		return g_strdup_printf(_("Local mail directory %s"), service->url->path);
-}
-
-
-static CamelFolderInfo *
-get_folder_info (CamelStore *store, const char *top,
-		 gboolean fast, gboolean recursive,
-		 gboolean subscribed_only,
-		 CamelException *ex)
-{
-	/* FIXME: This is broken, but it corresponds to what was
-	 * there before.
-	 */
-	return NULL;
-}
diff --git a/camel/providers/mh/camel-mh-store.h b/camel/providers/mh/camel-mh-store.h
deleted file mode 100644
index e2e2bbb656..0000000000
--- a/camel/providers/mh/camel-mh-store.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-mh-store.h : class for an mh store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_MH_STORE_H
-#define CAMEL_MH_STORE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif				/* __cplusplus } */
-#include "camel-store.h"
-#define CAMEL_MH_STORE_TYPE     (camel_mh_store_get_type ())
-#define CAMEL_MH_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_STORE_TYPE, CamelMhStore))
-#define CAMEL_MH_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass))
-#define IS_CAMEL_MH_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;
-	
-} CamelMhStore;
-
-typedef struct {
-	CamelStoreClass parent_class;
-	
-} CamelMhStoreClass;
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_mh_store_get_type(void);
-
-const gchar *camel_mh_store_get_toplevel_dir(CamelMhStore * store);
-
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-#endif				/* CAMEL_MH_STORE_H */
diff --git a/camel/providers/mh/camel-mh-summary.c b/camel/providers/mh/camel-mh-summary.c
deleted file mode 100644
index c757a9a0a9..0000000000
--- a/camel/providers/mh/camel-mh-summary.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-mh-summary.h"
-#include <camel/camel-mime-message.h>
-
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <dirent.h>
-
-#include <ctype.h>
-
-#define d(x)
-
-#define CAMEL_MH_SUMMARY_VERSION (0x2000)
-
-static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *);
-
-static void camel_mh_summary_class_init	(CamelMhSummaryClass *class);
-static void camel_mh_summary_init	(CamelMhSummary *gspaper);
-static void camel_mh_summary_finalise	(CamelObject *obj);
-
-#define _PRIVATE(x) (((CamelMhSummary *)(x))->priv)
-
-struct _CamelMhSummaryPrivate {
-	char *current_uid;
-};
-
-static CamelFolderSummaryClass *parent_class;
-
-CamelType
-camel_mh_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_folder_summary_get_type (), "CamelMhSummary",
-					   sizeof(CamelMhSummary),
-					   sizeof(CamelMhSummaryClass),
-					   (CamelObjectClassInitFunc)camel_mh_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc)camel_mh_summary_init,
-					   (CamelObjectFinalizeFunc)camel_mh_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_mh_summary_class_init (CamelMhSummaryClass *class)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;
-	
-	parent_class = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs(camel_folder_summary_get_type ()));
-
-	/* override methods */
-	sklass->message_info_new = message_info_new;
-}
-
-static void
-camel_mh_summary_init (CamelMhSummary *o)
-{
-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;
-
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	/* set unique file version */
-	s->version += CAMEL_MH_SUMMARY_VERSION;
-}
-
-static void
-camel_mh_summary_finalise(CamelObject *obj)
-{
-	CamelMhSummary *o = (CamelMhSummary *)obj;
-
-	g_free(o->mh_path);
-	g_free(o->priv);
-}
-
-/**
- * camel_mh_summary_new:
- *
- * Create a new CamelMhSummary object.
- * 
- * Return value: A new #CamelMhSummary object.
- **/
-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index)
-{
-	CamelMhSummary *o = (CamelMhSummary *)camel_object_new(camel_mh_summary_get_type ());
-
-	camel_folder_summary_set_build_content((CamelFolderSummary *)o, TRUE);
-	camel_folder_summary_set_filename((CamelFolderSummary *)o, filename);
-	o->mh_path = g_strdup(mhdir);
-	o->index = index;
-	return o;
-}
-
-static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _header_raw *h)
-{
-	CamelMessageInfo *mi;
-	CamelMhSummary *mhs = (CamelMhSummary *)s;
-
-	mi = ((CamelFolderSummaryClass *) parent_class)->message_info_new(s, h);
-	if (mi) {
-		/* it only ever indexes 1 message at a time */
-		mi->uid = g_strdup(mhs->priv->current_uid);
-	}
-
-	return mi;
-}
-
-int		camel_mh_summary_load(CamelMhSummary * mhs, int forceindex)
-{
-	CamelFolderSummary *s = CAMEL_FOLDER_SUMMARY(mhs);
-
-	d(printf("loading summary ...\n"));
-
-	if (forceindex || camel_folder_summary_load(s) == -1) {
-		camel_folder_summary_clear(s);
-	}
-	return camel_mh_summary_check(mhs, forceindex);
-}
-
-int		camel_mh_summary_add(CamelMhSummary * mhs, const char *name, int forceindex)
-{
-	char *filename = g_strdup_printf("%s/%s", mhs->mh_path, name);
-	int fd;
-	CamelMimeParser *mp;
-
-	d(printf("summarising: %s\n", name));
-
-	fd = open(filename, O_RDONLY);
-	if (fd == -1) {
-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));
-		g_free(filename);
-		return -1;
-	}
-	mp = camel_mime_parser_new();
-	camel_mime_parser_scan_from(mp, FALSE);
-	camel_mime_parser_init_with_fd(mp, fd);
-	if (mhs->index && (forceindex || !ibex_contains_name(mhs->index, (char *)name))) {
-		d(printf("forcing indexing of message content\n"));
-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, mhs->index);
-	} else {
-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);
-	}
-	mhs->priv->current_uid = (char *)name;
-	camel_folder_summary_add_from_parser((CamelFolderSummary *)mhs, mp);
-	camel_object_unref((CamelObject *)mp);
-	mhs->priv->current_uid = NULL;
-	camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);
-	g_free(filename);
-	return 0;
-}
-
-static void
-remove_summary(char *key, CamelMessageInfo *info, CamelMhSummary *mhs)
-{
-	d(printf("removing message %s from summary\n", key));
-	if (mhs->index)
-		ibex_unindex(mhs->index, info->uid);
-	camel_folder_summary_remove((CamelFolderSummary *)mhs, info);
-}
-
-int		camel_mh_summary_check(CamelMhSummary * mhs, int forceindex)
-{
-	DIR *dir;
-	struct dirent *d;
-	char *p, c;
-	CamelMessageInfo *info;
-	GHashTable *left;
-	int i, count;
-
-	d(printf("checking summary ...\n"));
-
-	/* scan the directory, check for mail files not in the index, or index entries that
-	   no longer exist */
-	dir = opendir(mhs->mh_path);
-	if (dir == NULL)
-		return -1;
-
-	/* keeps track of all uid's that have not been processed */
-	left = g_hash_table_new(g_str_hash, g_str_equal);
-	count = camel_folder_summary_count((CamelFolderSummary *)mhs);
-	for (i=0;i<count;i++) {
-		info = camel_folder_summary_index((CamelFolderSummary *)mhs, i);
-		if (info) {
-			g_hash_table_insert(left, info->uid, info);
-		}
-	}
-	while ( (d = readdir(dir)) ) {
-		/* FIXME: also run stat to check for regular file */
-		p = d->d_name;
-		while ( (c = *p++) ) {
-			if (!isdigit(c))
-				break;
-		}
-		if (c==0) {
-			info = camel_folder_summary_uid((CamelFolderSummary *)mhs, d->d_name);
-			if (info == NULL || (mhs->index && (!ibex_contains_name(mhs->index, d->d_name)))) {
-				/* need to add this file to the summary */
-				if (info != NULL) {
-					g_hash_table_remove(left, info->uid);
-					camel_folder_summary_remove((CamelFolderSummary *)mhs, info);
-				}
-				camel_mh_summary_add(mhs, d->d_name, forceindex);
-			} else {
-				g_hash_table_remove(left, info->uid);
-			}
-		}
-	}
-	closedir(dir);
-	g_hash_table_foreach(left, (GHFunc)remove_summary, mhs);
-	g_hash_table_destroy(left);
-
-	/* force a save of the index, just to make sure */
-	/* note this could be expensive so possibly shouldn't be here
-	   as such */
-	if (mhs->index) {
-		ibex_save(mhs->index);
-	}
-
-	return 0;
-}
-
-/* sync the summary with the ondisk files.
-   It doesnt store the state in the file, the summary only, == MUCH faster */
-int		camel_mh_summary_sync(CamelMhSummary * mhs, int expunge, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	int count, i;
-	CamelMessageInfo *info;
-	char *name;
-
-	printf("summary_sync(expunge=%s)\n", expunge?"true":"false");
-
-	if (mhs->index) {
-		ibex_save(mhs->index);
-	}
-	if (!expunge)
-		return 0;
-
-	count = camel_folder_summary_count((CamelFolderSummary *)mhs);
-	for (i=count-1;i>=0;i--) {
-		info = camel_folder_summary_index((CamelFolderSummary *)mhs, i);
-		if (info && info->flags & CAMEL_MESSAGE_DELETED) {
-			name = g_strdup_printf("%s/%s", mhs->mh_path, info->uid);
-			d(printf("deleting %s\n", name));
-			if (unlink(name) == 0 || errno==ENOENT) {
-				camel_folder_change_info_remove_uid(changes, info->uid);
-				camel_folder_summary_remove((CamelFolderSummary *)mhs, info);
-			}
-		}
-	}
-	return 0;
-}
-
diff --git a/camel/providers/mh/camel-mh-summary.h b/camel/providers/mh/camel-mh-summary.h
deleted file mode 100644
index 81aa91b418..0000000000
--- a/camel/providers/mh/camel-mh-summary.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_MH_SUMMARY_H
-#define _CAMEL_MH_SUMMARY_H
-
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <libibex/ibex.h>
-
-#define CAMEL_MH_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_mh_summary_get_type (), CamelMhSummary)
-#define CAMEL_MH_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass)
-#define IS_CAMEL_MH_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mh_summary_get_type ())
-
-typedef struct _CamelMhSummary	CamelMhSummary;
-typedef struct _CamelMhSummaryClass	CamelMhSummaryClass;
-
-struct _CamelMhSummary {
-	CamelFolderSummary parent;
-	struct _CamelMhSummaryPrivate *priv;
-
-	char *mh_path;
-	ibex *index;
-};
-
-struct _CamelMhSummaryClass {
-	CamelFolderSummaryClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-CamelType	 camel_mh_summary_get_type	(void);
-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index);
-
-/* methods */
-int		camel_mh_summary_load(CamelMhSummary * mhs, int forceindex);
-int		camel_mh_summary_check(CamelMhSummary * mhs, int forceindex);
-int		camel_mh_summary_add(CamelMhSummary * mhs, const char *name, int forceindex);
-int		camel_mh_summary_sync(CamelMhSummary * mhs, int expunge, CamelFolderChangeInfo *changes, CamelException *ex);
-
-#endif /* ! _CAMEL_MH_SUMMARY_H */
-
diff --git a/camel/providers/mh/libcamelmh.urls b/camel/providers/mh/libcamelmh.urls
deleted file mode 100644
index 372daaa98f..0000000000
--- a/camel/providers/mh/libcamelmh.urls
+++ /dev/null
@@ -1 +0,0 @@
-mh
diff --git a/camel/providers/nntp/.cvsignore b/camel/providers/nntp/.cvsignore
deleted file mode 100644
index 1f5b9d35fb..0000000000
--- a/camel/providers/nntp/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-test-newsrc
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
deleted file mode 100644
index 4b686735e3..0000000000
--- a/camel/providers/nntp/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelnntpincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelnntp.la
-provider_DATA = libcamelnntp.urls
-
-INCLUDES = -I../..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR) 			\
-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
-
-libcamelnntp_la_SOURCES = 			\
-	camel-nntp-auth.c			\
-	camel-nntp-folder.c			\
-	camel-nntp-grouplist.c			\
-	camel-nntp-newsrc.c			\
-	camel-nntp-provider.c			\
-	camel-nntp-store.c			\
-	camel-nntp-utils.c
-
-libcamelnntpinclude_HEADERS =			\
-	camel-nntp-auth.h			\
-	camel-nntp-folder.h			\
-	camel-nntp-grouplist.h			\
-	camel-nntp-newsrc.h			\
-	camel-nntp-resp-codes.h			\
-	camel-nntp-store.h			\
-	camel-nntp-types.h			\
-	camel-nntp-utils.h
-
-libcamelnntp_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelnntp.urls
-
-#noinst_PROGRAMS = test-newsrc
-
-#LDADD = \
-	#$(top_builddir)/camel/libcamel.la 	\
-	#$(top_builddir)/e-util/libeutil.la	\
-	#$(top_builddir)/libibex/libibex.la 	\
-	#$(GNOME_LIBDIR) 			\
-	#$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-#	$(BONOBO_LIBS)				
-
-#test_newsrc_LDADD = libcamelnntp.la $(LDADD)
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
deleted file mode 100644
index 1f1e6ab2d8..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.c : authentication for nntp */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <camel-nntp-auth.h>
-#include <camel-nntp-store.h>
-#include <camel-nntp-resp-codes.h>
-#include <camel-exception.h>
-#include <camel-session.h>
-
-int
-camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelService *service = CAMEL_SERVICE (store);
-	CamelSession *session = camel_service_get_session (service);
-	int resp;
-
-	if (!service->url->authmech && !service->url->passwd) {
-		gchar *prompt;
-			
-		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),
-					  service->url->user, service->url->host);
-		service->url->passwd =
-			camel_session_query_authenticator (session,
-							   CAMEL_AUTHENTICATOR_ASK, prompt,
-							   TRUE, service, "password", ex);
-		g_free (prompt);
-			
-		if (!service->url->passwd) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, 
-					     "You didn\'t enter a password.");
-			resp = 666;
-			goto done;
-		}
-	}
-
-	/* first send username */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO USER %s", service->url->user);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username"));
-		goto done;
-
-	}
-	else if (resp != NNTP_AUTH_CONTINUE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Failed to send username to server"));
-		goto done;
-	}
-
-	/* then send the username if the server asks for it */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO PASS %s", service->url->passwd);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username/password"));
-		goto done;
-	}
-
- done:
-
-	if (service->url->passwd) {
-		/* let's be paranoid */
-		memset (service->url->passwd, 0, strlen (service->url->passwd));
-		g_free (service->url->passwd);
-		service->url->passwd = NULL;
-	}
-	return resp;
-}
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
deleted file mode 100644
index 2708d9d335..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.h : authentication for nntp */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_AUTH_H
-#define CAMEL_NNTP_AUTH_H 1
-
-#include <camel-nntp-store.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_AUTH_H */
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
deleted file mode 100644
index e4d53d779f..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.c : Abstract class for an email folder */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h> 
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-
-#include "string-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-folder-summary.h"
-
-#include "camel-exception.h"
-
-static CamelFolderClass *parent_class=NULL;
-
-/* Returns the class for a CamelNNTPFolder */
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void
-nntp_folder_sync (CamelFolder *folder, gboolean expunge, 
-		  CamelException *ex)
-{
-	CamelNNTPStore *store;
-
-	camel_folder_summary_save (CAMEL_NNTP_FOLDER(folder)->summary);
-
-	store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-}
-
-static gint
-nntp_folder_get_message_count (CamelFolder *folder)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER(folder);
-
-	g_assert (folder);
-	g_assert (nntp_folder->summary);
-
-        return camel_folder_summary_count(nntp_folder->summary);
-}
-
-static guint32
-nntp_folder_get_message_flags (CamelFolder *folder, const char *uid)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	CamelMessageInfo *info = camel_folder_summary_uid (nntp_folder->summary, uid);
-
-	return info->flags;
-}
-
-static void
-nntp_folder_set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	CamelMessageInfo *info = camel_folder_summary_uid (nntp_folder->summary, uid);
-
-	info->flags = set;
-
-	if (set & CAMEL_MESSAGE_SEEN) {
-		int article_num;
-		CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-		sscanf (uid, "%d", &article_num);
-
-		camel_nntp_newsrc_mark_article_read (nntp_store->newsrc,
-						     folder->name,
-						     article_num);
-	}
-
-	camel_folder_summary_touch (nntp_folder->summary);
-}
-
-static CamelMimeMessage *
-nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelStore *parent_store;
-	char *buf;
-	int buf_len;
-	int buf_alloc;
-	int status;
-	gboolean done;
-	char *message_id;
-
-	/* get the parent store */
-	parent_store = camel_folder_get_parent_store (folder);
-
-	message_id = strchr (uid, ',') + 1;
-	status = camel_nntp_command (CAMEL_NNTP_STORE( parent_store ), ex, NULL, "ARTICLE %s", message_id);
-
-	/* if the message_id was not found, raise an exception and return */
-	if (status == NNTP_NO_SUCH_ARTICLE) {
-		camel_exception_setv (ex, 
-				     CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Message %s not found."),
-				      message_id);
-		return NULL;
-	}
-	else if (status != NNTP_ARTICLE_FOLLOWS) {
-		/* XXX */
-		g_warning ("weird nntp error %d\n", status);
-		return NULL;
-	}
-
-	/* XXX ick ick ick.  read the entire message into a buffer and
-	   then create a stream_mem for it. */
-	buf_alloc = 2048;
-	buf_len = 0;
-	buf = g_malloc(buf_alloc);
-	done = FALSE;
-
-	buf[0] = 0;
-
-	while (!done) {
-		int line_length;
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (parent_store), &line, ex) < 0) {
-			g_warning ("recv_line failed while building message\n");
-			break;
-		}
-
-		/* XXX check exception */
-
-		line_length = strlen ( line );
-
-		if (!strcmp(line, ".")) {
-			done = TRUE;
-			g_free (line);
-		}
-		else {
-			if (buf_len + line_length > buf_alloc) {
-				buf_alloc *= 2;
-				buf = g_realloc (buf, buf_alloc);
-			}
-			strcat(buf, line);
-			strcat(buf, "\n");
-			buf_len += strlen(line) + 1;
-			g_free (line);
-		}
-	}
-
-	/* create a stream bound to the message */
-	message_stream = camel_stream_mem_new_with_buffer(buf, buf_len);
-
-	message = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER(message), message_stream);
-
-	camel_object_unref (CAMEL_OBJECT (message_stream));
-
-#if 0
-	gtk_signal_connect (CAMEL_OBJECT (message), "message_changed", message_changed, folder);
-#endif
-
-	g_free (buf);
-
-	return message;
-}
-
-static GPtrArray *
-nntp_folder_get_uids (CamelFolder *folder)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	GPtrArray *out;
-	CamelMessageInfo *message_info;
-	int i;
-	int count = camel_folder_summary_count (nntp_folder->summary);
-
-	out = g_ptr_array_new ();
-	g_ptr_array_set_size (out, count);
-	
-	for (i = 0; i < count; i++) {
-		message_info = camel_folder_summary_index (nntp_folder->summary, i);
-		out->pdata[i] = g_strdup (message_info->uid);
-	}
-	
-	return out;
-}
-
-static GPtrArray *
-nntp_folder_get_summary (CamelFolder *folder)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-
-	return nntp_folder->summary->messages;
-}
-
-static GPtrArray*
-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	g_assert (0);
-	return NULL;
-}
-
-static const CamelMessageInfo*
-nntp_folder_get_message_info (CamelFolder *folder, const char *uid)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-
-	return camel_folder_summary_uid (nntp_folder->summary, uid);
-}
-
-static void           
-nntp_folder_finalize (CamelObject *object)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (object);
-
-	g_free (nntp_folder->summary_file_path);
-}
-
-static void
-camel_nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_nntp_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-		
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = nntp_folder_sync;
-	camel_folder_class->get_message_count = nntp_folder_get_message_count;
-	camel_folder_class->set_message_flags = nntp_folder_set_message_flags;
-	camel_folder_class->get_message_flags = nntp_folder_get_message_flags;
-	camel_folder_class->get_message = nntp_folder_get_message;
-	camel_folder_class->get_uids = nntp_folder_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_deep;
-	camel_folder_class->get_summary = nntp_folder_get_summary;
-	camel_folder_class->free_summary = camel_folder_free_nop;
-	camel_folder_class->search_by_expression = nntp_folder_search_by_expression;
-	camel_folder_class->get_message_info = nntp_folder_get_message_info;
-}
-
-CamelType
-camel_nntp_folder_get_type (void)
-{
-	static CamelType camel_nntp_folder_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_folder_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelNNTPFolder",
-							      sizeof (CamelNNTPFolder),
-							      sizeof (CamelNNTPFolderClass),
-							      (CamelObjectClassInitFunc) camel_nntp_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) NULL,
-							      (CamelObjectFinalizeFunc) nntp_folder_finalize);
-	}
-	
-	return camel_nntp_folder_type;
-}
-
-CamelFolder *
-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
-{
-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (CAMEL_NNTP_FOLDER_TYPE));
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	const gchar *root_dir_path;
-
-	camel_folder_construct (folder, parent, folder_name, folder_name);
-	folder->has_summary_capability = TRUE;
-
-	root_dir_path = camel_nntp_store_get_toplevel_dir (CAMEL_NNTP_STORE(folder->parent_store));
-	nntp_folder->summary_file_path = g_strdup_printf ("%s/%s-ev-summary",
-							  root_dir_path,
-							  folder->name);
-
-	nntp_folder->summary = camel_folder_summary_new ();
-	camel_folder_summary_set_filename (nntp_folder->summary,
-					   nntp_folder->summary_file_path);
-
-	if (-1 == camel_folder_summary_load (nntp_folder->summary)) {
-		/* Bad or nonexistant summary file */
-		camel_nntp_get_headers (CAMEL_FOLDER( folder )->parent_store,
-					nntp_folder, ex);
-		if (camel_exception_get_id (ex)) {
-			camel_object_unref (CAMEL_OBJECT (folder));
-			return NULL;
-		}
-
-		/* XXX check return value */
-		camel_folder_summary_save (nntp_folder->summary);
-	}
-
-	return folder;
-}
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
deleted file mode 100644
index eed946fb5c..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.h : NNTP group (folder) support. */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_FOLDER_H
-#define CAMEL_NNTP_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-/*  #include "camel-store.h" */
-
-#define CAMEL_NNTP_FOLDER_TYPE     (camel_nntp_folder_get_type ())
-#define CAMEL_NNTP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))
-#define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))
-#define IS_CAMEL_NNTP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	gchar *summary_file_path;  /* contains the messages summary */
-	CamelFolderSummary *summary;
-} CamelNNTPFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelNNTPFolderClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_nntp_folder_get_type (void);
-
-CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_FOLDER_H */
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
deleted file mode 100644
index d7ee85d182..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-exception.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-resp-codes.h"
-
-static CamelNNTPGroupList *
-camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	gboolean done = FALSE;
-	CamelNNTPGroupList *list;
-
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not get group list from server."));
-		return NULL;
-	}
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->time = time (NULL);
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			return list;
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-			char **split_line = g_strsplit (line, " ", 4);
-
-			entry->group_name = g_strdup (split_line[0]);
-			entry->high = atoi (split_line[1]);
-			entry->low = atoi (split_line[2]);
-
-			g_strfreev (split_line);
-			
-			list->group_list = g_list_append (list->group_list, entry);
-		}
-	}
-
-	return list;
-}
-
-static CamelNNTPGroupList*
-camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-	CamelNNTPGroupList *list;
-	FILE *fp;
-	char buf[300];
-	unsigned long time;
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "r");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	/* read the time */
-	if (!fgets (buf, 300, fp)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		fclose (fp);
-		return NULL;
-	}
-
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->store = store;
-	sscanf (buf, "%lu", &time);
-	list->time = time;
-
-	while (fgets (buf, 300, fp)) {
-		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-		char **split_line = g_strsplit (buf, " ", 4);
-
-		entry->group_name = g_strdup (split_line[0]);
-		entry->high = atoi (split_line[1]);
-		entry->low = atoi (split_line[2]);
-
-		g_strfreev (split_line);
-
-		list->group_list = g_list_append (list->group_list, entry);
-	}
-
-	fclose (fp);
-
-	return list;
-}
-
-static void
-save_entry (CamelNNTPGroupListEntry *entry, FILE *fp)
-{
-	fprintf (fp, "%s %d %d\n", entry->group_name, entry->low, entry->high);
-}
-
-void
-camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	FILE *fp;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(group_list->store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "w");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to save grouplist file for %s: %s"),
-				      CAMEL_SERVICE(group_list->store)->url->host,
-				      strerror(errno));
-		return;
-	}
-
-	fprintf (fp, "%lu\n", (long)group_list->time);
-
-	g_list_foreach (group_list->group_list, (GFunc)save_entry, fp);
-
-	fclose (fp);
-}
-
-static void
-free_entry (CamelNNTPGroupListEntry *entry, void *data)
-{
-	g_free (entry->group_name);
-	g_free (entry);
-}
-
-void
-camel_nntp_grouplist_free (CamelNNTPGroupList *group_list)
-{
-	g_return_if_fail (group_list);
-
-	g_list_foreach (group_list->group_list, (GFunc)free_entry, NULL);
-
-	g_free (group_list);
-}
-
-CamelNNTPGroupList*
-camel_nntp_grouplist_fetch (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelNNTPGroupList *list;
-
-	list = camel_nntp_get_grouplist_from_file (store, ex);
-
-	printf ("camel_nntp_get_grouplist_from_file returned %p\n", list);
-
-	if (!list) {
-		camel_exception_clear (ex);
-
-		list = camel_nntp_get_grouplist_from_server (store, ex);
-
-		if (!list) {
-			camel_nntp_grouplist_free (list);
-		}
-		else {
-			list->store = store;
-			camel_nntp_grouplist_save (list, ex);
-			return list;
-		}
-	}
-
-	return list;
-}
-
-gint
-camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	return 0;
-}
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
deleted file mode 100644
index 67c74d5dc2..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_GROUPLIST_H
-#define CAMEL_NNTP_GROUPLIST_H 1
-
-#include <time.h>
-#include "camel-nntp-store.h"
-
-struct CamelNNTPGroupListEntry {
-	char *group_name;
-	guint32 low;
-	guint32 high;
-	guint32 flags;
-};
-
-struct CamelNNTPGroupList {
-	CamelNNTPStore *store;
-	time_t time;
-	GList *group_list;
-};
-
-CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);
-gint                camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_save   (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_free   (CamelNNTPGroupList *group_list);
-
-#endif /* CAMEL_NNTP_GROUPLIST_H */
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
deleted file mode 100644
index b474dd3a40..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "camel-nntp-newsrc.h"
-#include <camel/camel-folder-summary.h>
-
-typedef struct {
-	guint low;
-	guint high;
-} ArticleRange;
-
-typedef struct {
-	char *name;
-	GArray *ranges;
-	gboolean subscribed;
-} NewsrcGroup;
-
-struct CamelNNTPNewsrc {
-	gchar *filename;
-	GHashTable *groups;
-	gboolean dirty;
-} ;
-
-static NewsrcGroup *
-camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const char *group_name, gboolean subscribed)
-{
-	NewsrcGroup *new_group = g_malloc(sizeof(NewsrcGroup));
-
-	new_group->name = g_strdup(group_name);
-	new_group->subscribed = subscribed;
-	new_group->ranges = g_array_new (FALSE, FALSE, sizeof (ArticleRange));
-
-	g_hash_table_insert (newsrc->groups, new_group->name, new_group);
-
-	newsrc->dirty = TRUE;
-
-	return new_group;
-}
-
-static int
-camel_nntp_newsrc_group_get_highest_article_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	if (!group || group->ranges->len == 0)
-		return 0;
-
-	return g_array_index(group->ranges, ArticleRange, group->ranges->len - 1).high;
-}
-
-static int
-camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	int i;
-	int count = 0;
-
-	if (group == NULL)
-		return 0;
-
-	for (i = 0; i < group->ranges->len; i ++)
-		count += (g_array_index(group->ranges, ArticleRange, i).high -
-			  g_array_index(group->ranges, ArticleRange, i).low) + 1;
-
-	return count;
-}
-
-
-static void
-camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, long low, long high)
-{
-	int i;
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		g_array_index (group->ranges, ArticleRange, 0).low = low;
-		g_array_index (group->ranges, ArticleRange, 0).high = high;
-
-		newsrc->dirty = TRUE;
-	}
-	else  {
-		ArticleRange tmp_range;
-
-		for (i = 0; i < group->ranges->len; i ++) {
-			guint range_low = g_array_index (group->ranges, ArticleRange, i).low;
-			guint range_high = g_array_index (group->ranges, ArticleRange, i).high;
-			
-			/* if it's already part of a range, return immediately. */
-			if (low >= range_low &&
-			    low <= range_high &&
-			    high >= range_low &&
-			    high <= range_high) {
-				return;
-			}
-			/* if we have a new lower bound for this range, set it. */
-			else if (low <= range_low
-				 && high >= range_low
-				 && high <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we have a new upper bound for this range, set it. */
-			else if (high >= range_high
-				 && low >= range_low
-				 && low <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           starts one index higher than an existing
-                           one, make the upper value of the existing
-                           range the upper value of the new one. */
-			else if (low == range_high + 1) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           ends one index lower than an existing one,
-                           group the existing range by setting its low
-                           to the new low */
-			else if (high == range_low - 1) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if the range lies entirely outside another
-                           range, doesn't coincide with it's
-                           endpoints, and has lower values, insert it
-                           into the middle of the list. */
-			else if (low < range_low
-				 && high < range_low) {
-				tmp_range.low = low;
-				tmp_range.high = high;
-
-				group->ranges = g_array_insert_val (group->ranges, i, tmp_range);
-				newsrc->dirty = TRUE;
-
-				return;
-			}
-		}
-
-		/* if we made it here, the range needs to go at the end */
-		tmp_range.low = low;
-		tmp_range.high = high;
-		group->ranges = g_array_append_val (group->ranges, tmp_range);
-		newsrc->dirty = TRUE;
-	} 
-}
-
-int
-camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	return camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);
-}
-
-int
-camel_nntp_newsrc_get_num_articles_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	return camel_nntp_newsrc_group_get_num_articles_read (newsrc, group);
-}
-
-void
-camel_nntp_newsrc_mark_article_read (CamelNNTPNewsrc *newsrc, const char *group_name, int num)
-{
-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);
-}
-
-void
-camel_nntp_newsrc_mark_range_read(CamelNNTPNewsrc *newsrc, const char *group_name, long low, long high)
-{
-	NewsrcGroup *group;
-
-	/* swap them if they're in the wrong order. */
-	if (low > high) {
-		long tmp;
-
-		tmp = high;
-		high = low;
-		low = tmp;
-	}
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-}
-
-gboolean
-camel_nntp_newsrc_article_is_read (CamelNNTPNewsrc *newsrc, const char *group_name, long num)
-{
-	int i;
-	NewsrcGroup *group;
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	
-	for (i = 0; i < group->ranges->len; i++) {
-		if (num >= g_array_index (group->ranges, ArticleRange, i).low && 
-		    num <= g_array_index (group->ranges, ArticleRange, i).high) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-gboolean  
-camel_nntp_newsrc_group_is_subscribed (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		return group->subscribed;
-	}
-	else {
-		return FALSE;
-	}
-}
-
-void
-camel_nntp_newsrc_subscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		if (!group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = TRUE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, TRUE);
-	}
-}
-
-void
-camel_nntp_newsrc_unsubscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		if (group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = FALSE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, FALSE);
-	}
-}
-
-struct newsrc_ptr_array {
-	GPtrArray *ptr_array;
-	gboolean subscribed_only;
-};
-
-static void
-get_group_foreach (char *group_name, NewsrcGroup *group, struct newsrc_ptr_array *npa)
-{
-	if (group->subscribed || !npa->subscribed_only) {
-		g_ptr_array_add (npa->ptr_array, group_name);
-	}
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = TRUE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	return npa.ptr_array;
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = FALSE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	return npa.ptr_array;
-}
-
-void
-camel_nntp_newsrc_free_group_names (CamelNNTPNewsrc *newsrc, GPtrArray *group_names)
-{
-	g_ptr_array_free (group_names, TRUE);
-}
-
-struct newsrc_fp {
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-};
-
-static void
-camel_nntp_newsrc_write_group_line(gpointer key, NewsrcGroup *group, struct newsrc_fp *newsrc_fp)
-{
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-	int i;
-
-	fp = newsrc_fp->fp;
-	newsrc = newsrc_fp->newsrc;
-
-	fprintf (fp, "%s%c", group->name, group->subscribed ? ':' : '!');
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		fprintf (fp, "\n");
-
-		return; /* special case since our parsing code will insert this
-			   bogus range if there were no read articles.  The code
-			   to add a range is smart enough to remove this one if we
-			   ever mark an article read, but we still need to deal with
-			   it if that code doesn't get hit. */
-	}
-
-	fprintf (fp, " ");
-
-	for (i = 0; i < group->ranges->len; i ++) {
-		char range_buffer[100];
-		guint low = g_array_index (group->ranges, ArticleRange, i).low;
-		guint high = g_array_index (group->ranges, ArticleRange, i).high;
-
-		if (low == high)
-			sprintf(range_buffer, "%d", low);
-		else if (low == high - 1)
-			sprintf(range_buffer, "%d,%d", low, high);
-		else
-			sprintf(range_buffer, "%d-%d", low, high);
-
-		if (i != group->ranges->len - 1)
-			strcat(range_buffer, ",");
-
-		fprintf (fp, range_buffer);
-	}
-
-	fprintf (fp, "\n");
-}
-
-void 
-camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)
-{
-	struct newsrc_fp newsrc_fp;
-
-	g_return_if_fail (newsrc);
-
-	newsrc_fp.newsrc = newsrc;
-	newsrc_fp.fp = fp;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)camel_nntp_newsrc_write_group_line,
-			      &newsrc_fp);
-}
-
-void
-camel_nntp_newsrc_write(CamelNNTPNewsrc *newsrc)
-{
-	FILE *fp;
-
-	g_return_if_fail (newsrc);
-
-	if (!newsrc->dirty)
-		return;
-
-	if ((fp = fopen(newsrc->filename, "w")) == NULL) {
-		g_warning ("Couldn't open newsrc file '%s'.\n", newsrc->filename);
-		return;
-	}
-
-	camel_nntp_newsrc_write_to_file(newsrc, fp);
-
-	newsrc->dirty = FALSE;
-
-	fclose(fp);
-}
-
-static void
-camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, char *line)
-{
-	char *p, *comma, *dash;
-	gboolean is_subscribed;
-	NewsrcGroup *group;
-
-	p = strchr(line, ':');
-
-	if (p) {
-		is_subscribed = TRUE;
-	}
-	else {
-		p = strchr(line, '!');
-		if (p)
-			is_subscribed = FALSE;
-		else
-			return; /* bogus line. */
-	}
-
-	*p++ = '\0';
-
-	group = camel_nntp_newsrc_group_add (newsrc, line, is_subscribed);
-
-	do {
-		guint high, low;
-
-		comma = strchr(p, ',');
-
-		if (comma)
-			*comma = '\0';
-
-		dash = strchr(p, '-');
-
-		if (!dash) { /* there wasn't a dash.  must be just one number */
-			high = low = atol(p);
-		}
-		else { /* there was a dash. */
-			*dash = '\0';
-			low = atol(p);
-			*dash = '-';
-			p = dash + 1;
-			high = atol(p);
-		}
-
-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-
-		if (comma) {
-			*comma = ',';
-			p = comma + 1;
-		}
-
-	} while(comma);
-}
-
-static char*
-get_line (char *buf, char **p)
-{
-	char *l;
-	char *line;
-
-	g_assert (*p == NULL || **p == '\n' || **p == '\0');
-
-	if (*p == NULL) {
-		*p = buf;
-
-		if (**p == '\0')
-			return NULL;
-	}
-	else {
-		if (**p == '\0')
-			return NULL;
-
-		(*p) ++;
-	
-		/* if we just incremented to the end of the buffer, return NULL */
-		if (**p == '\0')
-			return NULL;
-	}
-
-	l = strchr (*p, '\n');
-	if (l) {
-		*l = '\0';
-		line = g_strdup (*p);
-		*l = '\n';
-		*p = l;
-	}
-	else {
-		/* we're at the last line (which isn't terminated by a \n, btw) */
-		line = g_strdup (*p);
-		(*p) += strlen (*p);
-	}
-
-	return line;
-}
-
-CamelNNTPNewsrc *
-camel_nntp_newsrc_read_for_server (const char *server)
-{
-	int fd;
-	char buf[1024];
-	char *file_contents, *line, *p;
-	char *filename;
-	CamelNNTPNewsrc *newsrc;
-	int newsrc_len;
-	int len_read = 0;
-	struct stat sb;
-
-	filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);
-
-	newsrc = g_new0(CamelNNTPNewsrc, 1);
-	newsrc->filename = filename;
-	newsrc->groups = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if ((fd = open(filename, O_RDONLY)) == -1) {
-		g_warning ("~/.newsrc-%s not present.\n", server);
-		return newsrc;
-	}
-
-	if (fstat (fd, &sb) == -1) {
-		g_warning ("failed fstat on ~/.newsrc-%s: %s\n", server, strerror(errno));
-		return newsrc;
-	}
-	newsrc_len = sb.st_size;
-
-	file_contents = g_malloc (newsrc_len + 1);
-
-	while (len_read < newsrc_len) {
-		int c = read (fd, buf, sizeof (buf));
-
-		if (c == -1)
-			break;
-
-		memcpy (&file_contents[len_read], buf, c);
-		len_read += c;
-	}
-	file_contents [len_read] = 0;
-
-	p = NULL;
-	while ((line = get_line (file_contents, &p))) {
-		camel_nntp_newsrc_parse_line(newsrc, line);
-		g_free (line);
-	}
-
-	close (fd);
-	g_free (file_contents);
-
-	return newsrc;
-}
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
deleted file mode 100644
index 652e3edbce..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef _CAMEL_NNTP_NEWSRC_H_
-#define _CAMEL_NNTP_NEWSRC_H_
-
-#include <stdio.h>
-#include "glib.h"
-
-typedef struct CamelNNTPNewsrc CamelNNTPNewsrc;
-
-int              camel_nntp_newsrc_get_highest_article_read   (CamelNNTPNewsrc *newsrc, const char *group_name);
-int              camel_nntp_newsrc_get_num_articles_read      (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_mark_article_read          (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, int num);
-void             camel_nntp_newsrc_mark_range_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long low, long high);
-
-gboolean         camel_nntp_newsrc_article_is_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long num);
-
-gboolean         camel_nntp_newsrc_group_is_subscribed        (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_subscribe_group            (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_unsubscribe_group          (CamelNNTPNewsrc *newsrc, const char *group_name);
-
-GPtrArray*       camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc);
-GPtrArray*       camel_nntp_newsrc_get_all_group_names        (CamelNNTPNewsrc *newsrc);
-void             camel_nntp_newsrc_free_group_names           (CamelNNTPNewsrc *newsrc, GPtrArray *group_names);
-
-void             camel_nntp_newsrc_write_to_file              (CamelNNTPNewsrc *newsrc, FILE *fp);
-void             camel_nntp_newsrc_write                      (CamelNNTPNewsrc *newsrc);
-CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server            (const char *server);
-
-#endif /* _CAMEL_NNTP_NEWSRC_H_ */
-
-
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
deleted file mode 100644
index 76ac521ec6..0000000000
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-provider.c: nntp provider registration code */
-
-/* 
- * Authors :
- *   Chris Toshok <toshok@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-nntp-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-
-static void add_hash (guint *hash, char *s);
-static guint nntp_url_hash (gconstpointer key);
-static gint check_equal (char *s1, char *s2);
-static gint nntp_url_equal (gconstpointer a, gconstpointer b);
-
-static CamelProvider news_provider = {
-	"nntp",
-	N_("USENET news"),
-
-	N_("This is a provider for reading from and posting to"
-	   "USENET newsgroups."),
-
-	"news",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	news_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_nntp_store_get_type();
-
-	news_provider.service_cache = g_hash_table_new (nntp_url_hash, nntp_url_equal);
-
-	camel_session_register_provider (session, &news_provider);
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-static guint
-nntp_url_hash (gconstpointer key)
-{
-	const CamelURL *u = (CamelURL *)key;
-	guint hash = 0;
-
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->host);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static gint
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-static gint
-nntp_url_equal (gconstpointer a, gconstpointer b)
-{
-	const CamelURL *u1 = a, *u2 = b;
-	
-	return check_equal (u1->user, u2->user)
-		&& check_equal (u1->host, u2->host)
-		&& u1->port == u2->port;
-}
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
deleted file mode 100644
index 8b9dc8ff6c..0000000000
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-resp-codes.h : #defines for all the response codes we care about */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_RESP_CODES_H
-#define CAMEL_NNTP_RESP_CODES_H 1
-
-#define CAMEL_NNTP_OK(x) ((x) < 400)
-#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) && (x) < 500)
-#define CAMEL_NNTP_FAIL(x) (!CAMEL_NNTP_OK(x) && !CAMEL_NNTP_ERR(x))
-
-#define NNTP_GREETING_POSTING_OK    200
-#define NNTP_GREETING_NO_POSTING    201
-
-#define NNTP_GROUP_SELECTED           211
-#define NNTP_LIST_FOLLOWS             215
-#define NNTP_ARTICLE_FOLLOWS          220
-#define NNTP_HEAD_FOLLOWS             221
-#define NNTP_DATA_FOLLOWS             224
-#define NNTP_NEW_ARTICLE_LIST_FOLLOWS 230
-#define NNTP_NEW_GROUP_LIST_FOLLOWS   231
-
-#define NNTP_NO_SUCH_GROUP          411
-#define NNTP_NO_SUCH_ARTICLE        430
-
-/* authentication */
-#define NNTP_AUTH_ACCEPTED          281
-#define NNTP_AUTH_CONTINUE          381
-#define NNTP_AUTH_REQUIRED          480
-#define NNTP_AUTH_REJECTED          482
-
-#define NNTP_PROTOCOL_ERROR         666
-
-#endif /* CAMEL_NNTP_RESP_CODES_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
deleted file mode 100644
index ff9e7a989a..0000000000
--- a/camel/providers/nntp/camel-nntp-store.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.c : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "libgnome/libgnome.h"
-
-#include "camel-nntp-resp-codes.h"
-#include "camel-folder-summary.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-auth.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#include <gal/util/e-util.h>
-
-#define NNTP_PORT 119
-
-#define DUMP_EXTENSIONS
-
-/* define if you want the subscribe ui to show folders in tree form */
-/* #define INFO_AS_TREE */
-
-static CamelRemoteStoreClass *remote_store_class = NULL;
-
-static CamelServiceClass *service_class = NULL;
-
-/* Returns the class for a CamelNNTPStore */
-#define CNNTPS_CLASS(so) CAMEL_NNTP_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static gboolean ensure_news_dir_exists (CamelNNTPStore *store);
-
-static void
-camel_nntp_store_get_extensions (CamelNNTPStore *store, CamelException *ex)
-{
-	store->extensions = 0;
-
-	if (camel_nntp_command (store, ex, NULL, "LIST EXTENSIONS") == NNTP_LIST_FOLLOWS) {
-		gboolean done = FALSE;
-		CamelException ex;
-
-		camel_exception_init (&ex);
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, &ex) < 0)
-				break; /* XXX */
-
-			if (*line == '.') {
-				done = TRUE;
-			}
-			else {
-#define CHECK_EXT(name,val) if (!strcasecmp (line, (name))) store->extensions |= (val)
-
-				CHECK_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-				CHECK_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-				CHECK_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-				CHECK_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-				CHECK_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-				CHECK_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-				CHECK_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-				CHECK_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-
-#undef CHECK_EXT
-			}
-
-			g_free (line);
-		}
-	}
-
-#ifdef DUMP_EXTENSIONS
-	g_print ("NNTP Extensions:");
-#define DUMP_EXT(name,val) if (store->extensions & (val)) g_print (" %s", name);
-	DUMP_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-	DUMP_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-	DUMP_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-	DUMP_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-	DUMP_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-	DUMP_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-	DUMP_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-	DUMP_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-	g_print ("\n");
-#undef DUMP_EXT
-#endif
-}
-
-static void
-camel_nntp_store_get_overview_fmt (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	int i;
-	gboolean done = FALSE;
-	
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST OVERVIEW.FMT");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		if (store->extensions & CAMEL_NNTP_EXT_OVER) {
-			/* if we can't get the overview format, we should
-			   disable OVER support */
-			g_warning ("server reported support of OVER but LIST OVERVIEW.FMT failed."
-				   "  disabling OVER.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-			return;
-		}
-	}
-	else {
-		if (!(store->extensions & CAMEL_NNTP_EXT_OVER)) {
-			g_warning ("server didn't report support of OVER but LIST OVERVIEW.FMT worked."
-				   "  enabling OVER.\n");
-			store->extensions |= CAMEL_NNTP_EXT_OVER;
-		}
-	}
-
-	/* start at 1 because the article number is always first */
-	store->num_overview_fields = 1;
-	
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		store->overview_field [i].index = -1;
-	}
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			break; /* XXX */
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPOverField *over_field = NULL;
-			char *colon = NULL;;
-
-			if (!strncasecmp (line, "From:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_FROM ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Subject:", 7)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 7;
-			}
-			else if (!strncasecmp (line, "Date:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_DATE ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Message-ID:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "References:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_REFERENCES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "Bytes:", 6)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_BYTES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-		
-			if (colon && !strncmp (colon + 1, "full", 4))
-				over_field->full = TRUE;
-
-			store->num_overview_fields ++;
-		}
-
-		g_free (line);
-	}
-
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		if (store->overview_field [i].index == -1) {
-			g_warning ("server's OVERVIEW.FMT doesn't support minimum set we require,"
-				   " disabling OVER support.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-		}
-	}
-}
-
-static gboolean
-nntp_store_connect (CamelService *service, CamelException *ex)
-{
-	char *buf;
-	int resp_code;
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (!ensure_news_dir_exists(store)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open directory for news server: %s"),
-				      strerror (errno));
-		return FALSE;
-	}
-
-	if (CAMEL_SERVICE_CLASS (remote_store_class)->connect (service, ex) == FALSE)
-		return FALSE;
-
-	/* Read the greeting */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service), &buf, ex) < 0) {
-		return FALSE;
-	}
-
-	/* check if posting is allowed. */
-	resp_code = atoi (buf);
-	if (resp_code == NNTP_GREETING_POSTING_OK) {
-		g_print ("posting allowed\n");
-		store->posting_allowed = TRUE;
-	}
-	else if (resp_code == NNTP_GREETING_NO_POSTING) {
-		g_print ("no posting allowed\n");
-		store->posting_allowed = FALSE;
-	}
-	else {
-		g_warning ("unexpected server greeting code %d, no posting allowed\n", resp_code);
-		store->posting_allowed = FALSE;
-	}
-
-	g_free (buf);
-
-	/* get a list of extensions that the server supports */
-	camel_nntp_store_get_extensions (store, ex);
-
-	/* try to get the overview.fmt */
-	camel_nntp_store_get_overview_fmt (store, ex);
-
-	return TRUE;
-}
-
-static gboolean
-nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (clean)
-		camel_nntp_command (store, ex, NULL, "QUIT");
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static char *
-nntp_store_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf ("%s", service->url->host);
-	else
-		return g_strdup_printf (_("USENET News via %s"), service->url->host);
-	
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-	
-	N_("This option will authenticate with the NNTP server using a "
-	   "plaintext password."),
-	
-	"",
-	TRUE
-};
-
-static GList *
-nntp_store_query_auth_types_generic (CamelService *service, CamelException *ex)
-{
-	GList *prev;
-	
-	prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types_generic (service, ex);
-	return g_list_prepend (prev, &password_authtype);
-}
-
-static GList *
-nntp_store_query_auth_types_connected (CamelService *service, CamelException *ex)
-{
-	g_warning ("nntp::query_auth_types_connected: not implemented. Defaulting.");
-	/* FIXME: use the classfunc instead of the local? */
-	return nntp_store_query_auth_types_generic (service, ex);
-}
-
-static CamelFolder *
-nntp_store_get_folder (CamelStore *store, const gchar *folder_name,
-		       guint32 flags, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	printf ("get_folder called on folder_name=%s\n", folder_name);
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	return camel_nntp_folder_new (store, folder_name, ex);
-}
-
-#ifdef INFO_AS_TREE
-static void
-build_folder_info (CamelNNTPStore *nntp_store, CamelFolderInfo **root,
-		   CamelFolderInfo *parent, CamelNNTPGroupListEntry *entry,
-		   char *prefix, char *suffix,
-		   GHashTable *name_to_info)
-{
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-	char *dot;
-	if ((dot = strchr (suffix, '.'))) {
-		/* it's an internal node, figure out the next node in
-                   the chain */
-		CamelFolderInfo *node;
-		char *node_name, *node_full_name;
-
-		node_name = g_malloc0 (dot - suffix + 1);
-		strncpy (node_name, suffix, dot - suffix);
-		node_full_name = g_strdup_printf ("%s.%s", prefix, node_name);
-
-		node = g_hash_table_lookup (name_to_info, node_full_name);
-		if (!node) {
-			/* we need to add one */
-			node = g_new0 (CamelFolderInfo, 1);
-			node->name = g_strdup (node_name);
-			node->full_name = g_strdup (node_full_name);
-			node->url = NULL;
-			node->message_count = -1;
-			node->unread_message_count = -1;
-
-			if (parent) {
-				if (parent->child) {
-					node->sibling = parent->child;
-					parent->child = node;
-				}
-				else {
-					parent->child = node;
-				}
-			}
-			else {
-				if (*root) {
-					*root = node;
-				}
-				else {
-					node->sibling = *root;
-					*root = node;
-				}
-			}
-
-			g_hash_table_insert (name_to_info, node_full_name, node);
-		}
-
-		build_folder_info (nntp_store, root, node, entry, node_full_name, dot + 1, name_to_info);
-	}
-	else {
-		/* it's a leaf node, make the CamelFolderInfo and
-                   append it to @parent's list of children. */
-		CamelFolderInfo *new_group;
-
-		new_group = g_new0 (CamelFolderInfo, 1);
-		new_group->name = g_strdup (entry->group_name);
-		new_group->full_name = g_strdup (entry->group_name);
-		new_group->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						  url->user ? url->user : "",
-						  url->user ? "@" : "",
-						  url->host, (char *)entry->group_name);
-
-		new_group->message_count = entry->high - entry->low;
-		new_group->unread_message_count = (new_group->message_count - 
-						   camel_nntp_newsrc_get_num_articles_read (nntp_store->newsrc, entry->group_name));
-
-		if (parent) {
-			if (parent->child) {
-				new_group->sibling = parent->child;
-				parent->child = new_group;
-			}
-			else {
-				parent->child = new_group;
-			}
-		}
-		else {
-			if (*root) {
-				*root = new_group;
-			}
-			else {
-				new_group->sibling = *root;
-				*root = new_group;
-			}
-		}
-	}
-}
-#endif
-
-static CamelFolderInfo *
-build_folder_info_from_grouplist (CamelNNTPStore *nntp_store, const char *top)
-{
-	GList *g;
-	CamelFolderInfo *groups = NULL;
-#ifdef INFO_AS_TREE
-	GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
-#else
-	CamelFolderInfo *last = NULL, *fi;
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-#endif
-
-	for (g = nntp_store->group_list->group_list; g; g = g_list_next (g)) {
-		CamelNNTPGroupListEntry *entry = g->data;
-
-		if (!top || !strncmp (top, entry->group_name, strlen (top))) {
-#ifdef INFO_AS_TREE
-			build_folder_info (nntp_store, &groups, NULL, entry,
-					   "", entry->group_name, hash);
-#else
-
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (entry->group_name);
-			fi->full_name = g_strdup (entry->group_name);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)entry->group_name);
-
-			fi->message_count = entry->high - entry->low;
-			fi->unread_message_count = (fi->message_count - 
-						    camel_nntp_newsrc_get_num_articles_read (
-							     nntp_store->newsrc, entry->group_name));
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-#endif
-		}
-	}
-
-	return groups;
-}
-
-static CamelFolderInfo *
-nntp_store_get_folder_info (CamelStore *store, const char *top,
-			    gboolean fast, gboolean recursive,
-			    gboolean subscribed_only,
-			    CamelException *ex)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)store;
-	GPtrArray *names;
-	CamelFolderInfo *groups = NULL, *last = NULL, *fi;
-	int i;
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	if (!subscribed_only) {
-		if (!nntp_store->group_list)
-			nntp_store->group_list = camel_nntp_grouplist_fetch (nntp_store, ex);
-		if (camel_exception_is_set (ex)) {
-			return NULL;
-		}
-		else {
-			fi = build_folder_info_from_grouplist (nntp_store, top);
-			return fi;
-		}
-	}
-
-	if (top == NULL) {
-		/* return the list of groups */
-		names = camel_nntp_newsrc_get_subscribed_group_names (nntp_store->newsrc);
-		for (i = 0; i < names->len; i++) {
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (names->pdata[i]);
-			fi->full_name = g_strdup (names->pdata[i]);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)names->pdata[i]);
-			/* FIXME */
-			fi->message_count = fi->unread_message_count = -1;
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-		}
-		camel_nntp_newsrc_free_group_names (nntp_store->newsrc, names);
-
-		return groups;
-	}
-	else {
-		/* getting a specific group */
-
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->name = g_strdup (top);
-		fi->full_name = g_strdup (top);
-		fi->url = g_strdup_printf ("nntp://%s/%s", url->host, top);
-		/* FIXME */
-		fi->message_count = fi->unread_message_count = -1;
-
-		return fi;
-	}
-}
-
-static char *
-nntp_store_get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	return camel_nntp_newsrc_group_is_subscribed (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,
-			     CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_subscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,
-			       CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_unsubscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);
-	if (nntp_store->newsrc)
-		camel_nntp_newsrc_write (nntp_store->newsrc);
-}
-
-static void
-camel_nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_nntp_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_class);
-
-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						      (camel_remote_store_get_type ()));
-
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = nntp_store_connect;
-	camel_service_class->disconnect = nntp_store_disconnect;
-	camel_service_class->query_auth_types_generic = nntp_store_query_auth_types_generic;
-	camel_service_class->query_auth_types_connected = nntp_store_query_auth_types_connected;
-	camel_service_class->get_name = nntp_store_get_name;
-
-	camel_store_class->get_folder = nntp_store_get_folder;
-	camel_store_class->get_root_folder_name = nntp_store_get_root_folder_name;
-	camel_store_class->get_folder_info = nntp_store_get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->folder_subscribed = nntp_store_folder_subscribed;
-	camel_store_class->subscribe_folder = nntp_store_subscribe_folder;
-	camel_store_class->unsubscribe_folder = nntp_store_unsubscribe_folder;
-}
-
-
-
-static void
-camel_nntp_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-
-	remote_store->default_port = NNTP_PORT;
-
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-}
-
-CamelType
-camel_nntp_store_get_type (void)
-{
-	static CamelType camel_nntp_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_store_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelNNTPStore",
-							     sizeof (CamelNNTPStore),
-							     sizeof (CamelNNTPStoreClass),
-							     (CamelObjectClassInitFunc) camel_nntp_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_nntp_store_init,
-							     (CamelObjectFinalizeFunc) finalize);
-	}
-	
-	return camel_nntp_store_type;
-}
-
-
-/**
- * camel_nntp_command: Send a command to a NNTP server.
- * @store: the NNTP store
- * @ret: a pointer to return the full server response in
- * @fmt: a printf-style format string, followed by arguments
- *
- * This command sends the command specified by @fmt and the following
- * arguments to the connected NNTP store specified by @store. It then
- * reads the server's response and parses out the status code. If
- * the caller passed a non-NULL pointer for @ret, camel_nntp_command
- * will set it to point to an buffer containing the rest of the
- * response from the NNTP server. (If @ret was passed but there was
- * no extended response, @ret will be set to NULL.) The caller must
- * free this buffer when it is done with it.
- *
- * Return value: the response code of the nntp command.
- **/
-static int
-camel_nntp_command_send_recv (CamelNNTPStore *store, CamelException *ex, char **ret, char *cmd)
-{
-	char *respbuf;
-	int resp_code;
-	gboolean again;
-
-	do {
-		again = FALSE;
-
-		/* Send the command */
-		if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, cmd) < 0) {
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		/* Read the response */
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0) {
-			if (ret)
-				*ret = g_strdup (g_strerror (errno));
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		resp_code = atoi (respbuf);
-
-		/* this is kind of a gross hack, but since an auth challenge
-		   can pop up at any time, and we want to shield this from our
-		   callers, we handle authentication here. */
-		if (resp_code == NNTP_AUTH_REQUIRED) {
-			resp_code = camel_nntp_auth_authenticate (store, ex);
-			if (resp_code != NNTP_AUTH_ACCEPTED) {
-				return resp_code;
-			}
-
-			/* need to resend our command here */
-			again = TRUE;
-		}
-	} while (again);
-
-	if (ret) {
-		*ret = strchr (respbuf, ' ');
-		if (*ret)
-			*ret = g_strdup (*ret + 1);
-	}
-	g_free (respbuf);
-
-	return resp_code;
-}
-
-int
-camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...)
-{
-	char *cmdbuf;
-	va_list ap;
-	int resp_code;
-	char *real_fmt;
-
-	real_fmt = g_strdup_printf ("%s\r\n", fmt);
-
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (real_fmt, ap);
-	va_end (ap);
-
-	g_free (real_fmt);
-
-	resp_code = camel_nntp_command_send_recv (store, ex, ret, cmdbuf);
-
-	g_free (cmdbuf);
-
-	return resp_code;
-}
-
-void
-camel_nntp_store_subscribe_group (CamelStore *store,
-				  const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	char *ret = NULL;
-	CamelException *ex = camel_exception_new();
-
-	if (camel_exception_get_id (ex)) {
-		g_free (root_dir);
-		camel_exception_free (ex);
-		return;
-	}
-
-	if (camel_nntp_command ( CAMEL_NNTP_STORE (store),
-				 ex, &ret, "GROUP %s", group_name) == NNTP_GROUP_SELECTED) {
-		/* we create an empty summary file here, so that when
-                   the group is opened we'll know we need to build it. */
-		gchar *summary_file;
-		int fd;
-		summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-		
-		fd = open (summary_file, O_CREAT | O_RDWR, 0666);
-		close (fd);
-
-		g_free (summary_file);
-	}
-	if (ret) g_free (ret);
-
-	g_free (root_dir);
-	camel_exception_free (ex);
-}
-
-void
-camel_nntp_store_unsubscribe_group (CamelStore *store,
-				    const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *summary_file;
-
-	summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-	if (g_file_exists (summary_file))
-		unlink (summary_file);
-	g_free (summary_file);
-
-	g_free (root_dir);
-}
-
-GList *
-camel_nntp_store_list_subscribed_groups(CamelStore *store)
-{
-	GList *group_name_list = NULL;
-	struct stat stat_buf;
-	gint stat_error = 0;
-	gchar *entry_name;
-	gchar *full_entry_name;
-	gchar *real_group_name;
-	struct dirent *dir_entry;
-	DIR *dir_handle;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-
-	dir_handle = opendir (root_dir);
-	g_return_val_if_fail (dir_handle, NULL);
-
-	/* read the first entry in the directory */
-	dir_entry = readdir (dir_handle);
-	while ((stat_error != -1) && (dir_entry != NULL)) {
-
-		/* get the name of the next entry in the dir */
-		entry_name = dir_entry->d_name;
-		full_entry_name = g_strdup_printf ("%s/%s", root_dir, entry_name);
-		stat_error = stat (full_entry_name, &stat_buf);
-		g_free (full_entry_name);
-
-		/* is it a normal file ending in -ev-summary ? */
-		if ((stat_error != -1) && S_ISREG (stat_buf.st_mode)) {
-			gboolean summary_suffix_found;
-
-			real_group_name = string_prefix (entry_name, "-ev-summary",
-							 &summary_suffix_found);
-
-			if (summary_suffix_found)
-				/* add the folder name to the list */
-				group_name_list = g_list_append (group_name_list, 
-								 real_group_name);
-		}
-		/* read next entry */
-		dir_entry = readdir (dir_handle);
-	}
-
-	closedir (dir_handle);
-
-	return group_name_list;
-}
-
-gchar *
-camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	char *top_dir;
-
-	g_assert(url != NULL);
-
-	top_dir = g_strdup_printf( "%s/evolution/news/%s",
-				   g_get_home_dir (),
-				   url->host );
-
-	return top_dir;
-}
-
-static gboolean
-ensure_news_dir_exists (CamelNNTPStore *store)
-{
-	gchar *dir = camel_nntp_store_get_toplevel_dir (store);
-
-	if (access (dir, F_OK) == 0) {
-		g_free (dir);
-		return TRUE;
-	}
-
-	if (e_mkdir_hier (dir, S_IRWXU) == -1) {
-		g_free (dir);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
deleted file mode 100644
index 0566967fd7..0000000000
--- a/camel/providers/nntp/camel-nntp-store.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.h : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_STORE_H
-#define CAMEL_NNTP_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-remote-store.h"
-#include "camel-nntp-newsrc.h"
-#include "camel-nntp-types.h"
-
-#define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())
-#define CAMEL_NNTP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))
-#define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))
-#define IS_CAMEL_NNTP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_STORE_TYPE))
-
-
-enum {
-	CAMEL_NNTP_OVER_FROM,
-	CAMEL_NNTP_OVER_SUBJECT,
-	CAMEL_NNTP_OVER_DATE,
-	CAMEL_NNTP_OVER_MESSAGE_ID,
-	CAMEL_NNTP_OVER_REFERENCES,
-	CAMEL_NNTP_OVER_BYTES,
-
-	CAMEL_NNTP_OVER_LAST
-};
-
-struct CamelNNTPOverField {
-	int index;
-	gboolean full; /* full in the OVER sense - the field name
-                          precedes the ':' in the XOVER list. */
-};
-
-struct CamelNNTPStore {
-	CamelRemoteStore parent_object;	
-
-#define CAMEL_NNTP_EXT_SEARCH     (1<<0)
-#define CAMEL_NNTP_EXT_SETGET     (1<<1)
-#define CAMEL_NNTP_EXT_OVER       (1<<2)
-#define CAMEL_NNTP_EXT_XPATTEXT   (1<<3)
-#define CAMEL_NNTP_EXT_XACTIVE    (1<<4)
-#define CAMEL_NNTP_EXT_LISTMOTD   (1<<5)
-#define CAMEL_NNTP_EXT_LISTSUBSCR (1<<6)
-#define CAMEL_NNTP_EXT_LISTPNAMES (1<<7)
-	guint32 extensions;
-
-	gboolean posting_allowed;
-
-	int num_overview_fields;
-	CamelNNTPOverField overview_field[ CAMEL_NNTP_OVER_LAST ];
-
-	CamelNNTPNewsrc *newsrc;
-	CamelNNTPGroupList *group_list;
-
-};
-
-struct CamelNNTPStoreClass {
-	CamelRemoteStoreClass parent_class;
-
-};
-
-
-/* public methods */
-void camel_nntp_store_open (CamelNNTPStore *store, CamelException *ex);
-void camel_nntp_store_close (CamelNNTPStore *store, gboolean expunge,
-			     CamelException *ex);
-
-void camel_nntp_store_subscribe_group (CamelStore *store, const gchar *group_name);
-void camel_nntp_store_unsubscribe_group (CamelStore *store, const gchar *group_name);
-GList *camel_nntp_store_list_subscribed_groups(CamelStore *store);
-
-gchar *camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store);
-
-/* support functions */
-int camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...);
-
-/* Standard Camel function */
-CamelType camel_nntp_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_STORE_H */
-
-
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
deleted file mode 100644
index b1d91779b1..0000000000
--- a/camel/providers/nntp/camel-nntp-types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_TYPES_H
-#define CAMEL_NNTP_TYPES_H 1
-
-typedef struct CamelNNTPGroupList CamelNNTPGroupList;
-typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry;
-typedef struct CamelNNTPOverField CamelNNTPOverField;
-typedef struct CamelNNTPStore CamelNNTPStore;
-typedef struct CamelNNTPStoreClass CamelNNTPStoreClass;
-
-#endif /* CAMEL_NNTP_TYPES_H */
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
deleted file mode 100644
index e8ee9bb112..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.c : utilities used by the nntp code. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-exception.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-static void
-get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		  int first_message, int last_message, CamelException *ex)
-{
-	int status;
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-
-	status = camel_nntp_command (nntp_store, ex, NULL,
-				     "XOVER %d-%d",
-				     first_message,
-				     last_message);
-
-	if (status == NNTP_DATA_FOLLOWS) {
-		gboolean done = FALSE;
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (nntp_store), &line, ex) < 0) {
-				g_warning ("failed to recv_line while building OVER header list\n");
-				break;
-			}
-
-			if (*line == '.') {
-				done = TRUE;
-				g_print ("done\n");
-			}
-			else {
-				CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);
-				char **split_line = g_strsplit (line, "\t", 7);
-				char *subject, *from, *date, *message_id, *bytes;
-
-				subject = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_SUBJECT].index];
-				from = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_FROM].index];
-				date = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_DATE].index];
-				message_id = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_MESSAGE_ID].index];
-				bytes = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_BYTES].index];
-
-				/* if the overview format flagged this
-                                   field as "full", skip over the
-                                   preceding field name and colon */
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ].full)
-					subject += strlen ("Subject:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_FROM ].full)
-					from += strlen ("From:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_DATE ].full)
-					date += strlen ("Date:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ].full)
-					message_id += strlen ("Message-ID:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_BYTES ].full)
-					bytes += strlen ("Bytes:");
-
-				new_info->subject = g_strdup(subject);
-				new_info->from = g_strdup(from);
-				new_info->to = g_strdup(folder->name);
-				new_info->date_sent = header_decode_date(date, NULL);
-#if 0
-				/* XXX do we need to fill in both dates? */
-				new_info->headers.date_received = g_strdup(date);
-#endif
-				new_info->size = atoi(bytes);
-				new_info->uid = g_strdup_printf ("%s,%s", split_line[0], message_id);
-				new_info->message_id = g_strdup(message_id);
-
-				if (camel_nntp_newsrc_article_is_read (nntp_store->newsrc,
-								       folder->name,
-								       atoi (split_line[0])))
-				    new_info->flags |= CAMEL_MESSAGE_SEEN;
-
-				camel_folder_summary_add (nntp_folder->summary, new_info);
-				g_strfreev (split_line);
-			}
-			g_free (line);
-		}
-	}
-	else {
-		/* XXX */
-		g_warning ("weird nntp response for XOVER: %d\n", status);
-	}
-}
-
-#if 0
-static GArray*
-get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		 int first_message, int last_message, CamelException *ex)
-{
-	int i;
-	int status;
-
-	for (i = first_message; i < last_message; i ++) {
-		status = camel_nntp_command (nntp_store, ex, NULL,
-					     "HEAD %d", i);
-
-		if (status == NNTP_HEAD_FOLLOWS) {
-			gboolean done = FALSE;
-			char *buf;
-			int buf_len;
-			int buf_alloc;
-			int h;
-			CamelStream *header_stream;
-			GArray *header_array;
-			CamelStream *nntp_istream;
-			CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);
-
-			buf_alloc = 2048;
-			buf_len = 0;
-			buf = g_malloc(buf_alloc);
-			done = FALSE;
-
-			buf[0] = 0;
-
-			nntp_istream = nntp_store->istream;
-
-			while (!done) {
-				char *line;
-				int line_length;
-
-				line = camel_stream_buffer_read_line ( 
-						      CAMEL_STREAM_BUFFER ( nntp_istream ));
-				line_length = strlen ( line );
-
-				if (*line == '.') {
-					done = TRUE;
-				}
-				else {
-					if (buf_len + line_length > buf_alloc) {
-						buf_alloc *= 2;
-						buf = g_realloc (buf, buf_alloc);
-					}
-					strcat(buf, line);
-					strcat(buf, "\n");
-					buf_len += strlen(line);
-					g_free (line);
-				}
-			}
-
-			/* create a stream from which to parse the headers */
-			header_stream = camel_stream_mem_new_with_buffer(buf,
-								 buf_len,
-								 CAMEL_STREAM_MEM_READ);
-
-			header_array = get_header_array_from_stream (header_stream);
-
-			memset (&info, 0, sizeof(info));
-
-			for (h = 0; h < header_array->len; h ++) {
-				Rfc822Header *header = &((Rfc822Header*)header_array->data)[h];
-				if (!g_strcasecmp(header->name, "From"))
-					new_info->from = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "To"))
-					new_info->to = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Subject"))
-					new_info->subject = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Message-ID")) {
-					new_info->uid = g_strdup_printf("%d,%s", i, header->value);
-					new_info->message_id = g_strdup(header->value);
-				}
-				else if (!g_strcasecmp(header->name, "Date")) {
-					new_info->date_sent = header_decode_date (header->value);
-#if 0
-					new_info->date_sent = g_strdup(header->value);
-					new_info->date_received = g_strdup(header->value);
-#endif
-				}
-			}
-
-			camel_folder_summary_add (nntp_folder->summary, new_info);
-		}
-		else if (status == CAMEL_NNTP_FAIL) {
-			/* nasty things are afoot */
-			g_warning ("failure doing HEAD\n");
-			break;
-		}
-	}
-}
-#endif
-
-void
-camel_nntp_get_headers (CamelStore *store,
-			CamelNNTPFolder *nntp_folder,
-			CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-	CamelFolder *folder = CAMEL_FOLDER (nntp_folder);
-	char *ret;
-	int first_message, nb_message, last_message;
-	int status;
-
-	status = camel_nntp_command (nntp_store, ex, &ret,
-				     "GROUP %s", folder->name);
-
-	sscanf (ret, "%d %d %d", &nb_message, &first_message, &last_message);
-	g_free (ret);
-
-	if (status == NNTP_NO_SUCH_GROUP) {
-		/* XXX throw invalid group exception */
-		camel_exception_setv (ex, 
-				      CAMEL_EXCEPTION_FOLDER_INVALID,
-				      "group %s not found on server",
-				      folder->name);
-		return;
-	}
-
-
-	if (nntp_store->extensions & CAMEL_NNTP_EXT_OVER) {
-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);
-	}
-	else {
-		g_warning ("need to fix get_HEAD_headers\n");
-#if 0
-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);
-#endif
-	}		
-}
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
deleted file mode 100644
index f28697c744..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.h : Utilities for the NNTP provider */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_UTILS_H
-#define CAMEL_NNTP_UTILS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void camel_nntp_get_headers (CamelStore *store, CamelNNTPFolder *nntp_folder, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_UTILS_H */
diff --git a/camel/providers/nntp/libcamelnntp.urls b/camel/providers/nntp/libcamelnntp.urls
deleted file mode 100644
index dee2e70f14..0000000000
--- a/camel/providers/nntp/libcamelnntp.urls
+++ /dev/null
@@ -1,2 +0,0 @@
-news
-nntp
diff --git a/camel/providers/nntp/test-newsrc.c b/camel/providers/nntp/test-newsrc.c
deleted file mode 100644
index c4b985e565..0000000000
--- a/camel/providers/nntp/test-newsrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <glib.h>
-#include "camel-nntp-newsrc.h"
-
-int
-main(int argc, char *argv[])
-{
-  CamelNNTPNewsrc *newsrc = camel_nntp_newsrc_read_for_server (argv[1]);
-  camel_nntp_newsrc_write_to_file (newsrc, stdout);
-}
diff --git a/camel/providers/pop3/.cvsignore b/camel/providers/pop3/.cvsignore
deleted file mode 100644
index 7d926a5545..0000000000
--- a/camel/providers/pop3/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
deleted file mode 100644
index 608e640cd9..0000000000
--- a/camel/providers/pop3/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelpop3includedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelpop3.la
-provider_DATA = libcamelpop3.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-        -I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
-	$(KRB4_CFLAGS)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
-
-libcamelpop3_la_SOURCES = 			\
-	camel-pop3-folder.c			\
-	camel-pop3-provider.c			\
-	camel-pop3-store.c
-
-libcamelpop3include_HEADERS =			\
-	camel-pop3-folder.h			\
-	camel-pop3-store.h
-
-
-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
-
-libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelpop3.urls
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
deleted file mode 100644
index 5cc0609e01..0000000000
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-folder.c : class for a pop3 folder */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-pop3-folder.h"
-#include "camel-pop3-store.h"
-#include "camel-exception.h"
-#include "camel-stream-mem.h"
-#include "camel-stream-filter.h"
-#include "camel-mime-message.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))
-static CamelFolderClass *parent_class;
-
-static void pop3_finalize (CamelObject *object);
-
-static void pop3_refresh_info (CamelFolder *folder, CamelException *ex);
-static void pop3_sync (CamelFolder *folder, gboolean expunge,
-		       CamelException *ex);
-
-static gint pop3_get_message_count (CamelFolder *folder);
-static GPtrArray *pop3_get_uids (CamelFolder *folder);
-static CamelMimeMessage *pop3_get_message (CamelFolder *folder, 
-					   const char *uid,
-					   CamelException *ex);
-static void pop3_set_message_flags (CamelFolder *folder, const char *uid,
-				    guint32 flags, guint32 set);
-
-static GPtrArray *parse_listing (int count, char *data);
-
-static void
-camel_pop3_folder_class_init (CamelPop3FolderClass *camel_pop3_folder_class)
-{
-	CamelFolderClass *camel_folder_class =
-		CAMEL_FOLDER_CLASS (camel_pop3_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	/* virtual method overload */
-	camel_folder_class->refresh_info = pop3_refresh_info;
-	camel_folder_class->sync = pop3_sync;
-
-	camel_folder_class->get_message_count = pop3_get_message_count;
-	camel_folder_class->get_uids = pop3_get_uids;
-	camel_folder_class->free_uids = camel_folder_free_nop;
-
-	camel_folder_class->get_message = pop3_get_message;
-	camel_folder_class->set_message_flags = pop3_set_message_flags;
-}
-
-static void
-camel_pop3_folder_init (gpointer object)
-{
-	CamelFolder *folder = CAMEL_FOLDER (object);
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);
-
-	folder->has_summary_capability = FALSE;
-	folder->has_search_capability = FALSE;
-
-	pop3_folder->uids = NULL;
-	pop3_folder->flags = NULL;
-}
-
-CamelType
-camel_pop3_folder_get_type (void)
-{
-	static CamelType camel_pop3_folder_type = CAMEL_INVALID_TYPE;
-
-	if (!camel_pop3_folder_type) {
-		camel_pop3_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelPop3Folder",
-							      sizeof (CamelPop3Folder),
-							      sizeof (CamelPop3FolderClass),
-							      (CamelObjectClassInitFunc) camel_pop3_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) camel_pop3_folder_init,
-							      (CamelObjectFinalizeFunc) pop3_finalize);
-	}
-
-	return camel_pop3_folder_type;
-}
-
-void
-pop3_finalize (CamelObject *object)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);
-
-	camel_folder_free_deep (NULL, pop3_folder->uids);
-	g_free (pop3_folder->flags);
-}
-
-CamelFolder *
-camel_pop3_folder_new (CamelStore *parent, CamelException *ex)
-{
-	CamelFolder *folder;
-
-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_POP3_FOLDER_TYPE));
-	camel_folder_construct (folder, parent, "inbox", "inbox");
-
-	camel_folder_refresh_info (folder, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		folder = NULL;
-	}
-
-	return folder;
-}
-
-static void 
-pop3_refresh_info (CamelFolder *folder, CamelException *ex)
-{
-	GPtrArray *uids;
-	int status, count;
-	char *data;
-	CamelPop3Folder *pop3_folder = (CamelPop3Folder *) folder;
-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-
-	status = camel_pop3_command (pop3_store, &data, ex, "STAT");
-	if (status != CAMEL_POP3_OK)
-		return;
-
-	count = atoi (data);
-	g_free (data);
-
-	if (pop3_store->supports_uidl != FALSE) {
-		status = camel_pop3_command (pop3_store, NULL, ex, "UIDL");
-		switch (status) {
-		case CAMEL_POP3_ERR:
-			pop3_store->supports_uidl = FALSE;
-			break;
-		case CAMEL_POP3_FAIL:
-			return;
-		}
-	}
-
-	if (pop3_store->supports_uidl == FALSE) {
-		int i;
-
-		uids = g_ptr_array_new ();
-		g_ptr_array_set_size (uids, count);
-
-		for (i = 0; i < count; i++)
-			uids->pdata[i] = g_strdup_printf ("%d", i + 1);
-	} else {
-		data = camel_pop3_command_get_additional_data (pop3_store, ex);
-		if (camel_exception_is_set (ex))
-			return;
-
-		uids = parse_listing (count, data);
-		g_free (data);
-
-		if (!uids) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not open folder: "
-						"message listing was "
-						"incomplete."));
-			return;
-		}
-	}
-
-	pop3_folder->uids = uids;
-	pop3_folder->flags = g_new0 (guint32, uids->len);
-}
-
-static void
-pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	CamelPop3Folder *pop3_folder;
-	CamelPop3Store *pop3_store;
-	int i, status;
-	char *resp;
-
-	if (!expunge)
-		return;
-
-	pop3_folder = CAMEL_POP3_FOLDER (folder);
-	pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-
-	for (i = 0; i < pop3_folder->uids->len; i++) {
-		if (pop3_folder->flags[i] & CAMEL_MESSAGE_DELETED) {
-			status = camel_pop3_command (pop3_store, &resp, ex,
-						     "DELE %d", i + 1);
-			if (status != CAMEL_POP3_OK)
-				return;
-		}
-	}
-
-	camel_pop3_store_expunge (pop3_store, ex);
-}
-
-
-static GPtrArray *
-parse_listing (int count, char *data)
-{
-	GPtrArray *ans;
-	char *p;
-	int index, len;
-
-	ans = g_ptr_array_new ();
-	g_ptr_array_set_size (ans, count);
-
-	p = data;
-	while (*p) {
-		index = strtoul (p, &p, 10);
-		len = strcspn (p, "\n");
-		if (index <= count && *p == ' ')
-			ans->pdata[index - 1] = g_strndup (p + 1, len - 1);
-		p += len;
-		if (*p == '\n')
-			p++;
-	}
-
-	for (index = 0; index < count; index++) {
-		if (ans->pdata[index] == NULL) {
-			g_ptr_array_free (ans, TRUE);
-			return NULL;
-		}
-	}
-
-	return ans;
-}
-
-static int
-uid_to_number (CamelPop3Folder *pop3_folder, const char *uid)
-{
-	int i;
-
-	for (i = 0; i < pop3_folder->uids->len; i++) {
-		if (!strcmp (uid, pop3_folder->uids->pdata[i]))
-			return i + 1;
-	}
-
-	return -1;
-}
-
-
-static CamelMimeMessage *
-pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	int status, num;
-	char *result, *body;
-	CamelStream *msgstream;
-	CamelMimeMessage *msg;
-
-	num = uid_to_number (CAMEL_POP3_FOLDER (folder), uid);
-	if (num == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				      _("No message with uid %s"), uid);
-		return NULL;
-	}
-
-	status = camel_pop3_command (CAMEL_POP3_STORE (folder->parent_store),
-				     &result, ex, "RETR %d", num);
-	if (status != CAMEL_POP3_OK)
-		return NULL;
-	g_free (result);
-
-	body = camel_pop3_command_get_additional_data (CAMEL_POP3_STORE (folder->parent_store), ex);
-	if (!body) {
-		CamelService *service = CAMEL_SERVICE (folder->parent_store);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not retrieve message from POP "
-					"server %s: %s"), service->url->host,
-				      camel_exception_get_description (ex));
-		return NULL;
-	}
-
-	msgstream = camel_stream_mem_new_with_buffer (body, strlen (body));
-	g_free (body);
-	
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
-						  CAMEL_STREAM (msgstream));
-
-	camel_object_unref (CAMEL_OBJECT (msgstream));
-
-	return msg;
-}
-
-static void
-pop3_set_message_flags (CamelFolder *folder, const char *uid,
-			guint32 flags, guint32 set)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-	int num;
-
-	num = uid_to_number (pop3_folder, uid);
-	if (num == -1)
-		return;
-
-	pop3_folder->flags[num - 1] =
-		(pop3_folder->flags[num] & ~flags) | (set & flags);
-}
-
-static gint
-pop3_get_message_count (CamelFolder *folder)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-
-	return pop3_folder->uids->len;
-}
-
-static GPtrArray *
-pop3_get_uids (CamelFolder *folder)
-{
-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);
-
-	return pop3_folder->uids;
-}
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
deleted file mode 100644
index b4cfd469b6..0000000000
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-folder.h : Class for a POP3 folder */
-
-/* 
- * Author:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_POP3_FOLDER_H
-#define CAMEL_POP3_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-#define CAMEL_POP3_FOLDER_TYPE     (camel_pop3_folder_get_type ())
-#define CAMEL_POP3_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPop3Folder))
-#define CAMEL_POP3_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPop3FolderClass))
-#define IS_CAMEL_POP3_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	GPtrArray *uids;
-	guint32 *flags;
-
-} CamelPop3Folder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelPop3FolderClass;
-
-
-/* public methods */
-CamelFolder *camel_pop3_folder_new (CamelStore *parent, CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_pop3_folder_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_POP3_FOLDER_H */
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
deleted file mode 100644
index 5af0dad73c..0000000000
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-provider.c: pop3 provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-pop3-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider pop3_provider = {
-	"pop",
-	N_("POP"),
-
-	N_("For connecting to POP servers. The POP protocol can also "
-	   "be used to retrieve mail from certain web mail providers "
-	   "and proprietary email systems."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,
-
-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	pop3_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_pop3_store_get_type();
-
-	pop3_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &pop3_provider);
-}
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
deleted file mode 100644
index bdcf7996e3..0000000000
--- a/camel/providers/pop3/camel-pop3-store.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-store.c : class for a pop3 store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#ifdef HAVE_KRB4
-/* Specified nowhere */
-#define KPOP_PORT 1109
-
-#include <krb.h>
-/* MIT krb4 des.h #defines _. Sigh. We don't need it. */
-#undef _
-
-#ifdef NEED_KRB_SENDAUTH_PROTO
-extern int krb_sendauth(long options, int fd, KTEXT ticket, char *service,
-			char *inst, char *realm, unsigned KRB4_32 checksum,
-			MSG_DAT *msg_data, CREDENTIALS *cred,
-			Key_schedule schedule, struct sockaddr_in *laddr,
-			struct sockaddr_in *faddr, char *version);
-#endif
-#endif
-
-#include "camel-pop3-store.h"
-#include "camel-pop3-folder.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "e-util/md5-utils.h"
-
-/* Specified in RFC 1939 */
-#define POP3_PORT 110
-
-static CamelRemoteStoreClass *parent_class = NULL;
-
-static void finalize (CamelObject *object);
-
-static gboolean pop3_connect (CamelService *service, CamelException *ex);
-static gboolean pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);
-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);
-
-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, 
-				guint32 flags, CamelException *ex);
-static char *get_folder_name (CamelStore *store, const char *folder_name, 
-			      CamelException *ex);
-static char *get_root_folder_name (CamelStore *store, CamelException *ex);
-
-static int pop3_get_response (CamelPop3Store *store, char **ret, CamelException *ex);
-
-
-static void
-camel_pop3_store_class_init (CamelPop3StoreClass *camel_pop3_store_class)
-{
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_pop3_store_class);
-	CamelStoreClass *camel_store_class =
-		CAMEL_STORE_CLASS (camel_pop3_store_class);
-	/*CamelRemoteStoreClass *camel_remote_store_class =
-	 *	CAMEL_STORE_CLASS (camel_pop3_store_class);
-	 */
-
-	parent_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						(camel_remote_store_get_type ()));
-
-	/* virtual method overload */
-	camel_service_class->query_auth_types_connected = query_auth_types_connected;
-	camel_service_class->query_auth_types_generic = query_auth_types_generic;
-	camel_service_class->connect = pop3_connect;
-	camel_service_class->disconnect = pop3_disconnect;
-
-	camel_store_class->get_folder = get_folder;
-	camel_store_class->get_folder_name = get_folder_name;
-	camel_store_class->get_root_folder_name = get_root_folder_name;
-}
-
-
-
-static void
-camel_pop3_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-
-	remote_store->default_port = 110;
-}
-
-CamelType
-camel_pop3_store_get_type (void)
-{
-	static CamelType camel_pop3_store_type = CAMEL_INVALID_TYPE;
-
-	if (!camel_pop3_store_type) {
-		camel_pop3_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelPop3Store",
-							     sizeof (CamelPop3Store),
-							     sizeof (CamelPop3StoreClass),
-							     (CamelObjectClassInitFunc) camel_pop3_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_pop3_store_init,
-							     finalize);
-	}
-
-	return camel_pop3_store_type;
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (object);
-
-	if (pop3_store->apop_timestamp)
-		g_free (pop3_store->apop_timestamp);
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-
-	N_("This option will connect to the POP server using a plaintext "
-	   "password. This is the only option supported by many POP servers."),
-
-	"",
-	TRUE
-};
-
-static CamelServiceAuthType apop_authtype = {
-	"APOP",
-
-	N_("This option will connect to the POP server using an encrypted "
-	   "password via the APOP protocol. This may not work for all users "
-	   "even on servers that claim to support it."),
-
-	"+APOP",
-	TRUE
-};
-
-#ifdef HAVE_KRB4
-static CamelServiceAuthType kpop_authtype = {
-	"Kerberos 4 (KPOP)",
-
-	N_("This will connect to the POP server and use Kerberos 4 "
-	   "to authenticate to it."),
-
-	"+KPOP",
-	FALSE
-};
-#endif
-
-static gboolean
-connect_to_server (CamelService *service, /*gboolean real, */CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-	char *buf, *apoptime, *apopend;
-	gint status;
-#ifdef HAVE_KRB4
-	gboolean kpop = service->url->authmech &&
-		!strcmp (service->url->authmech, "+KPOP");
-#endif
-
-#ifdef HAVE_KRB4
-	if (kpop) {
-		KTEXT_ST ticket_st;
-		MSG_DAT msg_data;
-		CREDENTIALS cred;
-		Key_schedule schedule;
-		char *hostname;
-		struct hostent *h;
-		int fd;
-
-		/* Need to copy hostname, because krb_realmofhost will
-		 * call gethostbyname as well, and gethostbyname uses
-		 * static storage.
-		 */
-		h = camel_service_gethost (service, ex);
-		hostname = g_strdup (h->h_name);
-
-		fd = CAMEL_STREAM_FS (CAMEL_REMOTE_STORE (service)->ostream)->fd;
-
-		status = krb_sendauth (0, fd, &ticket_st, "pop", hostname,
-				       krb_realmofhost (hostname), 0,
-				       &msg_data, &cred, schedule,
-				       NULL, NULL, "KPOPV0.1");
-		g_free (hostname);
-		if (status != KSUCCESS) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not authenticate to "
-						"KPOP server: %s"),
-					      krb_err_txt[status]);
-			return FALSE;
-		}
-
-		if (!service->url->passwd)
-			service->url->passwd = g_strdup (service->url->user);
-	}
-#endif /* HAVE_KRB4 */
-
-	/* Read the greeting, check status */
-	status = pop3_get_response (store, &buf, ex);
-	if (status != CAMEL_POP3_OK)
-		return FALSE;
-
-	apoptime = strchr (buf, '<');
-	apopend = apoptime ? strchr (apoptime, '>') : NULL;
-	if (apopend) {
-		store->apop_timestamp = g_strndup (apoptime,
-						   apopend - apoptime + 1);
-		memmove (apoptime, apopend + 1, strlen (apopend + 1));
-	}
-	store->implementation = buf;
-
-	/* Check extensions */
-	store->login_delay = -1;
-	store->supports_top = -1;
-	store->supports_uidl = -1;
-	store->expires = -1;
-
-	status = camel_pop3_command (store, NULL, ex, "CAPA");
-	if (status == CAMEL_POP3_OK) {
-		char *p;
-		int len;
-
-		buf = camel_pop3_command_get_additional_data (store, ex);
-		if (camel_exception_is_set (ex))
-			return FALSE;
-
-		p = buf;
-		while (*p) {
-			len = strcspn (p, "\n");
-			if (!strncmp (p, "IMPLEMENTATION ", 15)) {
-				g_free (store->implementation);
-				store->implementation =
-					g_strndup (p + 15, len - 15);
-			} else if (len == 3 && !strncmp (p, "TOP", 3))
-				store->supports_top = TRUE;
-			else if (len == 4 && !strncmp (p, "UIDL", 4))
-				store->supports_uidl = TRUE;
-			else if (!strncmp (p, "LOGIN-DELAY ", 12))
-				store->login_delay = atoi (p + 12);
-			else if (!strncmp (p, "EXPIRE NEVER", 12))
-				store->expires = FALSE;
-			else if (!strncmp (p, "EXPIRE ", 7))
-				store->expires = TRUE;
-
-			p += len;
-			if (*p)
-				p++;
-		}
-
-		g_free (buf);
-	}
-
-	return TRUE;
-}
-
-static GList *
-query_auth_types_connected (CamelService *service, CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-	GList *ret = NULL;
-	gboolean passwd = TRUE, apop = TRUE;
-#ifdef HAVE_KRB4
-	gboolean kpop = TRUE;
-	int saved_port;
-#endif
-
-	ret = CAMEL_SERVICE_CLASS (parent_class)->query_auth_types_connected (service, ex);
-
-	passwd = camel_service_connect (service, ex);
-	/*ignore the exception here; the server may just not support passwd */
-	/*if (camel_exception_is_set (ex) != CAMEL_EXCEPTION_NONE)*/
-	/*return NULL;*/
-	
-	/* should we check apop too? */
-	apop = store->apop_timestamp != NULL;
-	if (passwd)
-		camel_service_disconnect (service, TRUE, ex);
-	camel_exception_clear (ex);
-
-#ifdef HAVE_KRB4
-	saved_port = service->url->port;
-	service->url->port = KPOP_PORT;
-	kpop = camel_service_connect (service, ex);
-	service->url->port = saved_port;
-	/*ignore the exception here; the server may just not support kpop */
-	/*if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)*/
-	/*return NULL;*/
-
-	if (kpop)
-		camel_service_disconnect (service, TRUE, ex);
-	camel_exception_clear (ex);
-#endif
-
-	if (passwd)
-		ret = g_list_append (ret, &password_authtype);
-	if (apop)
-		ret = g_list_append (ret, &apop_authtype);
-#ifdef HAVE_KRB4
-	if (kpop)
-		ret = g_list_append (ret, &kpop_authtype);
-#endif
-
-	if (!ret) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not connect to POP server on "
-					"%s."), service->url->host);
-	}				      
-
-	return ret;
-}
-
-static GList *
-query_auth_types_generic (CamelService *service, CamelException *ex)
-{
-	GList *ret;
-
-	ret = g_list_append (NULL, &password_authtype);
-	ret = g_list_append (ret, &apop_authtype);
-#ifdef HAVE_KRB4
-	ret = g_list_append (ret, &kpop_authtype);
-#endif
-
-	return ret;
-}
-
-/**
- * camel_pop3_store_expunge:
- * @store: the store
- * @ex: a CamelException
- *
- * Expunge messages from the store. This will result in the connection
- * being closed, which may cause later commands to fail if they can't
- * reconnect.
- **/
-void
-camel_pop3_store_expunge (CamelPop3Store *store, CamelException *ex)
-{
-	camel_pop3_command (store, NULL, ex, "QUIT");
-	camel_service_disconnect (CAMEL_SERVICE (store), FALSE, ex);
-}
-
-
-static gboolean
-pop3_try_authenticate (CamelService *service, gboolean kpop,
-		       const char *errmsg, CamelException *ex)
-{
-	CamelPop3Store *store = (CamelPop3Store *)service;
-	int status;
-	char *msg;
-
-	/* The KPOP code will have set the password to be the username
-	 * in connect_to_server. Password and APOP are the only other
-	 * cases, and they both need a password. So if there's no
-	 * password stored, query for it.
-	 */
-	if (!service->url->passwd) {
-		char *prompt;
-
-		prompt = g_strdup_printf (_("%sPlease enter the POP3 password "
-					    "for %s@%s"), errmsg ? errmsg : "",
-					  service->url->user,
-					  service->url->host);
-		service->url->passwd = camel_session_query_authenticator (
-			camel_service_get_session (service),
-			CAMEL_AUTHENTICATOR_ASK, prompt, TRUE,
-			service, "password", ex);
-		g_free (prompt);
-		if (!service->url->passwd)
-			return FALSE;
-	}
-
-	if (!service->url->authmech || kpop) {
-		status = camel_pop3_command (store, &msg, ex, "USER %s",
-					     service->url->user);
-		switch (status) {
-		case CAMEL_POP3_ERR:
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("Unable to connect to POP "
-						"server.\nError sending "
-						"username: %s"),
-					      msg ? msg : _("(Unknown)"));
-			g_free (msg);
-			/*fallll*/
-		case CAMEL_POP3_FAIL:
-			return FALSE;
-		}
-		g_free (msg);
-
-		status = camel_pop3_command (store, &msg, ex, "PASS %s",
-					     service->url->passwd);
-	} else if (!strcmp (service->url->authmech, "+APOP")
-		   && store->apop_timestamp) {
-		char *secret, md5asc[33], *d;
-		unsigned char md5sum[16], *s;
-
-		secret = g_strdup_printf ("%s%s", store->apop_timestamp,
-					  service->url->passwd);
-		md5_get_digest (secret, strlen (secret), md5sum);
-		g_free (secret);
-
-		for (s = md5sum, d = md5asc; d < md5asc + 32; s++, d += 2)
-			sprintf (d, "%.2x", *s);
-
-		status = camel_pop3_command (store, &msg, ex, "APOP %s %s",
-					     service->url->user, md5asc);
-	} else {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				     _("Unable to connect to POP server.\n"
-				       "No support for requested "
-				       "authentication mechanism."));
-		return FALSE;
-	}
-
-	if (status == CAMEL_POP3_ERR) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Unable to connect to POP server.\n"
-					"Error sending password: %s"),
-				      msg ? msg : _("(Unknown)"));
-	}
-
-	g_free (msg);
-	return camel_exception_is_set (ex);
-}
-
-static gboolean
-pop3_connect (CamelService *service, CamelException *ex)
-{
-	char *errbuf = NULL;
-	gboolean tryagain, kpop = FALSE;
-	gboolean res;
-
-#ifdef HAVE_KRB4
-	gboolean set_port = FALSE;
-
-	kpop = (service->url->authmech &&
-		!strcmp (service->url->authmech, "+KPOP"));
-
-	if (kpop && service->url->port == 0) {
-		set_port = TRUE;
-		service->url->port = KPOP_PORT;
-	}
-#endif
-
-  	res = CAMEL_SERVICE_CLASS (parent_class)->connect (service, ex);
-
-#ifdef HAVE_KRB4
-	/* This is veeery nasty. When we set the port, we're changing the
-	 * hash value of our URL. service_cache_remove() gets called when
-	 * we're done checking the mail, but the hash table lookup fails
-	 * because the url port has changed. Then, a finalized instance of
-	 * the CamelService is stuck in the hash table, and the next time
-	 * we try to look up the service, with a URL of port 0, we look
-	 * up the freed service and a segfault results.
-	 */
-
-	if (kpop && set_port)
-		service->url->port = 0;
-#endif
-
-	if (res == FALSE)
-		return FALSE;
-
-	/*FIXME integrate these functions */
-	if (!connect_to_server (service, ex))
-		return FALSE;
-
-	camel_exception_clear (ex);
-	do {
-		if (camel_exception_is_set (ex)) {
-			errbuf = g_strdup_printf (
-				"%s\n\n",
-				camel_exception_get_description (ex));
-			camel_exception_clear (ex);
-
-			/* Uncache the password before prompting again. */
-			camel_session_query_authenticator (
-				camel_service_get_session (service),
-				CAMEL_AUTHENTICATOR_TELL, NULL, TRUE, service,
-				"password", ex);
-			g_free (service->url->passwd);
-			service->url->passwd = NULL;
-		}
-
-		tryagain = pop3_try_authenticate (service, kpop, errbuf, ex);
-		g_free (errbuf);
-	} while (tryagain);
-
-	if (camel_exception_is_set (ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static gboolean
-pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelPop3Store *store = CAMEL_POP3_STORE (service);
-
-	if (clean)
-		camel_pop3_command (store, NULL, ex, "QUIT");
-
-	if (!CAMEL_SERVICE_CLASS (parent_class)->disconnect (service, clean, ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static CamelFolder *
-get_folder (CamelStore *store, const char *folder_name,
-	    guint32 flags, CamelException *ex)
-{
-	return camel_pop3_folder_new (store, ex);
-}
-
-static char *
-get_folder_name (CamelStore *store, const char *folder_name,
-		 CamelException *ex)
-{
-	if (!g_strcasecmp (folder_name, "inbox"))
-		return g_strdup ("inbox");
-	else {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-				      _("No such folder `%s'."), folder_name);
-		return NULL;
-	}
-}
-
-static char *
-get_root_folder_name (CamelStore *store, CamelException *ex)
-{
-	return g_strdup ("inbox");
-}
-
-
-/**
- * camel_pop3_command: Send a command to a POP3 server.
- * @store: the POP3 store
- * @ret: a pointer to return the full server response in
- * @fmt: a printf-style format string, followed by arguments
- *
- * This command sends the command specified by @fmt and the following
- * arguments to the connected POP3 store specified by @store. It then
- * reads the server's response and parses out the status code. If
- * the caller passed a non-NULL pointer for @ret, camel_pop3_command
- * will set it to point to an buffer containing the rest of the
- * response from the POP3 server. (If @ret was passed but there was
- * no extended response, @ret will be set to NULL.) The caller must
- * free this buffer when it is done with it.
- *
- * Return value: one of CAMEL_POP3_OK (command executed successfully),
- * CAMEL_POP3_ERR (command encounted an error), or CAMEL_POP3_FAIL
- * (a protocol-level error occurred, and Camel is uncertain of the
- * result of the command.)
- **/
-int
-camel_pop3_command (CamelPop3Store *store, char **ret, CamelException *ex, char *fmt, ...)
-{
-	char *cmdbuf;
-	va_list ap;
-
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (fmt, ap);
-	va_end (ap);
-
-	/* Send the command */
-	if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, "%s\r\n", cmdbuf) < 0) {
-		g_free (cmdbuf);
-		if (ret)
-			*ret = NULL;
-		return CAMEL_POP3_FAIL;
-	}
-	g_free (cmdbuf);
-
-	return pop3_get_response (store, ret, ex);
-}
-
-static int
-pop3_get_response (CamelPop3Store *store, char **ret, CamelException *ex)
-{
-	char *respbuf;
-	int status;
-
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0) {
-		if (ret)
-			*ret = NULL;
-		return CAMEL_POP3_FAIL;
-	}
-
-	if (!strncmp (respbuf, "+OK", 3))
-		status = CAMEL_POP3_OK;
-	else if (!strncmp (respbuf, "-ERR", 4))
-		status = CAMEL_POP3_ERR;
-	else
-		status = CAMEL_POP3_FAIL;
-
-	if (ret) {
-		if (status != CAMEL_POP3_FAIL) {
-			*ret = strchr (respbuf, ' ');
-			if (*ret)
-				*ret = g_strdup (*ret + 1);
-		} else
-			*ret = NULL;
-	}
-	g_free (respbuf);
-
-	return status;
-}
-
-/**
- * camel_pop3_command_get_additional_data: get "additional data" from
- * a POP3 command.
- * @store: the POP3 store
- *
- * This command gets the additional data returned by "multi-line" POP
- * commands, such as LIST, RETR, TOP, and UIDL. This command _must_
- * be called after a successful (CAMEL_POP3_OK) call to
- * camel_pop3_command for a command that has a multi-line response.
- * The returned data is un-byte-stuffed, and has lines termined by
- * newlines rather than CR/LF pairs.
- *
- * Return value: the data, which the caller must free.
- **/
-char *
-camel_pop3_command_get_additional_data (CamelPop3Store *store, CamelException *ex)
-{
-	GPtrArray *data;
-	char *buf, *p;
-	int i, len = 0, status = CAMEL_POP3_OK;
-
-	data = g_ptr_array_new ();
-	while (1) {
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &buf, ex) < 0) {
-			status = CAMEL_POP3_FAIL;
-			break;
-		}
-
-		if (!strcmp (buf, "."))
-			break;
-
-		g_ptr_array_add (data, buf);
-		len += strlen (buf) + 1;
-	}
-	
-	if (buf)
-		g_free (buf);
-
-	if (status == CAMEL_POP3_OK) {
-		buf = g_malloc0 (len + 1);
-
-		for (i = 0, p = buf; i < data->len; i++) {
-			char *ptr, *datap;
-
-			datap = (char *) data->pdata[i];
-			ptr = (*datap == '.') ? datap + 1 : datap;
-			len = strlen (ptr);
-			memcpy (p, ptr, len);
-			p += len;
-			*p++ = '\n';
-		}
-		*p = '\0';
-	} else
-		buf = NULL;
-
-	for (i = 0; i < data->len; i++)
-		g_free (data->pdata[i]);
-	g_ptr_array_free (data, TRUE);
-
-	return buf;
-}
-
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
deleted file mode 100644
index cfa28f313f..0000000000
--- a/camel/providers/pop3/camel-pop3-store.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-pop3-store.h : class for an pop3 store */
-
-/* 
- * Authors:
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_POP3_STORE_H
-#define CAMEL_POP3_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-types.h"
-#include "camel-remote-store.h"
-
-#define CAMEL_POP3_STORE_TYPE     (camel_pop3_store_get_type ())
-#define CAMEL_POP3_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_STORE_TYPE, CamelPop3Store))
-#define CAMEL_POP3_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPop3StoreClass))
-#define IS_CAMEL_POP3_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_STORE_TYPE))
-
-
-typedef struct {
-	CamelRemoteStore parent_object;
-
-	char *apop_timestamp, *implementation;
-	gboolean supports_top, supports_uidl, expires;
-	int login_delay;
-
-} CamelPop3Store;
-
-
-
-typedef struct {
-	CamelRemoteStoreClass parent_class;
-
-} CamelPop3StoreClass;
-
-
-/* public methods */
-void camel_pop3_store_expunge (CamelPop3Store *store, CamelException *ex);
-
-/* support functions */
-enum { CAMEL_POP3_OK, CAMEL_POP3_ERR, CAMEL_POP3_FAIL };
-int camel_pop3_command (CamelPop3Store *store, char **ret, CamelException *ex, char *fmt, ...);
-char *camel_pop3_command_get_additional_data (CamelPop3Store *store,
-					      CamelException *ex);
-
-/* Standard Camel function */
-CamelType camel_pop3_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_POP3_STORE_H */
-
-
diff --git a/camel/providers/pop3/libcamelpop3.urls b/camel/providers/pop3/libcamelpop3.urls
deleted file mode 100644
index 7fffa4d861..0000000000
--- a/camel/providers/pop3/libcamelpop3.urls
+++ /dev/null
@@ -1 +0,0 @@
-pop
diff --git a/camel/providers/sendmail/.cvsignore b/camel/providers/sendmail/.cvsignore
deleted file mode 100644
index cacc3c5d5f..0000000000
--- a/camel/providers/sendmail/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-*.o
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
deleted file mode 100644
index 965f56afb8..0000000000
--- a/camel/providers/sendmail/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelsendmailincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelsendmail.la
-provider_DATA = libcamelsendmail.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-	-I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \
-        -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
-
-libcamelsendmail_la_SOURCES = 			\
-	camel-sendmail-provider.c		\
-	camel-sendmail-transport.c
-
-libcamelsendmailinclude_HEADERS =		\
-	camel-sendmail-transport.h
-
-libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelsendmail.urls
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
deleted file mode 100644
index d0e40b4cf8..0000000000
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-provider.c: sendmail provider registration code */
-
-/* 
- * Authors :
- *   Dan Winship <danw@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-provider.h"
-#include "camel-sendmail-transport.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider sendmail_provider = {
-	"sendmail",
-	N_("Sendmail"),
-
-	N_("For delivering mail by passing it to the \"sendmail\" program "
-	   "on the local system."),
-
-	"mail",
-
-	0,
-
-	0,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	sendmail_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
-		camel_sendmail_transport_get_type();
-
-	sendmail_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &sendmail_provider);
-}
-
-
-
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
deleted file mode 100644
index 137c1d32a9..0000000000
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-transport.c: Sendmail-based transport class. */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "camel-sendmail-transport.h"
-#include "camel-mime-message.h"
-#include "camel-data-wrapper.h"
-#include "camel-stream-fs.h"
-#include "camel-exception.h"
-
-static char *get_name (CamelService *service, gboolean brief);
-
-static gboolean _can_send (CamelTransport *transport, CamelMedium *message);
-static gboolean _send (CamelTransport *transport, CamelMedium *message,
-		       CamelException *ex);
-static gboolean _send_to (CamelTransport *transport, CamelMedium *message,
-			  GList *recipients, CamelException *ex);
-
-
-static void
-camel_sendmail_transport_class_init (CamelSendmailTransportClass *camel_sendmail_transport_class)
-{
-	CamelTransportClass *camel_transport_class =
-		CAMEL_TRANSPORT_CLASS (camel_sendmail_transport_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_sendmail_transport_class);
-
-	/* virtual method overload */
-	camel_service_class->get_name = get_name;
-
-	camel_transport_class->can_send = _can_send;
-	camel_transport_class->send = _send;
-	camel_transport_class->send_to = _send_to;
-}
-
-CamelType
-camel_sendmail_transport_get_type (void)
-{
-	static CamelType camel_sendmail_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_sendmail_transport_type == CAMEL_INVALID_TYPE)	{
-		camel_sendmail_transport_type = camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSendmailTransport",
-								     sizeof (CamelSendmailTransport),
-								     sizeof (CamelSendmailTransportClass),
-								     (CamelObjectClassInitFunc) camel_sendmail_transport_class_init,
-								     NULL,
-								     (CamelObjectInitFunc) NULL,
-								     NULL);
-	}
-	
-	return camel_sendmail_transport_type;
-}
-
-
-static gboolean
-_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CAMEL_IS_MIME_MESSAGE (message);
-}
-
-
-static gboolean
-_send_internal (CamelMedium *message, char **argv, CamelException *ex)
-{
-	int fd[2], nullfd, wstat;
-	sigset_t mask, omask;
-	CamelStream *out;
-	pid_t pid;
-
-	g_assert (CAMEL_IS_MIME_MESSAGE (message));
-
-	if (pipe (fd) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create pipe to sendmail: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		return FALSE;
-	}
-
-	/* Block SIGCHLD so the calling application doesn't notice
-	 * sendmail exiting before we do.
-	 */
-	sigemptyset (&mask);
-	sigaddset (&mask, SIGCHLD);
-	sigprocmask (SIG_BLOCK, &mask, &omask);
-
-	pid = fork ();
-	switch (pid) {
-	case -1:
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not fork sendmail: "
-					"%s: mail not sent"),
-				      g_strerror (errno));
-		sigprocmask (SIG_SETMASK, &omask, NULL);
-		return FALSE;
-
-	case 0:
-		/* Child process */
-		nullfd = open ("/dev/null", O_RDWR);
-		dup2 (fd[0], STDIN_FILENO);
-		dup2 (nullfd, STDOUT_FILENO);
-		dup2 (nullfd, STDERR_FILENO);
-		close (nullfd);
-		close (fd[1]);
-
-		execv (SENDMAIL_PATH, argv);
-		_exit (255);
-	}
-
-	/* Parent process. Write the message out. */
-	close (fd[0]);
-	out = camel_stream_fs_new_with_fd (fd[1]);
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out) == -1
-	    || camel_stream_close(out) == -1) {
-		camel_object_unref (CAMEL_OBJECT (out));
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not send message: %s"),
-				      strerror(errno));
-		return FALSE;
-	}
-	camel_object_unref (CAMEL_OBJECT (out));
-
-	/* Wait for sendmail to exit. */
-	while (waitpid (pid, &wstat, 0) == -1 && errno == EINTR)
-		;
-	sigprocmask (SIG_SETMASK, &omask, NULL);
-
-	if (!WIFEXITED (wstat)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("sendmail exited with signal %s: "
-					"mail not sent."),
-				      g_strsignal (WTERMSIG (wstat)));
-		return FALSE;
-	} else if (WEXITSTATUS (wstat) != 0) {
-		if (WEXITSTATUS (wstat) == 255) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not execute %s: "
-						"mail not sent."),
-					      SENDMAIL_PATH);
-		} else {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("sendmail exited with status "
-						"%d: mail not sent."),
-					      WEXITSTATUS (wstat));
-		}
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-_send_to (CamelTransport *transport, CamelMedium *message,
-	  GList *recipients, CamelException *ex)
-{
-	GList *r;
-	char **argv;
-	int i, len;
-	gboolean status;
-
-	len = g_list_length (recipients);
-	argv = g_malloc ((len + 4) * sizeof (char *));
-	argv[0] = "sendmail";
-	argv[1] = "-i";
-	argv[2] = "--";
-
-	for (i = 1, r = recipients; i <= len; i++, r = r->next)
-		argv[i + 2] = r->data;
-	argv[i + 2] = NULL;
-
-	status = _send_internal (message, argv, ex);
-	g_free (argv);
-	return status;
-}
-
-static gboolean
-_send (CamelTransport *transport, CamelMedium *message,
-       CamelException *ex)
-{
-	char *argv[4] = { "sendmail", "-t", "-i", NULL };
-
-	return _send_internal (message, argv, ex);
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup (_("sendmail"));
-	else
-		return g_strdup (_("Mail delivery via the sendmail program"));
-}
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
deleted file mode 100644
index bb5dca071b..0000000000
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-sendmail-transport.h: Sendmail-based transport class */
-
-/* 
- *
- * Author : 
- *  Dan Winship <danw@helixcode.com>
- *
- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SENDMAIL_TRANSPORT_H
-#define CAMEL_SENDMAIL_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-transport.h"
-
-#define CAMEL_SENDMAIL_TRANSPORT_TYPE     (camel_sendmail_transport_get_type ())
-#define CAMEL_SENDMAIL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))
-#define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass))
-#define CAMEL_IS_SENDMAIL_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SENDMAIL_TRANSPORT_TYPE))
-
-
-typedef struct {
-	CamelTransport parent_object;
-
-} CamelSendmailTransport;
-
-
-typedef struct {
-	CamelTransportClass parent_class;
-
-} CamelSendmailTransportClass;
-
-
-/* Standard Camel function */
-CamelType camel_sendmail_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SENDMAIL_TRANSPORT_H */
diff --git a/camel/providers/sendmail/libcamelsendmail.urls b/camel/providers/sendmail/libcamelsendmail.urls
deleted file mode 100644
index ccad52828e..0000000000
--- a/camel/providers/sendmail/libcamelsendmail.urls
+++ /dev/null
@@ -1 +0,0 @@
-sendmail
diff --git a/camel/providers/smtp/.cvsignore b/camel/providers/smtp/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/camel/providers/smtp/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
deleted file mode 100644
index 734a4e5128..0000000000
--- a/camel/providers/smtp/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelsmtpincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelsmtp.la
-provider_DATA = libcamelsmtp.urls
-
-INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
-	-I$(includedir)				\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
-	$(GTK_INCLUDEDIR)			\
-        -DG_LOG_DOMAIN=\"camel-smtp-provider\"
-
-libcamelsmtp_la_SOURCES = 			\
-	camel-smtp-provider.c			\
-	camel-smtp-transport.c
-
-libcamelsmtpinclude_HEADERS =			\
-	camel-smtp-transport.h
-
-
-libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
-
-libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelsmtp.urls
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
deleted file mode 100644
index 6d94536937..0000000000
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-provider.c: smtp provider registration code */
-
-/* 
- * Authors :
- *   Jeffrey Stedfast <fejj@stampede.org>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-#include "camel-smtp-transport.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider smtp_provider = {
-	"smtp",
-	"SMTP",
-
-	N_("For delivering mail by connecting to a remote mailhub "
-	   "using SMTP."),
-
-	"mail",
-
-	CAMEL_PROVIDER_IS_REMOTE,
-
-	CAMEL_URL_NEED_HOST,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
-		camel_smtp_transport_get_type();
-
-	smtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &smtp_provider);
-}
-
-
-
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
deleted file mode 100644
index 6fa39bb930..0000000000
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ /dev/null
@@ -1,788 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-transport.c : class for a smtp transport */
-
-/* 
- * Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#undef MIN
-#undef MAX
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-linewrap.h"
-#include "camel-stream-filter.h"
-#include "camel-smtp-transport.h"
-#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-mime-part.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-session.h"
-#include "camel-exception.h"
-
-#define d(x) x
-
-/* Specified in RFC 821 */
-#define SMTP_PORT 25
-
-/* camel smtp transport class prototypes */
-static gboolean _can_send (CamelTransport *transport, CamelMedium *message);
-static gboolean _send (CamelTransport *transport, CamelMedium *message, CamelException *ex);
-static gboolean _send_to (CamelTransport *transport, CamelMedium *message, GList *recipients, CamelException *ex);
-
-/* support prototypes */
-static gboolean smtp_connect (CamelService *service, CamelException *ex);
-static gboolean smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *esmtp_get_authtypes(gchar *buffer);
-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);
-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);
-static void free_auth_types (CamelService *service, GList *authtypes);
-static char *get_name (CamelService *service, gboolean brief);
-
-static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);
-static gboolean smtp_mail (CamelSmtpTransport *transport, const char *sender,
-			   gboolean has_8bit_parts, CamelException *ex);
-static gboolean smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex);
-static gboolean smtp_data (CamelSmtpTransport *transport, CamelMedium *message,
-			   gboolean has_8bit_parts, CamelException *ex);
-static gboolean smtp_rset (CamelSmtpTransport *transport, CamelException *ex);
-static gboolean smtp_quit (CamelSmtpTransport *transport, CamelException *ex);
-
-/* private data members */
-static CamelServiceClass *service_class = NULL;
-
-static void
-camel_smtp_transport_class_init (CamelSmtpTransportClass *camel_smtp_transport_class)
-{
-	CamelTransportClass *camel_transport_class =
-		CAMEL_TRANSPORT_CLASS (camel_smtp_transport_class);
-	CamelServiceClass *camel_service_class =
-		CAMEL_SERVICE_CLASS (camel_smtp_transport_class);
-	
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = smtp_connect;
-	camel_service_class->disconnect = smtp_disconnect;
-	camel_service_class->query_auth_types_generic = query_auth_types_generic;
-	camel_service_class->query_auth_types_connected = query_auth_types_connected;
-	camel_service_class->free_auth_types = free_auth_types;
-	camel_service_class->get_name = get_name;
-
-	camel_transport_class->can_send = _can_send;
-	camel_transport_class->send = _send;
-	camel_transport_class->send_to = _send_to;
-}
-
-static void
-camel_smtp_transport_init (gpointer object)
-{
-	CamelTransport *transport = CAMEL_TRANSPORT (object);
-	
-	transport->supports_8bit = FALSE;
-}
-
-CamelType
-camel_smtp_transport_get_type (void)
-{
-	static CamelType camel_smtp_transport_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_smtp_transport_type == CAMEL_INVALID_TYPE) {
-		camel_smtp_transport_type =
-			camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSmtpTransport",
-					     sizeof (CamelSmtpTransport),
-					     sizeof (CamelSmtpTransportClass),
-					     (CamelObjectClassInitFunc) camel_smtp_transport_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) camel_smtp_transport_init,
-					     NULL);
-	}
-	
-	return camel_smtp_transport_type;
-}
-
-static gboolean
-smtp_connect (CamelService *service, CamelException *ex)
-{
-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
-	struct hostent *h;
-	struct sockaddr_in sin;
-	gint fd, num, i;
-	guint32 addrlen;
-	gchar *pass = NULL, *respbuf = NULL;
-	
-	if (!service_class->connect (service, ex))
-		return FALSE;
-	
-	h = camel_service_gethost (service, ex);
-	if (!h)
-		return FALSE;
-	
-	/* set some smtp transport defaults */
-	transport->is_esmtp = FALSE;
-	transport->esmtp_supported_authtypes = NULL;
-	CAMEL_TRANSPORT (transport)->supports_8bit = FALSE;
-	
-	sin.sin_family = h->h_addrtype;
-	sin.sin_port = htons (service->url->port ? service->url->port : SMTP_PORT);
-	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
-	
-	fd = socket (h->h_addrtype, SOCK_STREAM, 0);
-	if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof (sin)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      "Could not connect to %s (port %d): %s",
-				      service->url->host,
-				      service->url->port ? service->url->port : SMTP_PORT,
-				      strerror (errno));
-		if (fd > -1)
-			close (fd);
-		g_free (pass);
-		return FALSE;
-	}
-	
-	/* get the localaddr - needed later by smtp_helo */
-	addrlen = sizeof (transport->localaddr);
-	getsockname (fd, (struct sockaddr*)&transport->localaddr, &addrlen);
-	
-	transport->ostream = camel_stream_fs_new_with_fd (fd);
-	transport->istream = camel_stream_buffer_new (transport->ostream, 
-						      CAMEL_STREAM_BUFFER_READ);
-	
-	/* Read the greeting, note whether the server is ESMTP or not. */
-	do {
-		/* Check for "220" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		if (!respbuf || strncmp (respbuf, "220", 3)) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "Welcome response error: "
-					      "%s: possibly non-fatal",
-					      g_strerror (errno));
-			return FALSE;
-		}
-		if (strstr (respbuf, "ESMTP"))
-			transport->is_esmtp = TRUE;
-	} while (*(respbuf+3) == '-'); /* if we got "220-" then loop again */
-	g_free (respbuf);
-	
-	/* send HELO (or EHLO, depending on the service type) */
-	if (!transport->is_esmtp) {
-		/* If we did not auto-detect ESMTP, we should still send EHLO */
-		transport->is_esmtp = TRUE;
-		if (!smtp_helo (transport, ex)) {
-			/* Okay, apprently this server doesn't support ESMTP */
-			transport->is_esmtp = FALSE;
-			smtp_helo (transport, ex);
-		}
-	} else {
-		smtp_helo (transport, ex);
-	}
-	
-	/* check to see if AUTH is required, if so...then AUTH ourselves */
-	if (transport->is_esmtp && transport->esmtp_supported_authtypes) {
-		/* not really supported yet, but we can at least show what auth types are supported */
-		d(fprintf (stderr, "camel-smtp-transport::connect(): %s requires AUTH\n", service->url->host));
-		num = g_list_length (transport->esmtp_supported_authtypes);
-		
-		for (i = 0; i < num; i++)
-			d(fprintf (stderr, "\nSupported AUTH: %s\n\n", 
-				(gchar *) g_list_nth_data (transport->esmtp_supported_authtypes, i)));
-		
-		g_list_free (transport->esmtp_supported_authtypes);
-		transport->esmtp_supported_authtypes = NULL;
-	} else {
-		d(fprintf (stderr, "\ncamel-smtp-transport::connect(): provider does not use AUTH\n\n"));
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
-	
-	/*if (!service->connected)
-	 *	return TRUE;
-	 */
-
-	if (clean) {
-		/* send the QUIT command to the SMTP server */
-		smtp_quit (transport, ex);
-	}
-	
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-	
-	g_free (transport->esmtp_supported_authtypes);
-	transport->esmtp_supported_authtypes = NULL;
-	camel_object_unref (CAMEL_OBJECT (transport->ostream));
-	camel_object_unref (CAMEL_OBJECT (transport->istream));
-	transport->ostream = NULL;
-	transport->istream = NULL;
-	
-	return TRUE;
-}
-
-static GList *
-esmtp_get_authtypes (gchar *buffer)
-{
-	GList *ret = NULL;
-	gchar *start, *end;
-	
-	/* advance to the first token */
-	for (start = buffer; *start == ' ' || *start == '='; start++);
-	
-	for ( ; *start; ) {
-		/* advance to the end of the token */
-		for (end = start; *end && *end != ' '; end++);
-		
-		ret = g_list_append (ret, g_strndup (start, end - start));
-		
-		/* advance to the next token */
-		for (start = end; *start == ' '; start++);
-	}
-	
-	return ret;
-}
-
-/* FIXME: use these? */
-#ifdef notyet
-static CamelServiceAuthType no_authtype = {
-	"No authentication required",
-	
-	"This option will connect to the SMTP server without using any "
-	"kind of authentication. This should be fine for connecting to "
-	"most SMTP servers."
-	
-	"",
-	FALSE
-};
-
-static CamelServiceAuthType cram_md5_authtype = {
-	"CRAM-MD5",
-	
-	"This option will connect to the SMTP server using CRAM-MD5 "
-	"authentication.",
-	
-	"CRAM-MD5",
-	TRUE
-};
-#endif
-
-static GList *
-query_auth_types_connected (CamelService *service, CamelException *ex)
-{
-	/* FIXME: Re-enable this when auth types are actually
-	 * implemented.
-	 */
-	
-	return NULL;
-}
-
-static GList *
-query_auth_types_generic (CamelService *service, CamelException *ex)
-{
-	/* FIXME: Re-enable this when auth types are actually
-	 * implemented.
-	 */
-	
-	return NULL;
-}
-
-static void
-free_auth_types (CamelService *service, GList *authtypes)
-{
-	g_list_free (authtypes);
-}
-
-static char *
-get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf ("SMTP server %s", service->url->host);
-	else {
-		return g_strdup_printf ("SMTP mail delivery via %s",
-					service->url->host);
-	}
-}
-
-static gboolean
-_can_send (CamelTransport *transport, CamelMedium *message)
-{
-	return CAMEL_IS_MIME_MESSAGE (message);
-}
-
-static gboolean
-_send_to (CamelTransport *transport, CamelMedium *message,
-	  GList *recipients, CamelException *ex)
-{
-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);
-	CamelInternetAddress *cia;
-	char *recipient, *sender;
-	const char *addr;
-	gboolean has_8bit_parts;
-	GList *r;
-	
-	sender = g_strdup (camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)));
-	if (!sender) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Cannot send message: "
-				      "sender address not defined.");
-		return FALSE;
-	}
-	
-	cia = camel_internet_address_new ();
-	camel_address_decode (CAMEL_ADDRESS (cia), sender);
-	g_free (sender);
-	
-	if (!camel_internet_address_get (cia, 0, NULL, &addr)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Cannot send message: "
-				      "sender address not valid.");
-		return FALSE;
-	}
-	
-	/* find out if the message has 8bit mime parts */
-	has_8bit_parts = camel_mime_message_has_8bit_parts (CAMEL_MIME_MESSAGE (message));
-	
-	/* rfc1652 (8BITMIME) requires that you notify the ESMTP daemon that
-	   you'll be sending an 8bit mime message at "MAIL FROM:" time. */
-	smtp_mail (smtp_transport, addr, has_8bit_parts, ex);
-	
-	if (!recipients) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Cannot send message: "
-				      "no recipients defined.");
-		return FALSE;
-	}
-	
-	for (r = recipients; r; r = r->next) {
-		recipient = (char *) r->data;
-		if (!smtp_rcpt (smtp_transport, recipient, ex)) {
-			g_free (recipient);
-			return FALSE;
-		}
-		g_free (recipient);
-	}
-	
-	/* passing in has_8bit_parts saves time as we don't have to
-           recurse through the message all over again if the user is
-           not sending 8bit mime parts */
-	if (!smtp_data (smtp_transport, message, has_8bit_parts, ex))
-		return FALSE;
-	
-	/* reset the service for our next transfer session */
-	smtp_rset (smtp_transport, ex);
-	
-	return TRUE;
-}
-
-static gboolean
-_send (CamelTransport *transport, CamelMedium *message, CamelException *ex)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *recipients = NULL;
-	guint index, len;
-	
-	to = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_TO);
-	cc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_CC);
-	bcc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_BCC);
-	
-	/* get all of the To addresses into our recipient list */
-	len = CAMEL_ADDRESS (to)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (to, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	/* get all of the Cc addresses into our recipient list */
-	len = CAMEL_ADDRESS (cc)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (cc, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	/* get all of the Bcc addresses into our recipient list */
-	len = CAMEL_ADDRESS (bcc)->addresses->len;
-	for (index = 0; index < len; index++) {
-		const char *addr;
-		
-		if (camel_internet_address_get (bcc, index, NULL, &addr))
-			recipients = g_list_append (recipients, g_strdup (addr));
-	}
-	
-	return _send_to (transport, message, recipients, ex);
-}
-
-static gboolean
-smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* say hello to the server */
-	gchar *cmdbuf, *respbuf = NULL;
-	struct hostent *host;
-	
-	/* get the local host name */
-	host = gethostbyaddr ((gchar *)&transport->localaddr.sin_addr, sizeof (transport->localaddr.sin_addr), AF_INET);
-	
-	/* hiya server! how are you today? */
-	if (transport->is_esmtp) {
-		if (host && host->h_name)
-			cmdbuf = g_strdup_printf ("EHLO %s\r\n", host->h_name);
-		else
-			cmdbuf = g_strdup_printf ("EHLO [%s]\r\n", inet_ntoa (transport->localaddr.sin_addr));
-	} else {
-		if (host && host->h_name)
-			cmdbuf = g_strdup_printf ("HELO %s\r\n", host->h_name);
-		else
-			cmdbuf = g_strdup_printf ("HELO [%s]\r\n", inet_ntoa (transport->localaddr.sin_addr));
-	}
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "HELO request timed out: "
-				      "%s: non-fatal",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "HELO response error: "
-					      "%s: non-fatal",
-					      g_strerror (errno));
-			return FALSE;
-		}
-		
-		if (strstr (respbuf, "8BITMIME")) {
-			d(fprintf (stderr, "This server supports 8bit\n"));
-			CAMEL_TRANSPORT (transport)->supports_8bit = TRUE;
-		}
-		
-		if (transport->is_esmtp && strstr (respbuf, "AUTH")) {
-			/* parse for supported AUTH types */
-			char *auths = strstr (respbuf, "AUTH") + 4;
-			
-			transport->esmtp_supported_authtypes = esmtp_get_authtypes (auths);
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_mail (CamelSmtpTransport *transport, const char *sender, gboolean has_8bit_parts, CamelException *ex)
-{
-	/* we gotta tell the smtp server who we are. (our email addy) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	/* enclose address in <>'s since some SMTP daemons *require* that */
-	if (CAMEL_TRANSPORT (transport)->supports_8bit && has_8bit_parts)
-		cmdbuf = g_strdup_printf ("MAIL FROM: <%s> BODY=8BITMIME\r\n", sender);
-	else
-		cmdbuf = g_strdup_printf ("MAIL FROM: <%s>\r\n", sender);
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "MAIL FROM request timed out: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "MAIL FROM response error: "
-					      "%s: mail not sent",
-					      g_strerror (errno));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex)
-{
-	/* we gotta tell the smtp server who we are going to be sending
-	 * our email to */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	/* enclose address in <>'s since some SMTP daemons *require* that */
-	cmdbuf = g_strdup_printf ("RCPT TO: <%s>\r\n", recipient);
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "RCPT TO request timed out: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "RCPT TO response error: "
-					      "%s: mail not sent",
-					      g_strerror (errno));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_data (CamelSmtpTransport *transport, CamelMedium *message, gboolean has_8bit_parts, CamelException *ex)
-{
-	/* now we can actually send what's important :p */
-	gchar *cmdbuf, *respbuf = NULL;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlffilter, *lwfilter;
-	gint crlfid, lwid;
-	
-	
-	/* if the message contains 8bit mime parts and the server
-           doesn't support it, encode 8bit parts to the best
-           encoding. */
-	if (has_8bit_parts && !CAMEL_TRANSPORT (transport)->supports_8bit)
-		camel_mime_message_encode_8bit_parts (CAMEL_MIME_MESSAGE (message));
-	
-	cmdbuf = g_strdup ("DATA\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "DATA request timed out: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-	
-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-	
-	if (!respbuf || strncmp (respbuf, "354", 3)) {
-		/* we should have gotten instructions on how to use the DATA command:
-		 * 354 Enter mail, end with "." on a line by itself
-		 */
-		g_free (respbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "DATA response error: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-
-	g_free (respbuf);
-	respbuf = NULL;
-	
-	/* setup stream filtering */
-	lwfilter = camel_mime_filter_linewrap_new (998, 998, '\t');
-	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);
-	
-	filtered_stream = camel_stream_filter_new_with_stream (transport->ostream);
-	lwid = camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (lwfilter));
-	crlfid = camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlffilter));
-	
-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (filtered_stream)) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "DATA send timed out: message termination: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	
-	camel_stream_filter_remove (filtered_stream, lwid);
-	camel_stream_filter_remove (filtered_stream, crlfid);
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
-	
-	/* terminate the message body */
-	
-	d(fprintf (stderr, "sending : \\r\\n.\\r\\n\n"));
-	
-	if (camel_stream_write (transport->ostream, "\r\n.\r\n", 5) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "DATA send timed out: message termination: "
-				      "%s: mail not sent",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	
-	do {
-		/* Check for "250 Sender OK..." */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "DATA response error: message termination: "
-					      "%s: mail not sent",
-					      g_strerror (errno));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_rset (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* we are going to reset the smtp server (just to be nice) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	cmdbuf = g_strdup ("RSET\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "RSET request timed out: "
-				      "%s",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "250" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "250", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "RSET response error: %s",
-					      g_strerror (errno));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
-
-static gboolean
-smtp_quit (CamelSmtpTransport *transport, CamelException *ex)
-{
-	/* we are going to reset the smtp server (just to be nice) */
-	gchar *cmdbuf, *respbuf = NULL;
-	
-	cmdbuf = g_strdup ("QUIT\r\n");
-	
-	d(fprintf (stderr, "sending : %s", cmdbuf));
-	
-	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "QUIT request timed out: "
-				      "%s: non-fatal",
-				      g_strerror (errno));
-		return FALSE;
-	}
-	g_free (cmdbuf);
-	
-	do {
-		/* Check for "221" */
-		g_free (respbuf);
-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
-		
-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));
-		
-		if (!respbuf || strncmp (respbuf, "221", 3)) {
-			g_free (respbuf);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "QUIT response error: "
-					      "%s: non-fatal",
-					      g_strerror (errno));
-			return FALSE;
-		}
-	} while (*(respbuf+3) == '-'); /* if we got "221-" then loop again */
-	g_free (respbuf);
-	
-	return TRUE;
-}
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
deleted file mode 100644
index b880230add..0000000000
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-smtp-transport.h : class for an smtp transfer */
-
-/* 
- * Authors:
- *   Jeffrey Stedfast <fejj@stampede.org>
- *
- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_SMTP_TRANSPORT_H
-#define CAMEL_SMTP_TRANSPORT_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "camel-transport.h"
-
-#define CAMEL_SMTP_TRANSPORT_TYPE     (camel_smtp_transport_get_type ())
-#define CAMEL_SMTP_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))
-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))
-#define IS_CAMEL_SMTP_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SMTP_TRANSPORT_TYPE))
-
-
-typedef struct {
-	CamelTransport parent_object;
-
-	CamelStream *istream, *ostream;
-
-	gboolean is_esmtp;
-
-	struct sockaddr_in localaddr;
-
-	GList *esmtp_supported_authtypes;
-	
-} CamelSmtpTransport;
-
-
-
-typedef struct {
-	CamelTransportClass parent_class;
-
-} CamelSmtpTransportClass;
-
-
-/* Standard Camel function */
-CamelType camel_smtp_transport_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_SMTP_TRANSPORT_H */
-
-
diff --git a/camel/providers/smtp/libcamelsmtp.urls b/camel/providers/smtp/libcamelsmtp.urls
deleted file mode 100644
index ec2fc0fc16..0000000000
--- a/camel/providers/smtp/libcamelsmtp.urls
+++ /dev/null
@@ -1 +0,0 @@
-smtp
diff --git a/camel/providers/vee/.cvsignore b/camel/providers/vee/.cvsignore
deleted file mode 100644
index fd6b811c68..0000000000
--- a/camel/providers/vee/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
diff --git a/camel/providers/vee/Makefile.am b/camel/providers/vee/Makefile.am
deleted file mode 100644
index 6c0693b02d..0000000000
--- a/camel/providers/vee/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelveeincludedir = $(includedir)/camel
-
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelvee.la
-provider_DATA = libcamelvee.urls
-
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-vee-provider\"	
-
-libcamelvee_la_SOURCES = 			\
-	camel-vee-folder.c			\
-	camel-vee-provider.c			\
-	camel-vee-store.c
-
-libcamelveeinclude_HEADERS =			\
-	camel-vee-folder.h			\
-	camel-vee-store.h
-
-libcamelvee_la_LDFLAGS = -version-info 0:0:0
-
-libcamelvee_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-#libcamelvee_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)
-
-EXTRA_DIST = libcamelvee.urls
-
diff --git a/camel/providers/vee/camel-vee-folder.c b/camel/providers/vee/camel-vee-folder.c
deleted file mode 100644
index da47761754..0000000000
--- a/camel/providers/vee/camel-vee-folder.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-exception.h"
-#include "camel-vee-folder.h"
-#include "camel-folder-summary.h"
-#include "camel-mime-message.h"
-
-#include <string.h>
-
-/* our message info includes the parent folder */
-typedef struct _CamelVeeMessageInfo {
-	CamelMessageInfo info;
-	CamelFolder *folder;
-} CamelVeeMessageInfo;
-
-struct _CamelVeeFolderPrivate {
-	GList *folders;
-};
-
-#define _PRIVATE(o) (((CamelVeeFolder *)(o))->priv)
-
-static void vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-
-static GPtrArray *vee_get_uids  (CamelFolder *folder);
-GPtrArray *vee_get_summary (CamelFolder *folder);
-
-static gint vee_get_message_count (CamelFolder *folder);
-static gint vee_get_unread_message_count (CamelFolder *folder);
-static CamelMimeMessage *vee_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex);
-
-static const CamelMessageInfo *vee_get_message_info (CamelFolder *folder, const char *uid);
-static GPtrArray *vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);
-
-static guint32 vee_get_message_flags (CamelFolder *folder, const char *uid);
-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);
-static gboolean vee_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);
-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value);
-
-
-static void camel_vee_folder_class_init (CamelVeeFolderClass *klass);
-static void camel_vee_folder_init       (CamelVeeFolder *obj);
-static void camel_vee_folder_finalise   (CamelObject *obj);
-
-static void vee_folder_build(CamelVeeFolder *vf, CamelException *ex);
-static void vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);
-
-static CamelFolderClass *camel_vee_folder_parent;
-
-CamelType
-camel_vee_folder_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_folder_get_type (), "CamelVeeFolder",
-					    sizeof (CamelVeeFolder),
-					    sizeof (CamelVeeFolderClass),
-					    (CamelObjectClassInitFunc) camel_vee_folder_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_vee_folder_init,
-					    (CamelObjectFinalizeFunc) camel_vee_folder_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_vee_folder_class_init (CamelVeeFolderClass *klass)
-{
-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;
-
-	camel_vee_folder_parent = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));
-
-	folder_class->sync = vee_sync;
-
-	folder_class->get_uids = vee_get_uids;
-	folder_class->free_uids = camel_folder_free_deep;
-	folder_class->get_summary = vee_get_summary;
-	folder_class->free_summary = camel_folder_free_nop;
-	folder_class->get_message = vee_get_message;
-
-	folder_class->get_message_info = vee_get_message_info;
-
-	folder_class->get_message_count = vee_get_message_count;
-	folder_class->get_unread_message_count = vee_get_unread_message_count;
-	folder_class->search_by_expression = vee_search_by_expression;
-
-	folder_class->get_message_flags = vee_get_message_flags;
-	folder_class->set_message_flags = vee_set_message_flags;
-	folder_class->get_message_user_flag = vee_get_message_user_flag;
-	folder_class->set_message_user_flag = vee_set_message_user_flag;
-}
-
-static void
-camel_vee_folder_init (CamelVeeFolder *obj)
-{
-	struct _CamelVeeFolderPrivate *p;
-	CamelFolder *folder = (CamelFolder *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	folder->has_summary_capability = TRUE;
-	folder->has_search_capability = TRUE;
-
-	/* FIXME: what to do about user flags if the subfolder doesn't support them? */
-	folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
-		CAMEL_MESSAGE_DELETED |
-		CAMEL_MESSAGE_DRAFT |
-		CAMEL_MESSAGE_FLAGGED |
-		CAMEL_MESSAGE_SEEN;
-}
-
-static void
-camel_vee_folder_finalise (CamelObject *obj)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)obj;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		camel_object_unref((CamelObject *)f);
-		node = g_list_next(node);
-	}
-}
-
-/**
- * camel_vee_folder_new:
- * @parent_store: the parent CamelVeeStore
- * @name: the vfolder name
- * @ex: a CamelException
- *
- * Create a new CamelVeeFolder object.
- *
- * Return value: A new CamelVeeFolder widget.
- **/
-CamelFolder *
-camel_vee_folder_new (CamelStore *parent_store, const char *name,
-		      CamelException *ex)
-{
-	CamelFolder *folder;
-	CamelVeeFolder *vf;
-	char *namepart, *searchpart;
-
-	folder =  CAMEL_FOLDER (camel_object_new (camel_vee_folder_get_type()));
-	vf = (CamelVeeFolder *)folder;
-
-	camel_folder_construct (folder, parent_store, name, name);
-
-	namepart = g_strdup(name);
-	searchpart = strchr(namepart, '?');
-	if (searchpart == NULL) {
-		/* no search, no result! */
-		searchpart = "(body-contains \"=some-invalid_string-sequence=xx\")";
-	} else {
-		*searchpart++ = 0;
-	}
-
-	vf->messages = g_ptr_array_new();
-	vf->messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-
-	vf->expression = g_strdup(searchpart);
-	vf->vname = namepart;
-
-	vee_folder_build(vf, ex);
-	if (camel_exception_is_set (ex)) {
-		camel_object_unref (CAMEL_OBJECT (folder));
-		return NULL;
-	}
-
-	return folder;
-}
-
-static void
-folder_changed(CamelFolder *sub, gpointer type, CamelVeeFolder *vf)
-{
-	CamelException *ex;
-
-	ex = camel_exception_new();
-	vee_folder_build_folder(vf, sub, ex);
-	camel_exception_free(ex);
-	/* FIXME: should only raise follow-on event if the result changed */
-	camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", GINT_TO_POINTER(0));
-}
-
-/* track flag changes in the summary */
-static void
-message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *mf)
-{
-	const CamelMessageInfo *info;
-	CamelMessageInfo *vinfo;
-	CamelFlag *flag;
-	char *vuid;
-
-	info = camel_folder_get_message_info(f, uid);
-
-	vuid = g_strdup_printf("%p:%s", f, uid);
-	vinfo = (CamelMessageInfo *)vee_get_message_info((CamelFolder *)mf, vuid);
-	if (info && vinfo) {
-		vinfo->flags = info->flags;
-		camel_flag_list_free(&vinfo->user_flags);
-		flag = info->user_flags;
-		while (flag) {
-			camel_flag_set(&vinfo->user_flags, flag->name, TRUE);
-			flag = flag->next;
-		}
-		camel_object_trigger_event( CAMEL_OBJECT(mf), "message_changed", vinfo->uid);
-	}
-	g_free(vuid);
-}
-
-void
-camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	CamelException *ex;
-
-	camel_object_ref((CamelObject *)sub);
-	p->folders = g_list_append(p->folders, sub);
-
-	camel_object_hook_event ((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);
-	camel_object_hook_event ((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);
-
-	ex = camel_exception_new();
-	vee_folder_build_folder(vf, sub, ex);
-	camel_exception_free(ex);
-	/* FIXME: should only raise follow-on event if the result changed */
-	camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", GINT_TO_POINTER(0));
-}
-
-
-static void
-vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	;
-}
-
-static gint vee_get_message_count (CamelFolder *folder)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-
-	return vf->messages->len;
-}
-
-static gint
-vee_get_unread_message_count (CamelFolder *folder)
-{
-	CamelVeeFolder *vee_folder = CAMEL_VEE_FOLDER (folder);
-	CamelMessageInfo *info;
-	GPtrArray *infolist;
-	gint i, count = 0;
-
-	g_return_val_if_fail (folder != NULL, -1);
-
-	infolist = vee_folder->messages;
-	
-	for (i = 0; i < infolist->len; i++) {
-		info = (CamelMessageInfo *) g_ptr_array_index (infolist, i);
-		if (!(info->flags & CAMEL_MESSAGE_SEEN))
-			count++;
-	}
-	
-	return count;
-}
-
-static gboolean
-get_real_message(CamelFolder *folder, const char *uid, CamelFolder **out_folder, const char **out_uid)
-{
-	CamelVeeMessageInfo *mi;
-
-	mi = (CamelVeeMessageInfo *)vee_get_message_info(folder, uid);
-	g_return_val_if_fail(mi != NULL, FALSE);
-
-	*out_folder = mi->folder;
-	*out_uid = strchr(mi->info.uid, ':')+1;
-	return TRUE;
-}
-
-static CamelMimeMessage *vee_get_message(CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	const char *real_uid;
-	CamelFolder *real_folder;
-
-	if (!get_real_message(folder, uid, &real_folder, &real_uid)) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     "No such message %s in %s", uid,
-				     folder->name);
-		return NULL;
-	}
-
-	return camel_folder_get_message (real_folder, real_uid, ex);
-}
-
-GPtrArray *vee_get_summary(CamelFolder *folder)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-
-	return vf->messages;
-}
-
-static const CamelMessageInfo *vee_get_message_info(CamelFolder *f, const char *uid)
-{
-	CamelVeeFolder *vf = (CamelVeeFolder *)f;
-
-	return g_hash_table_lookup(vf->messages_uid, uid);
-}
-
-static GPtrArray *vee_get_uids (CamelFolder *folder)
-{
-	GPtrArray *result;
-	int i;
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-
-	result = g_ptr_array_new ();
-	g_ptr_array_set_size (result, vf->messages->len);
-	for (i=0;i<vf->messages->len;i++) {
-		CamelMessageInfo *mi = g_ptr_array_index(vf->messages, i);
-		result->pdata[i] = g_strdup(mi->uid);
-	}
-
-	return result;
-}
-
-static GPtrArray *
-vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	GList *node;
-	GPtrArray *matches, *result = g_ptr_array_new ();
-	char *expr;
-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-
-	expr = g_strdup_printf("(and %s %s)", vf->expression, expression);
-	node = p->folders;
-	while (node) {
-		CamelFolder *f = node->data;
-		int i;
-
-		matches = camel_folder_search_by_expression(f, expression, ex);
-		for (i = 0; i < matches->len; i++) {
-			char *uid = matches->pdata[i];
-			g_ptr_array_add(result, g_strdup_printf("%p:%s", f, uid));
-		}
-		camel_folder_search_free(f, matches);
-		node = g_list_next(node);
-	}
-	return result;
-}
-
-static guint32
-vee_get_message_flags(CamelFolder *folder, const char *uid)
-{
-	const char *real_uid;
-	CamelFolder *real_folder;
-
-	if (!get_real_message (folder, uid, &real_folder, &real_uid))
-		return 0;
-
-	return camel_folder_get_message_flags(real_folder, real_uid);
-}
-
-static void
-vee_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	const char *real_uid;
-	CamelFolder *real_folder;
-
-	if (!get_real_message(folder, uid, &real_folder, &real_uid))
-		return;
-
-	camel_folder_set_message_flags(real_folder, real_uid, flags, set);
-}
-
-static gboolean
-vee_get_message_user_flag(CamelFolder *folder, const char *uid, const char *name)
-{
-	const char *real_uid;
-	CamelFolder *real_folder;
-
-	if (!get_real_message(folder, uid, &real_folder, &real_uid))
-		return FALSE;
-
-	return camel_folder_get_message_user_flag(real_folder, real_uid, name);
-}
-
-static void
-vee_set_message_user_flag(CamelFolder *folder, const char *uid,
-			  const char *name, gboolean value)
-{
-	const char *real_uid;
-	CamelFolder *real_folder;
-
-	if (!get_real_message(folder, uid, &real_folder, &real_uid))
-		return;
-
-	return camel_folder_set_message_user_flag(real_folder, real_uid, name, value);
-}
-
-
-/*
-  need incremental update, based on folder.
-  Need to watch folders for changes and update accordingly.
-*/
-
-/* this does most of the vfolder magic */
-static void
-vee_folder_build(CamelVeeFolder *vf, CamelException *ex)
-{
-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	GList *node;
-	int i;
-	GPtrArray *messages;
-	GHashTable *messages_uid;
-
-	for (i=0;i<vf->messages->len;i++) {
-		CamelMessageInfo *mi = g_ptr_array_index(vf->messages, i);
-		camel_message_info_free(mi);
-	}
-
-	messages = g_ptr_array_new();
-	messages_uid = g_hash_table_new(g_str_hash, g_str_equal);
-
-	node = p->folders;
-	while (node) {
-		GPtrArray *matches;
-		CamelFolder *f = node->data;
-		CamelVeeMessageInfo *mi;
-		const CamelMessageInfo *info;
-		int i;
-
-		matches = camel_folder_search_by_expression(f, vf->expression, ex);
-		for (i = 0; i < matches->len; i++) {
-			info = camel_folder_get_message_info(f, matches->pdata[i]);
-			if (info) {
-				mi = g_malloc0(sizeof(*mi));
-				camel_message_info_dup_to(info, (CamelMessageInfo *)mi);
-				g_free (mi->info.uid);
-				mi->info.uid = g_strdup_printf("%p:%s", f, info->uid);
-				mi->folder = f;
-				g_ptr_array_add(messages, mi);
-				g_hash_table_insert(messages_uid, mi->info.uid, mi);
-			}
-		}
-		camel_folder_search_free(f, matches);
-		node = g_list_next(node);
-	}
-
-	g_ptr_array_free(vf->messages, TRUE);
-	vf->messages = messages;
-	g_hash_table_destroy(vf->messages_uid);
-	vf->messages_uid = messages_uid;
-}
-
-
-/* build query contents for a single folder */
-static void
-vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)
-{
-	GPtrArray *matches;
-	CamelFolder *f = source;
-	CamelVeeMessageInfo *mi;
-	const CamelMessageInfo *info;
-
-	GPtrArray *messages;
-	GHashTable *messages_uid;
-	int i;
-
-	for (i=0;i<vf->messages->len;i++) {
-		CamelVeeMessageInfo *mi = g_ptr_array_index(vf->messages, i);
-		if (mi->folder == source) {
-			g_hash_table_remove(vf->messages_uid, mi->info.uid);
-			g_ptr_array_remove_index_fast(vf->messages, i);
-
-			camel_message_info_free((CamelMessageInfo *)mi);
-			i--;
-		}
-	}
-
-	messages = vf->messages;
-	messages_uid = vf->messages_uid;
-	
-	matches = camel_folder_search_by_expression(f, vf->expression, ex);
-	for (i = 0; i < matches->len; i++) {
-		info = camel_folder_get_message_info(f, matches->pdata[i]);
-		if (info) {
-			mi = g_malloc0(sizeof(*mi));
-			camel_message_info_dup_to(info, (CamelMessageInfo*)mi);
-			g_free (mi->info.uid);
-			mi->info.uid = g_strdup_printf("%p:%s", f, info->uid);
-			mi->folder = f;
-			g_ptr_array_add(messages, mi);
-			g_hash_table_insert(messages_uid, mi->info.uid, mi);
-		}
-	}
-	camel_folder_search_free(f, matches);
-}
-
-
-/*
-
-  (match-folder "folder1" "folder2")
-
- */
diff --git a/camel/providers/vee/camel-vee-folder.h b/camel/providers/vee/camel-vee-folder.h
deleted file mode 100644
index 2263854912..0000000000
--- a/camel/providers/vee/camel-vee-folder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_VEE_FOLDER_H
-#define _CAMEL_VEE_FOLDER_H
-
-#include <camel/camel-folder.h>
-
-#define CAMEL_VEE_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_vee_folder_get_type (), CamelVeeFolder)
-#define CAMEL_VEE_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass)
-#define IS_CAMEL_VEE_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_folder_get_type ())
-
-typedef struct _CamelVeeFolder      CamelVeeFolder;
-typedef struct _CamelVeeFolderClass CamelVeeFolderClass;
-
-struct _CamelVeeFolder {
-	CamelFolder parent;
-
-	struct _CamelVeeFolderPrivate *priv;
-
-	char *expression;	/* query expression */
-	char *vname;		/* local name */
-	CamelFolder *local;	/* local storage for folder */
-
-	/* FIXME: Move this to a summary object??? */
-	GPtrArray *messages; /* message info's */
-	GHashTable *messages_uid;
-};
-
-struct _CamelVeeFolderClass {
-	CamelFolderClass parent_class;
-};
-
-guint		camel_vee_folder_get_type	(void);
-CamelFolder    *camel_vee_folder_new		(CamelStore *parent_store,
-						 const char *name,
-						 CamelException *ex);
-
-void camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub);
-
-#endif /* ! _CAMEL_VEE_FOLDER_H */
diff --git a/camel/providers/vee/camel-vee-provider.c b/camel/providers/vee/camel-vee-provider.c
deleted file mode 100644
index 4588fb77d3..0000000000
--- a/camel/providers/vee/camel-vee-provider.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "config.h"
-#include "camel-vee-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
-static CamelProvider vee_provider = {
-	"vfolder",
-	N_("Virtual folder email provider"),
-
-	N_("For reading mail as a query of another set of folders"),
-
-	"vfolder",
-
-	0,
-
-	0,
-
-	{ 0, 0 },
-
-	NULL
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	vee_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_vee_store_get_type();
-
-	vee_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
-	
-	camel_session_register_provider (session, &vee_provider);
-}
diff --git a/camel/providers/vee/camel-vee-store.c b/camel/providers/vee/camel-vee-store.c
deleted file mode 100644
index 7acc127542..0000000000
--- a/camel/providers/vee/camel-vee-store.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "camel-vee-store.h"
-#include "camel-vee-folder.h"
-
-static CamelFolder *vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
-static char *vee_get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex);
-
-struct _CamelVeeStorePrivate {
-};
-
-#define _PRIVATE(o) (((CamelVeeStore *)(o))->priv)
-
-static void camel_vee_store_class_init (CamelVeeStoreClass *klass);
-static void camel_vee_store_init       (CamelVeeStore *obj);
-
-static CamelStoreClass *camel_vee_store_parent;
-
-CamelType
-camel_vee_store_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_store_get_type (), "CamelVeeStore",
-					    sizeof (CamelVeeStore),
-					    sizeof (CamelVeeStoreClass),
-					    (CamelObjectClassInitFunc) camel_vee_store_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_vee_store_init,
-					    NULL);
-	}
-	
-	return type;
-}
-
-static void
-
-camel_vee_store_class_init (CamelVeeStoreClass *klass)
-{
-	CamelStoreClass *store_class = (CamelStoreClass *) klass;
-	
-	camel_vee_store_parent = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));
-
-	/* virtual method overload */
-	store_class->get_folder = vee_get_folder;
-	store_class->get_folder_name = vee_get_folder_name;
-}
-
-static void
-camel_vee_store_init (CamelVeeStore *obj)
-{
-	struct _CamelVeeStorePrivate *p;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-}
-
-/**
- * camel_vee_store_new:
- *
- * Create a new CamelVeeStore object.
- * 
- * Return value: A new CamelVeeStore widget.
- **/
-CamelVeeStore *
-camel_vee_store_new (void)
-{
-	CamelVeeStore *new = CAMEL_VEE_STORE ( camel_object_new (camel_vee_store_get_type ()));
-	return new;
-}
-
-static CamelFolder *
-vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	return camel_vee_folder_new (store, folder_name, ex);
-}
-
-static char *
-vee_get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	return g_strdup(folder_name);
-}
-
diff --git a/camel/providers/vee/camel-vee-store.h b/camel/providers/vee/camel-vee-store.h
deleted file mode 100644
index d4ed7a0610..0000000000
--- a/camel/providers/vee/camel-vee-store.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _CAMEL_VEE_STORE_H
-#define _CAMEL_VEE_STORE_H
-
-#include <camel/camel-store.h>
-
-#define CAMEL_VEE_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_vee_store_get_type (), CamelVeeStore)
-#define CAMEL_VEE_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass)
-#define IS_CAMEL_VEE_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_store_get_type ())
-
-typedef struct _CamelVeeStore      CamelVeeStore;
-typedef struct _CamelVeeStoreClass CamelVeeStoreClass;
-
-struct _CamelVeeStore {
-	CamelStore parent;
-
-	struct _CamelVeeStorePrivate *priv;
-};
-
-struct _CamelVeeStoreClass {
-	CamelStoreClass parent_class;
-};
-
-guint		camel_vee_store_get_type	(void);
-CamelVeeStore      *camel_vee_store_new	(void);
-
-#endif /* ! _CAMEL_VEE_STORE_H */
diff --git a/camel/providers/vee/libcamelvee.urls b/camel/providers/vee/libcamelvee.urls
deleted file mode 100644
index 6fa58dadb5..0000000000
--- a/camel/providers/vee/libcamelvee.urls
+++ /dev/null
@@ -1 +0,0 @@
-vfolder
diff --git a/camel/string-utils.c b/camel/string-utils.c
deleted file mode 100644
index 023aee16af..0000000000
--- a/camel/string-utils.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* string-util : utilities for gchar* strings  */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include "string-utils.h"
-#include "string.h"
-
-gboolean
-string_equal_for_glist (gconstpointer v, gconstpointer v2)
-{
-	return (!strcmp ( ((const gchar *)v), ((const gchar*)v2))) == 0;
-}
-
-/* utility func : frees a gchar element in a GList */
-static void 
-__string_list_free_string (gpointer data, gpointer user_data)
-{
-	gchar *string = (gchar *)data;
-	g_free (string);
-}
-
-void 
-string_list_free (GList *string_list)
-{
-	if (string_list == NULL) return; 
-
-	g_list_foreach (string_list, __string_list_free_string, NULL);
-	g_list_free (string_list);
-}
-
-GList *
-string_split (const gchar *string, char sep, const gchar *trim_chars, StringTrimOption trim_options)
-{
-	GList *result = NULL;
-	gint first, last, pos;
-	gchar *new_string;
-
-	g_assert (string);
-	
-	first = 0;
-	last = strlen(string) - 1;
-	
-	/* strip leading and trailing separators */
-	while ( (first<=last) && (string[first]==sep) )
-		first++;
-	while ( (first<=last) && (string[last]==sep) )
-		last--;
-
-	
-	while (first<=last)  {
-		pos = first;
-		/* find next separator */
-		while ((pos<=last) && (string[pos]!=sep)) pos++;
-		if (first != pos) {
-			new_string = g_strndup (string+first, pos-first);
-			/* could do trimming in line to speed up this code */
-			if (trim_chars) string_trim (new_string, trim_chars, trim_options);
-			result = g_list_append (result, new_string);
-		}	
-		first = pos + 1;
-	}
-
-	return result;
-}
-
-void 
-string_trim (gchar *string, const gchar *trim_chars, StringTrimOption options)
-{
-	gint first_ok;
-	gint last_ok;
-	guint length;
-
-	g_return_if_fail (string);
-	length = strlen (string);
-	if (length==0)
-		return;
-	
-	first_ok = 0;
-	last_ok = length - 1;
-
-	if (options & STRING_TRIM_STRIP_LEADING)
-		while  ( (first_ok <= last_ok) && (strchr (trim_chars, string[first_ok])!=NULL) )
-			first_ok++;
-	
-	if (options & STRING_TRIM_STRIP_TRAILING)
-		while  ( (first_ok <= last_ok) && (strchr (trim_chars, string[last_ok])!=NULL) )
-			last_ok--;
-	
-	if (first_ok > 0)
-		memmove (string, string+first_ok, last_ok - first_ok + 1);
-	string[last_ok - first_ok +1] = '\0';
-	
-}
-
-
-/**
- * remove_suffix: remove a suffix from a string
- * @s: the string to remove the suffix from. 
- * @suffix: the suffix to remove
- * @suffix_found : suffix found flag
- *
- * Remove a suffix from a string. If the 
- * string ends with the full suffix, a copy 
- * of the string without the suffix is returned and
- * @suffix_found is set to %TRUE. 
- * Otherwise, NULL is returned and
- * @suffix_found is set to %FALSE. 
- * 
- * Return value: an allocated copy of the string without the suffix or NULL if the suffix was not found.
- **/
-gchar *
-string_prefix (const gchar *s, const gchar *suffix, gboolean *suffix_found)
-{
-	guint s_len, suf_len;
-	guint suffix_pos;
-	char *result_string;
-
-	g_assert (s);
-	g_assert (suffix);
-	g_assert (suffix_found);
-
-	s_len = strlen (s);
-	suf_len = strlen (suffix);
-
-	/* if the string is shorter than the suffix, do nothing */
-	if (s_len < suf_len) {
-		*suffix_found = FALSE;
-		return NULL;
-	}
-	
-	/* theoretical position of the prefix */
-	suffix_pos = s_len - suf_len;
-
-	/* compare the right hand side of the string with the suffix */
-	if (!strncmp (s+suffix_pos, suffix, suf_len)) {
-
-		/* if the suffix matches, check that there are 
-		   characters before */
-		if (suffix_pos == 0) {
-			result_string = NULL;
-			*suffix_found = TRUE;
-		} else { 
-			result_string = g_strndup (s, suffix_pos);
-			*suffix_found = TRUE;
-		}
-
-	} else { 
-		result_string = NULL;
-		*suffix_found = FALSE;
-	}
-
-	return result_string;
-}
-
-void
-string_unquote (gchar *string)
-{
-	/* if the string is quoted, unquote it */
-
-	g_return_if_fail (string != NULL);
-	
-	if (*string == '"' && *(string + strlen (string) - 1) == '"') {
-		*(string + strlen (string) - 1) = '\0';
-		if (*string)
-			memmove (string, string+1, strlen (string));
-	}
-}
-
-gchar *
-strip (gchar *string, gchar c)
-{
-	/* strip all occurances of c from the string */
-	gchar *src, *dst;
-	
-	g_return_val_if_fail (string != NULL, NULL);
-	
-	for (src = dst = string; *src; src++)
-		if (*src != c)
-			*dst++ = *src;
-	*dst = '\0';
-	
-	return string;
-}
diff --git a/camel/string-utils.h b/camel/string-utils.h
deleted file mode 100644
index 1556faa1df..0000000000
--- a/camel/string-utils.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* string-util : utilities for normal gchar * strings  */
-
-/* 
- *
- * Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
- *          Jeffrey Stedfast <fejj@helixcode.com>
- *
- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-
-#ifndef STRING_UTIL_H
-#define STRING_UTIL_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include <glib.h>
-
-typedef enum {
-	STRING_TRIM_NONE            =     0,
-	STRING_TRIM_STRIP_TRAILING  =     1,
-	STRING_TRIM_STRIP_LEADING   =     2
-} StringTrimOption;
-
-
-
-gboolean string_equal_for_glist (gconstpointer v, gconstpointer v2);
-
-void     string_list_free       (GList *string_list);
-
-GList   *string_split           (const gchar *string, char sep,
-				 const gchar *trim_chars, StringTrimOption trim_options);
-void     string_trim            (gchar *string, const gchar *chars,
-				 StringTrimOption options);
-
-gchar   *string_prefix          (const gchar *s, const gchar *suffix,
-				 gboolean *suffix_found);
-
-void    string_unquote          (gchar *string);
-
-gchar   *strip                  (gchar *string, gchar c);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* STRING_UTIL_H */
diff --git a/composer/.cvsignore b/composer/.cvsignore
deleted file mode 100644
index fe01043d2c..0000000000
--- a/composer/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.deps
-.libs
-evolution-msg-composer
-Makefile
-Makefile.in
-*.lo
-*.la
-Composer-stubs.c
-Composer-skels.c
-Composer-common.c
-Composer.h
-HTMLEditor-stubs.c
-HTMLEditor-skels.c
-HTMLEditor.h
-HTMLEditor-common.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames.h
diff --git a/composer/ChangeLog b/composer/ChangeLog
deleted file mode 100644
index a64ac15f41..0000000000
--- a/composer/ChangeLog
+++ /dev/null
@@ -1,947 +0,0 @@
-2000-11-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-msg-composer-attachment.c: Added #include <config.h>
-	* e-msg-composer-hdrs.c: s/_HAVE_CONFIG_H/HAVE_CONFIG_H for
-	working i18n.
-	
-2000-11-04  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): fix
-	test for regular file to !S_ISREG (statbuf.st_mode)
-
-	* listener.c (resolve_image_url): use inline images hash table
-
-	* e-msg-composer.c (init): create inlined images hash table
-	(destroy): destroy it
-	(clear_inline_images): helper function, used from
-	g_hash_table_foreach_remove to destroy one inline image record
-
-	* e-msg-composer.h: added hash table with inlined images url ->
-	cid info
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* listener.c (impl_event): updated for API changed
-	implemented image_url event
-	(resolve_image_url): new helper function, attaches image to mail
-	and returns new (resolved) url pointing to mime component
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	added conponent_id parameter
-
-	* e-msg-composer-attachment-bar.c
-	(e_msg_composer_attachment_bar_attach): added parameter content_id
-	(add_from_file): likewise
-
-2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
-	Don't allow attaching anything but regular files.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Clean the idl-generated files properly.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Don't create
-	the To, Cc, and Bcc lists based only on the address, use both the
-	name and address and camel_address_encode() them.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the
-	CTE kludge, calculate the best mime transfer encoding for the mime
-	part and use that. Include e-msg-composer-select-file.h
-
-2000-10-31  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (prepare_engine): new function, tries prepare
-	editor engine
-	(mark_orig_text): marks original text in editor
-	(set_editor_text): call mark_orig_text
-	(create_composer): call prepare_engine
-
-	* Makefile.am (IDL_GENERATED): added HTMLEditor generated files to
-	IDL_GENERATED
-	($(IDL_GENERATED)): generate also files from HTMLEditor.idl
-	(libcomposer_la_SOURCES): added listener.[ch]
-
-	* e-msg-composer.h: added editor_engine and editor_listener to
-	EMsgComposer
-
-	* listener.[ch]: new files, implementation of HTMLEditor::Listener
-
-2000-10-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from
-	`$(srcdir)' so that it builds with builddir != srcdir.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my
-	not-quite-right logic so that we don't accidently set the body
-	contents using a plain text attachment instead of the actual body
-	of the message :-)
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the
-	composer with any attachments.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-select-file.c (create_file_selection): Set the
-	wmclass and wmclass_name for the file selectors so that Sawfish
-	doesn't make the dialogs the same size as the parent.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* evolution-composer.c (init): Attach send/postpone signal
-	handlers to the EMsgComposer.
-	(evolution_composer_factory_init): Take send/postpone signal
-	handlers as arguments.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: add some
-	missing _()s.
-
-	* e-msg-composer-address-dialog.*, e-msg-composer-address-entry.*:
-	Old cruft. Remove.
-
-	* Makefile.am: Update for removed files.
-
-	* e-msg-composer-hdrs.c: Remove e-msg-composer-address-entry.h
-	include.
-
-	* e-msg-composer.c: Remove e-msg-composer-address-dialog.h include
-	
-2000-10-23  Ariel Rios   <ariel@arcavia.com>
-
-	* e-msg-composer-hdrs.c: Include Composer.h
-	instead of volution-Addressbook-SelectNames.h
-
-2000-10-22  Dan Winship  <danw@helixcode.com>
-
-	* .cvsignore: No, don't ignore Evolution-Addressbook-SelectNames*.
-	They're not supposed to be there any more. 
-
-2000-10-22  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_cb): Removed.
-	(add_from_user): Use `e_msg_composer_select_file()' instead of
-	doing the file selector widget magic by yourself.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore Evolution-Addressbook-SelectNames*
-
-2000-10-20  Dan Winship  <danw@helixcode.com>
-
-	* Evolution-Composer.idl: Evolution::Composer interface
-
-	* evolution-composer.[ch]: Implementation and factory. So
-	entirely not tested.
-
-	* Makefile.am (libcomposer_la_SOURCES): Add
-	evolution-composer.[ch]
-	(IDLS): Update this for Evolution-Composer.idl / Composer.idl
-
-	* main.c: Removed. (Old, dead code)
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.
-	(glade_messages): New.
-	(EXTRA_DIST): Add `$(glade_messages)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_file, create_menubar_edit),
-	(create_menubar_format, create_menubar_view, create_menubar): kill.
-	(create_toolbar): die.
-	(setup_ui): impl.
-	(e_msg_composer_construct): hook in.
-	(menu_format_html_cb): update.
-	(menu_view_attachments_activate_cb): ditto.
-	(destroy): upd.
-	(e_msg_composer_construct): upd.
-	(e_msg_composer_set_send_html): upd.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Don't need the ID anymore.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): If the body
-	text was NULL, then don't bother turning it into HTML (besides, it
-	causes a nasty segfault).
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing
-	any CPPFLAGS set at configure time.
-
-2000-10-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment.c (set_entry): If the entry widget is
-	NULL, obviously we can't set any text on it.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-hdrs.c (init): Create a unique-ish id for this set
-	of headers, so that only one select-names dialog will be created for
-	a given set of headers.
-	(address_button_clicked_cb): Pass the unique-ish id to the activate
-	dialog command.
-
-2000-10-13  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer.c (build_message): stop using format_text,
-	gtkhtml handles this now.
-	(format_text): function removed.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: Allow NULL pixbufs, and load the "broken" image
-
-	* e-msg-composer-attachment-bar.c (update): If the image isn't 
-	found load the default text/plain icon.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): If the body of the message has
-	8-bit chars, set the Content-Transfer-Encoding type to the best
-	encoding.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* e-icon-list.c: fix #include of gnome-canvas-pixbuf.h
-
-2000-10-02  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c: If the description of an attachment
-	is a blank string, revert to displaying the filename.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-icon-list.c: If you try to add an icon from a file that doesn't
-	exist put a "Broken icon" image.
-
-	* bad-icon.xpm: Broken icon image.
-
-2000-10-01  Iain Holmes  <iain@helixcode.com>
-
-	* e-msg-composer-attachment-bar.[ch] (update): If the attachment is
-	an image, then make a thumbnail for it.
-	Base the attachment bar on e-icon-list instead of gnome-icon-list.
-
-	* e-icon-list.[ch]: New files. These are modified versions of 
-	gnome-icon-list from gnome-libs HEAD that uses gdk-pixbuf instead
-	of the evil Imlib.
-
-	* e-msg-composer-attachment.[ch]: Add a pixbuf_cache member, to
-	save us having to generate a thumbnail for the attachment every
-	time the bar changes.
-	
-	* e-msg-composer.c (e_msg_composer_construct): Add dnd support for
-	files. Drag a file to the composer to add it as an attachment.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (build_message): Check to see if the body has
-	8bit chars, if so - set the Content-Transfer-Encoding to 8bit.
-	Addresses Bugzilla bug #652.
-
-2000-09-25  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (setup_headers): fix typo in tooltip.
-	* e-msg-composer.c (create_menubar_file): fix accelerator for
-	"Save as" to be different from "Save". (Both problems pointed out
-	by menthos@menthos.com.)
-
-2000-09-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (get_signature): Updated to handle FIFO
-	streams.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): Don't g_error out
-	if the html-editor-control fails.
-	(create_composer): New internal function to create and construct a
-	msg_composer and pop up an error message if it fails.
-	(e_msg_composer_new, e_msg_composer_new_with_sig_file,
-	e_msg_composer_new_with_message, e_msg_composer_new_from_url): Use
-	create_composer, return if it fails, change return type to
-	EMsgComposer *.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment.c (get_mime_type): Use
-	gnome_vfs_get_file_info.
-
-	* e-msg-composer-attachment-bar.c (update): Use gnome_vfs_mime
-	functions, not old gnome_mime.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,
-	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,
-	e-msg-composer.c: Fixed the #include lines to deal properly with
-	gal.
-
-2000-09-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c: Update for new UI handler.
-
-2000-09-12  Larry Ewing  <lewing@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_common): add a make sure
-	the attachment isn't NULL.  A more complete fix coming soon.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am ($(IDL_GENERATED)): Add space after `-I'.
-
-2000-09-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_menubar_format): Accelerate the
-	`Format' menu with an `o' instead of an `f' [the `f' is already
-	taken by the "File" menu].
-
-2000-09-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): Applied
-	Jesse's patch that sets the composer's sig_file
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Use e_utf8 wrappers
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_get_sig_file): This needs to
-	return a const char * and not a char *, because we're not actually
-	allocating memory here.
-	(create_menubar_file): Changed "Send" to "Send Now" and added
-	"Send Later"
-	(menu_file_send_later_cb): New callback that emits the POSTPONE
-	signal (equivalent to "Send Later"
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Always
-	request to import the HTML version if at all possible so that we
-	maintain formatting and other nifty stuff :-)
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the
-	"From" address in the CamelMimeMessage. Also updated to use
-	get_subject to both make our lives easier and prepare for using UTF8
-	(e_msg_composer_hdrs_get_subject): Updated to behave similarly to
-	get_from and return allocated memory (it will have to return
-	allocated memory once it's converted to use UTF8 anyways)
-
-	* e-msg-composer.c (setup_save_draft): Always set
-	composer->send_html = TRUE so that formatting is preserved.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-msg-composer-address-entry.c: Use e_utf8 wrappers
-
-	* e-msg-composer-attachment.c: Use e_utf8 wrappers
-
-	* e-msg-composer-hdrs.c: Use e_utf8 wrappers
-	
-2000-08-24  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add builddir/shell so we can
-	get Evolution.h
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): get_text not get_txt.
-
-2000-08-11  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Use
-	new config accessors
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove unneeded e-setup.h include
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (exit_dialog_cb): Made async
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Temporarily disable draft saving
-	while we figure out how to work around Zucchi's new append_message.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from): Return the
-	text in GtkCombo->entry
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList
-	identity stuff, should now display all configured identities.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-address-dialog.c: Fixed some warnings.
-
-	* e-msg-composer-hdrs.c: Switched the composer to use an EEntry
-	for the subject field.
-
-	* e-msg-composer.c: Changed the non scaling objects in this vbox
-	to be FALSE, FALSE instead of FALSE, TRUE.
-
-2000-08-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-hdrs.c (add_header): Modified to allow dropdown
-	entry-boxes as well (for headers like From:)
-	(setup_headers): Modified to use the correct enum type.
-	(create_dropdown_entry): New convenience function to add a
-	drop-down combo box and fill it in with identities
-	(init): Set from_entry to NULL
-	(e_msg_composer_hdrs_get_from): New convenience function to get
-	the text in the From widget in the composer
-	(e_msg_composer_hdrs_set_from): New convenience function to set
-	the From header in the composer
-
-2000-08-08  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Fix build by allowing includes for e-table dir
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart):
-	s/strcasecmp/g_strcasecmp
-
-	* e-msg-composer.c: s/strncasecmp/g_strncasecmp - this will help
-	later with building on different platforms :-)
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Added code
-	to set the body text based on the CamelMimeMessage.
-	(set_editor_text): Use lowercase html tags...
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c (do_exit): Prompt the user to save their
-	composition in Drafts.
-	(set_editor_text): Uhm, use "-- \n" not "--\n" because the space
-	is called for in the standard
-	(e_msg_composer_new_with_message): New convenience function that
-	takes a CamelMimeMessage as an argument. This will be useful when
-	we code the ability to resume the editing of a message draft (like
-	in the Drafts folder).
-
-2000-08-01  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.h: Constify param
-
-	* e-msg-composer.c (get_signature): Constify param
-	(set_editor_text): ditto
-	(e_msg_composer_new_with_sig_file): ditto
-
-2000-08-01  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): sizeof("--\") !=
-	strlen("--\n"), breaking the test for the signature prefix.
-
-2000-07-28  JP Rosevear  <jpr@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New
-	function to create composer with sig file set.
-	(e_msg_composer_get_sig_file): New function to get sig file
-	(e_msg_composer_set_sig_file): New function to set sig file
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* e-msg-composer.c (get_text): add textual exception printout.
-	(set_editor_text): close pre tags & check for pre-existing
-	sig separator.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c (menu_file_insert_file_cb): Mark this function
-	as FIXME because we're waiting for the HTML Editor Control to
-	support paste commands. Also some updates for when that happens.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: Remove GOAD support.
-	(create_editor): Try to give a more helpful error message when
-	failing to load the editor control.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (menu_format_html_cb): New callback for the
-	"Send HTML" menu toggle item.
-	(create_menubar_format): New.
-	(create_menubar): Call it.
-	(create_menubar_options): Removed.
-	(init): Initialize `send_html' and `attachment_bar_visible' to
-	FALSE.
-	(get_signature): Add `void' to the declaration.  This is C, not
-	C++.
-	(menu_file_close_cb): Renamed from `exit_cb'.
-	(menu_file_send_cb): Renamed from `send_cb'.
-	(menu_file_save_as_cb): Renamed from `save_as_cb'.
-	(menu_file_save_cb): Renamed from `save_cb'.
-	(menu_file_open_cb): Renamed from `open_cb'.
-	(menu_file_add_attachment_cb): Renamed from `add_attachment_cb'.
-	(menu_file_insert_file_cb): Renamed from `insert_file_cb'.
-	(e_msg_composer_set_send_html): New.
-	(build_message): Use the `send_html' flag instead of peeking the
-	`msg_format' gnome-config value directly.
-
-	* e-msg-composer.h: New member `send_html' in `EMsgComposer'.
-
-2000-07-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Changed to use BonoboUIHandler stuff directly
-	instead of translating from GnomeUIInfo.
-	(create_menubar_file): New.
-	(create_menubar_edit): New.
-	(create_menubar_view): New.
-	(create_menubar_options): New.
-	(create_menubar): Use these functions to set up the menu bar.
-	(create_toolbar): Use BonoboUIHandler directly instead of
-	converting from GnomeUIInfo.
-	(toolbar_view_attachments_clicked_cb): Removed.
-	(address_dialog_cb): Removed.
-	(address_dialog_destroy_cb): Removed.
-	(address_dialog_apply_cb): Removed.
-	(setup_address_dialog): Removed.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* e-msg-composer.c: (view_tree) Make the "View Attachments" item
-	a toggleitem ... so that it can be toggled...
-	(menu_view_attachments_activate_cb): Treat the widget correctly
-	and toggle correctly.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (exit_cb): Use it.
-	(delete_event): New, handler for the "delete_event" signal.
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (set_editor_text): Don't load "" into the
-	editor, because it will cause the editor component to g_warning.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Removed the extra frame here.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Create an empty "Edit" menu
-	for the editor control to insert itself into.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* .cvsignore: Ignore dynamically created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_entry): New.
-	(e_msg_composer_hdrs_set_to): Use it.
-	(e_msg_composer_hdrs_set_cc): Likewise
-	(e_msg_composer_hdrs_set_bcc): Likewise.
-	(e_msg_composer_hdrs_get_to): Replace implementation with a
-	`g_assert_not_reached()'.
-	(e_msg_composer_hdrs_get_cc): Likewise.
-	(e_msg_composer_hdrs_get_bcc): Likewise.
-
-	* e-msg-composer.c: Get rid of cut/copy/paste/undo as they
-	duplicate the editor toolbar and cannot be made to work for all
-	the widgets anyway.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer-hdrs.c: New member `corba_select_names' in
-	`EMsgComposerHdrsPrivate'.
-	(destroy): If not `CORBA_OBJECT_NIL', release.
-	(init): Init to `CORBA_OBJECT_NIL'.
-	(setup_corba): New.
-	(e_msg_composer_hdrs_new): Call it.
-	(add_entry): Create the entries by using the ::SelectNames
-	interface.
-	(address_button_clicked_cb): Activate the dialog through the
-	::SelectNames interface.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* e-msg-composer.c: Changed "Exit" to "Close" in the File menu.
-	This is a little more intuitive as it does not suggest exiting
-	the application, just says "close this window".
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-msg-composer-select-file.h for make
-	distcheck.
-
-2000-06-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c
-	(load): New.
-	(open_cb): Use it.
-	(save): New function.
-	(save_cb): Implemented by using it.
-	(save_as_cb): Likewise.
-
-2000-06-17  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_construct): I18N the title bar.
-
-	* Makefile.am (libcomposerinclude_HEADERS): Removed.  Move all the
-	`.h' files into `libcomposer_la_SOURCES' so that they get
-	distributed, but not installed.
-
-	* e-msg-composer.c (open_cb): New; implement the `Open' command.
-	(save_as_cb): New; implement the `Save as' command.
-	(init): Initialize the `persist_file_interface' and
-	`persist_stream_interface' members to NULL.
-	(destroy): Release the PersistStream and PersistFile interfaces.
-	(e_msg_composer_construct): Query the PersistFile and
-	PersistStream interfaces on the control and save them in the
-	`persist_file_interface' and `persist_stream_interface' members.
-	(get_text): Renamed from `get_editor_text'.  Get a
-	@persist_stream_interface instead of querying it a the control.
-	(build_message): Return NULL if `persist_stream_interface' is nil.
-
-	* e-msg-composer.h: New member `persist_file_interface' in
-	`EMsgComposer'.
-
-	* e-msg-composer-select-file.c: New.
-	* e-msg-composer-select-file.h: New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Make the `To:'
-	entry grab the keyboard focus.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to_entry): New.
-	(e_msg_composer_hdrs_get_cc_entry): New.
-	(e_msg_composer_hdrs_get_bcc_entry): New.
-	(e_msg_composer_hdrs_get_subject_entry): New.
-
-	* e-msg-composer.c (e_msg_composer_construct): Set the scroll
-	frame's shadow type to `GTK_SHADOW_IN'.
-	(format_text): Initialize `tabbing' to zero to shut down the
-	compiler.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (add_from_user): keep the
-	GtkFileSelection around between calls so we start up in the same
-	directory we ended up in last time around. (Also fixes a big
-	memory leak in that the code was already keeping the
-	GtkFileSelection around, it just wasn't remembering to reuse it.)
-
-	* e-msg-composer.c (format_text): Don't line-wrap lines that start
-	with ">".
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): If a paragraph starts with TABs,
-	indent the whole paragraph to that tab level.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c: Make the `attachment_scroll_frame' an
-	`EScrollFrame'.
-	(exit_cb): I18N the quit message.
-
-	* e-msg-composer.h: `attachment_scrolled_window' renamed to
-	`attachment_scroll_frame'.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (format_text): Don't break on non-breaking
-	spaces, don't keep non-breaking spaces that fall after a line
-	wrap, and translate non-breaking spaces to regular ones after
-	wrapping.
-
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_attach): New convenience
-	function.
-
-	* e-msg-composer-attachment.c: Store a CamelMimePart rather than
-	filename/description/mime_type info. Also record whether we were
-	told or guessed the MIME type.
-	(e_msg_composer_attachment_new_from_mime_part): New constructor.
-	(e_msg_composer_attachment_edit): Remove the "browse" button. (If
-	the user wants to change the actual file that the attachment is
-	based on, he should delete the attachment and create a new one...)
-	Remove the "Apply" button, because it's not all that useful. Make
-	the MIME type only track the filename if it was guessed rather
-	than being provided.
-
-	* e-msg-composer-attachment.glade: Remove "browse" and "apply"
-	buttons. Make filename editable.
-
-	* e-msg-composer-attachment-bar.c (sort): Removed. Send the
-	attachments in the order the user attached them in.
-	(text_changed): Removed, since we weren't enabling the relevant
-	GnomeIconList functionality that would have used this.
-	(update): Don't print the size if it's 0.
-	(attach_to_multipart, etc): adjust for EMsgComposerAttachment
-	changes.
-	(attach_to_multipart): Use 7bit encoding for message/ subparts.
-	(e_msg_composer_attachment_bar_attach_mime_part): New convenience
-	function.
-	
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer.c: Added the ability to save plain text mail.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): add a "format" argument so
-	we can fetch different kinds of text.
-	(format_text): New function to do line wrapping on plain text.
-	(build_message): Build multipart/alternative messages rather than
-	HTML-only ones. Yay. We don't suck (as much) any more!
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c: #include <errno.h>
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): Update for
-	PersistStream changes
-	(build_message): Update for CamelMultipart changes.
-
-	* e-msg-composer.c (get_signature): routine to read the user's
-	signature file.
-	(set_editor_text): If the user has configured a signature, append
-	it to the set text.
-	(e_msg_composer_new): Call set_editor_text with "" to load the
-	signature (if any).
-	
-2000-05-25  Not Zed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_data_wrapper_new
-	instead of camel_simple_data_wrapper_new.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Use
-	camel_simple_data_wrapper_new rather than camel_data_wrapper_new.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* e-msg-composer-attachment.glade: save translatable strings
-	* e-msg-composer-attachment.glade.h: file with strings
-	* e-msg-composer-address-dialog.glade: save translatable strings
-	* e-msg-composer-address-dialog.glade.h: file with strings
-
-2000-05-12  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text): NUL-terminate the data
-	extracted from the BonoboStream.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): deal with
-	Content-Transfer-Encoding a little bit at least.
-
-2000-05-07  Mathieu Lacage <mathieu@gnu.org>
-
-	* e-msg-composer.c (create_editor): remove FIXME and hardcoded 
-	string. You can write mails with OAF now.
-	
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): unref content, etc. after
-	attaching it to message.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): unref
-	part after attaching it.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-msg-composer-hdrs.c: Turned off focus in the To, Cc, and Bcc
-	buttons.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-hdrs.c (set_recipients): Update (minimally) for
-	Camel recipient changes.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new_from_url): New routine, to
-	process mailto URLs.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Only generate a multipart
-	message if there are attachments. Otherwise generate a single
-	part.
-
-	* Update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): add a
-	s/SIMPLE_// that notzed missed. Update to use
-	camel_mime_part_set_content.
-	* e-msg-composer.c (build_message): remove a now-unused variable.
-	Update for camel_mime_part_set_content.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* e-msg-composer.c (build_message): Use camel_mime_part_set_text()
-	to set the text rather than messing with data wrappers.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Change
-	for new camel-stream interfaces.
-	(attach_to_multipart): Also set base64 encoding by default.
-
-2000-04-25  Radek Doulik  <rodo@helixcode.com>
-
-	* e-msg-composer.c (create_editor): use uih here
-	(e_msg_composer_construct): create menubar/toolbar before creating
-	editor control
-
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: build libcomposer static and don't install it.
-
-	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was
-	only half-implemented. Finish it, mostly.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_add_header): new function to
-	make the composer record additional headers it should output.
-	(In-Reply-To), etc.
-	(build_message): output them
-
-2000-04-21  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_set_headers): 
-	(e_msg_composer_set_body_text): new functions
-	(exit_cb): Connect "Exit" menu item finally.
-
-	* e-msg-composer-hdrs.c: const poisoning
-	(e_msg_composer_hdrs_set_subject): 
-	(e_msg_composer_hdrs_get_subject): new functions
-
-	* e-msg-composer-address-entry.c: const poisoning
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (get_editor_text, set_editor_text): new
-	functions to get and set the contents of the HTML editor via
-	Bonobo::PersistStream.
-	(build_message): use get_editor_text. This works again.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* e-msg-composer.c (build_message): Change
-	camel_mime_message_new_with_session to camel_mime_message_new
-
-2000-03-17  bertrand  <bertrand@helixcode.com>
-
-	* e-msg-composer.c (create_menubar): Pass the composer as the data
-	for the menubar callbacks.
-
-2000-03-12  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: Modified to make the composer into a library, to be
-	used by the mail component.
-
-2000-03-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (create_toolbar): Pass the composer as the data
-	for the toolbar callbacks.
-	(e_msg_composer_construct): Connect the "changed" signal of the
-	attachment bar to `attachment_bar_changed()'.
-	(attachment_bar_changed): Renamed to `attachment_bar_changed_cb'.
-
-2000-03-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-msg-composer.c (e_msg_composer_new): Precondition:
-	gtk_main_level() greater than zero.
-	(e_msg_composer_construct): Likewise.
-	(create_menus): New function.  Set up menus through
-	BonoboUIHandler.
-	(e_msg_composer_construct): Use it.
-
-	* main.c (main): Initialize Bonobo.
-
-	* e-msg-composer.c (init): Initialize `uih' and `editor' to NULL.
-	Do not init `text' and `text_scrolled_window' anymore.
-	(destroy): Unref `uih'.
-	(e_msg_composer_construct): Create a new BonoboUIHandler and put
-	it into `uih'.
-	(create_editor): New helper function.
-	(e_msg_composer_construct): Use it to set up the editor.
-
-	* e-msg-composer.h: New member `uih' in `EMsgComposer'.  Removed
-	members `text', `text_scrolled_window'.  New member `editor'.
-
-	* Makefile.am (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(evolution_msg_composer_LDADD): Add `$(BONOBO_GNOME_LIBS)'.
-
-	* e-msg-composer.c (glade_connect): Removed.
-	(setup_signals): Removed.
-	(e_msg_composer_construct): Do not use libglade to set the toolbar
-	and menubar up.
-	(destroy): Removed libglade stuff.
-	(init): Likewise.
-
-	* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',
-	`appbar_gui'.
-
-	* e-msg-composer.glade: Removed.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* Makefile.am (evolution_msg_composer_LDADD): 
-	use $(EXTRA_GNOME_LIBS_THREADS) to link with gthread
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* Makefile.am: New Makefile to compile the message composer
-	executable.
-
-	* main.c: New file.
-
-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use
-	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones
-	that do not exist anymore.
-
-	* e-msg-composer-address-dialog.c
-	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'
-	instead of `E_GUIDIR'.
-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):
-	Likewise.
-	* e-msg-composer.c (e_msg_composer_construct): Likewise.
-
-(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the
-message composer.)
diff --git a/composer/Composer.idl b/composer/Composer.idl
deleted file mode 100644
index a6cb35c037..0000000000
--- a/composer/Composer.idl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <Evolution-Addressbook-SelectNames.idl>
-#include <Evolution-Composer.idl>
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
deleted file mode 100644
index 1e3701a594..0000000000
--- a/composer/Evolution-Composer.idl
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution-Composer.idl: Mail composer interfaces for Evolution
- *
- * Author:
- *   Dan Winship <danw@helixcode.com>
- * 
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	
-	interface Composer : Bonobo::Unknown {
-		struct Recipient {
-			string name;	/* UTF-8 */
-			string address;
-		};
-		typedef sequence<Recipient> RecipientList;
-
-		/**
-		 * set_headers:
-		 * @to: the "To" recipients
-		 * @cc: the "CC" recipients
-		 * @bcc: the "Bcc" recipients
-		 * @subject: the subject of the message
-		 *
-		 * Sets the composer headers. Any of @to, @cc, and
-		 * @bcc may be an empty list, and @subject may be an
-		 * empty string.
-		 **/
-		void set_headers (in RecipientList to, in RecipientList cc,
-				  in RecipientList bcc, in string subject);
-
-		/**
-		 * set_body_text:
-		 * @body: the body
-		 *
-		 * Sets the text in the body of the composer to
-		 * the given UTF-8 plain text.
-		 **/
-		void set_body_text (in string body);
-
-		/**
-		 * attach_MIME:
-		 * @data: the attachment data
-		 *
-		 * This adds an attachment to the composer. @data
-		 * should be a fully-formed MIME body part.
-		 **/
-		exception CouldNotParse {};
-		void attach_MIME (in string data)
-			raises (CouldNotParse);
-
-		/**
-		 * attach_data:
-		 * @content_type: the Content-Type header
-		 * @filename: the suggested filename, or ""
-		 * @description: a description of the data, or ""
-		 * @show_inline: whether the attachment should be
-		 * displayed inline or not.
-		 * @data: the raw attachment data
-		 *
-		 * This adds @data as an attachment, using the provided
-		 * information to generate MIME headers. @content_type
-		 * may contain just a MIME content type, or it may
-		 * contain a complete Content-Type header. @filename
-		 * is a filename for the Content-Disposition header
-		 * @description (if not "") provides the
-		 * Content-Description, and @show_inline determines if the
-		 * Content-Disposition is "inline" or "attachment".
-		 *
-		 * If you need to specify headers or values other than
-		 * what this function can do, you will need to generate
-		 * all of the MIME headers yourself and use
-		 * add_attachment ().
-		 **/
-		void attach_data (in string content_type,
-				  in string filename,
-				  in string description,
-				  in boolean show_inline,
-				  in string data);
-
-
-		/**
-		 * show:
-		 *
-		 * Shows the composer and lets the user edit things
-		 * and send the message.
-		 **/
-		void show ();
-	};
-};
diff --git a/composer/Makefile.am b/composer/Makefile.am
deleted file mode 100644
index 144c3f85a8..0000000000
--- a/composer/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## CORBA stuff
-
-IDLS =				\
-	Evolution-Composer.idl	\
-	Composer.idl
-
-IDL_GENERATED =			\
-	Composer.h		\
-	Composer-common.c	\
-	Composer-skels.c	\
-	Composer-stubs.c
-
-HTML_EDITOR_GENERATED =		\
-	HTMLEditor.h		\
-	HTMLEditor-common.c	\
-	HTMLEditor-skels.c	\
-	HTMLEditor-stubs.c
-
-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
-
-$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(selectnamesdir) -I . $(srcdir)/Composer.idl
-
-$(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL)
-	$(ORBIT_IDL) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)
-
-##
-
-gladedir = $(datadir)/evolution/glade
-
-glade_DATA =					\
-	e-msg-composer-attachment.glade
-
-glade_messages = \
-	e-msg-composer-attachment.glade.h
-
-libcomposerincludedir = $(includedir)/composer
-
-noinst_LTLIBRARIES = libcomposer.la
-libcomposer_la_LDFLAGS = -static
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_builddir)/widgets					\
-	-I$(top_srcdir)/camel					 	\
-	-I$(top_builddir)/camel					 	\
-	-I$(top_builddir)/addressbook/gui/component/select-names	\
-	-I$(top_builddir)/shell						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	$(GNOME_INCLUDEDIR)						\
-	$(BONOBO_GNOME_CFLAGS)						\
-	$(GTKHTML_CFLAGS)						\
-	$(UNICODE_CFLAGS)						\
-	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
-	-DE_GLADEDIR=\"$(gladedir)\"					\
-	-DG_LOG_DOMAIN=\"composer\"
-
-libcomposer_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	$(HTML_EDITOR_GENERATED)		\
-	e-msg-composer-attachment-bar.c		\
-	e-msg-composer-attachment-bar.h		\
-	e-msg-composer-attachment.c		\
-	e-msg-composer-attachment.h		\
-	e-msg-composer-hdrs.c			\
-	e-msg-composer-hdrs.h			\
-	e-msg-composer-select-file.c		\
-	e-msg-composer-select-file.h		\
-	e-msg-composer.c			\
-	e-msg-composer.h			\
-	e-icon-list.c				\
-	e-icon-list.h				\
-	evolution-composer.c			\
-	evolution-composer.h			\
-	listener.c				\
-	listener.h
-
-EXTRA_DIST =					\
-	$(glade_DATA)				\
-	$(glade_messages)			\
-	bad-icon.xpm
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/composer/bad-icon.xpm b/composer/bad-icon.xpm
deleted file mode 100644
index 0a9cac23cd..0000000000
--- a/composer/bad-icon.xpm
+++ /dev/null
@@ -1,53 +0,0 @@
-/* XPM */
-static char * bad_icon_xpm[] = {
-"48 48 2 1",
-" 	g None",
-".	g #000000",
-"................................................",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".        .                              .      .",
-".         .                            .       .",
-".          .                          .        .",
-".           .                        .         .",
-".            .                      .          .",
-".             .                    .           .",
-".              .                  .            .",
-".               .                .             .",
-".                .              .              .",
-".                 .            .               .",
-".                  .          .                .",
-".                   .        .                 .",
-".                    .      .                  .",
-".                     .    .                   .",
-".                      .  .                    .",
-".                       ..                     .",
-".                       ..                     .",
-".                      .  .                    .",
-".                     .    .                   .",
-".                    .      .                  .",
-".                   .        .                 .",
-".                  .          .                .",
-".                 .            .               .",
-".                .              .              .",
-".               .                .             .",
-".              .                  .            .",
-".             .                    .           .",
-".            .                      .          .",
-".           .                        .         .",
-".          .                          .        .",
-".         .                            .       .",
-".        .                              .      .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-".                                              .",
-"................................................"};
diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c
deleted file mode 100644
index bdff6c5abe..0000000000
--- a/composer/e-icon-list.c
+++ /dev/null
@@ -1,2666 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
-  @NOTATION@
- */
-
-/*
- * GnomeIconList widget - scrollable icon list
- *
- * Authors:
- *    Federico Mena <federico@nuclecu.unam.mx>
- *    Miguel de Icaza <miguel@nuclecu.unam.mx>
- *
- * Rewrote from scratch from the code written by Federico Mena
- * <federico@nuclecu.unam.mx> to be based on a GnomeCanvas, and
- * to support banding selection and allow inline icon renaming.
- *
- * Redone somewhat by Elliot to support gdk-pixbuf, and to use GArray instead of GList for item storage.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include "e-icon-list.h"
-#include <libgnomeui/gnome-icon-item.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-#include "bad-icon.xpm"
-
-/* Aliases to minimize screen use in my laptop */
-#define EIL(x)       E_ICON_LIST(x)
-#define EIL_CLASS(x) E_ICON_LIST_CLASS(x)
-#define IS_EIL(x)    E_IS_ICON_LIST(x)
-
-typedef EIconList Eil;
-typedef EIconListClass EilClass;
-
-
-/* default spacings */
-#define DEFAULT_ROW_SPACING  4
-#define DEFAULT_COL_SPACING  2
-#define DEFAULT_TEXT_SPACING 2
-#define DEFAULT_ICON_BORDER  2
-
-/* Autoscroll timeout in milliseconds */
-#define SCROLL_TIMEOUT 30
-
-
-/* Signals */
-enum {
-	SELECT_ICON,
-	UNSELECT_ICON,
-	TEXT_CHANGED,
-	LAST_SIGNAL
-};
-
-typedef enum {
-	SYNC_INSERT,
-	SYNC_REMOVE
-} SyncType;
-
-enum {
-	ARG_0,
-};
-
-static guint eil_signals[LAST_SIGNAL] = { 0 };
-
-
-static GnomeCanvasClass *parent_class;
-
-
-/* Icon structure */
-typedef struct {
-	/* Icon image and text items */
-	GnomeCanvasPixbuf *image;
-	GnomeIconTextItem *text;
-
-	/* Filename of the icon file. */
-	gchar *icon_filename;
-
-	/* User data and destroy notify function */
-	gpointer data;
-	GtkDestroyNotify destroy;
-
-	/* ID for the text item's event signal handler */
-	guint text_event_id;
-
-	/* Whether the icon is selected, and temporary storage for rubberband
-         * selections.
-	 */
-	guint selected : 1;
-	guint tmp_selected : 1;
-} Icon;
-
-/* A row of icons */
-typedef struct {
-	GList *line_icons;
-	gint16 y;
-	gint16 icon_height, text_height;
-} IconLine;
-
-/* Private data of the EIconList structure */
-struct _EIconListPrivate {
-	/* List of icons */
-	GArray *icon_list;
-
-	/* List of rows of icons */
-	GList *lines;
-
-	/* Separators used to wrap the text below icons */
-	char *separators;
-
-	Icon *last_selected_icon;
-
-	/* Rubberband rectangle */
-	GnomeCanvasItem *sel_rect;
-
-	/* Saved event for a pending selection */
-	GdkEvent select_pending_event;
-
-	/* Max of the height of all the icon rows and window height */
-	int total_height;
-
-	/* Selection mode */
-	GtkSelectionMode selection_mode;
-
-	/* A list of integers with the indices of the currently selected icons */
-	GList *selection;
-
-	/* Number of icons in the list */
-	int icons;
-
-	/* Freeze count */
-	int frozen;
-
-	/* Width allocated for icons */
-	int icon_width;
-
-	/* Spacing values */
-	int row_spacing;
-	int col_spacing;
-	int text_spacing;
-	int icon_border;
-
-	/* Index and pointer to last selected icon */
-	int last_selected_idx;
-
-	/* Timeout ID for autoscrolling */
-	guint timer_tag;
-
-	/* Change the adjustment value by this amount when autoscrolling */
-	int value_diff;
-
-	/* Mouse position for autoscrolling */
-	int event_last_x;
-	int event_last_y;
-
-	/* Selection start position */
-	int sel_start_x;
-	int sel_start_y;
-
-	/* Modifier state when the selection began */
-	guint sel_state;
-
-	/* Whether the icon texts are editable */
-	guint is_editable : 1;
-
-	/* Whether the icon texts need to be copied */
-	guint static_text : 1;
-
-	/* Whether the icons need to be laid out */
-	guint dirty : 1;
-
-	/* Whether the user is performing a rubberband selection */
-	guint selecting : 1;
-
-	/* Whether editing an icon is pending after a button press */
-	guint edit_pending : 1;
-
-	/* Whether selection is pending after a button press */
-	guint select_pending : 1;
-
-	/* Whether the icon that is pending selection was selected to begin with */
-	guint select_pending_was_selected : 1;
-};
-
-
-static inline int
-icon_line_height (Eil *eil, IconLine *il)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	return il->icon_height + il->text_height + priv->row_spacing + priv->text_spacing;
-}
-
-static void
-icon_get_height (Icon *icon, int *icon_height, int *text_height)
-{
-	double d_icon_height;
-	gtk_object_get(GTK_OBJECT(icon->image), "height", &d_icon_height, NULL);
-	*icon_height = d_icon_height;
-	*text_height = icon->text->ti->height;
-}
-
-static int
-eil_get_items_per_line (Eil *eil)
-{
-	EIconListPrivate *priv;
-	int items_per_line;
-
-	priv = eil->_priv;
-
-	items_per_line = GTK_WIDGET (eil)->allocation.width / (priv->icon_width + priv->col_spacing);
-	if (items_per_line == 0)
-		items_per_line = 1;
-
-	return items_per_line;
-}
-
-/**
- * e_icon_list_get_items_per_line:
- * @eil: An icon list.
- *
- * Returns the number of icons that fit in a line or row.
- */
-int
-e_icon_list_get_items_per_line (EIconList *eil)
-{
-	g_return_val_if_fail (eil != NULL, 1);
-	g_return_val_if_fail (IS_EIL (eil), 1);
-
-	return eil_get_items_per_line (eil);
-}
-
-static void
-eil_place_icon (Eil *eil, Icon *icon, int x, int y, int icon_height)
-{
-	EIconListPrivate *priv;
-	int x_offset, y_offset;
-	double d_icon_image_height;
-	double d_icon_image_width;
-	int icon_image_height;
-	int icon_image_width;
-
-	priv = eil->_priv;
-
-	gtk_object_get(GTK_OBJECT(icon->image), "height", &d_icon_image_height, NULL);
-	icon_image_height = d_icon_image_height;
-	g_assert(icon_image_height != 0);
-	if (icon_height > icon_image_height)
-		y_offset = (icon_height - icon_image_height) / 2;
-	else
-		y_offset = 0;
-
-	gtk_object_get(GTK_OBJECT(icon->image), "width", &d_icon_image_width, NULL);
-	icon_image_width = d_icon_image_width;
-	g_assert(icon_image_width != 0);
-	if (priv->icon_width > icon_image_width)
-		x_offset = (priv->icon_width - icon_image_width) / 2;
-	else
-		x_offset = 0;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon->image),
-			       "x",  (double) (x + x_offset),
-			       "y",  (double) (y + y_offset),
-			       NULL);
-	gnome_icon_text_item_setxy (icon->text,
-				    x,
-				    y + icon_height + priv->text_spacing);
-}
-
-static void
-eil_layout_line (Eil *eil, IconLine *il)
-{
-	EIconListPrivate *priv;
-	GList *l;
-	int x;
-
-	priv = eil->_priv;
-
-	x = 0;
-	for (l = il->line_icons; l; l = l->next) {
-		Icon *icon = l->data;
-
-		eil_place_icon (eil, icon, x, il->y, il->icon_height);
-		x += priv->icon_width + priv->col_spacing;
-	}
-}
-
-static void
-eil_add_and_layout_line (Eil *eil, GList *line_icons, int y,
-			 int icon_height, int text_height)
-{
-	EIconListPrivate *priv;
-	IconLine *il;
-
-	priv = eil->_priv;
-
-	il = g_new (IconLine, 1);
-	il->line_icons = line_icons;
-	il->y = y;
-	il->icon_height = icon_height;
-	il->text_height = text_height;
-
-	eil_layout_line (eil, il);
-	priv->lines = g_list_append (priv->lines, il);
-}
-
-static void
-eil_relayout_icons_at (Eil *eil, int pos, int y)
-{
-	EIconListPrivate *priv;
-	int col, row, text_height, icon_height;
-	int items_per_line, n;
-	GList *line_icons;
-
-	priv = eil->_priv;
-	items_per_line = eil_get_items_per_line (eil);
-
-	col = row = text_height = icon_height = 0;
-	line_icons = NULL;
-
-	for (n = pos; n < priv->icon_list->len; n++) {
-		Icon *icon = g_array_index(priv->icon_list, Icon*, n);
-		int ih, th;
-
-		if (!(n % items_per_line)) {
-			if (line_icons) {
-				eil_add_and_layout_line (eil, line_icons, y,
-							 icon_height, text_height);
-				line_icons = NULL;
-
-				y += (icon_height + text_height
-				      + priv->row_spacing + priv->text_spacing);
-			}
-
-			icon_height = 0;
-			text_height = 0;
-		}
-
-		icon_get_height (icon, &ih, &th);
-
-		icon_height = MAX (ih, icon_height);
-		text_height = MAX (th, text_height);
-
-		line_icons = g_list_append (line_icons, icon);
-	}
-
-	if (line_icons)
-		eil_add_and_layout_line (eil, line_icons, y, icon_height, text_height);
-}
-
-static void
-eil_free_line_info (Eil *eil)
-{
-	EIconListPrivate *priv;
-	GList *l;
-
-	priv = eil->_priv;
-
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		g_list_free (il->line_icons);
-		g_free (il);
-	}
-
-	g_list_free (priv->lines);
-	priv->lines = NULL;
-	priv->total_height = 0;
-}
-
-static void
-eil_free_line_info_from (Eil *eil, int first_line)
-{
-	EIconListPrivate *priv;
-	GList *l, *ll;
-
-	priv = eil->_priv;
-	ll = g_list_nth (priv->lines, first_line);
-
-	for (l = ll; l; l = l->next) {
-		IconLine *il = l->data;
-
-		g_list_free (il->line_icons);
-		g_free (il);
-	}
-
-	if (priv->lines) {
-		if (ll->prev)
-			ll->prev->next = NULL;
-		else
-			priv->lines = NULL;
-	}
-
-	g_list_free (ll);
-}
-
-static void
-eil_layout_from_line (Eil *eil, int line)
-{
-	EIconListPrivate *priv;
-	GList *l;
-	int height;
-
-	priv = eil->_priv;
-
-	eil_free_line_info_from (eil, line);
-
-	height = 0;
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		height += icon_line_height (eil, il);
-	}
-
-	eil_relayout_icons_at (eil, line * eil_get_items_per_line (eil), height);
-}
-
-static void
-eil_layout_all_icons (Eil *eil)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	eil_free_line_info (eil);
-	eil_relayout_icons_at (eil, 0, 0);
-	priv->dirty = FALSE;
-}
-
-static void
-eil_scrollbar_adjust (Eil *eil)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	GList *l;
-	double wx, wy, wx1, wy1, wx2, wy2;
-	int height, step_increment;
-
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	height = 0;
-	step_increment = 0;
-	for (l = priv->lines; l; l = l->next) {
-		IconLine *il = l->data;
-
-		height += icon_line_height (eil, il);
-
-		if (l == priv->lines)
-			step_increment = height;
-	}
-
-	if (!step_increment)
-		step_increment = 10;
-
-	priv->total_height = MAX (height, GTK_WIDGET (eil)->allocation.height);
-
-	gnome_canvas_c2w (GNOME_CANVAS (eil), 0, 0, &wx1, &wy1);
-	gnome_canvas_c2w (GNOME_CANVAS (eil),
-			  GTK_WIDGET (eil)->allocation.width,
-			  priv->total_height,
-			  &wx2, &wy2);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil),
-					wx1, wy1, wx2, wy2);
-
-	wx = wy = 0;
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), 0, 0, &wx, &wy);
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	adj->upper = priv->total_height;
-	adj->step_increment = step_increment;
-	adj->page_increment = GTK_WIDGET (eil)->allocation.height;
-	adj->page_size = GTK_WIDGET (eil)->allocation.height;
-
-	if (wy > adj->upper - adj->page_size)
-		wy = adj->upper - adj->page_size;
-
-	adj->value = wy;
-
-	gtk_adjustment_changed (adj);
-}
-
-/* Emits the select_icon or unselect_icon signals as appropriate */
-static void
-emit_select (Eil *eil, int sel, int i, GdkEvent *event)
-{
-	gtk_signal_emit (GTK_OBJECT (eil),
-			 eil_signals[sel ? SELECT_ICON : UNSELECT_ICON],
-			 i,
-			 event);
-}
-
-static int
-eil_unselect_all (EIconList *eil, GdkEvent *event, gpointer keep)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-	int i, idx = 0;
-
-	g_return_val_if_fail (eil != NULL, 0);
-	g_return_val_if_fail (IS_EIL (eil), 0);
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		if (icon == keep)
-			idx = i;
-		else if (icon->selected)
-			emit_select (eil, FALSE, i, event);
-	}
-
-	return idx;
-}
-
-/**
- * e_icon_list_unselect_all:
- * @eil:   An icon list.
- *
- * Returns: the number of icons in the icon list
- */
-int
-e_icon_list_unselect_all (EIconList *eil)
-{
-	return eil_unselect_all (eil, NULL, NULL);
-}
-
-static void
-sync_selection (Eil *eil, int pos, SyncType type)
-{
-	GList *list;
-
-	for (list = eil->_priv->selection; list; list = list->next) {
-		if (GPOINTER_TO_INT (list->data) >= pos) {
-			int i = GPOINTER_TO_INT (list->data);
-
-			switch (type) {
-			case SYNC_INSERT:
-				list->data = GINT_TO_POINTER (i + 1);
-				break;
-
-			case SYNC_REMOVE:
-				list->data = GINT_TO_POINTER (i - 1);
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		}
-	}
-}
-
-static int
-eil_icon_to_index (Eil *eil, Icon *icon)
-{
-	EIconListPrivate *priv;
-	int n;
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++)
-		if (g_array_index(priv->icon_list, Icon*, n) == icon)
-			return n;
-
-	g_assert_not_reached ();
-	return -1; /* Shut up the compiler */
-}
-
-/* Event handler for icons when we are in SINGLE or BROWSE mode */
-static gint
-selection_one_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	GnomeIconTextItem *text;
-	int retval;
-
-	priv = eil->_priv;
-	retval = FALSE;
-
-	/* We use a separate variable and ref the object because it may be
-	 * destroyed by one of the signal handlers.
-	 */
-	text = icon->text;
-	gtk_object_ref (GTK_OBJECT (text));
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		priv->edit_pending = FALSE;
-		priv->select_pending = FALSE;
-
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		if (!icon->selected) {
-			eil_unselect_all (eil, NULL, NULL);
-			emit_select (eil, TRUE, idx, event);
-		} else {
-			if (priv->selection_mode == GTK_SELECTION_SINGLE
-			    && (event->button.state & GDK_CONTROL_MASK))
-				emit_select (eil, FALSE, idx, event);
-			else if (on_text && priv->is_editable && event->button.button == 1)
-				priv->edit_pending = TRUE;
-			else
-				emit_select (eil, TRUE, idx, event);
-		}
-
-		retval = TRUE;
-		break;
-
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		emit_select (eil, TRUE, idx, event);
-		retval = TRUE;
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-		}
-
-		retval = TRUE;
-		break;
-
-	default:
-		break;
-	}
-
-	/* If the click was on the text and we actually did something, stop the
-	 * icon text item's own handler from executing.
-	 */
-	if (on_text && retval)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");
-
-	gtk_object_unref (GTK_OBJECT (text));
-
-	return retval;
-}
-
-/* Handles range selections when clicking on an icon */
-static void
-select_range (Eil *eil, Icon *icon, int idx, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	int a, b;
-	Icon *i;
-
-	priv = eil->_priv;
-
-	if (priv->last_selected_idx == -1) {
-		priv->last_selected_idx = idx;
-		priv->last_selected_icon = icon;
-	}
-
-	if (idx < priv->last_selected_idx) {
-		a = idx;
-		b = priv->last_selected_idx;
-	} else {
-		a = priv->last_selected_idx;
-		b = idx;
-	}
-
-	for (; a <= b; a++) {
-		i = g_array_index(priv->icon_list, Icon*, a);
-
-		if (!i->selected)
-			emit_select (eil, TRUE, a, NULL);
-	}
-
-	/* Actually notify the client of the event */
-	emit_select (eil, TRUE, idx, event);
-}
-
-/* Handles icon selection for MULTIPLE or EXTENDED selection modes */
-static void
-do_select_many (Eil *eil, Icon *icon, int idx, GdkEvent *event, int use_event)
-{
-	EIconListPrivate *priv;
-	int range, additive;
-
-	priv = eil->_priv;
-
-	range = (event->button.state & GDK_SHIFT_MASK) != 0;
-	additive = (event->button.state & GDK_CONTROL_MASK) != 0;
-
-	if (!additive) {
-		if (icon->selected)
-			eil_unselect_all (eil, NULL, icon);
-		else
-			eil_unselect_all (eil, NULL, NULL);
-	}
-
-	if (!range) {
-		if (additive)
-			emit_select (eil, !icon->selected, idx, use_event ? event : NULL);
-		else
-			emit_select (eil, TRUE, idx, use_event ? event : NULL);
-
-		priv->last_selected_idx = idx;
-		priv->last_selected_icon = icon;
-	} else
-		select_range (eil, icon, idx, use_event ? event : NULL);
-}
-
-/* Event handler for icons when we are in MULTIPLE or EXTENDED mode */
-static gint
-selection_many_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	GnomeIconTextItem *text;
-	int retval;
-	int additive, range;
-	int do_select;
-
-	priv = eil->_priv;
-	retval = FALSE;
-
-	/* We use a separate variable and ref the object because it may be
-	 * destroyed by one of the signal handlers.
-	 */
-	text = icon->text;
-	gtk_object_ref (GTK_OBJECT (text));
-
-	range = (event->button.state & GDK_SHIFT_MASK) != 0;
-	additive = (event->button.state & GDK_CONTROL_MASK) != 0;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		priv->edit_pending = FALSE;
-		priv->select_pending = FALSE;
-
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		do_select = TRUE;
-
-		if (additive || range) {
-			if (additive && !range) {
-				priv->select_pending = TRUE;
-				priv->select_pending_event = *event;
-				priv->select_pending_was_selected = icon->selected;
-
-				/* We have to emit this so that the client will
-				 * know about the click.
-				 */
-				emit_select (eil, TRUE, idx, event);
-				do_select = FALSE;
-			}
-		} else if (icon->selected) {
-			priv->select_pending = TRUE;
-			priv->select_pending_event = *event;
-			priv->select_pending_was_selected = icon->selected;
-
-			if (on_text && priv->is_editable && event->button.button == 1)
-				priv->edit_pending = TRUE;
-
-			emit_select (eil, TRUE, idx, event);
-			do_select = FALSE;
-		}
-#if 0
-		} else if (icon->selected && on_text && priv->is_editable
-			   && event->button.button == 1) {
-			priv->edit_pending = TRUE;
-			do_select = FALSE;
-		}
-#endif
-
-		if (do_select)
-			do_select_many (eil, icon, idx, event, TRUE);
-
-		retval = TRUE;
-		break;
-
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		/* Ignore wheel mouse clicks for now */
-		if (event->button.button > 3)
-			break;
-
-		emit_select (eil, TRUE, idx, event);
-		retval = TRUE;
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if (priv->select_pending) {
-			icon->selected = priv->select_pending_was_selected;
-			do_select_many (eil, icon, idx, &priv->select_pending_event, FALSE);
-			priv->select_pending = FALSE;
-			retval = TRUE;
-		}
-
-		if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-			retval = TRUE;
-		}
-#if 0
-		if (priv->select_pending) {
-			icon->selected = priv->select_pending_was_selected;
-			do_select_many (eil, icon, idx, &priv->select_pending_event);
-			priv->select_pending = FALSE;
-			retval = TRUE;
-		} else if (priv->edit_pending) {
-			gnome_icon_text_item_start_editing (text);
-			priv->edit_pending = FALSE;
-			retval = TRUE;
-		}
-#endif
-
-		break;
-
-	default:
-		break;
-	}
-
-	/* If the click was on the text and we actually did something, stop the
-	 * icon text item's own handler from executing.
-	 */
-	if (on_text && retval)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");
-
-	gtk_object_unref (GTK_OBJECT (text));
-
-	return retval;
-}
-
-/* Event handler for icons in the icon list */
-static gint
-icon_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	Icon *icon;
-	Eil *eil;
-	EIconListPrivate *priv;
-	int idx;
-	int on_text;
-
-	icon = data;
-	eil = EIL (item->canvas);
-	priv = eil->_priv;
-	idx = eil_icon_to_index (eil, icon);
-	on_text = item == GNOME_CANVAS_ITEM (icon->text);
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-		return selection_one_icon_event (eil, icon, idx, on_text, event);
-
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		return selection_many_icon_event (eil, icon, idx, on_text, event);
-
-	default:
-		g_assert_not_reached ();
-		return FALSE; /* Shut up the compiler */
-	}
-}
-
-/* Handler for the editing_started signal of an icon text item.  We block the
- * event handler so that it will not be called while the text is being edited.
- */
-static void
-editing_started (GnomeIconTextItem *iti, gpointer data)
-{
-	Icon *icon;
-
-	icon = data;
-	gtk_signal_handler_block (GTK_OBJECT (iti), icon->text_event_id);
-	eil_unselect_all (EIL (GNOME_CANVAS_ITEM (iti)->canvas), NULL, icon);
-}
-
-/* Handler for the editing_stopped signal of an icon text item.  We unblock the
- * event handler so that we can get events from it again.
- */
-static void
-editing_stopped (GnomeIconTextItem *iti, gpointer data)
-{
-	Icon *icon;
-
-	icon = data;
-	gtk_signal_handler_unblock (GTK_OBJECT (iti), icon->text_event_id);
-}
-
-static gboolean
-text_changed (GnomeCanvasItem *item, Icon *icon)
-{
-	Eil *eil;
-	gboolean accept;
-	int idx;
-
-	eil = EIL (item->canvas);
-	accept = TRUE;
-
-	idx = eil_icon_to_index (eil, icon);
-	gtk_signal_emit (GTK_OBJECT (eil),
-			 eil_signals[TEXT_CHANGED],
-			 idx, gnome_icon_text_item_get_text (icon->text),
-			 &accept);
-
-	return accept;
-}
-
-static void
-height_changed (GnomeCanvasItem *item, Icon *icon)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	int n;
-
-	eil = EIL (item->canvas);
-	priv = eil->_priv;
-
-	if (!GTK_WIDGET_REALIZED (eil))
-		return;
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	n = eil_icon_to_index (eil, icon);
-	eil_layout_from_line (eil, n / eil_get_items_per_line (eil));
-	eil_scrollbar_adjust (eil);
-}
-
-static Icon *
-icon_new_from_pixbuf (EIconList *eil, GdkPixbuf *im,
-		      const char *icon_filename, const char *text)
-{
-	EIconListPrivate *priv;
-	GnomeCanvas *canvas;
-	GnomeCanvasGroup *group;
-	Icon *icon;
-
-	priv = eil->_priv;
-	canvas = GNOME_CANVAS (eil);
-	group = GNOME_CANVAS_GROUP (canvas->root);
-
-	icon = g_new0 (Icon, 1);
-
-	if (icon_filename)
-		icon->icon_filename = g_strdup (icon_filename);
-	else
-		icon->icon_filename = NULL;
-
-	if (im == NULL)
-		im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); 
-	else
-		gdk_pixbuf_ref (im);
-
-	icon->image = GNOME_CANVAS_PIXBUF (gnome_canvas_item_new (
-		group,
-		gnome_canvas_pixbuf_get_type (),
-		"x", 0.0,
-		"y", 0.0,
-		"width", (double) gdk_pixbuf_get_width (im),
-		"height", (double) gdk_pixbuf_get_height (im),
-		"pixbuf", im,
-		NULL));
-	gdk_pixbuf_unref (im);
-
-	icon->text = GNOME_ICON_TEXT_ITEM (gnome_canvas_item_new (
-		group,
-		gnome_icon_text_item_get_type (),
-		NULL));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon->text),
-			       "use_broken_event_handling", FALSE,
-			       NULL);
-
-	gnome_icon_text_item_configure (icon->text,
-					0, 0, priv->icon_width, 
-					"-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1",
-					text, priv->is_editable, priv->static_text);
-
-	gtk_signal_connect (GTK_OBJECT (icon->image), "event",
-			    GTK_SIGNAL_FUNC (icon_event),
-			    icon);
-	icon->text_event_id = gtk_signal_connect (GTK_OBJECT (icon->text), "event",
-						  GTK_SIGNAL_FUNC (icon_event),
-						  icon);
-
-	gtk_signal_connect (GTK_OBJECT (icon->text), "editing_started",
-			    GTK_SIGNAL_FUNC (editing_started),
-			    icon);
-	gtk_signal_connect (GTK_OBJECT (icon->text), "editing_stopped",
-			    GTK_SIGNAL_FUNC (editing_stopped),
-			    icon);
-
-	gtk_signal_connect (GTK_OBJECT (icon->text), "text_changed",
-			    GTK_SIGNAL_FUNC (text_changed),
-			    icon);
-	gtk_signal_connect (GTK_OBJECT (icon->text), "height_changed",
-			    GTK_SIGNAL_FUNC (height_changed),
-			    icon);
-
-	return icon;
-}
-
-static Icon *
-icon_new (Eil *eil, const char *icon_filename, const char *text)
-{
-	GdkPixbuf *im;
-	Icon *retval;
-
-	if (icon_filename) {
-		im = gdk_pixbuf_new_from_file (icon_filename);
-
-		/* Bad icon image 
-		   Fixme. Need a better graphic. */
-		if (im == NULL)
-			im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); 
-	} else
-		im = NULL;
-
-	retval = icon_new_from_pixbuf (eil, im, icon_filename, text);
-
-	if(im)
-		gdk_pixbuf_unref(im);
-
-	return retval;
-}
-
-static int
-icon_list_append (Eil *eil, Icon *icon)
-{
-	EIconListPrivate *priv;
-	int pos;
-
-	priv = eil->_priv;
-
-	pos = priv->icons++;
-	g_array_append_val(priv->icon_list, icon);
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_BROWSE:
-		e_icon_list_select_icon (eil, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	if (!priv->frozen) {
-		/* FIXME: this should only layout the last line */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-
-	return priv->icons - 1;
-}
-
-static void
-icon_list_insert (Eil *eil, int pos, Icon *icon)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	if (pos == priv->icons) {
-		icon_list_append (eil, icon);
-		return;
-	}
-
-	g_array_insert_val(priv->icon_list, pos, icon);
-	priv->icons++;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_BROWSE:
-		e_icon_list_select_icon (eil, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	if (!priv->frozen) {
-		/* FIXME: this should only layout the lines from then one
-		 * containing the Icon to the end.
-		 */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-
-	sync_selection (eil, pos, SYNC_INSERT);
-}
-
-/**
- * e_icon_list_insert_pixbuf:
- * @eil:      An icon list.
- * @pos:      Position at which the new icon should be inserted.
- * @im:       Pixbuf image with the icon image.
- * @filename: Filename of the image file.
- * @text:     Text to be used for the icon's caption.
- *
- * Inserts an icon in the specified icon list.  The icon is created from the
- * specified Imlib image, and it is inserted at the @pos index.
- */
-void
-e_icon_list_insert_pixbuf (EIconList *eil, int pos, GdkPixbuf *im,
-			       const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);
-	icon_list_insert (eil, pos, icon);
-	return;
-}
-
-/**
- * e_icon_list_insert:
- * @eil:           An icon list.
- * @pos:           Position at which the new icon should be inserted.
- * @icon_filename: Name of the file that holds the icon's image.
- * @text:          Text to be used for the icon's caption.
- *
- * Inserts an icon in the specified icon list.  The icon's image is loaded
- * from the specified file, and it is inserted at the @pos index.
- */
-void
-e_icon_list_insert (EIconList *eil, int pos, const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	icon = icon_new (eil, icon_filename, text);
-	icon_list_insert (eil, pos, icon);
-	return;
-}
-
-/**
- * e_icon_list_append_pixbuf:
- * @eil:      An icon list.
- * @im:       Pixbuf image with the icon image.
- * @filename: Filename of the image file.
- * @text:     Text to be used for the icon's caption.
- *
- * Appends an icon to the specified icon list.  The icon is created from
- * the specified Imlib image.
- */
-int
-e_icon_list_append_pixbuf (EIconList *eil, GdkPixbuf *im,
-			       const char *icon_filename, const char *text)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);
-	return icon_list_append (eil, icon);
-}
-
-/**
- * e_icon_list_append:
- * @eil:           An icon list.
- * @icon_filename: Name of the file that holds the icon's image.
- * @text:          Text to be used for the icon's caption.
- *
- * Appends an icon to the specified icon list.  The icon's image is loaded from
- * the specified file, and it is inserted at the @pos index.
- */
-int
-e_icon_list_append (EIconList *eil, const char *icon_filename,
-			const char *text)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	icon = icon_new (eil, icon_filename, text);
-	return icon_list_append (eil, icon);
-}
-
-static void
-icon_destroy (Icon *icon)
-{
-	if (icon->destroy)
-		(* icon->destroy) (icon->data);
-
-	g_free (icon->icon_filename);
-
-	gtk_object_destroy (GTK_OBJECT (icon->image));
-	gtk_object_destroy (GTK_OBJECT (icon->text));
-	g_free (icon);
-}
-
-/**
- * e_icon_list_remove:
- * @eil: An icon list.
- * @pos: Index of the icon that should be removed.
- *
- * Removes the icon at index position @pos.  If a destroy handler was specified
- * for that icon, it will be called with the appropriate data.
- */
-void
-e_icon_list_remove (EIconList *eil, int pos)
-{
-	EIconListPrivate *priv;
-	int was_selected;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	was_selected = FALSE;
-
-	icon = g_array_index(priv->icon_list, Icon*, pos);
-
-	if (icon->selected) {
-		was_selected = TRUE;
-
-		switch (priv->selection_mode) {
-		case GTK_SELECTION_SINGLE:
-		case GTK_SELECTION_BROWSE:
-		case GTK_SELECTION_MULTIPLE:
-		case GTK_SELECTION_EXTENDED:
-			e_icon_list_unselect_icon (eil, pos);
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	g_array_remove_index(priv->icon_list, pos);
-	priv->icons--;
-
-	sync_selection (eil, pos, SYNC_REMOVE);
-
-	if (was_selected) {
-		switch (priv->selection_mode) {
-		case GTK_SELECTION_BROWSE:
-			if (pos == priv->icons)
-				e_icon_list_select_icon (eil, pos - 1);
-			else
-				e_icon_list_select_icon (eil, pos);
-
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	if (priv->icons >= priv->last_selected_idx)
-		priv->last_selected_idx = -1;
-
-	if (priv->last_selected_icon == icon)
-		priv->last_selected_icon = NULL;
-
-	icon_destroy (icon);
-
-	if (!priv->frozen) {
-		/* FIXME: Optimize, only re-layout from pos to end */
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-/**
- * e_icon_list_clear:
- * @eil: An icon list.
- *
- * Clears the contents for the icon list by removing all the icons.  If destroy
- * handlers were specified for any of the icons, they will be called with the
- * appropriate data.
- */
-void
-e_icon_list_clear (EIconList *eil)
-{
-	EIconListPrivate *priv;
-	int i;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++)
-		icon_destroy (g_array_index (priv->icon_list, Icon*, i));
-
-	eil_free_line_info (eil);
-
-	g_list_free (priv->selection);
-	priv->selection = NULL;
-	g_array_set_size(priv->icon_list, 0);
-	priv->icons = 0;
-	priv->last_selected_idx = -1;
-	priv->last_selected_icon = NULL;
-
-	if (!priv->frozen) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-static void
-eil_destroy (GtkObject *object)
-{
-	Eil *eil;
-
-	/* remember, destroy can be run multiple times! */
-
-	eil = EIL (object);
-
-	g_free (eil->_priv->separators);
-	eil->_priv->separators = NULL;
-
-	eil->_priv->frozen = 1;
-	eil->_priv->dirty  = TRUE;
-	if(eil->_priv->icon_list) {
-		e_icon_list_clear (eil);
-		g_array_free(eil->_priv->icon_list, TRUE);
-	}
-	eil->_priv->icon_list = NULL;
-
-	if (eil->_priv->timer_tag != 0) {
-		gtk_timeout_remove (eil->_priv->timer_tag);
-		eil->_priv->timer_tag = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-eil_finalize (GtkObject *object)
-{
-	Eil *eil;
-
-	eil = EIL (object);
-
-	g_free (eil->_priv);
-	eil->_priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(*GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-static void
-select_icon (Eil *eil, int pos, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	gint i;
-	Icon *icon;
-
-	priv = eil->_priv;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-		i = 0;
-
-		for (i = 0; i < priv->icon_list->len; i++) {
-			icon = g_array_index (priv->icon_list, Icon*, i);
-
-			if (i != pos && icon->selected)
-				emit_select (eil, FALSE, i, event);
-		}
-
-		emit_select (eil, TRUE, pos, event);
-		break;
-
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		emit_select (eil, TRUE, pos, event);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/**
- * e_icon_list_select_icon:
- * @eil: An icon list.
- * @pos: Index of the icon to be selected.
- *
- * Selects the icon at the index specified by @pos.
- */
-void
-e_icon_list_select_icon (EIconList *eil, int pos)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	select_icon (eil, pos, NULL);
-}
-
-static void
-unselect_icon (Eil *eil, int pos, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-
-	priv = eil->_priv;
-
-	switch (priv->selection_mode) {
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_BROWSE:
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		emit_select (eil, FALSE, pos, event);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/**
- * e_icon_list_unselect_icon:
- * @eil: An icon list.
- * @pos: Index of the icon to be unselected.
- *
- * Unselects the icon at the index specified by @pos.
- */
-void
-e_icon_list_unselect_icon (EIconList *eil, int pos)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	unselect_icon (eil, pos, NULL);
-}
-
-static void
-eil_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	requisition->width = 1;
-	requisition->height = 1;
-}
-
-static void
-eil_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	if (priv->frozen)
-		return;
-
-	eil_layout_all_icons (eil);
-}
-
-static void
-eil_realize (GtkWidget *widget)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	GtkStyle *style;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	priv->frozen++;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	priv->frozen--;
-
-	/* Change the style to use the base color as the background */
-
-	style = gtk_style_copy (gtk_widget_get_style (widget));
-	style->bg[GTK_STATE_NORMAL] = style->base[GTK_STATE_NORMAL];
-	gtk_widget_set_style (widget, style);
-
-	gdk_window_set_background (GTK_LAYOUT (eil)->bin_window,
-				   &widget->style->bg[GTK_STATE_NORMAL]);
-
-	if (priv->frozen)
-		return;
-
-	if (priv->dirty) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	}
-}
-
-static void
-real_select_icon (Eil *eil, gint num, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (num >= 0 && num < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	icon = g_array_index (priv->icon_list, Icon*, num);
-
-	if (icon->selected)
-		return;
-
-	icon->selected = TRUE;
-	gnome_icon_text_item_select (icon->text, TRUE);
-	priv->selection = g_list_append (priv->selection, GINT_TO_POINTER (num));
-}
-
-static void
-real_unselect_icon (Eil *eil, gint num, GdkEvent *event)
-{
-	EIconListPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (num >= 0 && num < eil->_priv->icons);
-
-	priv = eil->_priv;
-
-	icon = g_array_index (priv->icon_list, Icon*, num);
-
-	if (!icon->selected)
-		return;
-
-	icon->selected = FALSE;
-	gnome_icon_text_item_select (icon->text, FALSE);
-	priv->selection = g_list_remove (priv->selection, GINT_TO_POINTER (num));
-}
-
-/* Saves the selection of the icon list to temporary storage */
-static void
-store_temp_selection (Eil *eil)
-{
-	EIconListPrivate *priv;
-	int i;
-	Icon *icon;
-
-	priv = eil->_priv;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		icon->tmp_selected = icon->selected;
-	}
-}
-
-#define gray50_width 2
-#define gray50_height 2
-static const char gray50_bits[] = {
-  0x02, 0x01, };
-
-/* Button press handler for the icon list */
-static gint
-eil_button_press (GtkWidget *widget, GdkEventButton *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	int only_one;
-	GdkBitmap *stipple;
-	double tx, ty;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	/* Invoke the canvas event handler and see if an item picks up the event */
-
-	if ((* GTK_WIDGET_CLASS (parent_class)->button_press_event) (widget, event))
-		return TRUE;
-
-	if (!(event->type == GDK_BUTTON_PRESS
-	      && event->button == 1
-	      && priv->selection_mode != GTK_SELECTION_BROWSE))
-		return FALSE;
-
-	only_one = priv->selection_mode == GTK_SELECTION_SINGLE;
-
-	if (only_one || (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0)
-		eil_unselect_all (eil, NULL, NULL);
-
-	if (only_one)
-		return TRUE;
-
-	if (priv->selecting)
-		return FALSE;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &tx, &ty);
-	priv->sel_start_x = tx;
-	priv->sel_start_y = ty;
-	priv->sel_state = event->state;
-	priv->selecting = TRUE;
-
-	store_temp_selection (eil);
-
-	stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
-	priv->sel_rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (eil)),
-						gnome_canvas_rect_get_type (),
-						"x1", tx,
-						"y1", ty,
-						"x2", tx,
-						"y2", ty,
-						"outline_color", "black",
-						"width_pixels", 1,
-						"outline_stipple", stipple,
-						NULL);
-	gdk_bitmap_unref (stipple);
-
-	gnome_canvas_item_grab (priv->sel_rect, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-				NULL, event->time);
-
-	return TRUE;
-}
-
-/* Returns whether the specified icon is at least partially inside the specified
- * rectangle.
- */
-static int
-icon_is_in_area (Icon *icon, int x1, int y1, int x2, int y2)
-{
-	double ix1, iy1, ix2, iy2;
-
-	if (x1 == x2 && y1 == y2)
-		return FALSE;
-
-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon->image), &ix1, &iy1, &ix2, &iy2);
-
-	if (ix1 <= x2 && iy1 <= y2 && ix2 >= x1 && iy2 >= y1)
-		return TRUE;
-
-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon->text), &ix1, &iy1, &ix2, &iy2);
-
-	if (ix1 <= x2 && iy1 <= y2 && ix2 >= x1 && iy2 >= y1)
-		return TRUE;
-
-	return FALSE;
-}
-
-/* Updates the rubberband selection to the specified point */
-static void
-update_drag_selection (Eil *eil, int x, int y)
-{
-	EIconListPrivate *priv;
-	int x1, x2, y1, y2;
-	int i;
-	Icon *icon;
-	int additive, invert;
-
-	priv = eil->_priv;
-
-	/* Update rubberband */
-
-	if (priv->sel_start_x < x) {
-		x1 = priv->sel_start_x;
-		x2 = x;
-	} else {
-		x1 = x;
-		x2 = priv->sel_start_x;
-	}
-
-	if (priv->sel_start_y < y) {
-		y1 = priv->sel_start_y;
-		y2 = y;
-	} else {
-		y1 = y;
-		y2 = priv->sel_start_y;
-	}
-
-	if (x1 < 0)
-		x1 = 0;
-
-	if (y1 < 0)
-		y1 = 0;
-
-	if (x2 >= GTK_WIDGET (eil)->allocation.width)
-		x2 = GTK_WIDGET (eil)->allocation.width - 1;
-
-	if (y2 >= priv->total_height)
-		y2 = priv->total_height - 1;
-
-	gnome_canvas_item_set (priv->sel_rect,
-			       "x1", (double) x1,
-			       "y1", (double) y1,
-			       "x2", (double) x2,
-			       "y2", (double) y2,
-			       NULL);
-
-	/* Select or unselect icons as appropriate */
-
-	additive = priv->sel_state & GDK_SHIFT_MASK;
-	invert = priv->sel_state & GDK_CONTROL_MASK;
-
-	for (i = 0; i < priv->icon_list->len; i++) {
-		icon = g_array_index(priv->icon_list, Icon*, i);
-
-		if (icon_is_in_area (icon, x1, y1, x2, y2)) {
-			if (invert) {
-				if (icon->selected == icon->tmp_selected)
-					emit_select (eil, !icon->selected, i, NULL);
-			} else if (additive) {
-				if (!icon->selected)
-					emit_select (eil, TRUE, i, NULL);
-			} else {
-				if (!icon->selected)
-					emit_select (eil, TRUE, i, NULL);
-			}
-		} else if (icon->selected != icon->tmp_selected)
-			emit_select (eil, icon->tmp_selected, i, NULL);
-	}
-}
-
-/* Button release handler for the icon list */
-static gint
-eil_button_release (GtkWidget *widget, GdkEventButton *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	double x, y;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (!priv->selecting)
-		return (* GTK_WIDGET_CLASS (parent_class)->button_release_event) (widget, event);
-
-	if (event->button != 1)
-		return FALSE;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &x, &y);
-	update_drag_selection (eil, x, y);
-	gnome_canvas_item_ungrab (priv->sel_rect, event->time);
-
-	gtk_object_destroy (GTK_OBJECT (priv->sel_rect));
-	priv->sel_rect = NULL;
-	priv->selecting = FALSE;
-
-	if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
-		priv->timer_tag = 0;
-	}
-
-	return TRUE;
-}
-
-/* Autoscroll timeout handler for the icon list */
-static gint
-scroll_timeout (gpointer data)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	double x, y;
-	int value;
-
-	eil = data;
-	priv = eil->_priv;
-
-	GDK_THREADS_ENTER ();
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	value = adj->value + priv->value_diff;
-	if (value > adj->upper - adj->page_size)
-		value = adj->upper - adj->page_size;
-
-	gtk_adjustment_set_value (adj, value);
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil),
-				      priv->event_last_x, priv->event_last_y,
-				      &x, &y);
-	update_drag_selection (eil, x, y);
-
-	GDK_THREADS_LEAVE();
-
-	return TRUE;
-}
-
-/* Motion event handler for the icon list */
-static gint
-eil_motion_notify (GtkWidget *widget, GdkEventMotion *event)
-{
-	Eil *eil;
-	EIconListPrivate *priv;
-	double x, y;
-
-	eil = EIL (widget);
-	priv = eil->_priv;
-
-	if (!priv->selecting)
-		return (* GTK_WIDGET_CLASS (parent_class)->motion_notify_event) (widget, event);
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event->x, event->y, &x, &y);
-	update_drag_selection (eil, x, y);
-
-	/* If we are out of bounds, schedule a timeout that will do the scrolling */
-
-	if (event->y < 0 || event->y > widget->allocation.height) {
-		if (priv->timer_tag == 0)
-			priv->timer_tag = gtk_timeout_add (SCROLL_TIMEOUT, scroll_timeout, eil);
-
-		if (event->y < 0)
-			priv->value_diff = event->y;
-		else
-			priv->value_diff = event->y - widget->allocation.height;
-
-		priv->event_last_x = event->x;
-		priv->event_last_y = event->y;
-
-		/* Make the steppings be relative to the mouse distance from the
-		 * canvas.  Also notice the timeout above is small to give a
-		 * more smooth movement.
-		 */
-		priv->value_diff /= 5;
-	} else if (priv->timer_tag != 0) {
-		gtk_timeout_remove (priv->timer_tag);
-		priv->timer_tag = 0;
-	}
-
-	return TRUE;
-}
-
-typedef gboolean (*xGtkSignal_BOOL__INT_POINTER) (GtkObject * object,
-						  gint     arg1,
-						  gpointer arg2,
-						  gpointer user_data);
-static void
-xgtk_marshal_BOOL__INT_POINTER (GtkObject *object, GtkSignalFunc func, gpointer func_data,
-				GtkArg *args)
-{
-  xGtkSignal_BOOL__INT_POINTER rfunc;
-  gboolean *return_val;
-
-  return_val = GTK_RETLOC_BOOL (args[2]);
-  rfunc = (xGtkSignal_BOOL__INT_POINTER) func;
-  *return_val = (*rfunc) (object,
-			  GTK_VALUE_INT (args[0]),
-			  GTK_VALUE_POINTER (args[1]),
-			  func_data);
-}
-
-static void
-eil_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EIconList *eil;
-
-	eil = E_ICON_LIST (object);
-
-	switch (arg_id) {
-	default:
-		break;
-	}
-}
-
-static void
-eil_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EIconList *eil;
-	EIconListPrivate *priv;
-
-	eil = E_ICON_LIST (object);
-	priv = eil->_priv;
-
-	switch (arg_id) {
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-eil_class_init (EilClass *eil_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkLayoutClass *layout_class;
-	GnomeCanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass *)   eil_class;
-	widget_class = (GtkWidgetClass *)   eil_class;
-	layout_class = (GtkLayoutClass *)   eil_class;
-	canvas_class = (GnomeCanvasClass *) eil_class;
-
-	parent_class = gtk_type_class (gnome_canvas_get_type ());
-
-	eil_signals[SELECT_ICON] =
-		gtk_signal_new (
-			"select_icon",
-			GTK_RUN_FIRST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, select_icon),
-			gtk_marshal_NONE__INT_POINTER,
-			GTK_TYPE_NONE, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_GDK_EVENT);
-
-	eil_signals[UNSELECT_ICON] =
-		gtk_signal_new (
-			"unselect_icon",
-			GTK_RUN_FIRST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, unselect_icon),
-			gtk_marshal_NONE__INT_POINTER,
-			GTK_TYPE_NONE, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_GDK_EVENT);
-
-	eil_signals[TEXT_CHANGED] =
-		gtk_signal_new (
-			"text_changed",
-			GTK_RUN_LAST,
-			object_class->type,
-			GTK_SIGNAL_OFFSET (EIconListClass, text_changed),
-			xgtk_marshal_BOOL__INT_POINTER,
-			GTK_TYPE_BOOL, 2,
-			GTK_TYPE_INT,
-			GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, eil_signals, LAST_SIGNAL);
-
-	object_class->destroy = eil_destroy;
-	object_class->finalize = eil_finalize;
-	object_class->set_arg = eil_set_arg;
-	object_class->get_arg = eil_get_arg;
-
-	widget_class->size_request = eil_size_request;
-	widget_class->size_allocate = eil_size_allocate;
-	widget_class->realize = eil_realize;
-	widget_class->button_press_event = eil_button_press;
-	widget_class->button_release_event = eil_button_release;
-	widget_class->motion_notify_event = eil_motion_notify;
-
-	eil_class->select_icon = real_select_icon;
-	eil_class->unselect_icon = real_unselect_icon;
-}
-
-static void
-eil_init (Eil *eil)
-{
-	eil->_priv = g_new0 (EIconListPrivate, 1);
-
-	eil->_priv->icon_list = g_array_new(FALSE, FALSE, sizeof(gpointer));
-	eil->_priv->row_spacing = DEFAULT_ROW_SPACING;
-	eil->_priv->col_spacing = DEFAULT_COL_SPACING;
-	eil->_priv->text_spacing = DEFAULT_TEXT_SPACING;
-	eil->_priv->icon_border = DEFAULT_ICON_BORDER;
-	eil->_priv->separators = g_strdup (" ");
-
-	eil->_priv->selection_mode = GTK_SELECTION_SINGLE;
-	eil->_priv->dirty = TRUE;
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil), 0.0, 0.0, 1000000.0, 1000000.0);
-	gnome_canvas_scroll_to (GNOME_CANVAS (eil), 0, 0);
-}
-
-/**
- * e_icon_list_get_type:
- *
- * Registers the &EIconList class if necessary, and returns the type ID
- * associated to it.
- *
- * Returns: The type ID of the &EIconList class.
- */
-guint
-e_icon_list_get_type (void)
-{
-	static guint eil_type = 0;
-
-	if (!eil_type) {
-		GtkTypeInfo eil_info = {
-			"EIconList",
-			sizeof (EIconList),
-			sizeof (EIconListClass),
-			(GtkClassInitFunc) eil_class_init,
-			(GtkObjectInitFunc) eil_init,
-			NULL,
-			NULL,
-			NULL
-		};
-
-		eil_type = gtk_type_unique (gnome_canvas_get_type (),
-					    &eil_info);
-	}
-
-	return eil_type;
-}
-
-/**
- * e_icon_list_set_icon_width:
- * @eil: An icon list.
- * @w:   New width for the icon columns.
- *
- * Sets the amount of horizontal space allocated to the icons, i.e. the column
- * width of the icon list.
- */
-void
-e_icon_list_set_icon_width (EIconList *eil, int w)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	priv->icon_width  = w;
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	eil_layout_all_icons (eil);
-	eil_scrollbar_adjust (eil);
-}
-
-
-/**
- * e_icon_list_construct:
- * @eil: An icon list.
- * @icon_width: Width for the icon columns.
- * @flags: A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.
- *
- * Constructor for the icon list, to be used by derived classes.
- **/
-void
-e_icon_list_construct (EIconList *eil, guint icon_width, int flags)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-
-	e_icon_list_set_icon_width (eil, icon_width);
-	priv->is_editable = (flags & E_ICON_LIST_IS_EDITABLE) != 0;
-	priv->static_text = (flags & E_ICON_LIST_STATIC_TEXT) != 0;
-}
-
-
-/**
- * e_icon_list_new: [constructor]
- * @icon_width: Width for the icon columns.
- * @flags:      A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.
- *
- * Creates a new icon list widget.  The icon columns are allocated a width of
- * @icon_width pixels.  Icon captions will be word-wrapped to this width as
- * well.
- *
- * If @flags has the %E_ICON_LIST_IS_EDITABLE flag set, then the user will be
- * able to edit the text in the icon captions, and the "text_changed" signal
- * will be emitted when an icon's text is changed.
- *
- * If @flags has the %E_ICON_LIST_STATIC_TEXT flags set, then the text
- * for the icon captions will not be copied inside the icon list; it will only
- * store the pointers to the original text strings specified by the application.
- * This is intended to save memory.  If this flag is not set, then the text
- * strings will be copied and managed internally.
- *
- * Returns: a newly-created icon list widget
- */
-GtkWidget *
-e_icon_list_new (guint icon_width, int flags)
-{
-	Eil *eil;
-
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	eil = EIL (gtk_type_new (e_icon_list_get_type ()));
-	gtk_widget_pop_colormap ();
-
-	e_icon_list_construct (eil, icon_width, flags);
-
-	return GTK_WIDGET (eil);
-}
-
-
-/**
- * e_icon_list_freeze:
- * @eil:  An icon list.
- *
- * Freezes an icon list so that any changes made to it will not be
- * reflected on the screen until it is thawed with e_icon_list_thaw().
- * It is recommended to freeze the icon list before inserting or deleting
- * many icons, for example, so that the layout process will only be executed
- * once, when the icon list is finally thawed.
- *
- * You can call this function multiple times, but it must be balanced with the
- * same number of calls to e_icon_list_thaw() before the changes will take
- * effect.
- */
-void
-e_icon_list_freeze (EIconList *eil)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	eil->_priv->frozen++;
-
-	/* We hide the root so that the user will not see any changes while the
-	 * icon list is doing stuff.
-	 */
-
-	if (eil->_priv->frozen == 1)
-		gnome_canvas_item_hide (GNOME_CANVAS (eil)->root);
-}
-
-/**
- * e_icon_list_thaw:
- * @eil:  An icon list.
- *
- * Thaws the icon list and performs any pending layout operations.  This
- * is to be used in conjunction with e_icon_list_freeze().
- */
-void
-e_icon_list_thaw (EIconList *eil)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (eil->_priv->frozen > 0);
-
-	eil->_priv->frozen--;
-
-	if (eil->_priv->dirty) {
-                eil_layout_all_icons (eil);
-                eil_scrollbar_adjust (eil);
-        }
-
-	if (eil->_priv->frozen == 0)
-		gnome_canvas_item_show (GNOME_CANVAS (eil)->root);
-}
-
-/**
- * e_icon_list_set_selection_mode
- * @eil:  An icon list.
- * @mode: New selection mode.
- *
- * Sets the selection mode for an icon list.  The %GTK_SELECTION_MULTIPLE and
- * %GTK_SELECTION_EXTENDED modes are considered equivalent.
- */
-void
-e_icon_list_set_selection_mode (EIconList *eil, GtkSelectionMode mode)
-{
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	eil->_priv->selection_mode = mode;
-	eil->_priv->last_selected_idx = -1;
-	eil->_priv->last_selected_icon = NULL;
-}
-
-/**
- * e_icon_list_set_icon_data_full:
- * @eil:     An icon list.
- * @pos:     Index of an icon.
- * @data:    User data to set on the icon.
- * @destroy: Destroy notification handler for the icon.
- *
- * Associates the @data pointer to the icon at the index specified by @pos.  The
- * @destroy argument points to a function that will be called when the icon is
- * destroyed, or NULL if no function is to be called when this happens.
- */
-void
-e_icon_list_set_icon_data_full (EIconList *eil,
-				    int pos, gpointer data,
-				    GtkDestroyNotify destroy)
-{
-	Icon *icon;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, pos);
-	icon->data = data;
-	icon->destroy = destroy;
-}
-
-/**
- * e_icon_list_get_icon_data:
- * @eil:  An icon list.
- * @pos:  Index of an icon.
- * @data: User data to set on the icon.
- *
- * Associates the @data pointer to the icon at the index specified by @pos.
- */
-void
-e_icon_list_set_icon_data (EIconList *eil, int pos, gpointer data)
-{
-	e_icon_list_set_icon_data_full (eil, pos, data, NULL);
-}
-
-/**
- * e_icon_list_get_icon_data:
- * @eil: An icon list.
- * @pos: Index of an icon.
- *
- * Returns the user data pointer associated to the icon at the index specified
- * by @pos.
- */
-gpointer
-e_icon_list_get_icon_data (EIconList *eil, int pos)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, NULL);
-	g_return_val_if_fail (IS_EIL (eil), NULL);
-	g_return_val_if_fail (pos >= 0 && pos < eil->_priv->icons, NULL);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, pos);
-	return icon->data;
-}
-
-/**
- * e_icon_list_find_icon_from_data:
- * @eil:    An icon list.
- * @data:   Data pointer associated to an icon.
- *
- * Returns the index of the icon whose user data has been set to @data,
- * or -1 if no icon has this data associated to it.
- */
-int
-e_icon_list_find_icon_from_data (EIconList *eil, gpointer data)
-{
-	EIconListPrivate *priv;
-	int n;
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		icon = g_array_index(priv->icon_list, Icon*, n);
-		if (icon->data == data)
-			return n;
-	}
-
-	return -1;
-}
-
-/* Sets an integer value in the private structure of the icon list, and updates it */
-static void
-set_value (EIconList *eil, EIconListPrivate *priv, int *dest, int val)
-{
-	if (val == *dest)
-		return;
-
-	*dest = val;
-
-	if (!priv->frozen) {
-		eil_layout_all_icons (eil);
-		eil_scrollbar_adjust (eil);
-	} else
-		priv->dirty = TRUE;
-}
-
-/**
- * e_icon_list_set_row_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels for inter-row spacing.
- *
- * Sets the spacing to be used between rows of icons.
- */
-void
-e_icon_list_set_row_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->row_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_col_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels for inter-column spacing.
- *
- * Sets the spacing to be used between columns of icons.
- */
-void
-e_icon_list_set_col_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->col_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_text_spacing:
- * @eil:    An icon list.
- * @pixels: Number of pixels between an icon's image and its caption.
- *
- * Sets the spacing to be used between an icon's image and its text caption.
- */
-void
-e_icon_list_set_text_spacing (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->text_spacing, pixels);
-}
-
-/**
- * e_icon_list_set_icon_border:
- * @eil:    An icon list.
- * @pixels: Number of border pixels to be used around an icon's image.
- *
- * Sets the width of the border to be displayed around an icon's image.  This is
- * currently not implemented.
- */
-void
-e_icon_list_set_icon_border (EIconList *eil, int pixels)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-
-	priv = eil->_priv;
-	set_value (eil, priv, &priv->icon_border, pixels);
-}
-
-/**
- * e_icon_list_set_separators:
- * @eil: An icon list.
- * @sep: String with characters to be used as word separators.
- *
- * Sets the characters that can be used as word separators when doing
- * word-wrapping in the icon text captions.
- */
-void
-e_icon_list_set_separators (EIconList *eil, const char *sep)
-{
-	EIconListPrivate *priv;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (sep != NULL);
-
-	priv = eil->_priv;
-
-	if (priv->separators)
-		g_free (priv->separators);
-
-	priv->separators = g_strdup (sep);
-
-	if (priv->frozen) {
-		priv->dirty = TRUE;
-		return;
-	}
-
-	eil_layout_all_icons (eil);
-	eil_scrollbar_adjust (eil);
-}
-
-/**
- * e_icon_list_moveto:
- * @eil:    An icon list.
- * @pos:    Index of an icon.
- * @yalign: Vertical alignment of the icon.
- *
- * Makes the icon whose index is @pos be visible on the screen.  The icon list
- * gets scrolled so that the icon is visible.  An alignment of 0.0 represents
- * the top of the visible part of the icon list, and 1.0 represents the bottom.
- * An icon can be centered on the icon list.
- */
-void
-e_icon_list_moveto (EIconList *eil, int pos, double yalign)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	IconLine *il;
-	GList *l;
-	int i, y, uh, line;
-
-	g_return_if_fail (eil != NULL);
-	g_return_if_fail (IS_EIL (eil));
-	g_return_if_fail (pos >= 0 && pos < eil->_priv->icons);
-	g_return_if_fail (yalign >= 0.0 && yalign <= 1.0);
-
-	priv = eil->_priv;
-
-	g_return_if_fail (priv->lines != NULL);
-
-	line = pos / eil_get_items_per_line (eil);
-
-	y = 0;
-	for (i = 0, l = priv->lines; l && i < line; l = l->next, i++) {
-		il = l->data;
-		y += icon_line_height (eil, il);
-	}
-
-	il = l->data;
-
-	uh = GTK_WIDGET (eil)->allocation.height - icon_line_height (eil,il);
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-	gtk_adjustment_set_value (adj, y - uh * yalign);
-}
-
-/**
- * e_icon_list_is_visible:
- * @eil: An icon list.
- * @pos: Index of an icon.
- *
- * Returns whether the icon at the index specified by @pos is visible.  This
- * will be %GTK_VISIBILITY_NONE if the icon is not visible at all,
- * %GTK_VISIBILITY_PARTIAL if the icon is at least partially shown, and
- * %GTK_VISIBILITY_FULL if the icon is fully visible.
- */
-GtkVisibility
-e_icon_list_icon_is_visible (EIconList *eil, int pos)
-{
-	EIconListPrivate *priv;
-	GtkAdjustment *adj;
-	IconLine *il;
-	GList *l;
-	int line, y1, y2, i;
-
-	g_return_val_if_fail (eil != NULL, GTK_VISIBILITY_NONE);
-	g_return_val_if_fail (IS_EIL (eil), GTK_VISIBILITY_NONE);
-	g_return_val_if_fail (pos >= 0 && pos < eil->_priv->icons,
-			      GTK_VISIBILITY_NONE);
-
-	priv = eil->_priv;
-
-	if (priv->lines == NULL)
-		return GTK_VISIBILITY_NONE;
-
-	line = pos / eil_get_items_per_line (eil);
-	y1 = 0;
-	for (i = 0, l = priv->lines; l && i < line; l = l->next, i++) {
-		il = l->data;
-		y1 += icon_line_height (eil, il);
-	}
-
-	y2 = y1 + icon_line_height (eil, (IconLine *) l->data);
-
-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));
-
-	if (y2 < adj->value)
-		return GTK_VISIBILITY_NONE;
-
-	if (y1 > adj->value + GTK_WIDGET (eil)->allocation.height)
-		return GTK_VISIBILITY_NONE;
-
-	if (y2 <= adj->value + GTK_WIDGET (eil)->allocation.height &&
-	    y1 >= adj->value)
-		return GTK_VISIBILITY_FULL;
-
-	return GTK_VISIBILITY_PARTIAL;
-}
-
-/**
- * e_icon_list_get_icon_at:
- * @eil: An icon list.
- * @x:   X position in the icon list window.
- * @y:   Y position in the icon list window.
- *
- * Returns the index of the icon that is under the specified coordinates, which
- * are relative to the icon list's window.  If there is no icon in that
- * position, -1 is returned.
- */
-int
-e_icon_list_get_icon_at (EIconList *eil, int x, int y)
-{
-	EIconListPrivate *priv;
-	double wx, wy;
-	double dx, dy;
-	int cx, cy;
-	int n;
-	GnomeCanvasItem *item;
-	double dist;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-
-	priv = eil->_priv;
-
-	dx = x;
-	dy = y;
-
-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), dx, dy, &wx, &wy);
-	gnome_canvas_w2c (GNOME_CANVAS (eil), wx, wy, &cx, &cy);
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		Icon *icon = g_array_index(priv->icon_list, Icon*, n);
-		GnomeCanvasItem *image = GNOME_CANVAS_ITEM (icon->image);
-		GnomeCanvasItem *text = GNOME_CANVAS_ITEM (icon->text);
-
-		if (wx >= image->x1 && wx <= image->x2 && wy >= image->y1 && wy <= image->y2) {
-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (image)->klass)->point) (
-				image,
-				wx, wy,
-				cx, cy,
-				&item);
-
-			if ((int) (dist * GNOME_CANVAS (eil)->pixels_per_unit + 0.5)
-			    <= GNOME_CANVAS (eil)->close_enough)
-				return n;
-		}
-
-		if (wx >= text->x1 && wx <= text->x2 && wy >= text->y1 && wy <= text->y2) {
-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (text)->klass)->point) (
-				text,
-				wx, wy,
-				cx, cy,
-				&item);
-
-			if ((int) (dist * GNOME_CANVAS (eil)->pixels_per_unit + 0.5)
-			    <= GNOME_CANVAS (eil)->close_enough)
-				return n;
-		}
-	}
-
-	return -1;
-}
-
-
-/**
- * e_icon_list_get_num_icons:
- * @eil: An icon list.
- *
- * Returns the number of icons in the icon list.
- */
-guint
-e_icon_list_get_num_icons (EIconList *eil)
-{
-	g_return_val_if_fail (E_IS_ICON_LIST (eil), 0);
-
-	return eil->_priv->icons;
-}
-
-
-/**
- * e_icon_list_get_selection:
- * @eil: An icon list.
- *
- * Returns a list of integers with the indices of the currently selected icons.
- */
-GList *
-e_icon_list_get_selection (EIconList *eil)
-{
-	g_return_val_if_fail (E_IS_ICON_LIST (eil), NULL);
-
-	return eil->_priv->selection;
-}
-
-
-/**
- * e_icon_list_get_selection:
- * @eil: An icon list.
- * @idx: Index of an @icon.
- *
- * Returns the filename of the icon with index @idx.
- */
-gchar *
-e_icon_list_get_icon_filename (EIconList *eil, int idx)
-{
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, NULL);
-	g_return_val_if_fail (IS_EIL (eil), NULL);
-	g_return_val_if_fail (idx >= 0 && idx < eil->_priv->icons, NULL);
-
-	icon = g_array_index (eil->_priv->icon_list, Icon*, idx);
-	return icon->icon_filename;
-}
-
-
-/**
- * e_icon_list_find_icon_from_filename:
- * @eil:       An icon list.
- * @filename:  Filename of an icon.
- *
- * Returns the index of the icon whose filename is @filename or -1 if
- * there is no icon with this filename.
- */
-int
-e_icon_list_find_icon_from_filename (EIconList *eil,
-				     const gchar *filename)
-{
-	EIconListPrivate *priv;
-	int n;
-	Icon *icon;
-
-	g_return_val_if_fail (eil != NULL, -1);
-	g_return_val_if_fail (IS_EIL (eil), -1);
-	g_return_val_if_fail (filename != NULL, -1);
-
-	priv = eil->_priv;
-
-	for (n = 0; n < priv->icon_list->len; n++) {
-		icon = g_array_index(priv->icon_list, Icon*, n);
-		if (!strcmp (icon->icon_filename, filename))
-			return n;
-	}
-
-	return -1;
-}
-
diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h
deleted file mode 100644
index 43f2fa105d..0000000000
--- a/composer/e-icon-list.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 1998, 1999 Free Software Foundation
- * Copyright (C) 2000 Red Hat, Inc.
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
-  @NOTATION@
- */
-
-/* GnomeIconList widget - scrollable icon list
- *
- *
- * Authors:
- *   Federico Mena   <federico@nuclecu.unam.mx>
- *   Miguel de Icaza <miguel@nuclecu.unam.mx>
- */
-
-#ifndef _E_ICON_LIST_H_
-#define _E_ICON_LIST_H_
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_ICON_LIST            (e_icon_list_get_type ())
-#define E_ICON_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList))
-#define E_ICON_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass))
-#define E_IS_ICON_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ICON_LIST))
-#define E_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST))
-#define E_ICON_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ICON_LIST, EIconListClass))
-
-typedef struct _EIconList        EIconList;
-typedef struct _EIconListPrivate EIconListPrivate;
-typedef struct _EIconListClass   EIconListClass;
-
-typedef enum {
-	E_ICON_LIST_ICONS,
-	E_ICON_LIST_TEXT_BELOW,
-	E_ICON_LIST_TEXT_RIGHT
-} EIconListMode;
-
-/* This structure has been converted to use public and private parts.  To avoid
- * breaking binary compatibility, the slots for private fields have been
- * replaced with padding.  Please remove these fields when gnome-libs has
- * reached another major version and it is "fine" to break binary compatibility.
- */
-struct _EIconList {
-	GnomeCanvas canvas;
-
-	/*< private >*/
-	EIconListPrivate * _priv;
-};
-
-struct _EIconListClass {
-	GnomeCanvasClass parent_class;
-
-	void     (*select_icon)    (EIconList *gil, gint num, GdkEvent *event);
-	void     (*unselect_icon)  (EIconList *gil, gint num, GdkEvent *event);
-	gboolean (*text_changed)   (EIconList *gil, gint num, const char *new_text);
-};
-
-enum {
-	E_ICON_LIST_IS_EDITABLE	= 1 << 0,
-	E_ICON_LIST_STATIC_TEXT	= 1 << 1
-};
-
-guint          e_icon_list_get_type            (void) G_GNUC_CONST;
-
-GtkWidget     *e_icon_list_new                 (guint         icon_width,
-						int           flags);
-void           e_icon_list_construct           (EIconList *gil,
-						guint icon_width,
-						int flags);
-
-
-/* To avoid excesive recomputes during insertion/deletion */
-void           e_icon_list_freeze              (EIconList *gil);
-void           e_icon_list_thaw                (EIconList *gil);
-
-
-void           e_icon_list_insert              (EIconList *gil,
-						int idx,
-						const char *icon_filename,
-						const char *text);
-void           e_icon_list_insert_pixbuf       (EIconList *gil,
-						int idx,
-						GdkPixbuf *im,
-						const char *icon_filename,
-						const char *text);
-
-int            e_icon_list_append              (EIconList *gil,
-						const char *icon_filename,
-						const char *text);
-int            e_icon_list_append_pixbuf       (EIconList *gil,
-						GdkPixbuf *im,
-						const char *icon_filename,
-						const char *text);
-
-void           e_icon_list_clear               (EIconList *gil);
-void           e_icon_list_remove              (EIconList *gil,
-						int idx);
-
-guint          e_icon_list_get_num_icons       (EIconList *gil);
-
-
-/* Managing the selection */
-void           e_icon_list_set_selection_mode  (EIconList *gil,
-						GtkSelectionMode mode);
-void           e_icon_list_select_icon         (EIconList *gil,
-						int idx);
-void           e_icon_list_unselect_icon       (EIconList *gil,
-						int idx);
-int            e_icon_list_unselect_all        (EIconList *gil);
-GList *        e_icon_list_get_selection       (EIconList *gil);
-
-/* Setting the spacing values */
-void           e_icon_list_set_icon_width      (EIconList *gil,
-						int w);
-void           e_icon_list_set_row_spacing     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_col_spacing     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_text_spacing    (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_icon_border     (EIconList *gil,
-						int pixels);
-void           e_icon_list_set_separators      (EIconList *gil,
-						const char *sep);
-/* Icon filename. */
-gchar *        e_icon_list_get_icon_filename   (EIconList *gil,
-						int idx);
-int            e_icon_list_find_icon_from_filename (EIconList *gil,
-						    const char *filename);
-
-/* Attaching information to the icons */
-void           e_icon_list_set_icon_data       (EIconList *gil,
-						int idx, gpointer data);
-void           e_icon_list_set_icon_data_full  (EIconList *gil,
-						int idx, gpointer data,
-						GtkDestroyNotify destroy);
-int            e_icon_list_find_icon_from_data (EIconList *gil,
-						gpointer data);
-gpointer       e_icon_list_get_icon_data       (EIconList *gil,
-						int idx);
-
-/* Visibility */
-void           e_icon_list_moveto              (EIconList *gil,
-						int idx, double yalign);
-GtkVisibility  e_icon_list_icon_is_visible     (EIconList *gil,
-						int idx);
-
-int            e_icon_list_get_icon_at         (EIconList *gil,
-						int x, int y);
-
-int            e_icon_list_get_items_per_line  (EIconList *gil);
-
-END_GNOME_DECLS
-
-#endif /* _GNOME_ICON_LIST_H_ */
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
deleted file mode 100644
index 07debafdd0..0000000000
--- a/composer/e-msg-composer-attachment-bar.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment-bar.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-select-file.h"
-#include "e-msg-composer-attachment.h"
-#include "e-msg-composer-attachment-bar.h"
-
-#include "e-icon-list.h"
-
-#include "camel/camel-data-wrapper.h"
-#include "camel/camel-stream-fs.h"
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-mime-part.h"
-
-
-#define ICON_WIDTH 64
-#define ICON_SEPARATORS " /-_"
-#define ICON_SPACING 2
-#define ICON_ROW_SPACING ICON_SPACING
-#define ICON_COL_SPACING ICON_SPACING
-#define ICON_BORDER 2
-#define ICON_TEXT_SPACING 2
-
-
-static EIconListClass *parent_class = NULL;
-
-struct _EMsgComposerAttachmentBarPrivate {
-	GList *attachments;
-	guint num_attachments;
-
-	GtkWidget *context_menu;
-	GtkWidget *icon_context_menu;
-};
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-static void update (EMsgComposerAttachmentBar *bar);
-
-
-static gchar *
-size_to_string (gulong size)
-{
-	gchar *size_string;
-
-	/* FIXME: The following should probably go into a separate module, as
-           we might have to do the same thing in other places as well.  Also,
-	   I am not sure this will be OK for all the languages.  */
-
-	if (size < 1e3L) {
-		if (size == 1)
-			size_string = g_strdup (_("1 byte"));
-		else
-			size_string = g_strdup_printf (_("%u bytes"),
-						       (guint) size);
-	} else {
-		gdouble displayed_size;
-
-		if (size < 1e6L) {
-			displayed_size = (gdouble) size / 1.0e3;
-			size_string = g_strdup_printf (_("%.1fK"),
-						       displayed_size);
-		} else if (size < 1e9L) {
-			displayed_size = (gdouble) size / 1.0e6;
-			size_string = g_strdup_printf (_("%.1fM"),
-						       displayed_size);
-		} else {
-			displayed_size = (gdouble) size / 1.0e9;
-			size_string = g_strdup_printf (_("%.1fG"),
-						       displayed_size);
-		}
-	}
-
-	return size_string;
-}
-
-/* Attachment handling functions.  */
-
-static void
-free_attachment_list (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GList *p;
-
-	priv = bar->priv;
-
-	for (p = priv->attachments; p != NULL; p = p->next)
-		gtk_object_unref (GTK_OBJECT (p->data));
-}
-
-static void
-attachment_changed_cb (EMsgComposerAttachment *attachment,
-		       gpointer data)
-{
-	update (E_MSG_COMPOSER_ATTACHMENT_BAR (data));
-}
-
-static void
-add_common (EMsgComposerAttachmentBar *bar,
-	    EMsgComposerAttachment *attachment)
-{
-	g_return_if_fail (attachment != NULL);
-
-	gtk_signal_connect (GTK_OBJECT (attachment), "changed",
-			    GTK_SIGNAL_FUNC (attachment_changed_cb),
-			    bar);
-
-	bar->priv->attachments = g_list_append (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments++;
-
-	update (bar);
-
-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);
-}
-
-static void
-add_from_mime_part (EMsgComposerAttachmentBar *bar,
-		    CamelMimePart *part)
-{
-	add_common (bar, e_msg_composer_attachment_new_from_mime_part (part));
-}
-
-static void
-add_from_file (EMsgComposerAttachmentBar *bar,
-	       const gchar *file_name, const gchar *content_id)
-{
-	add_common (bar, e_msg_composer_attachment_new (file_name, content_id));
-}
-
-static void
-remove_attachment (EMsgComposerAttachmentBar *bar,
-		   EMsgComposerAttachment *attachment)
-{
-	bar->priv->attachments = g_list_remove (bar->priv->attachments,
-						attachment);
-	bar->priv->num_attachments--;
-
-	gtk_object_unref (GTK_OBJECT (attachment));
-
-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);
-}
-
-
-/* Icon list contents handling.  */
-
-static void
-update (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	EIconList *icon_list;
-	GList *p;
-
-	priv = bar->priv;
-	icon_list = E_ICON_LIST (bar);
-
-	e_icon_list_freeze (icon_list);
-
-	e_icon_list_clear (icon_list);
-
-	/* FIXME could be faster, but we don't care.  */
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		EMsgComposerAttachment *attachment;
-		const gchar *icon_name, *desc;
-		gchar *size_string, *label, *mime_type;
-		GMimeContentField *content_type;
-		GdkPixbuf *pixbuf;
-		gboolean image = FALSE;
-		
-		attachment = p->data;
-		content_type = camel_mime_part_get_content_type (attachment->body);
-
-		mime_type = g_strdup_printf ("%s/%s", content_type->type,
-					     content_type->subtype);
-		icon_name = gnome_vfs_mime_get_value (mime_type,
-						      "icon-filename");
-		g_free (mime_type);
-
-		/* FIXME we need some better default icon.  */
-		if (icon_name == NULL)
-			icon_name = gnome_vfs_mime_get_value ("text/plain",
-							      "icon-filename");
-
-		/* Get the image out of the attachment 
-		   and create a thumbnail for it */
-		if (strcmp (content_type->type, "image") == 0)
-			image = TRUE;
-		else
-			image = FALSE;
-		
-		if (image && attachment->pixbuf_cache == NULL) {
-			CamelDataWrapper *wrapper;
-			CamelStream *mstream;
-			GdkPixbufLoader *loader;
-			gboolean error = TRUE;
-			char tmp[4096];
-			int t;
-
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
-			mstream = camel_stream_mem_new ();
-
-			camel_data_wrapper_write_to_stream (wrapper, mstream);
-
-			camel_stream_reset (mstream);
-
-			/* Stream image into pixbuf loader */
-			loader = gdk_pixbuf_loader_new ();
-			do {
-				t = camel_stream_read (mstream, tmp, 4096);
-				if (t > 0) {
-					error = !gdk_pixbuf_loader_write (loader,
-									  tmp, t);
-					if (error) {
-						break;
-					}
-				} else {
-					if (camel_stream_eos (mstream))
-						break;
-					error = TRUE;
-					break;
-				}
-				
-			} while (!camel_stream_eos (mstream));
-
-			if (!error) {
-				int ratio, width, height;
-				
-				/* Shrink pixbuf */
-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-				width = gdk_pixbuf_get_width (pixbuf);
-				height = gdk_pixbuf_get_height (pixbuf);
-				if (width >= height) {
-					if (width > 48) {
-						ratio = width / 48;
-						width = 48;
-						height = height / ratio;
-					}
-				} else {
-					if (height > 48) {
-						ratio = height / 48;
-						height = 48;
-						width = width / ratio;
-					}
-				}
-				
-				attachment->pixbuf_cache = gdk_pixbuf_scale_simple 
-					(pixbuf,
-					 width,
-					 height,
-					 GDK_INTERP_BILINEAR);
-			} else {
-				g_warning ("GdkPixbufLoader Error");
-				image = FALSE;
-			}
-
-			/* Destroy everything */
-			gdk_pixbuf_loader_close (loader);
-			gtk_object_destroy (GTK_OBJECT (loader));
-			camel_stream_close (mstream);
-		}
-		
-		desc = camel_mime_part_get_description (attachment->body);
-		if (!desc || *desc == '\0')
-			desc = camel_mime_part_get_filename (attachment->body);
-		if (!desc)
-			desc = _("attachment");
-		
-		if (attachment->size) {
-			size_string = size_to_string (attachment->size);
-			label = g_strdup_printf ("%s (%s)", desc, size_string);
-			g_free (size_string);
-		} else
-			label = g_strdup (desc);
-
-		if (image) {
-			e_icon_list_append_pixbuf (icon_list, attachment->pixbuf_cache, icon_name, label);
-		} else {
-			if (icon_name)
-				pixbuf = gdk_pixbuf_new_from_file (icon_name);
-			else
-				pixbuf = NULL;
-
-			/* Get the default */
-			if (pixbuf == NULL) {
-				icon_name = gnome_vfs_mime_get_value ("text/plain",
-								      "icon-filename");
-				if (icon_name != NULL)
-					pixbuf = gdk_pixbuf_new_from_file (icon_name);
-			}
-			e_icon_list_append_pixbuf (icon_list, pixbuf, 
-						   icon_name, label);
-			if (pixbuf)
-				gdk_pixbuf_unref (pixbuf);
-		}
-
-		g_free (label);
-	}
-
-	e_icon_list_thaw (icon_list);
-}
-
-static void
-remove_selected (EMsgComposerAttachmentBar *bar)
-{
-	EIconList *icon_list;
-	EMsgComposerAttachment *attachment;
-	GList *attachment_list;
-	GList *p;
-	gint num;
-
-	icon_list = E_ICON_LIST (bar);
-
-	/* Weee!  I am especially proud of this piece of cheesy code: it is
-           truly awful.  But unless one attaches a huge number of files, it
-           will not be as greedy as intended.  FIXME of course.  */
-
-	attachment_list = NULL;
-	p = e_icon_list_get_selection (icon_list);
-	for (; p != NULL; p = p->next) {
-		num = GPOINTER_TO_INT (p->data);
-		attachment = E_MSG_COMPOSER_ATTACHMENT
-			(g_list_nth (bar->priv->attachments, num)->data);
-		attachment_list = g_list_prepend (attachment_list, attachment);
-	}
-
-	for (p = attachment_list; p != NULL; p = p->next)
-		remove_attachment (bar, E_MSG_COMPOSER_ATTACHMENT (p->data));
-
-	g_list_free (attachment_list);
-
-	update (bar);
-}
-
-static void
-edit_selected (EMsgComposerAttachmentBar *bar)
-{
-	EIconList *icon_list;
-	EMsgComposerAttachment *attachment;
-	GList *selection;
-	gint num;
-
-	icon_list = E_ICON_LIST (bar);
-
-	selection = e_icon_list_get_selection (icon_list);
-	num = GPOINTER_TO_INT (selection->data);
-	attachment = g_list_nth (bar->priv->attachments, num)->data;
-
-	e_msg_composer_attachment_edit (attachment, GTK_WIDGET (bar));
-}
-
-
-/* "Attach" dialog.  */
-
-static void
-add_from_user (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposer *composer;
-	char *file_name;
-	
-	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
-	
-	file_name = e_msg_composer_select_file (composer, _("Attach a file"));
-	
-	add_from_file (bar, file_name, NULL);
-	
-	g_free (file_name);
-}
-
-
-/* Callbacks.  */
-
-static void
-add_cb (GtkWidget *widget,
-	gpointer data)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	add_from_user (E_MSG_COMPOSER_ATTACHMENT_BAR (data));
-}
-
-static void
-properties_cb (GtkWidget *widget,
-	       gpointer data)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);
-	edit_selected (data);
-}
-
-static void
-remove_cb (GtkWidget *widget,
-	   gpointer data)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);
-	remove_selected (bar);
-}
-
-
-/* Popup menu handling.  */
-
-static GnomeUIInfo icon_context_menu_info[] = {
-	GNOMEUIINFO_ITEM (N_("Remove"),
-			  N_("Remove selected items from the attachment list"),
-			  remove_cb, NULL),
-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (properties_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GtkWidget *
-get_icon_context_menu (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-
-	priv = bar->priv;
-	if (priv->icon_context_menu == NULL)
-		priv->icon_context_menu = gnome_popup_menu_new
-			(icon_context_menu_info);
-
-	return priv->icon_context_menu;
-}
-
-static void
-popup_icon_context_menu (EMsgComposerAttachmentBar *bar,
-			 gint num,
-			 GdkEventButton *event)
-{
-	GtkWidget *menu;
-
-	menu = get_icon_context_menu (bar);
-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);
-}
-
-static GnomeUIInfo context_menu_info[] = {
-	GNOMEUIINFO_ITEM (N_("Add attachment..."),
-			  N_("Attach a file to the message"),
-			  add_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GtkWidget *
-get_context_menu (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-
-	priv = bar->priv;
-	if (priv->context_menu == NULL)
-		priv->context_menu = gnome_popup_menu_new (context_menu_info);
-
-	return priv->context_menu;
-}
-
-static void
-popup_context_menu (EMsgComposerAttachmentBar *bar,
-		    GdkEventButton *event)
-{
-	GtkWidget *menu;
-
-	menu = get_context_menu (bar);
-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerAttachmentBar *bar;
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (object);
-
-	free_attachment_list (bar);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* GtkWidget methods.  */
-
-static gint
-button_press_event (GtkWidget *widget,
-		    GdkEventButton *event)
-{
-	EMsgComposerAttachmentBar *bar;
-	EIconList *icon_list;
-	gint icon_number;
-
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (widget);
-	icon_list = E_ICON_LIST (widget);
-
-	if (event->button != 3)
-		return GTK_WIDGET_CLASS (parent_class)->button_press_event
-			(widget, event);
-
-	icon_number = e_icon_list_get_icon_at (icon_list,
-					       event->x, event->y);
-
-	if (icon_number >= 0) {
-		e_icon_list_select_icon (icon_list, icon_number);
-		popup_icon_context_menu (bar, icon_number, event);
-	} else {
-		popup_context_menu (bar, event);
-	}
-
-	return TRUE;
-}
-
-
-/* Initialization.  */
-
-static void
-class_init (EMsgComposerAttachmentBarClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	EIconListClass *icon_list_class;
-
-	object_class = GTK_OBJECT_CLASS (class);
-	widget_class = GTK_WIDGET_CLASS (class);
-	icon_list_class = E_ICON_LIST_CLASS (class);
-
-	parent_class = gtk_type_class (e_icon_list_get_type ());
-
-	object_class->destroy = destroy;
-
-	widget_class->button_press_event = button_press_event;
-
-	/* Setup signals.  */
-
-	signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerAttachmentBarClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposerAttachmentBar *bar)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	guint icon_size;
-
-	priv = g_new (EMsgComposerAttachmentBarPrivate, 1);
-
-	priv->attachments = NULL;
-	priv->context_menu = NULL;
-	priv->icon_context_menu = NULL;
-
-	priv->num_attachments = 0;
-
-	bar->priv = priv;
-
-	/* FIXME partly hardcoded.  We should compute height from the font, and
-           allow at least 2 lines for every item.  */
-	icon_size = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;
-	icon_size += 24;
-
-	gtk_widget_set_usize (GTK_WIDGET (bar), icon_size * 4, icon_size);
-}
-
-
-GtkType
-e_msg_composer_attachment_bar_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerAttachmentBar",
-			sizeof (EMsgComposerAttachmentBar),
-			sizeof (EMsgComposerAttachmentBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (e_icon_list_get_type (), &info);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_attachment_bar_new (GtkAdjustment *adj)
-{
-	EMsgComposerAttachmentBar *new;
-	EIconList *icon_list;
-
-	gdk_rgb_init ();
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	new = gtk_type_new (e_msg_composer_attachment_bar_get_type ());
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	icon_list = E_ICON_LIST (new);
-
-	e_icon_list_construct (icon_list, ICON_WIDTH, 0);
-
-	e_icon_list_set_separators (icon_list, ICON_SEPARATORS);
-	e_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);
-	e_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);
-	e_icon_list_set_icon_border (icon_list, ICON_BORDER);
-	e_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);
-	e_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);
-
-	return GTK_WIDGET (new);
-}
-
-/* FIXME: is_8bit() and best_encoding() should really be shared
-   between e-msg-composer.c and this file. */
-static gboolean
-is_8bit (const guchar *text)
-{
-	guchar *c;
-	
-	for (c = (guchar *) text; *c; c++)
-		if (*c > (guchar) 127)
-			return TRUE;
-	
-	return FALSE;
-}
-
-static int
-best_encoding (const guchar *text)
-{
-	guchar *ch;
-	int count = 0;
-	int total;
-	
-	for (ch = (guchar *) text; *ch; ch++)
-		if (*ch > (guchar) 127)
-			count++;
-	
-	total = (int) (ch - text);
-	
-	if ((float) count <= total * 0.17)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-}
-
-static void
-attach_to_multipart (CamelMultipart *multipart,
-		     EMsgComposerAttachment *attachment)
-{
-	GMimeContentField *content_type;
-	
-	content_type = camel_mime_part_get_content_type (attachment->body);
-	
-	if (!g_strcasecmp (content_type->type, "text")) {
-		CamelStream *stream;
-		GByteArray *array;
-		guchar *text;
-		
-		array = g_byte_array_new ();
-		stream = camel_stream_mem_new_with_byte_array (array);
-		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment->body), stream);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		g_byte_array_append (array, "", 1);
-		text = array->data;
-		
-		if (is_8bit (text))
-			camel_mime_part_set_encoding (attachment->body, best_encoding (text));
-		else
-			camel_mime_part_set_encoding (attachment->body, CAMEL_MIME_PART_ENCODING_7BIT);
-		
-		g_byte_array_free (array, TRUE);
-	} else if (g_strcasecmp (content_type->type, "message") != 0) {
-		camel_mime_part_set_encoding (attachment->body,
-					      CAMEL_MIME_PART_ENCODING_BASE64);
-	}
-	
-	camel_multipart_add_part (multipart, attachment->body);
-}
-
-void
-e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar,
-					    CamelMultipart *multipart)
-{
-	EMsgComposerAttachmentBarPrivate *priv;
-	GList *p;
-
-	g_return_if_fail (bar != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-	g_return_if_fail (multipart != NULL);
-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));
-
-	priv = bar->priv;
-
-	for (p = priv->attachments; p != NULL; p = p->next) {
-		EMsgComposerAttachment *attachment;
-
-		attachment = E_MSG_COMPOSER_ATTACHMENT (p->data);
-		attach_to_multipart (multipart, attachment);
-	}
-}
-
-
-guint
-e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar)
-{
-	g_return_val_if_fail (bar != NULL, 0);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar), 0);
-
-	return bar->priv->num_attachments;
-}
-
-
-void
-e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar,
-				      const gchar *file_name, const gchar *content_id)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-
-	if (file_name == NULL)
-		add_from_user (bar);
-	else
-		add_from_file (bar, file_name, content_id);
-}
-
-void
-e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar,
-						CamelMimePart *part)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));
-
-	add_from_mime_part (bar, part);
-}
diff --git a/composer/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h
deleted file mode 100644
index 31a59cc149..0000000000
--- a/composer/e-msg-composer-attachment-bar.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-attachment-bar.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_BAR_H__
-
-#include <gnome.h>
-#include "e-icon-list.h"
-#include <camel/camel-multipart.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR \
-	(e_msg_composer_attachment_bar_get_type ())
-#define E_MSG_COMPOSER_ATTACHMENT_BAR(obj) \
-	(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar))
-#define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \
-	(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))
-
-
-typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate;
-
-struct _EMsgComposerAttachmentBar {
-	EIconList parent;
-
-	EMsgComposerAttachmentBarPrivate *priv;
-};
-typedef struct _EMsgComposerAttachmentBar       EMsgComposerAttachmentBar;
-
-struct _EMsgComposerAttachmentBarClass {
-	EIconListClass parent_class;
-
-	void (* changed) (EMsgComposerAttachmentBar *bar);
-};
-typedef struct _EMsgComposerAttachmentBarClass  EMsgComposerAttachmentBarClass;
-
-
-GtkType e_msg_composer_attachment_bar_get_type (void);
-GtkWidget *e_msg_composer_attachment_bar_new (GtkAdjustment *adj);
-void e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar, CamelMultipart *multipart);
-guint e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar);
-void e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar, const gchar *file_name, const gchar *content_id);
-void e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar, CamelMimePart *part);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MSG_COMPOSER_ATTACHMENT_BAR_H__ */
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
deleted file mode 100644
index 537774d109..0000000000
--- a/composer/e-msg-composer-attachment.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-/* This is the object representing an email attachment.  It is implemented as a
-   GtkObject to make it easier for the application to handle it.  For example,
-   the "changed" signal is emitted whenever something changes in the
-   attachment.  Also, this contains the code to let users edit the
-   attachment manually. */
-
-#include <sys/stat.h>
-
-#include <gnome.h>
-#include <camel/camel.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#include "e-msg-composer-attachment.h"
-
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GtkObjectClass *parent_class = NULL;
-
-
-/* Utility functions.  */
-
-static gchar *
-get_mime_type (const gchar *file_name)
-{
-	GnomeVFSFileInfo info;
-	GnomeVFSResult result;
-
-	result = gnome_vfs_get_file_info (file_name, &info,
-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result == GNOME_VFS_OK) {
-		gchar *type;
-
-		type = g_strdup (gnome_vfs_file_info_get_mime_type (&info));
-		gnome_vfs_file_info_unref (&info);
-		return type;
-	} else
-		return NULL;
-}
-
-static void
-changed (EMsgComposerAttachment *attachment)
-{
-	gtk_signal_emit (GTK_OBJECT (attachment), signals[CHANGED]);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerAttachment *attachment;
-
-	attachment = E_MSG_COMPOSER_ATTACHMENT (object);
-
-	camel_object_unref (CAMEL_OBJECT (attachment->body));
-	if (attachment->pixbuf_cache != NULL)
-		gdk_pixbuf_unref (attachment->pixbuf_cache);
-}
-
-
-/* Signals.  */
-
-static void
-real_changed (EMsgComposerAttachment *msg_composer_attachment)
-{
-	g_return_if_fail (msg_composer_attachment != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (msg_composer_attachment));
-}
-
-
-static void
-class_init (EMsgComposerAttachmentClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = destroy;
-
-	signals[CHANGED] = gtk_signal_new ("changed",
-					   GTK_RUN_FIRST,
-					   object_class->type,
-					   GTK_SIGNAL_OFFSET
-					   	(EMsgComposerAttachmentClass,
-						 changed),
-					   gtk_marshal_NONE__NONE,
-					   GTK_TYPE_NONE, 0);
-
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	klass->changed = real_changed;
-}
-
-static void
-init (EMsgComposerAttachment *msg_composer_attachment)
-{
-	msg_composer_attachment->editor_gui = NULL;
-	msg_composer_attachment->body = NULL;
-	msg_composer_attachment->size = 0;
-	msg_composer_attachment->pixbuf_cache = NULL;
-}
-
-GtkType
-e_msg_composer_attachment_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerAttachment",
-			sizeof (EMsgComposerAttachment),
-			sizeof (EMsgComposerAttachmentClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-
-/**
- * e_msg_composer_attachment_new:
- * @file_name: 
- * 
- * Return value: 
- **/
-EMsgComposerAttachment *
-e_msg_composer_attachment_new (const gchar *file_name, const gchar *content_id)
-{
-	EMsgComposerAttachment *new;
-	CamelMimePart *part;
-	CamelDataWrapper *wrapper;
-	CamelStream *stream;
-	struct stat statbuf;
-	gchar *mime_type;
-	
-	g_return_val_if_fail (file_name != NULL, NULL);
-	
-	if (stat (file_name, &statbuf) < 0)
-		return NULL;
-	
-	/* return if it's not a regular file */
-	if (!S_ISREG (statbuf.st_mode))
-		return NULL;
-	
-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);
-	if (!stream)
-		return NULL;
-	wrapper = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (wrapper, stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	mime_type = get_mime_type (file_name);
-	if (mime_type) {
-		camel_data_wrapper_set_mime_type (wrapper, mime_type);
-		g_free (mime_type);
-	} else
-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");
-	
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (CAMEL_OBJECT (wrapper));
-
-	if (content_id) {
-		gchar *id;
-
-		id = g_strconcat ("<", content_id, ">", NULL);
-		camel_mime_part_set_content_id (part, id);
-		g_free (id);
-	}
-
-	camel_mime_part_set_disposition (part, "attachment");
-	if (strchr (file_name, '/'))
-		camel_mime_part_set_filename (part, strrchr (file_name, '/') + 1);
-	else
-		camel_mime_part_set_filename (part, file_name);
-	
-	new = e_msg_composer_attachment_new_from_mime_part (part);
-	
-	new->size = statbuf.st_size;
-	new->guessed_type = TRUE;
-	
-	return new;
-}
-
-
-/**
- * e_msg_composer_attachment_new_from_mime_part:
- * @part: a CamelMimePart
- * 
- * Return value: a new EMsgComposerAttachment based on the mime part
- **/
-EMsgComposerAttachment *
-e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part)
-{
-	EMsgComposerAttachment *new;
-
-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);
-
-	new = gtk_type_new (e_msg_composer_attachment_get_type ());
-
-	new->editor_gui = NULL;
-	new->body = part;
-	camel_object_ref (CAMEL_OBJECT (part));
-	new->guessed_type = FALSE;
-	new->size = 0;
-
-	return new;
-}
-
-
-/* The attachment property dialog.  */
-
-struct _DialogData {
-	GtkWidget *dialog;
-	GtkEntry *file_name_entry;
-	GtkEntry *description_entry;
-	GtkEntry *mime_type_entry;
-	EMsgComposerAttachment *attachment;
-};
-typedef struct _DialogData DialogData;
-
-static void
-destroy_dialog_data (DialogData *data)
-{
-	g_free (data);
-}
-
-/*
- * fixme: I am converting EVERYTHING to/from UTF-8, although mime types
- * are in ASCII. This is not strictly necessary, but we want to be
- * consistent and possibly check for errors somewhere.
- */
-
-static void
-update_mime_type (DialogData *data)
-{
-	const gchar *mime_type;
-	gchar *file_name;
-
-	if (!data->attachment->guessed_type)
-		return;
-
-	file_name = e_utf8_gtk_entry_get_text (data->file_name_entry);
-	mime_type = get_mime_type (file_name);
-	g_free (file_name);
-
-	e_utf8_gtk_entry_set_text (data->mime_type_entry, mime_type);
-}
-
-static void
-set_entry (GladeXML *xml,
-	   const gchar *widget_name,
-	   const gchar *value)
-{
-	GtkEntry *entry;
-
-	entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name));
-	if (entry == NULL)
-		g_warning ("Entry for `%s' not found.", widget_name);
-	else
-		e_utf8_gtk_entry_set_text (entry, value ? value : "");
-}
-
-static void
-connect_widget (GladeXML *gui,
-		const gchar *name,
-		const gchar *signal_name,
-		GtkSignalFunc func,
-		gpointer data)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget (gui, name);
-	gtk_signal_connect (GTK_OBJECT (widget), signal_name, func, data);
-}
-
-static void
-close_cb (GtkWidget *widget,
-	  gpointer data)
-{
-	EMsgComposerAttachment *attachment;
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-
-	gtk_widget_destroy (glade_xml_get_widget (attachment->editor_gui,
-						  "dialog"));
-	gtk_object_unref (GTK_OBJECT (attachment->editor_gui));
-	attachment->editor_gui = NULL;
-
-	destroy_dialog_data (dialog_data);
-}
-
-static void
-ok_cb (GtkWidget *widget,
-       gpointer data)
-{
-	DialogData *dialog_data;
-	EMsgComposerAttachment *attachment;
-	gchar *str;
-
-	dialog_data = (DialogData *) data;
-	attachment = dialog_data->attachment;
-
-	str = e_utf8_gtk_entry_get_text (dialog_data->file_name_entry);
-	camel_mime_part_set_filename (attachment->body, str);
-	g_free (str);
-
-	str = e_utf8_gtk_entry_get_text (dialog_data->description_entry);
-	camel_mime_part_set_description (attachment->body, str);
-	g_free (str);
-
-	str = e_utf8_gtk_entry_get_text (dialog_data->mime_type_entry);
-	camel_mime_part_set_content_type (attachment->body, str);
-
-	camel_data_wrapper_set_mime_type (
-		camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body)), str);
-	g_free (str);
-
-	changed (attachment);
-	close_cb (widget, data);
-}
-
-static void
-file_name_focus_out_cb (GtkWidget *widget,
-			GdkEventFocus *event,
-			gpointer data)
-{
-	DialogData *dialog_data;
-
-	dialog_data = (DialogData *) data;
-	update_mime_type (dialog_data);
-}
-
-
-void
-e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
-				GtkWidget *parent)
-{
-	DialogData *dialog_data;
-	GladeXML *editor_gui;
-
-	g_return_if_fail (attachment != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (attachment));
-
-	if (attachment->editor_gui != NULL) {
-		GtkWidget *window;
-
-		window = glade_xml_get_widget (attachment->editor_gui,
-					       "dialog");
-		gdk_window_show (window->window);
-		return;
-	}
-
-	editor_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer-attachment.glade",
-				    NULL);
-	if (editor_gui == NULL) {
-		g_warning ("Cannot load `e-msg-composer-attachment.glade'");
-		return;
-	}
-
-	attachment->editor_gui = editor_gui;
-
-	gtk_window_set_transient_for
-		(GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),
-		 GTK_WINDOW (gtk_widget_get_toplevel (parent)));
-
-	dialog_data = g_new (DialogData, 1);
-	dialog_data->attachment = attachment;
-	dialog_data->dialog = glade_xml_get_widget (editor_gui, "dialog");
-	dialog_data->file_name_entry = GTK_ENTRY (glade_xml_get_widget
-						  (editor_gui,
-						   "file_name_entry"));
-	dialog_data->description_entry = GTK_ENTRY (glade_xml_get_widget
-						    (editor_gui,
-						     "description_entry"));
-	dialog_data->mime_type_entry = GTK_ENTRY (glade_xml_get_widget
-						  (editor_gui,
-						   "mime_type_entry"));
-
-	if (attachment != NULL) {
-		GMimeContentField *content_type;
-		char *type;
-
-		set_entry (editor_gui, "file_name_entry",
-			   camel_mime_part_get_filename (attachment->body));
-		set_entry (editor_gui, "description_entry",
-			   camel_mime_part_get_description (attachment->body));
-		content_type = camel_mime_part_get_content_type (attachment->body);
-		type = g_strdup_printf ("%s/%s", content_type->type,
-					content_type->subtype);
-		set_entry (editor_gui, "mime_type_entry", type);
-		g_free (type);
-	}
-
-	connect_widget (editor_gui, "ok_button", "clicked", ok_cb, dialog_data);
-	connect_widget (editor_gui, "close_button", "clicked", close_cb, dialog_data);
-
-	connect_widget (editor_gui, "file_name_entry", "focus_out_event",
-			file_name_focus_out_cb, dialog_data);
-}
diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade
deleted file mode 100644
index a9717bef69..0000000000
--- a/composer/e-msg-composer-attachment.glade
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-msg-composer-attachment</name>
-  <program_name>e-msg-composer-attachment</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-msg-composer-attachment.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog</name>
-  <title>Attachment properties</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>ok_button</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>close_button</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
-      <rows>3</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>10</row_spacing>
-      <column_spacing>5</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>description_entry</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>10</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>True</xshrink>
-	  <yshrink>True</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>file_name_entry</name>
-	  <width>290</width>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>mime_type_entry</name>
-	<sensitive>False</sensitive>
-	<can_focus>True</can_focus>
-	<editable>False</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>MIME type:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Description:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>File name:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/composer/e-msg-composer-attachment.glade.h b/composer/e-msg-composer-attachment.glade.h
deleted file mode 100644
index 845aea9b32..0000000000
--- a/composer/e-msg-composer-attachment.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Attachment properties");
-gchar *s = N_("MIME type:");
-gchar *s = N_("Description:");
-gchar *s = N_("File name:");
diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
deleted file mode 100644
index f3d8922276..0000000000
--- a/composer/e-msg-composer-attachment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-attachment.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-#ifndef __E_MSG_COMPOSER_ATTACHMENT_H__
-#define __E_MSG_COMPOSER_ATTACHMENT_H__
-
-#include <gnome.h>
-#include <glade/glade-xml.h>
-#include <camel/camel-mime-part.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_ATTACHMENT			(e_msg_composer_attachment_get_type ())
-#define E_MSG_COMPOSER_ATTACHMENT(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment))
-#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass))
-#define E_IS_MSG_COMPOSER_ATTACHMENT(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))
-
-
-typedef struct _EMsgComposerAttachment       EMsgComposerAttachment;
-typedef struct _EMsgComposerAttachmentClass  EMsgComposerAttachmentClass;
-
-struct _EMsgComposerAttachment {
-	GtkObject parent;
-
-	GladeXML *editor_gui;
-
-	CamelMimePart *body;
-	gboolean guessed_type;
-	gulong size;
-
-	GdkPixbuf *pixbuf_cache;
-};
-
-struct _EMsgComposerAttachmentClass {
-	GtkObjectClass parent_class;
-
-	void (*changed)	(EMsgComposerAttachment *msg_composer_attachment);
-};
-
-
-GtkType e_msg_composer_attachment_get_type (void);
-EMsgComposerAttachment *e_msg_composer_attachment_new (const gchar *file_name, const gchar *content_id);
-EMsgComposerAttachment *e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part);
-void e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
-				     GtkWidget *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MSG_COMPOSER_ATTACHMENT_H__ */
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
deleted file mode 100644
index 21be22b3b2..0000000000
--- a/composer/e-msg-composer-hdrs.c
+++ /dev/null
@@ -1,712 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.c
- *
- * Copyright (C) 1999 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <camel/camel.h>
-
-#include <bonobo.h>
-
-#include <liboaf/liboaf.h>
-
-#include "Composer.h"
-
-#include "e-msg-composer-hdrs.h"
-#include <gal/e-text/e-entry.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "mail/mail-config.h"
-
-
-#define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-
-struct _EMsgComposerHdrsPrivate {
-	Evolution_Addressbook_SelectNames corba_select_names;
-
-	/* Total number of headers that we have.  */
-	guint num_hdrs;
-
-	/* The tooltips.  */
-	GtkTooltips *tooltips;
-
-	/* Standard headers.  */
-	GtkWidget *from_entry;
-	GtkWidget *to_entry;
-	GtkWidget *cc_entry;
-	GtkWidget *bcc_entry;
-	GtkWidget *subject_entry;
-};
-
-
-static GtkTableClass *parent_class = NULL;
-
-enum {
-	SHOW_ADDRESS_DIALOG,
-	LAST_SIGNAL
-};
-
-enum {
-	HEADER_ADDRBOOK,
-	HEADER_COMBOBOX,
-	HEADER_ENTRYBOX
-};
-
-static gint signals[LAST_SIGNAL];
-
-
-static gboolean
-setup_corba (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-	CORBA_Environment ev;
-
-	priv = hdrs->priv;
-
-	g_assert (priv->corba_select_names == CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
-
-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without
-           raising an exception in `ev'.  */
-	if (ev._major != CORBA_NO_EXCEPTION || priv->corba_select_names == CORBA_OBJECT_NIL) {
-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-
-static void
-address_button_clicked_cb (GtkButton *button,
-			   gpointer data)
-{
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-	CORBA_Environment ev;
-
-	hdrs = E_MSG_COMPOSER_HDRS (data);
-	priv = hdrs->priv;
-
-	CORBA_exception_init (&ev);
-
-	/* FIXME: Section ID */
-	Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, "", &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static GtkWidget *
-create_dropdown_entry (EMsgComposerHdrs *hdrs,
-		       const char *name)
-{
-	GtkWidget *combo;
-	GList *values = NULL;
-	
-	combo = gtk_combo_new ();
-	gtk_combo_set_use_arrows (GTK_COMBO (combo), TRUE);
-	gtk_combo_set_case_sensitive (GTK_COMBO (combo), FALSE);
-	if (!strcmp (name, _("From:"))) {
-		CamelInternetAddress *ciaddr;
-		GSList *ids, *stmp;
-		GList *tmp;
-		MailConfigIdentity *id;
-		char *val;
-		
-		ids = mail_config_get_identities ();
-		stmp = ids;
-		while (stmp) {
-			char *address;
-			
-			id = stmp->data;
-			g_assert (id);			
-			g_assert (id->name);
-			g_assert (id->address);
-			
-			ciaddr = camel_internet_address_new ();
-			camel_internet_address_add (ciaddr, id->name, id->address);
-			address = camel_address_encode (CAMEL_ADDRESS (ciaddr));
-			values = g_list_append (values, address);
-			stmp = stmp->next;
-		}
-		
-		gtk_combo_set_popdown_strings (GTK_COMBO (combo), values);
-
-		tmp = values;
-		while (tmp) {
-			g_free (tmp->data);
-			tmp = tmp->next;
-		}
-		g_list_free (values);
-
-		id = mail_config_get_default_identity ();
-		g_assert (id);			
-		g_assert (id->name);
-		g_assert (id->address);
-		
-		ciaddr = camel_internet_address_new ();
-		camel_internet_address_add (ciaddr, id->name, id->address);
-		val = camel_address_encode (CAMEL_ADDRESS (ciaddr));
-		
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), val);
-		g_free (val);
-	}
-	
-	return combo;
-}
-
-static GtkWidget *
-create_addressbook_entry (EMsgComposerHdrs *hdrs,
-			  const char *name)
-{
-	EMsgComposerHdrsPrivate *priv;
-	Evolution_Addressbook_SelectNames corba_select_names;
-	Bonobo_Control corba_control;
-	GtkWidget *control_widget;
-	CORBA_Environment ev;
-
-	priv = hdrs->priv;
-	corba_select_names = priv->corba_select_names;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Addressbook_SelectNames_add_section (corba_select_names, name, name, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	corba_control = Evolution_Addressbook_SelectNames_get_entry_for_section (corba_select_names, name, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
-
-	return control_widget;
-}
-
-static GtkWidget *
-add_header (EMsgComposerHdrs *hdrs,
-	    const gchar *name,
-	    const gchar *tip,
-	    const gchar *tip_private,
-	    int type)
-{
-	EMsgComposerHdrsPrivate *priv;
-	GtkWidget *label;
-	GtkWidget *entry;
-	guint pad;
-	
-	priv = hdrs->priv;
-	
-	if (type == HEADER_ADDRBOOK) {
-		label = gtk_button_new_with_label (name);
-		GTK_OBJECT_UNSET_FLAGS(label, GTK_CAN_FOCUS);
-		gtk_signal_connect (GTK_OBJECT (label), "clicked",
-				    GTK_SIGNAL_FUNC (address_button_clicked_cb),
-				    hdrs);
-		pad = 2;
-		gtk_tooltips_set_tip (hdrs->priv->tooltips, label,
-				      _("Click here for the address book"),
-				      NULL);
-	} else {
-		label = gtk_label_new (name);
-		pad = GNOME_PAD;
-	}
-	
-	gtk_table_attach (GTK_TABLE (hdrs), label,
-			  0, 1, priv->num_hdrs, priv->num_hdrs + 1,
-			  GTK_FILL, GTK_FILL,
-			  pad, pad);
-	gtk_widget_show (label);
-	
-	switch (type) {
-	case HEADER_ADDRBOOK:
-		entry = create_addressbook_entry (hdrs, name);
-		break;
-	case HEADER_COMBOBOX:
-		entry = create_dropdown_entry (hdrs, name);
-		break;
-	default:
-		entry = e_entry_new ();
-		gtk_object_set(GTK_OBJECT(entry),
-			       "editable", TRUE,
-			       "use_ellipsis", TRUE,
-			       NULL);
-	}
-
-	if (entry != NULL) {
-		gtk_widget_show (entry);
-		
-		gtk_table_attach (GTK_TABLE (hdrs), entry,
-				  1, 2, priv->num_hdrs, priv->num_hdrs + 1,
-				  GTK_FILL | GTK_EXPAND, 0,
-				  2, 2);
-		
-		gtk_tooltips_set_tip (hdrs->priv->tooltips, entry, tip, tip_private);
-	}
-	
-	priv->num_hdrs++;
-	
-	return entry;
-}
-
-static void
-setup_headers (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-
-	priv = hdrs->priv;
-	
-	priv->from_entry = add_header
-		(hdrs, _("From:"), 
-		 _("Enter the identity you wish to send this message from"),
-		 NULL,
-		 HEADER_COMBOBOX);
-	priv->to_entry = add_header
-		(hdrs, _("To:"), 
-		 _("Enter the recipients of the message"),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->cc_entry = add_header
-		(hdrs, _("Cc:"),
-		 _("Enter the addresses that will receive a carbon copy of "
-		   "the message"),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->bcc_entry = add_header
-		(hdrs, _("Bcc:"),
-		 _("Enter the addresses that will receive a carbon copy of "
-		   "the message without appearing in the recipient list of "
-		   "the message."),
-		 NULL,
-		 HEADER_ADDRBOOK);
-	priv->subject_entry = add_header
-		(hdrs, _("Subject:"),
-		 _("Enter the subject of the mail"),
-		 NULL,
-		 HEADER_ENTRYBOX);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposerHdrs *hdrs;
-	EMsgComposerHdrsPrivate *priv;
-
-	hdrs = E_MSG_COMPOSER_HDRS (object);
-	priv = hdrs->priv;
-
-	if (priv->corba_select_names != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->corba_select_names, &ev);
-		CORBA_exception_free (&ev);
-	}
-
-	gtk_object_destroy (GTK_OBJECT (priv->tooltips));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (EMsgComposerHdrsClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	signals[SHOW_ADDRESS_DIALOG] =
-		gtk_signal_new ("show_address_dialog",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,
-						   show_address_dialog),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposerHdrs *hdrs)
-{
-	EMsgComposerHdrsPrivate *priv;
-
-	priv = g_new (EMsgComposerHdrsPrivate, 1);
-
-	priv->corba_select_names = CORBA_OBJECT_NIL;
-
-	priv->from_entry    = NULL;
-	priv->to_entry      = NULL;
-	priv->cc_entry      = NULL;
-	priv->bcc_entry     = NULL;
-	priv->subject_entry = NULL;
-
-	priv->tooltips = gtk_tooltips_new ();
-
-	priv->num_hdrs = 0;
-
-	hdrs->priv = priv;
-}
-
-
-GtkType
-e_msg_composer_hdrs_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposerHdrs",
-			sizeof (EMsgComposerHdrs),
-			sizeof (EMsgComposerHdrsClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_new (void)
-{
-	EMsgComposerHdrs *new;
-	EMsgComposerHdrsPrivate *priv;
-	
-	new = gtk_type_new (e_msg_composer_hdrs_get_type ());
-	priv = new->priv;
-	
-	if (! setup_corba (new)) {
-		gtk_widget_destroy (GTK_WIDGET (new));
-		return NULL;
-	}
-	
-	setup_headers (new);
-
-	return GTK_WIDGET (new);
-}
-
-
-static GList *
-decode_addresses (const char *s)
-{
-	const char *p, *oldp;
-	gboolean in_quotes;
-	GList *list;
-
-	g_print ("Decoding addresses -- %s\n", s ? s : "(null)");
-
-	if (s == NULL)
-		return NULL;
-
-	in_quotes = FALSE;
-	list = NULL;
-
-	p = s;
-	oldp = s;
-
-	while (1) {
-		if (*p == '"') {
-			in_quotes = ! in_quotes;
-			p++;
-		} else if ((! in_quotes && *p == ',') || *p == 0) {
-			if (p != oldp) {
-				char *new_addr;
-
-				new_addr = g_strndup (oldp, p - oldp);
-				new_addr = g_strstrip (new_addr);
-				if (*new_addr != '\0')
-					list = g_list_prepend (list, new_addr);
-				else
-					g_free (new_addr);
-			}
-
-			while (*p == ',' || *p == ' ' || *p == '\t')
-				p++;
-
-			if (*p == 0)
-				break;
-
-			oldp = p;
-		} else {
-			p++;
-		}
-	}
-
-	return g_list_reverse (list);
-}
-
-static void
-set_recipients (CamelMimeMessage *msg,
-		GtkWidget *entry_widget,
-		const gchar *type)
-{
-	GList *list;
-	GList *p;
-	struct _header_address *addr;
-	char *s;
-
-	bonobo_widget_get_property (BONOBO_WIDGET (entry_widget), "text", &s, NULL);
-
-	list = decode_addresses (s);
-
-	g_free (s);
-
-	/* FIXME leak?  */
-
-	for (p = list; p != NULL; p = p->next) {
-		addr = header_address_decode (p->data);
-		camel_mime_message_add_recipient (msg, type, addr->name,
-						  addr->v.addr);
-		header_address_unref (addr);
-	}
-
-	g_list_free (list);
-}
-
-void
-e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs,
-				CamelMimeMessage *msg)
-{
-	gchar *subject;
-	gchar *from;
-	
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (msg != NULL);
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));
-	
-	subject = e_msg_composer_hdrs_get_subject (hdrs);
-	camel_mime_message_set_subject (msg, subject);
-	g_free (subject);
-	
-	from = e_msg_composer_hdrs_get_from (hdrs);
-	camel_mime_message_set_from (msg, from);
-	g_free (from);
-	
-	set_recipients (msg, hdrs->priv->to_entry, CAMEL_RECIPIENT_TYPE_TO);
-	set_recipients (msg, hdrs->priv->cc_entry, CAMEL_RECIPIENT_TYPE_CC);
-	set_recipients (msg, hdrs->priv->bcc_entry, CAMEL_RECIPIENT_TYPE_BCC);
-}
-
-
-static void
-set_entry (BonoboWidget *bonobo_widget,
-	   const GList *list)
-{
-	GString *string;
-	const GList *p;
-
-	string = g_string_new (NULL);
-	for (p = list; p != NULL; p = p->next) {
-		if (string->str[0] != '\0')
-			g_string_append (string, ", ");
-		g_string_append (string, p->data);
-	}
-
-	bonobo_widget_set_property (BONOBO_WIDGET (bonobo_widget), "text", string->str, NULL);
-
-	g_string_free (string, TRUE);
-}
-
-void
-e_msg_composer_hdrs_set_from (EMsgComposerHdrs *hdrs,
-			      const char *from)
-{
-	GtkEntry *entry;
-	
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	
-	entry = GTK_ENTRY (GTK_COMBO (hdrs->priv->from_entry)->entry);
-	e_utf8_gtk_entry_set_text (entry, from);
-}
-
-void
-e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
-			    const GList *to_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->to_entry), to_list);
-}
-
-void
-e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
-			    const GList *cc_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->cc_entry), cc_list);
-}
-
-void
-e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
-			     const GList *bcc_list)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-
-	set_entry (BONOBO_WIDGET (hdrs->priv->bcc_entry), bcc_list);
-}
-
-void
-e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
-				 const char *subject)
-{
-	g_return_if_fail (hdrs != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
-	g_return_if_fail (subject != NULL);
-
-	gtk_object_set (GTK_OBJECT (hdrs->priv->subject_entry),
-			"text", subject,
-			NULL);
-}
-
-char *
-e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (hdrs->priv->from_entry)->entry));
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-/* FIXME this is currently unused and broken.  */
-GList *
-e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	g_assert_not_reached ();
-	
-	return NULL;
-}
-
-/* FIXME: This is just changed to return allooc'd mem to be consistant with get_from */
-char *
-e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)
-{
-	gchar *subject;
-	
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	gtk_object_get (GTK_OBJECT (hdrs->priv->subject_entry),
-			"text", &subject, NULL);
-	
-	return g_strdup (subject);
-}
-
-
-GtkWidget *
-e_msg_composer_hdrs_get_to_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	return hdrs->priv->to_entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_cc_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-	
-	return hdrs->priv->cc_entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_bcc_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	return hdrs->priv->bcc_entry;
-}
-
-GtkWidget *
-e_msg_composer_hdrs_get_subject_entry (EMsgComposerHdrs *hdrs)
-{
-	g_return_val_if_fail (hdrs != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
-	return hdrs->priv->subject_entry;
-}
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
deleted file mode 100644
index a495fd853c..0000000000
--- a/composer/e-msg-composer-hdrs.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* msg-composer-hdrs.h
- *
- * Copyright (C) 1999 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef ___E_MSG_COMPOSER_HDRS_H__
-#define ___E_MSG_COMPOSER_HDRS_H__
-
-#include <gnome.h>
-#include <camel/camel-mime-message.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_MSG_COMPOSER_HDRS		(e_msg_composer_hdrs_get_type ())
-#define E_MSG_COMPOSER_HDRS(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs))
-#define E_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass))
-#define E_IS_MSG_COMPOSER_HDRS(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))
-#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))
-
-
-typedef struct _EMsgComposerHdrs        EMsgComposerHdrs;
-typedef struct _EMsgComposerHdrsClass   EMsgComposerHdrsClass;
-typedef struct _EMsgComposerHdrsPrivate EMsgComposerHdrsPrivate;
-
-struct _EMsgComposerHdrs {
-	GtkTable parent;
-
-	EMsgComposerHdrsPrivate *priv;
-};
-
-struct _EMsgComposerHdrsClass {
-	GtkTableClass parent_class;
-
-	void (* show_address_dialog) (EMsgComposerHdrs *hdrs);
-};
-
-
-GtkType     e_msg_composer_hdrs_get_type           (void);
-GtkWidget  *e_msg_composer_hdrs_new                (void);
-
-void        e_msg_composer_hdrs_to_message         (EMsgComposerHdrs *hdrs,
-						    CamelMimeMessage *msg);
-
-void        e_msg_composer_hdrs_set_from           (EMsgComposerHdrs *hdrs,
-						    const char       *from);
-void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,
-						    const GList      *to_list);
-void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,
-						    const GList      *cc_list);
-void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,
-						    const GList      *bcc_list);
-void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,
-						    const char       *subject);
-
-char       *e_msg_composer_hdrs_get_from           (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_to             (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_cc             (EMsgComposerHdrs *hdrs);
-GList      *e_msg_composer_hdrs_get_bcc            (EMsgComposerHdrs *hdrs);
-char       *e_msg_composer_hdrs_get_subject        (EMsgComposerHdrs *hdrs);
-
-GtkWidget  *e_msg_composer_hdrs_get_to_entry       (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_cc_entry       (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_bcc_entry      (EMsgComposerHdrs *hdrs);
-GtkWidget  *e_msg_composer_hdrs_get_subject_entry  (EMsgComposerHdrs *hdrs);
-
-#ifdef _cplusplus
-}
-#endif /* _cplusplus */
-
-
-#endif /* __E_MSG_COMPOSER_HDRS_H__ */
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
deleted file mode 100644
index 36b53c8446..0000000000
--- a/composer/e-msg-composer-select-file.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-select-file.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <gtk/gtkfilesel.h>
-
-#include "e-msg-composer-select-file.h"
-
-
-struct _FileSelectionInfo {
-	GtkWidget *widget;
-	char *selected_file;
-};
-typedef struct _FileSelectionInfo FileSelectionInfo;
-
-
-static void
-confirm (FileSelectionInfo *info)
-{
-	const char *filename;
-
-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (info->widget));
-	info->selected_file = g_strdup (filename);
-
-	gtk_widget_hide (info->widget);
-
-	gtk_main_quit ();
-}
-
-static void
-cancel (FileSelectionInfo *info)
-{
-	g_assert (info->selected_file == NULL);
-
-	gtk_widget_hide (info->widget);
-
-	gtk_main_quit ();
-}
-
-
-/* Callbacks.  */
-
-static void
-ok_clicked_cb (GtkWidget *widget,
-	       void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	confirm (info);
-}
-
-static void
-cancel_clicked_cb (GtkWidget *widget,
-		   void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	cancel (info);
-}
-
-static int
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-	cancel (info);
-
-	return TRUE;
-}
-
-
-/* Setup.  */
-
-static FileSelectionInfo *
-create_file_selection (EMsgComposer *composer)
-{
-	FileSelectionInfo *info;
-	GtkWidget *widget;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	info = g_new (FileSelectionInfo, 1);
-
-	widget        = gtk_file_selection_new (NULL);
-	gtk_window_set_wmclass (GTK_WINDOW (widget), "fileselection", 
-				"Evolution:composer");
-	ok_button     = GTK_FILE_SELECTION (widget)->ok_button;
-	cancel_button = GTK_FILE_SELECTION (widget)->cancel_button;
-
-	gtk_signal_connect (GTK_OBJECT (ok_button),
-			    "clicked", GTK_SIGNAL_FUNC (ok_clicked_cb), info);
-	gtk_signal_connect (GTK_OBJECT (cancel_button),
-			    "clicked", GTK_SIGNAL_FUNC (cancel_clicked_cb), info);
-	gtk_signal_connect (GTK_OBJECT (widget), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), info);
-
-	info->widget        = widget;
-	info->selected_file = NULL;
-
-	return info;
-}
-
-static void
-file_selection_info_destroy_notify (void *data)
-{
-	FileSelectionInfo *info;
-
-	info = (FileSelectionInfo *) data;
-
-	g_free (info->selected_file);
-	g_free (info);
-}
-
-
-char *
-e_msg_composer_select_file (EMsgComposer *composer,
-			    const char *title)
-{
-	FileSelectionInfo *info;
-	char *retval;
-
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-
-	info = gtk_object_get_data (GTK_OBJECT (composer),
-				    "e-msg-composer-file-selection-info");
-
-	if (info == NULL) {
-		info = create_file_selection (composer);
-		gtk_object_set_data_full (GTK_OBJECT (composer),
-					  "e-msg-composer-file-selection-info", info,
-					  file_selection_info_destroy_notify);
-	}
-
-	if (GTK_WIDGET_VISIBLE (info->widget))
-		return NULL;		/* Busy!  */
-
-	gtk_window_set_title (GTK_WINDOW (info->widget), title);
-	gtk_widget_show (info->widget);
-
-	GDK_THREADS_ENTER();
-	gtk_main ();
-	GDK_THREADS_LEAVE();
-
-	retval = info->selected_file;
-	info->selected_file = NULL;
-
-	return retval;
-}
diff --git a/composer/e-msg-composer-select-file.h b/composer/e-msg-composer-select-file.h
deleted file mode 100644
index 2f89bd58b4..0000000000
--- a/composer/e-msg-composer-select-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer-select-file.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_MSG_COMPOSER_SELECT_FILE_H
-#define E_MSG_COMPOSER_SELECT_FILE_H
-
-#include "e-msg-composer.h"
-
-char *e_msg_composer_select_file (EMsgComposer *composer,
-				  const char *title);
-
-#endif /* E_MSG_COMPOSER_SELECT_FILE_H */
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
deleted file mode 100644
index 456b8a54f9..0000000000
--- a/composer/e-msg-composer.c
+++ /dev/null
@@ -1,1904 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.c
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ettore Perazzoli, Jeffrey Stedfast
- */
-
-/*
-
-   TODO
-
-   - Somehow users should be able to see if any file(s) are attached even when
-     the attachment bar is not shown.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <errno.h>
-
-#include <bonobo.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <glade/glade.h>
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include "camel/camel.h"
-#include "camel-charset-map.h"
-
-#include "mail/mail.h"
-#include "mail/mail-tools.h"
-#include "mail/mail-threads.h"
-
-#include "e-util/e-html-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-msg-composer.h"
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "e-msg-composer-select-file.h"
-
-#include "HTMLEditor.h"
-#include "listener.h"
-
-#define HTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c"
-
-
-#define DEFAULT_WIDTH 600
-#define DEFAULT_HEIGHT 500
-
-enum {
-	SEND,
-	POSTPONE,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static GnomeAppClass *parent_class = NULL;
-
-/* local prototypes */
-static GList *add_recipients (GList *list, const char *recips, gboolean decode);
-static void free_recipients (GList *list);
-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);
-
-
-static char *
-get_text (Bonobo_PersistStream persist, char *format)
-{
-	BonoboStream *stream;
-	BonoboStreamMem *stream_mem;
-	CORBA_Environment ev;
-	char *text;
-	
-	CORBA_exception_init (&ev);
-	
-	stream = bonobo_stream_mem_create (NULL, 0, FALSE, TRUE);
-	Bonobo_PersistStream_save (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
-				   format, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Exception getting mail '%s'",
-			   bonobo_exception_get_text (&ev));
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	stream_mem = BONOBO_STREAM_MEM (stream);
-	text = g_malloc (stream_mem->pos + 1);
-	memcpy (text, stream_mem->buffer, stream_mem->pos);
-	text[stream_mem->pos] = 0;
-	bonobo_object_unref (BONOBO_OBJECT(stream));
-	
-	return text;
-}
-
-#define LINE_LEN 72
-
-typedef enum {
-	MSG_FORMAT_PLAIN,
-	MSG_FORMAT_ALTERNATIVE,
-} MsgFormat;
-
-static gboolean
-is_8bit (const guchar *text)
-{
-	guchar *c;
-	
-	for (c = (guchar *) text; *c; c++)
-		if (*c > (guchar) 127)
-			return TRUE;
-	
-	return FALSE;
-}
-
-static int
-best_encoding (const guchar *text)
-{
-	guchar *ch;
-	int count = 0;
-	int total;
-	
-	for (ch = (guchar *) text; *ch; ch++)
-		if (*ch > (guchar) 127)
-			count++;
-	
-	total = (int) (ch - text);
-	
-	if ((float) count <= total * 0.17)
-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;
-	else
-		return CAMEL_MIME_PART_ENCODING_BASE64;
-}
-
-static char *
-best_content (gchar *plain)
-{
-	char *result;
-	const char *best;
-
-	if ((best = camel_charset_best (plain, strlen (plain)))) {
-		result = g_strdup_printf ("text/plain ; charset=%s", best);
-	} else {
-		result = g_strdup ("text/plain");
-	}
-	
-	return result;
-}
-
-/* This functions builds a CamelMimeMessage for the message that the user has
-   composed in `composer'.  */
-static CamelMimeMessage *
-build_message (EMsgComposer *composer)
-{
-	EMsgComposerAttachmentBar *attachment_bar =
-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	MsgFormat type = MSG_FORMAT_ALTERNATIVE;
-	CamelMimeMessage *new;
-	CamelMultipart *body = NULL;
-	CamelMimePart *part;
-	gchar *from = NULL;
-	gboolean e8bit;
-	char *html = NULL, *plain = NULL;
-	char *content_type = NULL;
-	int i;
-	
-
-	if (composer->persist_stream_interface == CORBA_OBJECT_NIL)
-		return NULL;
-	
-	if (composer->send_html)
-		type = MSG_FORMAT_ALTERNATIVE;
-	else
-		type = MSG_FORMAT_PLAIN;
-	
-	/* get and/or set the From field */
-	from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer->hdrs));
-	if (!from) {
-		const MailConfigIdentity *id = NULL;
-		CamelInternetAddress *ciaddr;
-		
-		id = mail_config_get_default_identity ();
-		ciaddr = camel_internet_address_new ();
-		camel_internet_address_add (ciaddr, id->name, id->address);
-		from = camel_address_encode (CAMEL_ADDRESS (ciaddr));
-		e_msg_composer_hdrs_set_from (E_MSG_COMPOSER_HDRS (composer->hdrs), from);
-		camel_object_unref (CAMEL_OBJECT (ciaddr));
-	}
-	g_free (from);
-	
-	new = camel_mime_message_new ();
-	
-	e_msg_composer_hdrs_to_message (E_MSG_COMPOSER_HDRS (composer->hdrs), new);
-	for (i = 0; i < composer->extra_hdr_names->len; i++) {
-		camel_medium_add_header (CAMEL_MEDIUM (new),
-					 composer->extra_hdr_names->pdata[i],
-					 composer->extra_hdr_values->pdata[i]);
-	}
-	
-	plain = get_text (composer->persist_stream_interface, "text/plain");
-
-	/* the component has probably died */ 
-	if (plain == NULL)
-		return NULL;
-
-	e8bit = is_8bit (plain);
-	content_type = best_content (plain);
-
-	if (type != MSG_FORMAT_PLAIN) {
-		html = get_text (composer->persist_stream_interface, "text/html");
-		
-		/* the component has probably died */ 
-		if (html == NULL) {
-			g_free (plain);
-			g_free (content_type);
-			return NULL;
-		}
-	}
-
-	if (type == MSG_FORMAT_ALTERNATIVE) {
-		body = camel_multipart_new ();
-		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
-						  "multipart/alternative");
-		camel_multipart_set_boundary (body, NULL);
-		
-		part = camel_mime_part_new ();
-
-		camel_mime_part_set_content (part, plain, strlen (plain), content_type);
-
-		if (e8bit)
-			camel_mime_part_set_encoding (part, best_encoding (plain));		
-
-		g_free (plain);
-		g_free (content_type);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-		
-		part = camel_mime_part_new ();
-		camel_mime_part_set_content (part, html, strlen (html), "text/html");
-		g_free (html);
-		camel_multipart_add_part (body, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-	}
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
-		CamelMultipart *multipart = camel_multipart_new ();
-		
-		/* Generate a random boundary. */
-		camel_multipart_set_boundary (multipart, NULL);
-		
-		part = camel_mime_part_new ();
-		switch (type) {
-		case MSG_FORMAT_ALTERNATIVE:
-			camel_medium_set_content_object (CAMEL_MEDIUM (part),
-							 CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (CAMEL_OBJECT (body));
-			break;
-		case MSG_FORMAT_PLAIN:
-			camel_mime_part_set_content (part, plain, strlen (plain), best_content (plain));
-
-			if (e8bit)
-				camel_mime_part_set_encoding (part, best_encoding (plain));
-
-			g_free (plain);
-			g_free (content_type);
-			break;
-		}
-		camel_multipart_add_part (multipart, part);
-		camel_object_unref (CAMEL_OBJECT (part));
-		
-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);
-		
-		camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (multipart));
-		camel_object_unref (CAMEL_OBJECT (multipart));
-	} else {
-		switch (type) {
-		case MSG_FORMAT_ALTERNATIVE:
-			camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (CAMEL_OBJECT (body));
-			break;
-
-		case MSG_FORMAT_PLAIN:
-			camel_mime_part_set_content (CAMEL_MIME_PART (new), plain, strlen (plain), best_content (plain));
-
-			if (e8bit)
-				camel_mime_part_set_encoding (CAMEL_MIME_PART (new), best_encoding (plain));
-
-			g_free (plain);
-			g_free (content_type);
-			break;
-		}
-	}
-	
-	return new;
-}
-
-static char *
-get_signature (const char *sigfile)
-{
-	GString *rawsig;
-	char buf[1024];
-	char *htmlsig = NULL;
-	int fd, n;
-	
-	if (!sigfile || !*sigfile) {
-		return NULL;
-	}
-	
-	fd = open (sigfile, O_RDONLY);
-	if (fd == -1) {
-		char *msg;
-		
-		msg = g_strdup_printf (_("Could not open signature file %s:\n"
-					 "%s"), sigfile, g_strerror (errno));
-		gnome_error_dialog (msg);
-		g_free (msg);
-		
-		return NULL;
-	}
-	
-	rawsig = g_string_new ("");
-	while ((n = read (fd, buf, 1023)) > 0) {
-		buf[n] = '\0';
-		g_string_append (rawsig, buf);
-	}
-	close (fd);
-	
-	htmlsig = e_text_to_html (rawsig->str, 0);
-	g_string_free (rawsig, TRUE);
-	
-	return htmlsig;
-}
-
-static void
-prepare_engine (EMsgComposer *composer)
-{
-	CORBA_Environment ev;
-
-	g_assert (composer);
-	g_assert (E_IS_MSG_COMPOSER (composer));
-
-	/* printf ("prepare_engine\n"); */
-
-	CORBA_exception_init (&ev);
-	composer->editor_engine = (HTMLEditor_Engine) bonobo_object_client_query_interface
-		(bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)), "IDL:HTMLEditor/Engine:1.0", &ev);
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		
-		/* printf ("trying set listener\n"); */
-		composer->editor_listener = BONOBO_OBJECT (html_editor_listener_new (composer));
-		if (composer->editor_listener != CORBA_OBJECT_NIL)
-			HTMLEditor_Engine__set_listener (composer->editor_engine,
-							 (HTMLEditor_Listener)
-							 bonobo_object_dup_ref
-							 (bonobo_object_corba_objref (composer->editor_listener), &ev),
-							 &ev);
-	}
-	CORBA_exception_free (&ev);
-}
-
-static void
-mark_orig_text (EMsgComposer *composer)
-{
-	g_assert (composer);
-	g_assert (E_IS_MSG_COMPOSER (composer));
-
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		CORBA_any *flag = bonobo_arg_new (TC_boolean);
-		*((CORBA_boolean *) flag->_value) = CORBA_TRUE;
-
-		CORBA_exception_init (&ev);
-		HTMLEditor_Engine_set_object_data_by_type (composer->editor_engine, "ClueFlow", "orig", flag, &ev);
-		CORBA_free (flag);
-		CORBA_exception_free (&ev);
-	}
-}
-
-static void
-set_editor_text (EMsgComposer *composer, const char *sig_file, const char *text)
-{
-	Bonobo_PersistStream persist;
-	BonoboStream *stream;
-	BonoboWidget *editor;
-	CORBA_Environment ev;
-	char *sig, *fulltext;
-	
-	editor = BONOBO_WIDGET (composer->editor);
-	sig    = get_signature (sig_file);
-	if (sig) {
-		if (!strncmp ("-- \n", sig, 3))
-			fulltext = g_strdup_printf ("%s<br>\n<pre>\n%s</pre>",
-						    text, sig);
-		else
-			fulltext = g_strdup_printf ("%s<br>\n<pre>\n-- \n%s</pre>",
-						    text, sig);
-	} else {
-		if (!*text)
-			return;
-		fulltext = (char*)text;
-	}
-	
-	CORBA_exception_init (&ev);
-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (
-		bonobo_widget_get_server (editor), "IDL:Bonobo/PersistStream:1.0", &ev);
-	g_assert (persist != CORBA_OBJECT_NIL);
-	
-	stream = bonobo_stream_mem_create (fulltext, strlen (fulltext),
-					   TRUE, FALSE);
-	if (sig)
-		g_free (fulltext);
-	Bonobo_PersistStream_load (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),
-				   "text/html", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		/* FIXME. Some error message. */
-		return;
-	}
-	if (ev._major != CORBA_SYSTEM_EXCEPTION)
-		CORBA_Object_release (persist, &ev);
-	
-	Bonobo_Unknown_unref (persist, &ev);
-	CORBA_exception_free (&ev);
-	bonobo_object_unref (BONOBO_OBJECT(stream));
-
-	mark_orig_text (composer);
-}
-
-
-/* Commands.  */
-
-static void
-show_attachments (EMsgComposer *composer,
-		  gboolean show)
-{
-	if (show) {
-		gtk_widget_show (composer->attachment_scroll_frame);
-		gtk_widget_show (composer->attachment_bar);
-	} else {
-		gtk_widget_hide (composer->attachment_scroll_frame);
-		gtk_widget_hide (composer->attachment_bar);
-	}
-
-	composer->attachment_bar_visible = show;
-
-	/* Update the GUI.  */
-
-#if 0
-	gtk_check_menu_item_set_active
-		(GTK_CHECK_MENU_ITEM
-		 (glade_xml_get_widget (composer->menubar_gui,
-					"menu_view_attachments")),
-		 show);
-#endif
-
-	/* XXX we should update the toggle toolbar item as well.  At
-	   this point, it is not a toggle because Glade is broken.  */
-}
-
-static void
-save (EMsgComposer *composer,
-      const char *file_name)
-{
-	CORBA_Environment ev;
-	char *my_file_name;
-
-	if (file_name != NULL)
-		my_file_name = g_strdup (file_name);
-	else
-		my_file_name = e_msg_composer_select_file (composer, _("Save as..."));
-
-	if (my_file_name == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_PersistFile_save (composer->persist_file_interface, my_file_name, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,
-			  _("Error saving file: %s"), g_basename (file_name));
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (my_file_name);
-}
-
-static void
-load (EMsgComposer *composer,
-      const char *file_name)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_PersistFile_load (composer->persist_file_interface, file_name, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,
-			  _("Error loading file: %s"), g_basename (file_name));
-
-	CORBA_exception_free (&ev);
-}
-
-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */
-
-enum { REPLY_YES = 0, REPLY_NO, REPLY_CANCEL };
-
-typedef struct save_draft_input_s {
-	EMsgComposer *composer;
-} save_draft_input_t;
-
-typedef struct save_draft_data_s {
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-} save_draft_data_t;
-
-static gchar *
-describe_save_draft (gpointer in_data, gboolean gerund)
-{
-	if (gerund) {
-		return g_strdup (_("Saving changes to message..."));
-	} else {
-		return g_strdup (_("Save changes to message..."));
-	}
-}
-
-static void
-setup_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	save_draft_input_t *input = (save_draft_input_t *) in_data;
-	save_draft_data_t *data = (save_draft_data_t *) op_data;
-	
-	g_return_if_fail (input->composer != NULL);
-	
-	/* initialize op_data */
-	input->composer->send_html = TRUE;  /* always save drafts as HTML to keep formatting */
-	data->msg = e_msg_composer_get_message (input->composer);
-	data->info = g_new0 (CamelMessageInfo, 1);
-	data->info->flags = CAMEL_MESSAGE_DRAFT;
-}
-
-static void
-do_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	/*save_draft_input_t *input = (save_draft_input_t *) in_data;*/
-	save_draft_data_t *data = (save_draft_data_t *) op_data;
-	extern CamelFolder *drafts_folder;
-	
-	/* perform camel operations */
-	mail_tool_camel_lock_up ();
-	camel_folder_append_message (drafts_folder, data->msg, data->info, ex);
-	mail_tool_camel_lock_down ();
-}
-
-static void
-cleanup_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)
-{
-	save_draft_input_t *input = (save_draft_input_t *) in_data;
-	/*save_draft_data_t *data = (save_draft_data_t *) op_data;*/
-	
-	if (camel_exception_is_set (ex)) {
-		char *reason;
-		
-		reason = g_strdup_printf (_("Error saving composition to 'Drafts': %s"),
-					  camel_exception_get_description (ex));
-		
-		gnome_warning_dialog_parented (reason, GTK_WINDOW (input->composer));
-		g_free (reason);
-	} else {
-		gtk_widget_destroy (GTK_WIDGET (input->composer));
-	}
-}
-
-static const mail_operation_spec op_save_draft = {
-	describe_save_draft,
-	sizeof (save_draft_data_t),
-	setup_save_draft,
-	do_save_draft,
-	cleanup_save_draft
-};
-
-static void
-exit_dialog_cb (int reply, EMsgComposer *composer)
-{
-	save_draft_input_t *input;
-	
-	switch (reply) {
-	case REPLY_YES:
-		/* this has to be done async */
-		input = g_new0 (save_draft_input_t, 1);
-		input->composer = composer;
-		mail_operation_queue (&op_save_draft, input, TRUE);
-	case REPLY_NO:
-		gtk_widget_destroy (GTK_WIDGET (composer));
-		break;
-	case REPLY_CANCEL:
-	default:
-	}
-}
- 
-static void
-do_exit (EMsgComposer *composer)
-{
-	GtkWidget *dialog;
-	GtkWidget *label;
-	gint button;
-	
-	dialog = gnome_dialog_new (_("Evolution"),
-				   GNOME_STOCK_BUTTON_YES,      /* Save */
-				   GNOME_STOCK_BUTTON_NO,       /* Don't save */
-				   GNOME_STOCK_BUTTON_CANCEL,   /* Cancel */
-				   NULL);
-	
-	label = gtk_label_new (_("This message has not been sent.\n\nDo you wish to save your changes?"));
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (composer));
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	
-	exit_dialog_cb (button, composer);
-}
-
-/* Menu callbacks.  */
-
-static void
-menu_file_open_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	char *file_name;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	file_name = e_msg_composer_select_file (composer, _("Open file"));
-	if (file_name == NULL)
-		return;
-	
-	load (composer, file_name);
-	
-	g_free (file_name);
-}
-
-static void
-menu_file_save_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	EMsgComposer *composer;
-	CORBA_char *file_name;
-	CORBA_Environment ev;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	CORBA_exception_init (&ev);
-	
-	file_name = Bonobo_PersistFile_getCurrentFile (composer->persist_file_interface, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		save (composer, NULL);
-	} else {
-		save (composer, file_name);
-		CORBA_free (file_name);
-	}
-	
-	CORBA_exception_free (&ev);
-}
-
-static void
-menu_file_save_as_cb (BonoboUIComponent *uic,
-		      void *data,
-		      const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	save (composer, NULL);
-}
-
-static void
-menu_file_send_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
-}
-
-static void
-menu_file_send_later_cb (BonoboUIComponent *uic,
-			 void *data,
-			 const char *path)
-{
-	gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);
-}
-
-static void
-menu_file_close_cb (BonoboUIComponent *uic,
-		    void *data,
-		    const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	do_exit (composer);
-}
-	
-static void
-menu_file_add_attachment_cb (BonoboUIComponent *uic,
-			     void *data,
-			     const char *path)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	e_msg_composer_attachment_bar_attach
-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-		 NULL, NULL);
-}
-
-static void
-menu_view_attachments_activate_cb (BonoboUIComponent           *component,
-				   const char                  *path,
-				   Bonobo_UIComponent_EventType type,
-				   const char                  *state,
-				   gpointer                     user_data)
-
-{
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	new_state = atoi (state);
-	
-	e_msg_composer_show_attachments (E_MSG_COMPOSER (user_data), new_state);
-}
-
-#if 0
-static void
-insert_file_ok_cb (GtkWidget *widget, void *user_data)
-{
-	GtkFileSelection *fs;
-	GdkAtom selection_atom = GDK_NONE;
-	char *name;
-	EMsgComposer *composer;
-	struct stat sb;
-	int fd;
-	guint8 *buffer;
-	size_t bufsz, actual;
-	
-	fs = GTK_FILE_SELECTION (gtk_widget_get_ancestor (widget,
-							  GTK_TYPE_FILE_SELECTION));
-	composer = E_MSG_COMPOSER (user_data);
-	name = gtk_file_selection_get_filename (fs);
-	
-	if (stat (name, &sb) < 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented( _("That file does not exist."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if (!(S_ISREG (sb.st_mode))) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That is not a regular file."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if (access (name, R_OK) != 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That file exists but is not readable."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	if ((fd = open (name, O_RDONLY)) < 0) {
-		GtkWidget *dlg;
-		
-		dlg = gnome_error_dialog_parented (_("That file appeared accesible but open(2) failed."),
-						   GTK_WINDOW (fs));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		gtk_widget_destroy (GTK_WIDGET (dlg));
-		return;
-	}
-	
-	buffer = NULL;
-	bufsz = 0;
-	actual = 0;
-#define CHUNK 5120
-	
-	while (TRUE) {
-		ssize_t chunk;
-		
-		if (bufsz - actual < CHUNK) {
-			bufsz += CHUNK;
-			
-			if (bufsz >= 102400) {
-				GtkWidget *dlg;
-				gint result;
-				
-				dlg = gnome_dialog_new (_("The file is very large (more than 100K).\n"
-							  "Are you sure you wish to insert it?"),
-							GNOME_STOCK_BUTTON_YES,
-							GNOME_STOCK_BUTTON_NO,
-							NULL);
-				gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (fs));
-				result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-				gtk_widget_destroy (GTK_WIDGET (dlg));
-				
-				if (result == 1)
-					goto cleanup;
-			}
-			
-			buffer = g_realloc (buffer, bufsz * sizeof (guint8));
-		}
-		
-		chunk = read (fd, &(buffer[actual]), CHUNK);
-
-		if (chunk < 0) {
-			GtkWidget *dlg;
-			
-			dlg = gnome_error_dialog_parented (_("An error occurred while reading the file."),
-							   GTK_WINDOW (fs));
-			gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-			gtk_widget_destroy (GTK_WIDGET (dlg));
-			goto cleanup;
-		}
-		
-		if (chunk == 0)
-			break;
-		
-		actual += chunk;
-	}
-	
-	buffer[actual] = '\0';
-	
-	if (selection_atom == GDK_NONE)
-		selection_atom = gdk_atom_intern ("TEMP_PASTE", FALSE);
-	gtk_object_set_data (GTK_OBJECT (fs), "ev_file_buffer", buffer);
-	gtk_selection_owner_set (GTK_WIDGET (fs), selection_atom, GDK_CURRENT_TIME);
-	/*gtk_html_paste (composer->send_html);*/
-	
- cleanup:
-	close (fd);
-	g_free (buffer);
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-fs_selection_get (GtkWidget *widget, GtkSelectionData *sdata,
-		  guint info, guint time)
-{
-	gchar *buffer;
-	GdkAtom encoding;
-	gint format;
-	guchar *ctext;
-	gint length;
-	
-	buffer = gtk_object_get_data (GTK_OBJECT (widget), "ev_file_buffer");
-	if (gdk_string_to_compound_text (buffer, &encoding, &format, &ctext,
-					 &length) == Success)
-		gtk_selection_data_set (sdata, encoding, format, ctext, length);
-	g_free (buffer);
-	gtk_object_remove_data (GTK_OBJECT (widget), "ev_file_buffer");
-}
-
-#endif
-static void
-menu_file_insert_file_cb (BonoboUIComponent *uic,
-		void *data,
-		const char *path)
-{
-#if 0
-	EMsgComposer *composer;
-	GtkFileSelection *fs;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new ("Choose File"));
-	/* FIXME: remember the location or something */
-	/*gtk_file_selection_set_filename( fs, g_get_home_dir() );*/
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    GTK_SIGNAL_FUNC (insert_file_ok_cb), data);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), 
-				   "clicked",
-				   GTK_SIGNAL_FUNC (gtk_widget_destroy), 
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET(fs));
-#else
-	g_message ("Insert file is unimplemented! oh no!");
-#endif
-}
-
-static void
-menu_format_html_cb (BonoboUIComponent           *component,
-		     const char                  *path,
-		     Bonobo_UIComponent_EventType type,
-		     const char                  *state,
-		     gpointer                     user_data)
-
-{
-	EMsgComposer *composer;
-	gboolean new_state;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	composer = E_MSG_COMPOSER (user_data);
-	
-	new_state = atoi (state);
-	
-	if ((new_state && composer->send_html) ||
-	    (! new_state && ! composer->send_html))
-		return;
-	
-	e_msg_composer_set_send_html (composer, new_state);
-}
-
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_UNSAFE_VERB ("FileOpen",   menu_file_open_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSave",   menu_file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAs", menu_file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileClose",  menu_file_close_cb),
-	
-	BONOBO_UI_UNSAFE_VERB ("FileInsertFile", menu_file_insert_file_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileAttach",     menu_file_add_attachment_cb),
-	
-	BONOBO_UI_UNSAFE_VERB ("FileSend",       menu_file_send_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSendLater",  menu_file_send_later_cb),
-	
-	BONOBO_UI_VERB_END
-};	
-
-static void
-setup_ui (EMsgComposer *composer)
-{
-	BonoboUIContainer *container;
-	
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));
-	
-	composer->uic = bonobo_ui_component_new ("evolution-message-composer");
-	bonobo_ui_component_set_container (
-		composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		composer->uic, verbs, composer);	
-	
-	bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
-			       "evolution-message-composer.xml",
-			       "evolution-message-composer");
-	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
-				      "state", composer->send_html ? "1" : "0", NULL);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "FormatHtml",
-		menu_format_html_cb, composer);
-	
-	bonobo_ui_component_add_listener (
-		composer->uic, "ViewAttach",
-		menu_view_attachments_activate_cb, composer);
-}
-
-
-/* Miscellaneous callbacks.  */
-
-static void
-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,
-			   void *data)
-{
-	EMsgComposer *composer;
-	
-	composer = E_MSG_COMPOSER (data);
-	
-	if (e_msg_composer_attachment_bar_get_num_attachments (bar) > 0)
-		e_msg_composer_show_attachments (composer, TRUE);
-	else
-		e_msg_composer_show_attachments (composer, FALSE);
-}
-
-
-/* GtkObject methods.  */
-
-static gboolean
-clear_inline_images (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-	g_free (value);
-
-	return TRUE;
-}
-
-static void
-destroy (GtkObject *object)
-{
-	EMsgComposer *composer;
-	CORBA_Environment ev;
-	
-	composer = E_MSG_COMPOSER (object);
-	
-	if (composer->uic)
-		bonobo_object_unref (BONOBO_OBJECT (composer->uic));
-	composer->uic = NULL;
-
-	/* FIXME?  I assume the Bonobo widget will get destroyed
-           normally?  */
-	
-	if (composer->address_dialog != NULL)
-		gtk_widget_destroy (composer->address_dialog);
-	if (composer->hdrs != NULL)
-		gtk_widget_destroy (composer->hdrs);
-	
-	if (composer->extra_hdr_names) {
-		int i;
-		
-		for (i = 0; i < composer->extra_hdr_names->len; i++) {
-			g_free (composer->extra_hdr_names->pdata[i]);
-			g_free (composer->extra_hdr_values->pdata[i]);
-		}
-		g_ptr_array_free (composer->extra_hdr_names, TRUE);
-		g_ptr_array_free (composer->extra_hdr_values, TRUE);
-	}
-	
-	CORBA_exception_init (&ev);
-	
-	if (composer->persist_stream_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_stream_interface, &ev);
-		CORBA_Object_release (composer->persist_stream_interface, &ev);
-	}
-	
-	if (composer->persist_file_interface != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->persist_file_interface, &ev);
-		CORBA_Object_release (composer->persist_file_interface, &ev);
-	}
-	
-	if (composer->editor_engine != CORBA_OBJECT_NIL) {
-		Bonobo_Unknown_unref (composer->editor_engine, &ev);
-		CORBA_Object_release (composer->editor_engine, &ev);
-	}
-	g_hash_table_foreach_remove (composer->inline_images, clear_inline_images, NULL);
-
-	CORBA_exception_free (&ev);
-
-	if (composer->editor_listener)
-		bonobo_object_unref (composer->editor_listener);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* GtkWidget methods.  */
-
-static int
-delete_event (GtkWidget *widget,
-	      GdkEventAny *event)
-{
-	do_exit (E_MSG_COMPOSER (widget));
-	
-	return TRUE;
-}
-
-static void
-drag_data_received (EMsgComposer *composer,
-		    GdkDragContext *context,
-		    gint x,
-		    gint y,
-		    GtkSelectionData *selection,
-		    guint info,
-		    guint time)
-{
-	gchar *temp, *filename;
-	
-	filename = g_strdup (selection->data);
-	temp = strchr (filename, '\n');
-	if (temp) {
-		if (*(temp - 1) == '\r')
-			*(temp - 1) = '\0';
-		*temp = '\0';
-	}
-	
-	/* Chop the file: part off */
-	if (strncasecmp (filename, "file:", 5) == 0) {
-		temp = g_strdup (filename + 5);
-		g_free (filename);
-		filename = temp;
-	}
-	
-	e_msg_composer_attachment_bar_attach
-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
-		 filename, NULL);
-	
-	g_free (filename);
-}
-
-
-static void
-class_init (EMsgComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	
-	object_class->destroy = destroy;
-	
-	widget_class->delete_event = delete_event;
-	
-	parent_class = gtk_type_class (bonobo_window_get_type ());
-	
-	signals[SEND] =
-		gtk_signal_new ("send",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerClass, send),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	
-	signals[POSTPONE] =
-		gtk_signal_new ("postpone",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMsgComposerClass, postpone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (EMsgComposer *composer)
-{
-	composer->uic                      = NULL;
-	
-	composer->hdrs                     = NULL;
-	composer->extra_hdr_names          = g_ptr_array_new ();
-	composer->extra_hdr_values         = g_ptr_array_new ();
-	
-	composer->editor                   = NULL;
-	
-	composer->address_dialog           = NULL;
-	
-	composer->attachment_bar           = NULL;
-	composer->attachment_scroll_frame  = NULL;
-	
-	composer->persist_file_interface   = CORBA_OBJECT_NIL;
-	composer->persist_stream_interface = CORBA_OBJECT_NIL;
-
-	composer->editor_engine            = CORBA_OBJECT_NIL;
-	composer->inline_images            = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	composer->attachment_bar_visible   = FALSE;
-	composer->send_html                = FALSE;
-}
-
-
-GtkType
-e_msg_composer_get_type (void)
-{
-	static GtkType type = 0;
-	
-	if (type == 0) {
-		static const GtkTypeInfo info = {
-			"EMsgComposer",
-			sizeof (EMsgComposer),
-			sizeof (EMsgComposerClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (bonobo_window_get_type (), &info);
-	}
-	
-	return type;
-}
-
-/**
- * e_msg_composer_construct:
- * @composer: A message composer widget
- * 
- * Construct @composer.
- **/
-void
-e_msg_composer_construct (EMsgComposer *composer)
-{
-	GtkWidget *vbox;
-	BonoboObject *editor_server;
-
-	static GtkTargetEntry drop_types[] = {
-		{"text/uri-list", 0, 1}
-	};
-	
-	g_return_if_fail (gtk_main_level () > 0);
-	
-	gtk_window_set_default_size (GTK_WINDOW (composer),
-				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	
-	bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",
-			     _("Compose a message"));
-	
-	/* DND support */
-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
-			   drop_types, 1, GDK_ACTION_COPY);
-	gtk_signal_connect (GTK_OBJECT (composer), "drag_data_received",
-			    GTK_SIGNAL_FUNC (drag_data_received), NULL);
-	
-	setup_ui (composer);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	
-	composer->hdrs = e_msg_composer_hdrs_new ();
-	gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
-	gtk_widget_show (composer->hdrs);
-	
-	/* Editor component.  */
-	composer->editor = bonobo_widget_new_control (
-		HTML_EDITOR_CONTROL_ID,
-		bonobo_ui_component_get_container (composer->uic));
-	
-	if (!composer->editor)
-		return;
-	
-	editor_server = BONOBO_OBJECT (bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)));
-	
-	composer->persist_file_interface
-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistFile:1.0");
-	composer->persist_stream_interface
-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistStream:1.0");
-	
-	gtk_widget_show (composer->editor);
-	gtk_box_pack_start (GTK_BOX (vbox), composer->editor, TRUE, TRUE, 0);
-	gtk_widget_show (composer->editor);
-
-	/* Attachment editor, wrapped into an EScrollFrame.  We don't
-           show it for now.  */
-	
-	composer->attachment_scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (composer->attachment_scroll_frame),
-					GTK_SHADOW_IN);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (composer->attachment_scroll_frame),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	composer->attachment_bar = e_msg_composer_attachment_bar_new (NULL);
-	GTK_WIDGET_SET_FLAGS (composer->attachment_bar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (composer->attachment_scroll_frame),
-			   composer->attachment_bar);
-	gtk_box_pack_start (GTK_BOX (vbox),
-			    composer->attachment_scroll_frame,
-			    FALSE, FALSE, GNOME_PAD_SMALL);
-	
-	gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed",
-			    GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);
-	
-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
-	gtk_widget_show (vbox);
-	
-	e_msg_composer_show_attachments (composer, FALSE);
-	
-	/* Set focus on the `To:' field.  */
-	
-	gtk_widget_grab_focus (e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs)));
-}
-
-static EMsgComposer *
-create_composer (void)
-{
-	EMsgComposer *new;
-	
-	new = gtk_type_new (E_TYPE_MSG_COMPOSER);
-	e_msg_composer_construct (new);
-	if (!new->editor) {
-		e_notice (GTK_WINDOW (new), GNOME_MESSAGE_BOX_ERROR,
-			  _("Could not create composer window."));
-		gtk_object_unref (GTK_OBJECT (new));
-		return NULL;
-	}
-	prepare_engine (new);
-
-	return new;
-}
-
-/**
- * e_msg_composer_new:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new (void)
-{
-	EMsgComposer *new;
-	
-	new = create_composer ();
-	if (new) {
-		/* Load the signature, if any. */
-		set_editor_text (new, NULL, "");
-	}
-	
-	return new;
-}
-
-/**
- * e_msg_composer_new_with_sig_file:
- *
- * Create a new message composer widget. Sets the signature file.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_sig_file (const char *sig_file)
-{
-	EMsgComposer *new;
-	
-	new = create_composer ();
-	if (new) {
-		/* Load the signature, if any. */
-		set_editor_text (new, sig_file, "");
-		
-		e_msg_composer_set_sig_file (new, sig_file);
-	}
-	
-	return new;
-}
-
-static void
-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart)
-{
-	/* Find the text/html part and set the composer body to it's contents */
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		GMimeContentField *content_type;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		
-		if (gmime_content_field_is_type (content_type, "text", "html")) {
-			CamelDataWrapper *contents;
-			char *text, *final_text;
-			gboolean is_html;
-			
-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			text = mail_get_message_body (contents, FALSE, &is_html);
-			if (text) {
-				if (is_html)
-					final_text = g_strdup (text);
-				else
-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-								     E_TEXT_TO_HTML_CONVERT_SPACES);
-				g_free (text);
-				
-				e_msg_composer_set_body_text (composer, final_text);
-			}
-			
-			return;
-		}
-	}
-}
-
-static void
-handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
-{
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts; i++) {
-		GMimeContentField *content_type;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content_type = camel_mime_part_get_content_type (mime_part);
-		
-		if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {
-			/* this structure contains the body */
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			handle_multipart_alternative (composer, mpart);
-		} else if (gmime_content_field_is_type (content_type, "multipart", "*")) {
-			/* another layer of multipartness... */
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			handle_multipart (composer, mpart, depth + 1);
-		} else if (depth == 0 && i == 0) {
-			/* Since the first part is not multipart/alternative, then this must be the body */
-			CamelDataWrapper *contents;
-			char *text, *final_text;
-			gboolean is_html;
-			
-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			text = mail_get_message_body (contents, FALSE, &is_html);
-			if (text) {
-				if (is_html)
-					final_text = g_strdup (text);
-				else
-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-								     E_TEXT_TO_HTML_CONVERT_SPACES);
-				g_free (text);
-				
-				e_msg_composer_set_body_text (composer, final_text);
-			}
-		} else {
-			/* this is a leaf of the tree, so attach it */
-			e_msg_composer_attach (composer, mime_part);
-		}
-	}
-}
-
-/**
- * e_msg_composer_new_with_message:
- *
- * Create a new message composer widget.
- * 
- * Return value: A pointer to the newly created widget
- **/
-EMsgComposer *
-e_msg_composer_new_with_message (CamelMimeMessage *msg)
-{
-	const CamelInternetAddress *to, *cc, *bcc;
-	GList *To = NULL, *Cc = NULL, *Bcc = NULL;
-	GMimeContentField *content_type;
-	const gchar *subject;
-	EMsgComposer *new;
-	guint len, i;
-	
-	g_return_val_if_fail (gtk_main_level () > 0, NULL);
-	
-	new = create_composer ();
-	if (!new)
-		return NULL;
-	
-	subject = camel_mime_message_get_subject (msg);
-	
-	to = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_TO);
-	cc = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_CC);
-	bcc = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_BCC);
-	
-	len = CAMEL_ADDRESS (to)->addresses->len;
-	for (i = 0; i < len; i++) {
-		const char *name, *addr;
-		
-		if (camel_internet_address_get (to, i, &name, &addr)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			To = g_list_append (To, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	len = CAMEL_ADDRESS (cc)->addresses->len;
-	for (i = 0; i < len; i++) {
-		const char *name, *addr;
-		
-		if (camel_internet_address_get (to, i, &name, &addr)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			Cc = g_list_append (Cc, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	len = CAMEL_ADDRESS (bcc)->addresses->len;
-	for (i = 0; i < len; i++) {
-		const char *name, *addr;
-		
-		if (camel_internet_address_get (to, i, &name, &addr)) {
-			CamelInternetAddress *cia;
-			
-			cia = camel_internet_address_new ();
-			camel_internet_address_add (cia, name, addr);
-			Bcc = g_list_append (Bcc, camel_address_encode (CAMEL_ADDRESS (cia)));
-			camel_object_unref (CAMEL_OBJECT (cia));
-		}
-	}
-	
-	e_msg_composer_set_headers (new, To, Cc, Bcc, subject);
-	
-	free_recipients (To);
-	free_recipients (Cc);
-	free_recipients (Bcc);
-	
-	content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (msg));
-	if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {
-		/* multipart/alternative contains the text/plain and text/html versions of the message body */
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		handle_multipart_alternative (new, multipart);
-	} else if (gmime_content_field_is_type (content_type, "multipart", "*")) {
-		/* there must be attachments... */
-		CamelDataWrapper *wrapper;
-		CamelMultipart *multipart;
-		
-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));
-		multipart = CAMEL_MULTIPART (wrapper);
-		
-		handle_multipart (new, multipart, 0);
-	} else {
-		/* We either have a text/plain or a text/html part */
-		CamelDataWrapper *contents;
-		char *text, *final_text;
-		gboolean is_html;
-		
-		contents = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
-		text = mail_get_message_body (contents, FALSE, &is_html);
-		if (text) {
-			if (is_html)
-				final_text = g_strdup (text);
-			else
-				final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |
-							     E_TEXT_TO_HTML_CONVERT_SPACES);
-			g_free (text);
-			
-			e_msg_composer_set_body_text (new, final_text);
-		}
-	}
-	
-	return new;
-}
-
-static GList *
-add_recipients (GList *list, const char *recips, gboolean decode)
-{
-	int len;
-	char *addr;
-	
-	while (*recips) {
-		len = strcspn (recips, ",");
-		if (len) {
-			addr = g_strndup (recips, len);
-			if (decode)
-				camel_url_decode (addr);
-			list = g_list_append (list, addr);
-		}
-		recips += len;
-		if (*recips == ',')
-			recips++;
-	}
-	
-	return list;
-}
-
-static void
-free_recipients (GList *list)
-{
-	GList *l;
-	
-	for (l = list; l; l = l->next)
-		g_free (l->data);
-	g_list_free (list);
-}
-
-/**
- * e_msg_composer_new_from_url:
- * @url: a mailto URL
- *
- * Create a new message composer widget, and fill in fields as
- * defined by the provided URL.
- **/
-EMsgComposer *
-e_msg_composer_new_from_url (const char *url)
-{
-	EMsgComposer *composer;
-	EMsgComposerHdrs *hdrs;
-	GList *to = NULL, *cc = NULL, *bcc = NULL;
-	char *subject = NULL, *body = NULL;
-	const char *p, *header;
-	int len, clen;
-	char *content;
-	
-	g_return_val_if_fail (g_strncasecmp (url, "mailto:", 7) == 0, NULL);
-	
-	composer = e_msg_composer_new ();
-	if (!composer)
-		return NULL;
-
-	/* Parse recipients (everything after ':' until '?' or eos. */
-	p = url + 7;
-	len = strcspn (p, "?,");
-	if (len) {
-		content = g_strndup (p, len);
-		to = add_recipients (to, content, TRUE);
-		g_free (content);
-	}
-	
-	p += len;
-	if (*p == '?') {
-		p++;
-		
-		while (*p) {
-			len = strcspn (p, "=&");
-			
-			/* If it's malformed, give up. */
-			if (p[len] != '=')
-				break;
-			
-			header = p;
-			p += len + 1;
-			
-			clen = strcspn (p, "&");
-			content = g_strndup (p, clen);
-			camel_url_decode (content);
-			
-			if (!g_strncasecmp (header, "to", len))
-				to = add_recipients (to, content, FALSE);
-			else if (!g_strncasecmp (header, "cc", len))
-				cc = add_recipients (cc, content, FALSE);
-			else if (!g_strncasecmp (header, "bcc", len))
-				bcc = add_recipients (bcc, content, FALSE);
-			else if (!g_strncasecmp (header, "subject", len))
-				subject = g_strdup (content);
-			else if (!g_strncasecmp (header, "body", len))
-				body = g_strdup (content);
-			
-			g_free (content);
-			p += clen;
-			if (*p == '&') {
-				p++;
-				if (!strcmp (p, "amp;"))
-					p += 4;
-			}
-		}
-	}
-	
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	e_msg_composer_hdrs_set_to (hdrs, to);
-	free_recipients (to);
-	e_msg_composer_hdrs_set_cc (hdrs, cc);
-	free_recipients (cc);
-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
-	free_recipients (bcc);
-	if (subject) {
-		e_msg_composer_hdrs_set_subject (hdrs, subject);
-		g_free (subject);
-	}
-	
-	if (body) {
-		char *htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);
-		set_editor_text (composer, NULL, htmlbody);
-		g_free (htmlbody);
-	}
-	
-	return composer;
-}
-
-/**
- * e_msg_composer_show_attachments:
- * @composer: A message composer widget
- * @show: A boolean specifying whether the attachment bar should be shown or
- * not
- * 
- * If @show is %FALSE, hide the attachment bar.  Otherwise, show it.
- **/
-void
-e_msg_composer_show_attachments (EMsgComposer *composer,
-				 gboolean show)
-{
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	show_attachments (composer, show);
-}
-
-/**
- * e_msg_composer_set_headers:
- * @composer: a composer object
- * @to: the values for the "To" header
- * @cc: the values for the "Cc" header
- * @bcc: the values for the "Bcc" header
- * @subject: the value for the "Subject" header
- *
- * Sets the headers in the composer to the given values.
- **/
-void 
-e_msg_composer_set_headers (EMsgComposer *composer, const GList *to,
-			    const GList *cc, const GList *bcc,
-			    const char *subject)
-{
-	EMsgComposerHdrs *hdrs;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
-	
-	e_msg_composer_hdrs_set_to (hdrs, to);
-	e_msg_composer_hdrs_set_cc (hdrs, cc);
-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
-	e_msg_composer_hdrs_set_subject (hdrs, subject);
-}
-
-
-/**
- * e_msg_composer_set_body_text:
- * @composer: a composer object
- * @text: the HTML text to initialize the editor with
- *
- * Loads the given HTML text into the editor.
- **/
-void
-e_msg_composer_set_body_text (EMsgComposer *composer, const char *text)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	set_editor_text (composer, composer->sig_file, text);
-}
-
-
-/**
- * e_msg_composer_add_header:
- * @composer: a composer object
- * @name: the header name
- * @value: the header value
- *
- * Adds a header with @name and @value to the message. This header
- * may not be displayed by the composer, but will be included in
- * the message it outputs.
- **/
-void
-e_msg_composer_add_header (EMsgComposer *composer, const char *name,
-			   const char *value)
-{
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (value != NULL);
-	
-	g_ptr_array_add (composer->extra_hdr_names, g_strdup (name));
-	g_ptr_array_add (composer->extra_hdr_values, g_strdup (value));
-}
-
-
-/**
- * e_msg_composer_attach:
- * @composer: a composer object
- * @attachment: the CamelMimePart to attach
- *
- * Attaches @attachment to the message being composed in the composer.
- **/
-void
-e_msg_composer_attach (EMsgComposer *composer, CamelMimePart *attachment)
-{
-	EMsgComposerAttachmentBar *bar;
-	
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	g_return_if_fail (CAMEL_IS_MIME_PART (attachment));
-	
-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar);
-	e_msg_composer_attachment_bar_attach_mime_part (bar, attachment);
-}
-
-
-/**
- * e_msg_composer_get_message:
- * @composer: A message composer widget
- * 
- * Retrieve the message edited by the user as a CamelMimeMessage.  The
- * CamelMimeMessage object is created on the fly; subsequent calls to this
- * function will always create new objects from scratch.
- * 
- * Return value: A pointer to the new CamelMimeMessage object
- **/
-CamelMimeMessage *
-e_msg_composer_get_message (EMsgComposer *composer)
-{
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return build_message (composer);
-}
-
-
-
-/**
- * e_msg_composer_set_sig:
- * @composer: A message composer widget
- * @path: Signature file
- * 
- * Set a signature
- **/
-void
-e_msg_composer_set_sig_file (EMsgComposer *composer, const char *sig_file)
-{
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-	
-	composer->sig_file = g_strdup (sig_file);
-}
-
-/**
- * e_msg_composer_get_sig_file:
- * @composer: A message composer widget
- * 
- * Get the signature file
- * 
- * Return value: The signature file.
- **/
-const char *
-e_msg_composer_get_sig_file (EMsgComposer *composer)
-{
-	g_return_val_if_fail (composer != NULL, NULL);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
-	
-	return composer->sig_file;
-}
-
-
-/**
- * e_msg_composer_set_send_html:
- * @composer: A message composer widget
- * @send_html: Whether the composer should have the "Send HTML" flag set
- * 
- * Set the status of the "Send HTML" toggle item.  The user can override it.
- **/
-void
-e_msg_composer_set_send_html (EMsgComposer *composer,
-			      gboolean send_html)
-{
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	if (composer->send_html && send_html)
-		return;
-	if (! composer->send_html && ! send_html)
-		return;
-
-	composer->send_html = send_html;
-
-	bonobo_ui_component_set_prop (composer->uic, "/commands/FormatHtml",
-				      "state", composer->send_html ? "1" : "0", NULL);
-}
-
-/**
- * e_msg_composer_get_send_html:
- * @composer: A message composer widget
- * 
- * Get the status of the "Send HTML mail" flag.
- * 
- * Return value: The status of the "Send HTML mail" flag.
- **/
-gboolean
-e_msg_composer_get_send_html (EMsgComposer *composer)
-{
-	g_return_val_if_fail (composer != NULL, FALSE);
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	return composer->send_html;
-}
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
deleted file mode 100644
index 08d7da9906..0000000000
--- a/composer/e-msg-composer.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.h
- *
- * Copyright (C) 1999  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef ___E_MSG_COMPOSER_H__
-#define ___E_MSG_COMPOSER_H__
-
-typedef struct _EMsgComposer       EMsgComposer;
-typedef struct _EMsgComposerClass  EMsgComposerClass;
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "e-msg-composer-attachment-bar.h"
-#include "e-msg-composer-hdrs.h"
-#include "HTMLEditor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-
-#define E_TYPE_MSG_COMPOSER	       (e_msg_composer_get_type ())
-#define E_MSG_COMPOSER(obj)	       (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer))
-#define E_MSG_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass))
-#define E_IS_MSG_COMPOSER(obj)	       (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-#define E_IS_MSG_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER))
-
-
-
-struct _EMsgComposer {
-	BonoboWindow parent;
-	
-	BonoboUIComponent *uic;
-	
-	GtkWidget *hdrs;
-	GPtrArray *extra_hdr_names, *extra_hdr_values;
-	
-	GtkWidget *editor;
-	
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scroll_frame;
-	
-	GtkWidget *address_dialog;
-	
-	Bonobo_PersistFile   persist_file_interface;
-	Bonobo_PersistStream persist_stream_interface;
-	HTMLEditor_Engine    editor_engine;
-	BonoboObject        *editor_listener;
-	GHashTable          *inline_images;
-
-	char *sig_file;
-	
-	gboolean attachment_bar_visible : 1;
-	gboolean send_html : 1;
-};
-
-struct _EMsgComposerClass {
-	BonoboWindowClass parent_class;
-	
-	void (* send) (EMsgComposer *composer);
-	void (* postpone) (EMsgComposer *composer);
-};
-
-
-GtkType           e_msg_composer_get_type          (void);
-
-void              e_msg_composer_construct         (EMsgComposer *composer);
-EMsgComposer     *e_msg_composer_new               (void);
-EMsgComposer     *e_msg_composer_new_with_sig_file (const char *sig_file);
-EMsgComposer     *e_msg_composer_new_with_message  (CamelMimeMessage *msg);
-EMsgComposer     *e_msg_composer_new_from_url      (const char *url);
-void              e_msg_composer_show_attachments  (EMsgComposer *composer,
-						    gboolean      show);
-
-void              e_msg_composer_set_headers       (EMsgComposer *composer,
-						    const GList *to,
-						    const GList *cc,
-						    const GList *bcc,
-						    const char *subject);
-void              e_msg_composer_set_body_text     (EMsgComposer *composer,
-						    const char *text);
-void              e_msg_composer_add_header        (EMsgComposer *composer,
-						    const char *name,
-						    const char *value);
-void              e_msg_composer_attach            (EMsgComposer *composer,
-						    CamelMimePart *attachment);
-
-CamelMimeMessage *e_msg_composer_get_message       (EMsgComposer *composer);
-
-void              e_msg_composer_set_sig_file      (EMsgComposer *composer,
-						    const char *sig_file);
-const char       *e_msg_composer_get_sig_file      (EMsgComposer *composer);
-
-void              e_msg_composer_set_send_html     (EMsgComposer *composer,
-						    gboolean send_html);
-gboolean          e_msg_composer_get_send_html     (EMsgComposer *composer);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ___E_MSG_COMPOSER_H__ */
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
deleted file mode 100644
index f39482336c..0000000000
--- a/composer/evolution-composer.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Dan Winship <danw@helixcode.com>
- */
-
-#include <config.h>
-
-#include <bonobo.h>
-#include <camel/camel.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include "evolution-composer.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-static void (*send_cb) (EMsgComposer *, gpointer);
-static void (*postpone_cb) (EMsgComposer *, gpointer);
-
-/* CORBA interface implementation.  */
-
-static POA_Evolution_Composer__vepv Composer_vepv;
-
-static GList *
-corba_recipientlist_to_glist (const Evolution_Composer_RecipientList *cl)
-{
-	Evolution_Composer_Recipient *recip;
-	GList *gl = NULL;
-	char *str;
-	int i;
-
-	for (i = cl->_length - 1; i >= 0; i--) {
-		recip = &(cl->_buffer[i]);
-
-		/* Let's copy this code into yet another place! */
-		if (*recip->name) {
-			str = g_strdup_printf ("\"%s\" <%s>",
-					       recip->name, recip->address);
-		} else
-			str = g_strdup (recip->address);
-
-		gl = g_list_prepend (gl, str);		
-	}
-
-	return gl;
-}
-
-static void
-free_recipient_glist (GList *gl)
-{
-	GList *tmp;
-
-	while (gl) {
-		tmp = gl->next;
-		g_free (gl->data);
-		g_list_free_1 (gl);
-		gl = tmp;
-	}
-}
-
-static void
-impl_Composer_set_headers (PortableServer_Servant servant,
-			   const Evolution_Composer_RecipientList *to,
-			   const Evolution_Composer_RecipientList *cc,
-			   const Evolution_Composer_RecipientList *bcc,
-			   const CORBA_char *subject,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	GList *gto, *gcc, *gbcc;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	gto = corba_recipientlist_to_glist (to);
-	gcc = corba_recipientlist_to_glist (cc);
-	gbcc = corba_recipientlist_to_glist (bcc);
-
-	e_msg_composer_set_headers (composer->composer, gto, gcc, gbcc,
-				    subject);
-
-	free_recipient_glist (gto);
-	free_recipient_glist (gcc);
-	free_recipient_glist (gbcc);
-}
-
-static void
-impl_Composer_set_body_text (PortableServer_Servant servant,
-			     const CORBA_char *text,
-			     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	e_msg_composer_set_body_text (composer->composer, text);
-}
-
-static void
-impl_Composer_attach_MIME (PortableServer_Servant servant,
-			   const CORBA_char *data,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	CamelMimePart *attachment;
-	CamelStream *mem_stream;
-	int status;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	mem_stream = camel_stream_mem_new_with_buffer (data, strlen (data));
-	attachment = camel_mime_part_new ();
-	status = camel_data_wrapper_construct_from_stream (
-		CAMEL_DATA_WRAPPER (attachment), mem_stream);
-	camel_object_unref (CAMEL_OBJECT (mem_stream));
-
-	if (status == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Composer_CouldNotParse,
-				     NULL);
-		return;
-	}
-
-	e_msg_composer_attach (composer->composer, attachment);
-	camel_object_unref (CAMEL_OBJECT (attachment));
-}
-
-static void
-impl_Composer_attach_data (PortableServer_Servant servant,
-			   const CORBA_char *content_type,
-			   const CORBA_char *filename,
-			   const CORBA_char *description,
-			   const CORBA_boolean show_inline,
-			   const CORBA_char *data,
-			   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-	CamelMimePart *attachment;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	attachment = camel_mime_part_new ();
-	camel_mime_part_set_content (attachment, data, strlen (data),
-				     content_type);
-
-	if (*filename)
-		camel_mime_part_set_filename (attachment, filename);
-	if (*description)
-		camel_mime_part_set_description (attachment, description);
-	camel_mime_part_set_disposition (attachment, show_inline ?
-					 "inline" : "attachment");
-
-	e_msg_composer_attach (composer->composer, attachment);
-	camel_object_unref (CAMEL_OBJECT (attachment));
-}
-
-static void
-impl_Composer_show (PortableServer_Servant servant,
-		    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EvolutionComposer *composer;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	composer = EVOLUTION_COMPOSER (bonobo_object);
-
-	gtk_widget_show (GTK_WIDGET (composer->composer));
-}
-
-POA_Evolution_Composer__epv *
-evolution_composer_get_epv (void)
-{
-	POA_Evolution_Composer__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Composer__epv, 1);
-	epv->set_headers = impl_Composer_set_headers;
-	epv->set_body_text = impl_Composer_set_body_text;
-	epv->attach_MIME = impl_Composer_attach_MIME;
-	epv->attach_data = impl_Composer_attach_data;
-	epv->show = impl_Composer_show;
-
-	return epv;
-}
-
-
-/* GtkObject stuff */
-
-static void
-destroy (GtkObject *object)
-{
-	EvolutionComposer *composer = EVOLUTION_COMPOSER (object);
-
-	if (composer->composer)
-		gtk_object_unref (GTK_OBJECT (composer->composer));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-class_init (EvolutionComposerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	Composer_vepv.Evolution_Composer_epv = evolution_composer_get_epv ();
-}
-
-static void
-init (EvolutionComposer *composer)
-{
-	composer->composer = e_msg_composer_new ();
-	gtk_signal_connect (GTK_OBJECT (composer->composer), "send",
-			    GTK_SIGNAL_FUNC (send_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (composer->composer), "postpone",
-			    GTK_SIGNAL_FUNC (postpone_cb), NULL);
-}
-
-
-void
-evolution_composer_construct (EvolutionComposer *composer,
-			      Evolution_Composer corba_object)
-{
-	g_return_if_fail (composer != NULL);
-	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-
-	bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);
-}
-
-EvolutionComposer *
-evolution_composer_new (void)
-{
-	EvolutionComposer *new;
-	POA_Evolution_Composer *servant;
-	CORBA_Environment ev;
-	Evolution_Composer corba_object;
-
-	servant = (POA_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Composer_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Composer__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	new = gtk_type_new (evolution_composer_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new),
-						       servant);
-	evolution_composer_construct (new, corba_object);
-
-	return new;
-}
-
-E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE)
-
-
-#define COMPOSER_FACTORY_ID "OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, void *closure)
-{
-	return BONOBO_OBJECT (evolution_composer_new ());
-}
-
-void
-evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
-				 void (*postpone) (EMsgComposer *, gpointer))
-{
-	if (bonobo_generic_factory_new (COMPOSER_FACTORY_ID,
-					factory_fn, NULL) == NULL) {
-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-			  _("Cannot initialize Evolution's composer."));
-		exit (1);
-	}
-
-	send_cb = send;
-	postpone_cb = postpone;
-}
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
deleted file mode 100644
index 6f248dae22..0000000000
--- a/composer/evolution-composer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-composer.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Dan Winship
- */
-
-#ifndef __EVOLUTION_COMPOSER_H__
-#define __EVOLUTION_COMPOSER_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Composer.h"
-#include "e-msg-composer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_COMPOSER            (evolution_composer_get_type ())
-#define EVOLUTION_COMPOSER(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer))
-#define EVOLUTION_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass))
-#define EVOLUTION_IS_COMPOSER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-#define EVOLUTION_IS_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))
-
-typedef struct _EvolutionComposer        EvolutionComposer;
-typedef struct _EvolutionComposerClass   EvolutionComposerClass;
-
-struct _EvolutionComposer {
-	BonoboObject parent;
-
-	EMsgComposer *composer;
-};
-
-struct _EvolutionComposerClass {
-	BonoboObjectClass parent_class;
-};
-
-POA_Evolution_Composer__epv *evolution_composer_get_epv            (void);
-
-GtkType            evolution_composer_get_type     (void);
-void               evolution_composer_construct    (EvolutionComposer *,
-						    Evolution_Composer);
-EvolutionComposer *evolution_composer_new          (void);
-
-void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
-						    void (*postpone) (EMsgComposer *, gpointer));
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_COMPOSER_H__ */
diff --git a/composer/listener.c b/composer/listener.c
deleted file mode 100644
index 3b90e7200f..0000000000
--- a/composer/listener.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  This file is part of gnome-spell bonobo component
-
-    Copyright (C) 2000 Helix Code, Inc.
-    Authors:           Radek Doulik <rodo@helixcode.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <bonobo.h>
-
-#include "listener.h"
-
-static BonoboObjectClass *listener_parent_class;
-static POA_HTMLEditor_Listener__vepv listener_vepv;
-
-inline static HTMLEditorListener *
-html_editor_listener_from_servant (PortableServer_Servant servant)
-{
-	return HTML_EDITOR_LISTENER (bonobo_object_from_servant (servant));
-}
-
-static CORBA_any *
-get_any_null ()
-{
-	CORBA_any *rv;
-
-	rv = CORBA_any__alloc ();
-	rv->_type = TC_null;
-
-	return rv;
-}
-
-static gchar *
-resolve_image_url (HTMLEditorListener *l, gchar *url)
-{
-	gchar *cid = NULL;
-
-	if (!strncmp (url, "file:", 5)) {
-		gchar *id;
-
-		id = (gchar *) g_hash_table_lookup (l->composer->inline_images, url + 5);
-		if (!id) {
-			id = header_msgid_generate ();
-			e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (l->composer->attachment_bar),
-							      url + 5, id);
-			g_hash_table_insert (l->composer->inline_images, g_strdup (url + 5), id);
-		}
-		cid = g_strconcat ("cid:", id, NULL);
-	}
-
-	return cid;
-}
-
-static CORBA_any *
-impl_event (PortableServer_Servant _servant,
-       const CORBA_char * name, const CORBA_any * arg,
-       CORBA_Environment * ev)
-{
-	HTMLEditorListener *l = html_editor_listener_from_servant (_servant);
-	BonoboArg *data;
-	CORBA_any *rv = NULL;
-
-	/* printf ("impl_event\n"); */
-
-	if (!strcmp (name, "command")) {
-		/* FIXME check for insert-paragraph command */
-		data = HTMLEditor_Engine_get_paragraph_data (l->composer->editor_engine, "orig", ev);
-		if (ev->_major == CORBA_NO_EXCEPTION && data) {
-			if (CORBA_TypeCode_equal (data->_type, TC_boolean, ev) && BONOBO_ARG_GET_BOOLEAN (data)) {
-				HTMLEditor_Engine_command (l->composer->editor_engine, "style-normal", ev);
-				HTMLEditor_Engine_command (l->composer->editor_engine, "indent-zero", ev);
-				HTMLEditor_Engine_command (l->composer->editor_engine, "italic-off", ev);
-			}
-			BONOBO_ARG_SET_BOOLEAN (data, CORBA_FALSE);
-			HTMLEditor_Engine_set_paragraph_data (l->composer->editor_engine, "orig", data, ev);
-		}
-	} else if (!strcmp (name, "image_url")) {
-		gchar *url;
-
-		if ((url = resolve_image_url (l, BONOBO_ARG_GET_STRING (arg)))) {
-			rv = bonobo_arg_new (TC_string);
-			BONOBO_ARG_SET_STRING (rv, url);
-			printf ("new url: %s\n", url);
-			g_free (url);
-		}
-	}
-
-	return rv ? rv : get_any_null ();
-}
-
-POA_HTMLEditor_Listener__epv *
-html_editor_listener_get_epv (void)
-{
-	POA_HTMLEditor_Listener__epv *epv;
-
-	epv = g_new0 (POA_HTMLEditor_Listener__epv, 1);
-
-	epv->event = impl_event;
-
-	return epv;
-}
-
-static void
-init_listener_corba_class (void)
-{
-	listener_vepv.Bonobo_Unknown_epv    = bonobo_object_get_epv ();
-	listener_vepv.HTMLEditor_Listener_epv = html_editor_listener_get_epv ();
-}
-
-static void
-listener_class_init (HTMLEditorListenerClass *klass)
-{
-	listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	init_listener_corba_class ();
-}
-
-GtkType
-html_editor_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"HTMLEditorListener",
-			sizeof (HTMLEditorListener),
-			sizeof (HTMLEditorListenerClass),
-			(GtkClassInitFunc) listener_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-HTMLEditorListener *
-html_editor_listener_construct (HTMLEditorListener *listener, HTMLEditor_Listener corba_listener)
-{
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_HTML_EDITOR_LISTENER (listener), NULL);
-	g_return_val_if_fail (corba_listener != CORBA_OBJECT_NIL, NULL);
-
-	if (!bonobo_object_construct (BONOBO_OBJECT (listener), (CORBA_Object) corba_listener))
-		return NULL;
-
-	return listener;
-}
-
-static HTMLEditor_Listener
-create_listener (BonoboObject *listener)
-{
-	POA_HTMLEditor_Listener *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_HTMLEditor_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_HTMLEditor_Listener__init ((PortableServer_Servant) servant, &ev);
-	ORBIT_OBJECT_KEY(servant->_private)->object = NULL;
-
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return (HTMLEditor_Listener) bonobo_object_activate_servant (listener, servant);
-}
-
-HTMLEditorListener *
-html_editor_listener_new (EMsgComposer *composer)
-{
-	HTMLEditorListener *listener;
-	HTMLEditor_Listener corba_listener;
-
-	listener = gtk_type_new (HTML_EDITOR_LISTENER_TYPE);
-	listener->composer = composer;
-
-	corba_listener = create_listener (BONOBO_OBJECT (listener));
-
-	if (corba_listener == CORBA_OBJECT_NIL) {
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return NULL;
-	}
-	
-	return html_editor_listener_construct (listener, corba_listener);
-}
diff --git a/composer/listener.h b/composer/listener.h
deleted file mode 100644
index e2815a3221..0000000000
--- a/composer/listener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*  This file is part of gnome-spell bonobo component
-
-    Copyright (C) 2000 Helix Code, Inc.
-    Authors:           Radek Doulik <rodo@helixcode.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-*/
-
-#ifndef LISTENER_H_
-#define LISTENER_H_
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "HTMLEditor.h"
-#include "e-msg-composer.h"
-
-BEGIN_GNOME_DECLS
-
-#define HTML_EDITOR_LISTENER_TYPE        (html_editor_listener_get_type ())
-#define HTML_EDITOR_LISTENER(o)          (GTK_CHECK_CAST ((o), HTML_EDITOR_LISTENER_TYPE, HTMLEditorListener))
-#define HTML_EDITOR_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), HTML_EDITOR_LISTENER_TYPE, HTMLEditorListenerClass))
-#define IS_HTML_EDITOR_LISTENER(o)       (GTK_CHECK_TYPE ((o), HTML_EDITOR_LISTENER_TYPE))
-#define IS_HTML_EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HTML_EDITOR_LISTENER_TYPE))
-
-typedef struct {
-	BonoboObject parent;
-	EMsgComposer *composer;
-} HTMLEditorListener;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-} HTMLEditorListenerClass;
-
-GtkType                       html_editor_listener_get_type   (void);
-HTMLEditorListener           *html_editor_listener_construct  (HTMLEditorListener  *listener,
-							       HTMLEditor_Listener  corba_listener);
-HTMLEditorListener           *html_editor_listener_new        (EMsgComposer *composer);
-POA_HTMLEditor_Listener__epv *html_editor_listener_get_epv    (void);
-
-END_GNOME_DECLS
-
-#endif /* LISTENER_H_ */
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 0a0418b3ca..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,699 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(camel)
-AM_CONFIG_HEADER(config.h)
-
-cflags_set=${CFLAGS+set}
-
-EVOLUTION_MAJOR_VERSION=0
-EVOLUTION_MINOR_VERSION=0
-EVOLUTION_MICRO_VERSION=6
-VERSION=$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
-PACKAGE=evolution
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_SUBST(VERSION)
-
-
-dnl Initialize libtool
-AM_PROG_LIBTOOL
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-AC_CANONICAL_HOST
-
-AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT(capplet)
-GNOME_COMPILE_WARNINGS
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_LEX
-AC_PROG_YACC
-AC_STDC_HEADERS
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, /usr/sbin:/usr/lib)
-AC_DEFINE_UNQUOTED(SENDMAIL_PATH, "$SENDMAIL")
-
-AC_MSG_CHECKING(system mail directory)
-if test -d /var/mail; then
-	system_mail_dir=/var/mail
-else
-	system_mail_dir=/var/spool/mail
-fi
-AC_MSG_RESULT($system_mail_dir)
-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir")
-
-dnl Check for new enough gnome-libs
-CFLAGS_save=$CFLAGS
-LIBS_save=$LIBS
-CFLAGS=`gnome-config --cflags gnomeui`
-LIBS=`gnome-config --libs gnomeui`
-
-AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[
-AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)])
-
-CFLAGS=$CFLAGS_save
-LIBS=$LIBS_save
-
-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"
-
-AM_GNOME_GETTEXT
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
-GNOME_X_CHECKS
-
-dnl
-dnl Purify support
-dnl
-AC_ARG_ENABLE(purify, 
-[  --enable-purify=[no/yes]      Enable support for building executables with
-                                Purify.],,enable_purify=no)
-AC_PATH_PROG(PURIFY, purify, impure)
-AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])
-if test "x$with_purify_options" = "xno"; then
-  with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
-fi
-if test "x$PURIFYOPTIONS" = "x"; then
-  PURIFYOPTIONS=$with_purify_options
-fi
-AC_SUBST(PURIFY)
-AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")
-PURIFY="$PURIFY $PURIFYOPTIONS"
-
-dnl * Time zone stuff
-AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
-	AC_TRY_COMPILE([
-		#include <time.h>
-	], [
-		timezone = 1;
-	], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-if test $ac_cv_var_timezone = yes; then
-	AC_DEFINE(HAVE_TIMEZONE)
-else
-	AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-		AC_TRY_COMPILE([
-			#include <time.h>
-			], [
-			struct tm tm;
-			tm.tm_gmtoff = 1;
-			], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-	if test $ac_cv_struct_tm_gmtoff = yes; then
-		AC_DEFINE(HAVE_TM_GMTOFF)
-	else
-		AC_ERROR(unable to find a way to determine timezone)
-	fi
-fi
-
-AC_CHECK_FUNCS(mkstemp mkdtemp isblank)
-
-dnl **************************************************
-dnl ctime_r prototype
-dnl **************************************************
-
-AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,
-[
-	AC_TRY_COMPILE([
-		#include <time.h>
-	],[
-		char *buf;
-		time_t date;
-		ctime_r( &date, buf, 100 );
-	],[
-		ac_cv_ctime_r_three_args=yes
-	],[
-		ac_cv_ctime_r_three_args=no
-	])
-])
-	
-if test x"$ac_cv_ctime_r_three_args" = xyes ; then
-	AC_DEFINE(CTIME_R_THREE_ARGS)
-fi
-
-dnl **************************************************
-dnl * pas-backend-file stuff.
-dnl * check for db_185.h.  if it's there, we use it.
-dnl * otherwise, we use db.h (since it'll be 185).
-dnl * Except on RH7.0, which puts db in yet another place
-dnl **************************************************
-AC_CHECK_HEADERS(db_185.h)
-AC_CHECK_HEADERS(db1/db.h)
-
-dnl **************************************************
-dnl * ldap related stuff.
-dnl **************************************************
-AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")
-if test x$ac_cv_lib_lber_ber_get_tag = xyes; then
-AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)
-fi
-if test x$ac_cv_lib_ldap_ldap_open = xyes; then
-	AC_DEFINE(HAVE_LDAP)
-	AC_SUBST(LDAP_LIBS)
-	msg_ldap=Yes
-else
-	AC_MSG_WARN(no ldap support present)
-	msg_ldap=No
-fi
-AM_CONDITIONAL(ENABLE_LDAP, test x$ac_cv_lib_ldap_ldap_open = xyes)
-
-dnl **************************************************
-dnl * Posix thread support
-dnl **************************************************
-
-dnl Hah! Threads are no longer an option
-dnl AC_ARG_WITH(threads, [  --with-threads          Include thread support],[
-dnl FIXME: support more thread types, pth at least
-
-GNOME_PTHREAD_CHECK
-
-if test "x$PTHREAD_LIB" = "x" ; then
-	AC_MSG_ERROR([POSIX threads are currently required for Evolution])
-fi
-
-dnl
-dnl Notice that this is a hack, and we wont be able to use this forever, but
-dnl at least for some time
-dnl
-
-THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
-THREADS_CFLAGS="`glib-config --cflags gthread`"
-
-AC_SUBST(THREADS_LIBS)
-AC_SUBST(THREADS_CFLAGS)
-
-dnl **************************************************
-dnl * Print check
-dnl **************************************************
-AC_MSG_CHECKING(for GnomePrint libraries version either 0.20 or later)
-  if gnome-config --libs print > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-    if test "$vers" -ge 20; then
-      if test "$vers" -ge 21; then
-          AC_MSG_RESULT(found >=0.21)
-      else
-          AC_MSG_RESULT(found 0.20)
-	  AC_DEFINE(USING_GNOME_PRINT_0_20)
-      fi
-    else
-        AC_MSG_ERROR(Please upgrade your gnome-print to version 0.20 or later.)
-    fi
-  else
-     AC_MSG_ERROR(Did not find GnomePrint installed)
-  fi
-
-GNOME_PRINT_LIBS=`gnome-config --libs print`
-GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
-AC_SUBST(GNOME_PRINT_LIBS)
-AC_SUBST(GNOME_PRINT_CFLAGS)
-
-dnl ******************************
-dnl Check for Bonobo
-dnl ******************************
-AC_MSG_CHECKING(for Bonobo >= 0.27)
-if gnome-config --libs bonobox > /dev/null 2>&1; then
-	vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
-		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
-	if test "$vers" -ge 27; then
-		bonobo_ok=true
-	else
-		bonobo_ok=false
-	fi
-else
-	bonobo_ok=false
-fi
-
-if $bonobo_ok; then
-	AC_MSG_RESULT($vers found)
-else
-	AC_MSG_ERROR(Bonobo 0.20 or newer is required to compile Evolution)
-fi
-
-dnl ******************************
-dnl OAF
-dnl ******************************
-
-AC_PATH_PROG(OAF_CONFIG,oaf-config,no)
-if test x$OAF_CONFIG = xno; then
-	AC_MSG_ERROR("The oaf-config program was not found")
-else
-	OAF_LIBS=`$OAF_CONFIG --libs`
-	OAF_CFLAGS=`$OAF_CONFIG --cflags`
-fi
-
-AC_SUBST(OAF_LIBS)
-AC_SUBST(OAF_CFLAGS)
-
-
-dnl ******************************
-dnl LibGlade checking
-dnl ******************************
-AC_MSG_CHECKING(for Glade libraries)
-if gnome-config --libs libglade > /dev/null 2>&1; then 
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(Did not find libGlade installed)
-fi
-
-dnl ******************************
-dnl libunicode checking
-dnl ******************************
-AC_MSG_CHECKING(for libunicode)
-if unicode-config --libs > /dev/null 2>&1; then 
-    UNICODE_LIBS=`unicode-config --libs`
-    UNICODE_CFLAGS=`unicode-config --cflags`
-    AC_SUBST(UNICODE_LIBS)
-    AC_SUBST(UNICODE_CFLAGS)
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(libunicode not found)
-fi
-
-dnl ******************************
-dnl GdkPixbuf checking
-dnl ******************************
-AC_MSG_CHECKING(for Gdkpixbuf libraries)
-if gnome-config --libs gdk_pixbuf gnomecanvaspixbuf > /dev/null 2>&1; then 
-    AC_MSG_RESULT(found)
-else
-    AC_MSG_ERROR(Did not find gdkpixbuf installed)
-fi
-
-dnl ******************************
-dnl Gnome App Lib checking
-dnl ******************************
-AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.2.1.2)
-if gnome-config --libs gal > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
-        awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
-    if test "$vers" -ge 20102; then
-        AC_MSG_RESULT(found)
-    else
-        AC_MSG_ERROR(You need at least GNOME Application libs 0.2.1.2 for this version of Evolution)
-    fi
-else
-    AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
-fi
-
-GLIB_CFLAGS="`glib-config --cflags`"
-GLIB_LIBS="`glib-config --libs`"
-
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-
-EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_LIBS $UNICODE_LIBS"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS $UNICODE_CFLAGS"
-
-AC_SUBST(EXTRA_GNOME_LIBS)
-AC_SUBST(EXTRA_GNOME_CFLAGS)
-
-
-BONOBO_GNOME_LIBS="`gnome-config --libs bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $UNICODE_LIBS $OAF_LIBS"
-BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $UNICODE_CFLAGS $OAF_CFLAGS"
-AC_SUBST(BONOBO_GNOME_LIBS)
-AC_SUBST(BONOBO_GNOME_CFLAGS)
-
-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS $UNICODE_LIBS"
-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS $UNICODE_CFLAGS"
-AC_SUBST(BONOBO_HTML_GNOME_LIBS)
-AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
-
-dnl ******************************
-dnl GtkHTML checking
-dnl ******************************
-
-AC_MSG_CHECKING(for GtkHTML)
-if gnome-config --libs gtkhtml > /dev/null 2>&1; then
-	vers=`gnome-config --modversion gtkhtml`
-	case $vers
-	in
-	    gtkhtml-0.[01234567]) gtkhtml_ok=false ;;
-	    *) gtkhtml_ok=true ;;
-	esac
-else
-	gtkhtml_ok=false
-fi
-
-if $gtkhtml_ok; then
-	AC_MSG_RESULT($vers found)
-else
-	AC_MSG_ERROR(GtkHTML 0.8 or later is required to compile Evolution)
-fi
-
-GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`"
-GTKHTML_LIBS="`gnome-config --libs gtkhtml`"
-
-AC_SUBST(GTKHTML_CFLAGS)
-AC_SUBST(GTKHTML_LIBS)
-
-if test x${prefix} = xNONE; then
-	html_prefix=$ac_default_prefix
-else
-	html_prefix=$prefix
-fi
-AC_MSG_CHECKING(for HTMLEditor.idl in `gnome-config --datadir`/gtkhtml or ${html_prefix}/share/gtkhtml)
-if test -f `gnome-config --datadir`/gtkhtml/HTMLEditor.idl; then
-	GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/HTMLEditor.idl
-	AC_MSG_RESULT(found)
-else
-	if test -f ${html_prefix}/share/gtkhtml/HTMLEditor.idl; then
-		GTK_HTML_EDITOR_IDL=${html_prefix}/share/gtkhtml/HTMLEditor.idl
-		AC_MSG_RESULT(found)
-	else
-		AC_MSG_ERROR(HTMLEditor.idl is required to compile Evolution composer, it's included in GtkHTML
-You need GtkHTML build with html-editor-control)
-	fi
-fi
-
-AC_SUBST(GTK_HTML_EDITOR_IDL)
-
-dnl ******************************
-dnl Gnome-VFS checking
-dnl ******************************
-AC_MSG_CHECKING(for GNOME-VFS)
-if gnome-config --libs vfs > /dev/null 2>&1; then
-	vers=`gnome-config --modversion vfs`
-	case $vers
-	in
-	    gnome-vfs-0.[012]) vfs_ok=false ;;
-	    *) vfs_ok=true ;;
-	esac
-else
-	vfs_ok=false
-fi
-
-if $vfs_ok; then
-	AC_MSG_RESULT($vers)
-else
-	AC_MSG_ERROR(GNOME-VFS 0.3 or newer is required to compile Evolution)
-fi
-
-GNOME_VFS_LIBS="`gnome-config --libs vfs`"
-GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
-AC_SUBST(GNOME_VFS_LIBS)
-AC_SUBST(GNOME_VFS_CFLAGS)
-
-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-AC_SUBST(BONOBO_VFS_GNOME_LIBS)
-AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
-
-dnl ******************************
-dnl Pilot checking
-dnl ******************************
-AC_ARG_ENABLE(pilot-conduits, 
-[  --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)
-if test "x$enable_pilot_conduits" = "xyes"; then
-GNOME_PILOT_CHECK
-fi
-AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")
-if test x$enable_pilot_conduits = xyes; then
-   msg_pilot=Yes
-else
-   msg_pilot=No
-fi
-
-dnl ******
-dnl XML
-dnl ******
-GNOME_XML_CHECK
-xmlversion=`xml-config --version | sed 's/^libxml//'`
-xmlmajor=`echo $xmlversion | awk -F. '{print $1;}'`
-xmlminor=`echo $xmlversion | awk -F. '{print $2;}'`
-xmlpatch=`echo $xmlversion | awk -F. '{print $3;}'`
-if test "$xmlmajor" -ne 1 -o "$xmlminor" -ne 8 -o "$xmlpatch" -lt 7; then
-	AC_MSG_ERROR(gnome-xml 1.8.7 (or later, but not 2.0) is required to compile Evolution)
-fi
-
-AC_SUBST(CAPPLET_LIBS)
-
-
-dnl ********
-dnl Kerberos
-dnl ********
-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 libs/includes])
-AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 libs/includes])
-msg_krb5=No
-if test x${with_krb5:=no} != xno; then
-	CFLAGS_save="$CFLAGS"
-	LDFLAGS_save="$LDFLAGS"
-	CFLAGS="-I$with_krb5/include/krb5"
-	LDFLAGS="-L$with_krb5/lib"
-	AC_CHECK_LIB(krb5, krb5_init_context,
-	[
-		AC_DEFINE(HAVE_KRB5)
-		KRB5_CFLAGS="$CFLAGS"
-		KRB5_LDFLAGS="$LDFLAGS -lkrb5 -lk5crypto -lcom_err"
-		msg_krb5=Yes
-	],[
-		AC_MSG_WARN([A sample Kerberos 5 program could not be compiled with the
-Kerberos found in $with_krb5. Please verify that the prefix is correct.])
-		with_krb5=no
-	], [-lk5crypto -lcom_err])
-	CFLAGS="$CFLAGS_save"
-	LDFLAGS="$LIBS_save"
-else
-	AC_MSG_CHECKING(for Kerberos 5)
-	AC_MSG_RESULT($with_krb5)
-fi
-
-msg_krb4=No
-if test x${with_krb4:=no} != xno; then
-	CFLAGS_save="$CFLAGS"
-	LDFLAGS_save="$LDFLAGS"
-	CFLAGS="-I$with_krb4/include/kerberosIV -I$with_krb4/include/kerberos"
-	test -f "$with_krb4/include/krb.h" && \
-		CFLAGS="$CFLAGS -I$with_krb4/include"
-	test -f "$with_krb4/include/port-sockets.h" && \
-		CFLAGS="$CFLAGS -I$with_krb4/include"
-
-	LDFLAGS="-L$with_krb4/lib"
-	AC_CHECK_LIB(krb, krb_mk_req,
-	[
-		AC_DEFINE(HAVE_KRB4)
-		KRB4_CFLAGS="$CFLAGS"
-		KRB4_LDFLAGS="$LDFLAGS -lkrb"
-		msg_krb4=Yes
-	],[
-		AC_CHECK_LIB(krb, krb_rd_req,
-		[
-			AC_DEFINE(HAVE_KRB4)
-			KRB4_CFLAGS="$CFLAGS"
-			KRB4_LDFLAGS="$LDFLAGS -lkrb -ldes"
-			msg_krb4=Yes
-		],[
-			AC_CHECK_LIB(krb4, krb_mk_req,
-			[
-				AC_DEFINE(HAVE_KRB4)
-				KRB4_CFLAGS="$CFLAGS"
-				KRB4_LDFLAGS="$LDFLAGS -lkrb4 -ldes425 $KRB5_LDFLAGS"
-				msg_krb4=Yes
-			],[
-				AC_MSG_WARN([A sample Kerberos 4 program could not be compiled with the
-Kerberos found in $with_krb4. Please verify that the prefix is correct.])
-				with_krb4=no
-			],[-ldes425 $KRB5_LDFLAGS])
-		],[-ldes])
-	])
-
-	AC_TRY_COMPILE([#include "krb.h"
-	int krb_sendauth;
-	],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO)],)
-
-	CFLAGS="$CFLAGS_save"
-	LDFLAGS="$LIBS_save"
-else
-	AC_MSG_CHECKING(for Kerberos 4)
-	AC_MSG_RESULT(${with_krb4})
-fi
-
-AC_SUBST(KRB5_CFLAGS)
-AC_SUBST(KRB5_LDFLAGS)
-AC_SUBST(KRB4_CFLAGS)
-AC_SUBST(KRB4_LDFLAGS)
-
-
-dnl ******************************
-dnl gtk-doc
-dnl ******************************
-
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
-AC_SUBST(HAVE_GTK_DOC)
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-
-dnl NOTE: We need to use a separate automake conditional for this
-dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
-dnl ********
-dnl movemail
-dnl ********
-AC_ARG_WITH(movemail, [  --with-movemail=PATH    Path to a movemail binary])
-AC_MSG_CHECKING(for movemail)
-if test x$with_movemail = xyes -o x$with_movemail = x; then
-    with_movemail=no
-fi
-if test x$with_movemail != xno; then
-    AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$with_movemail")
-    AC_MSG_RESULT($with_movemail)
-else
-    emacs_exec_dir=`emacs --batch --eval '(message exec-directory)' 2>&1`
-    case $emacs_exec_dir in
-    /*) if test -x $emacs_exec_dir/movemail; then
-	    if test -u $emacs_exec_dir/movemail -o -g $emacs_exec_dir/movemail; then
-		AC_MSG_RESULT($emacs_exec_dir/movemail)
-		AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$emacs_exec_dir/movemail")
-	    else
-		AC_MSG_RESULT($emacs_exec_dir/movemail... not set-id: ignored)
-	    fi
-	else
-	    AC_MSG_RESULT(no)
-	fi
-	;;
-    *)
-	AC_MSG_RESULT(no)
-	;;
-    esac
-fi
-
-dnl **********
-dnl GPGPGPGPGP
-dnl **********
-AC_PATH_PROG(GPG, gpg)
-priv=None
-if test -n "$GPG"; then
-	AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")
-	AC_DEFINE(PGP_PROGRAM, "GPG")
-	priv="GNU PG"
-else
-	AC_PATH_PROG(PGP5, pgpv)
-	if test -n "$PGP5"; then
-		AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5")
-		AC_DEFINE(PGP_PROGRAM, "PGP")
-		priv="PGP5"
-	else
-		AC_PATH_PROG(PGP, pgp)
-		if test -n "$PGP"; then
-			AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP")
-			AC_DEFINE(PGP_PROGRAM, "PGP")
-			priv=PGP
-		fi
-	fi
-fi
-
-dnl ******************************
-dnl Makefiles
-dnl ******************************
-
-AC_CONFIG_SUBDIRS(libical)
-
-EVOLUTION_DIR=`(cd $srcdir; pwd)`
-AC_SUBST(EVOLUTION_DIR)
-
-AC_OUTPUT([
-Makefile
-macros/Makefile
-intl/Makefile
-po/Makefile.in
-e-util/Makefile
-e-util/ename/Makefile
-libibex/Makefile
-executive-summary/Makefile
-executive-summary/evolution-services/Makefile
-executive-summary/widgets/Makefile
-executive-summary/idl/Makefile
-executive-summary/component/Makefile
-executive-summary/test-service/Makefile
-camel/Makefile
-camel/providers/Makefile
-camel/providers/mbox/Makefile
-camel/providers/pop3/Makefile
-camel/providers/sendmail/Makefile
-camel/providers/smtp/Makefile
-camel/providers/vee/Makefile
-camel/providers/imap/Makefile
-camel/providers/mh/Makefile
-camel/providers/nntp/Makefile
-composer/Makefile
-widgets/Makefile
-widgets/meeting-time-sel/Makefile
-widgets/misc/Makefile
-widgets/shortcut-bar/Makefile
-addressbook/Makefile
-addressbook/conduit/Makefile
-addressbook/contact-editor/Makefile
-addressbook/printing/Makefile
-addressbook/backend/Makefile
-addressbook/backend/idl/Makefile
-addressbook/backend/pas/Makefile
-addressbook/backend/ebook/Makefile
-addressbook/gui/Makefile
-addressbook/gui/widgets/Makefile
-addressbook/gui/search/Makefile
-addressbook/gui/component/Makefile
-addressbook/gui/component/select-names/Makefile
-shell/Makefile
-shell/glade/Makefile
-mail/Makefile
-data/Makefile
-libversit/Makefile
-libibex/Makefile
-calendar/Makefile
-calendar/idl/Makefile
-calendar/cal-util/Makefile
-calendar/cal-client/Makefile
-calendar/pcs/Makefile
-calendar/gui/Makefile
-calendar/gui/dialogs/Makefile
-calendar/conduits/Makefile
-calendar/conduits/calendar/Makefile
-calendar/conduits/todo/Makefile
-filter/Makefile
-wombat/Makefile
-art/Makefile
-ui/Makefile
-default_user/Makefile
-default_user/local/Makefile
-default_user/local/Calendar/Makefile
-default_user/local/Contacts/Makefile
-default_user/local/Drafts/Makefile
-default_user/local/Executive-Summary/Makefile
-default_user/local/Inbox/Makefile
-default_user/local/Outbox/Makefile
-default_user/local/Sent/Makefile
-default_user/local/Trash/Makefile
-tools/Makefile
-doc/Makefile
-doc/C/Makefile
-doc/devel/Makefile
-doc/devel/calendar/Makefile
-doc/devel/calendar/cal-client/Makefile
-doc/devel/calendar/cal-util/Makefile
-])
-
-echo "
-	Evolution has been configured as follows:
-
-	Mail Directory:   $system_mail_dir
-	LDAP support:     $msg_ldap
-	Pilot conduits:   $msg_pilot
-	Kerberos 4/5:     $msg_krb4/$msg_krb5
-	Use movemail:     $with_movemail
-	Crypto support:   $priv
-"
diff --git a/data/.cvsignore b/data/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 1748709438..0000000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-mimedir = $(datadir)/mime-info
-mime_DATA = evolution.keys
-
-EXTRA_DIST = \
-	evolution.desktop	\
-	$(mime_DATA)
\ No newline at end of file
diff --git a/data/evolution.desktop b/data/evolution.desktop
deleted file mode 100644
index 390e8f2e3a..0000000000
--- a/data/evolution.desktop
+++ /dev/null
@@ -1,28 +0,0 @@
-[Desktop Entry]
-Name=Evolution
-Name[pt_BR]=Evolution
-Name[da]=Evolution
-Name[es]=Evolution
-Name[fr]=Evolucija
-Name[hu]=Evolúció
-Name[lt]=Evolution
-Name[no]=Evolution
-Name[ru]=ü×ÏÌÀÃÉÑ
-Name[sl]=Evolucija
-Name[sv]=Evolution
-Name[tr]=Evolution
-Comment=Mail, Contacts and Task.
-Comment[pt_BR]=Correio, Contatos e Tarefa.
-Comment[da]=E-post, kontakter og opgaver.
-Comment[es]=Correo electrónico, contactos y agenda de tareas.
-Comment[fr]=Courrier électronique, Contacts, Agenda et Tâches.
-Comment[hu]=E-mail, névjegyek, munkák.
-Comment[lt]=El. paðtas, adresai ir uþduotys
-Comment[no]=E-post, kontakter og oppgaver.
-Comment[ru]=üÌ.ÐÏÞÔÁ, ËÏÎÔÁËÔÙ É ÚÁÄÁÎÉÑ.
-Comment[sl]=Po¹ta, stiki in naloge.
-Comment[sv]=E-post, kontakter och uppgifter.
-Comment[tr]=ePosta, tanýk ve görevler
-Exec=evolution
-Terminal=0
-Type=Application
diff --git a/data/evolution.keys b/data/evolution.keys
deleted file mode 100644
index 7f28de5c8a..0000000000
--- a/data/evolution.keys
+++ /dev/null
@@ -1,24 +0,0 @@
-text/x-vcard
-	description=address card
-	default_action_type=component
-	default_component_iid=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9
-
-text/x-calendar
-	description=calendar information
-	default_action_type=component
-	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-
-text/calendar
-	description=calendar information
-	default_action_type=component
-	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad
-
diff --git a/default_user/.cvsignore b/default_user/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
deleted file mode 100644
index 7f728d3a22..0000000000
--- a/default_user/ChangeLog
+++ /dev/null
@@ -1,134 +0,0 @@
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: Added executive-summary again.
-
-	* shortcurts.xml: In out, in out and shake it all about
-	The executive summary is back in.
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: And removed it again.
-
-	* shortcuts.xml: Commented out the Exec-summary.
-
-2000-10-10  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile.am: Added the Executive-Summary dir.
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* local/Makefile: Added Executive-Summary.
-
-	* shortcuts.xml: Added the Executive-Summary
-
-	* local/Executive-Summary/*: Added.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* ldapservers.xml: added yahoo, whowhere, and infospace servers.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (defaultdir): Use $(datadir), not $(prefix)/share
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* local/Sent/Makefile.am (defaultcalendardir): Install the Sent
-	dir in Sent, not Sentbox
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* local/Makefile.am: Renamed Sentbox to Sent
-
-	* local/{Sent\ Mail,Sentbox}/*: removed
-
-	* local/Sent/*: created
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change, folders with spaces in the name breaks
-	configure
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* local/Makefile.am: Renamed Sentbox to Sent\ Mail
-
-	* local/Sent\ Mail/*: Updated
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* local/Makefile.am: Added Sentbox
-
-	* local/Sentbox/*: New folder for storing sent messages
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	(install-data-hook): ignore error on mkdir.
-	
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (install-data-hook): create an empty news directory
-	in $(defaultdir).
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* ldapservers.xml: break up the uri into it's component pieces. -
-	don't store the uri in this file.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* shortcuts.xml: remove the Internet Directories group.
-
-	* Makefile.am (default_DATA): add ldapservers.xml.
-
-	* local/Makefile.am (SUBDIRS): remove Directories.
-
-	* ldapservers.xml: new ldap metadata.
-	
-	* local/Directories/*: remove directories.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* local/Inbox/mbox: Removed `<blockquote>' from the main text so
-	that the welcome mail is all visible when loaded into Evolution at
-	startup.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* local/Inbox/mbox: Commented out currently unimplemented shortcut
-	items.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, local/Calendar/Makefile.am,
-	local/Contacts/Makefile.am, local/Directories/Makefile.am,
-	local/Directories/subfolders/Bigfoot/Makefile.am,
-	local/Directories/subfolders/Netcenter/Makefile.am,
-	local/Drafts/Makefile.am, local/Inbox/Makefile.am,
-	local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a
-	proper EXTRA_DIST section.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Directories/subfolders/Bigfoot/.cvsignore: New .cvsignore
-	file.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Contacts/Makefile.am, local/Contacts/addressbook.db:
-	Removed addressbook.db since this is now handled by the pas.
-
-2000-05-08  Matt Loper  <matt@helixcode.com>
-
-	* shortcuts.xml: Removed unused shortcuts which point to
-	unimplemented folders.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* local/Contacts/Makefile.am: Install `addressbook.db'.
-
-000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* default_user/local/Inbox/Makefile.am: Install `mbox'.
-
-	
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
deleted file mode 100644
index a7455498a8..0000000000
--- a/default_user/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = local
-
-defaultdir = $(datadir)/evolution/default_user
-default_DATA = ldapservers.xml shortcuts.xml
-
-EXTRA_DIST = $(default_DATA)
-
-install-data-hook:
-	-mkdir $(defaultdir)/news
diff --git a/default_user/ldapservers.xml b/default_user/ldapservers.xml
deleted file mode 100644
index 46620d21a9..0000000000
--- a/default_user/ldapservers.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<contactservers>
-  <contactserver>
-      <name>Bigfoot</name>
-      <description>Bigfoot</description>
-      <host>ldap.bigfoot.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>InfoSpace</name>
-      <description>Infospace</description>
-      <host>ldap.infospace.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Netcenter</name>
-      <description>Netcenter Member Directory</description>
-      <host>memberdir.netscape.com</host>
-      <port>389</port>
-      <rootdn>ou=member_directory,o=netcenter.com</rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>WhoWhere</name>
-      <description>WhoWhere</description>
-      <host>ldap.whowhere.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Yahoo!</name>
-      <description>Yahoo! People Search</description>
-      <host>ldap.yahoo.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-</contactservers>
diff --git a/default_user/local/.cvsignore b/default_user/local/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Calendar/.cvsignore b/default_user/local/Calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am
deleted file mode 100644
index 9117ae6373..0000000000
--- a/default_user/local/Calendar/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar
-defaultcalendar_DATA = folder-metadata.xml
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Calendar/folder-metadata.xml b/default_user/local/Calendar/folder-metadata.xml
deleted file mode 100644
index 9313cb5f50..0000000000
--- a/default_user/local/Calendar/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>calendar</type>
-	<description>Calendar items</description>
-</efolder>
diff --git a/default_user/local/Contacts/.cvsignore b/default_user/local/Contacts/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Contacts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am
deleted file mode 100644
index 6c0407f9e4..0000000000
--- a/default_user/local/Contacts/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts
-defaultcalendar_DATA =		\
-	folder-metadata.xml
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Contacts/folder-metadata.xml b/default_user/local/Contacts/folder-metadata.xml
deleted file mode 100644
index dcee1ec826..0000000000
--- a/default_user/local/Contacts/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>contacts</type>
-	<description>Contacts</description>
-</efolder>
diff --git a/default_user/local/Drafts/.cvsignore b/default_user/local/Drafts/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Drafts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am
deleted file mode 100644
index 144b8bb834..0000000000
--- a/default_user/local/Drafts/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Drafts
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Drafts/folder-metadata.xml b/default_user/local/Drafts/folder-metadata.xml
deleted file mode 100644
index ee9cafe3b2..0000000000
--- a/default_user/local/Drafts/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Drafts</description>
-</efolder>
diff --git a/default_user/local/Executive-Summary/.cvsignore b/default_user/local/Executive-Summary/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Executive-Summary/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Executive-Summary/Makefile.am b/default_user/local/Executive-Summary/Makefile.am
deleted file mode 100644
index 6fae47d4ab..0000000000
--- a/default_user/local/Executive-Summary/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Executive-Summary
-
-defaultcalendar_DATA = 		\
-	folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Executive-Summary/folder-metadata.xml b/default_user/local/Executive-Summary/folder-metadata.xml
deleted file mode 100644
index 86e9e425e4..0000000000
--- a/default_user/local/Executive-Summary/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>executive-summary</type>
-	<description>Executive Summary folder</description>
-</efolder>
diff --git a/default_user/local/Inbox/.cvsignore b/default_user/local/Inbox/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Inbox/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am
deleted file mode 100644
index ed3ecd58d4..0000000000
--- a/default_user/local/Inbox/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox
-
-defaultcalendar_DATA = 		\
-	folder-metadata.xml	\
-	mbox
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Inbox/folder-metadata.xml b/default_user/local/Inbox/folder-metadata.xml
deleted file mode 100644
index 64cfbadfc3..0000000000
--- a/default_user/local/Inbox/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Inbox folder</description>
-</efolder>
diff --git a/default_user/local/Inbox/mbox b/default_user/local/Inbox/mbox
deleted file mode 100644
index 9b3910df46..0000000000
--- a/default_user/local/Inbox/mbox
+++ /dev/null
@@ -1,2225 +0,0 @@
-From -
-Return-Path: danw@helixcode.com
-Delivery-Date: Tue May  9 11:16:21 2000
-Received: from trna.helixcode.com (IDENT:root@trna.helixcode.com [140.239.238.2])
-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA26395
-	for <danw@twelve-monkeys.helixcode.com>; Tue, 9 May 2000 11:16:21 -0400 (EDT)
-Received: from twelve-monkeys.helixcode.com (twelve-monkeys.helixcode.com [140.239.238.12])
-	by trna.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA02867
-	for <danw@helixcode.com>; Tue, 9 May 2000 11:14:49 -0400
-Received: (from danw@localhost)
-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) id LAA26391;
-	Tue, 9 May 2000 11:16:21 -0400 (EDT)
-Message-Id: <200005091516.LAA26391@twelve-monkeys.helixcode.com>
-To: Eva Lucy Ann Tester <eltester@helixcode.com>
-MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <26389.957885364.0@twelve-monkeys.helixcode.com>
-Date: Tue, 09 May 2000 11:16:21 -0400
-From: "Helix Code, Inc." <hello@helixcode.com>
-Subject: Welcome to Evolution!
-
-------- =_aaaaaaaaaa0
-Content-Type: text/html; charset="us-ascii"
-Content-ID: <26389.957885364.1@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: quoted-printable
-
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>Welcome to Evolution Pre-Release!</title>
-  </head>
-
-  <body background=3D"cid:26389.957885364.2@twelve-monkeys.helixcode.com">
-		<img src=3D"cid:26389.957885364.3@twelve-monkeys.helixcode.com" align=3Dcenter><br>
-		=
-
-		<blockquote>
-		  =
-
-		<p>A warm welcome from the whole Evolution development
-		team. Thank you for helping us test Evolution; with
-		your feedback we can make it the best groupware suite
-		available today.</p>
-		=
-
-		</blockquote>	=
-
-
-		<h4>Getting Started</h4>
-
-		<blockquote>
-
-   <p>On the left of the Evolution window is the Shortcut Bar, with
-	 icons labelled Inbox, Calendar, and Contacts.  You can click on those icons to jump from one tool to
-	 another.</p>
-		  =
-
-		  <dl> <!-- <dt><b><font color=3D"#993366">Today</font></b></dt> =
-
-		  <dd>This tool offers a summary of new messages and the tasks
-			 and appointments you have lined up for today.</dd>-->
-			 =
-
-		  <img src=3D"cid:26389.957885364.4@twelve-monkeys.helixcode.com" align=3Dright>
-
-        <dt><b><font color=3D"#993366">Inbox</font></b></dt> =
-
-		  <dd>Click on this icon to see your email - all of it.  Your
-		  Inbox is also where you can access Evolution's powerful tools
-		  to sort, filter, organize, and search your mail.
-		     </dd>
-		  =
-
-		  <dt><b><font
-		  color=3D"#993366">Calendar</font></b></dt> <dd>Network
-		  and share your calendar to keep your whole
-		  organization on schedule and up to date.  </dd>
-		  =
-
-        <dt><b><font color=3D"#993366">Contacts</font></b></dt> =
-
-		  <dd>The Contact manager holds your addresses, phone numbers, and
-        contact information.  Like calendar information, contact data
-        can be synchronized with hand-held devices and shared over a
-        network.</dd>
-		  =
-
-		  <!-- <dt><b><font color=3D"#993366">Tasks</font></b></dt>
-		  <dd>The Tasks tool combines a "to do" list with
-		  alarms and reminders to help you keep track of
-		  daily events.
-		  </dd> -->
-		  =
-
-        <!--<dt><b><font color=3D"#993366">Notes</font></b></dt> =
-
-		  <dd> Write poems, take down messages from phone conversations,
-		  or keep small things organized: Notes is your catch-all
-		  notepad.</dd> -->
-
-		</dl>
-		  =
-
-		</blockquote>
-		=
-
-  </body>
-</html>
-
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.2@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhEcJQyUsSkAACAASURB
-VHjabL3ZcuRIkiyqAByOLSJIZlZN95z//6Hzch5G5J5lZrqWriQZG/btPpiruYHZKVLSXZVkBBZ3
-czM1VbXkr7/+c++6Fnmew/sCSZJg2zY45zDPM/7885/4+9//hiRJsCwLsixDkiRwLsM0zUiSBGma
-Yl1XpGmKtn2iqmqkaYp933G73dE0NZxzWNcV27Yizz32fce2bfq7+75hXTcURQHvc+w7kKUJrrc7
-8jxHlmXI8xzrumJZFgDAy+WMfQfGaULfd3AuR5qm2LYNAJCmKbquQ13XAIBt28K1O2zbpj93u93Q
-NA2SJNHfA4Asy9C2LZqmwb7vh89YlgVJkiDPc4zjgCRJkWUZvM9xvd7gfY6iKPHx8YG3tzds24b7
-/Y6Xlxf9rHVd9fklSYJ931FVJR6PB+Z5Rl03uN1uOJ1OODUNxmnCMAzw3qPwOQBgmhc4l2GeF0zT
-hDRN4ZzD4/GAcw7TNOF0OgEA5nnGvu8oy1LvbxgGZFmGrutQVRWausK8rGjbFmVZYhgGNE2D3GWY
-lxXbtmGeJyRJqp+fZRmcc3AuQ+E9lnXFMIxYlgWPxwOnUwPncuR5jnmesW0b8jzXZ5BlGbIsxTTN
-KAsPX1Ro2ye2bcPtdsMvv3zHum7h9xy6rkOSpMjzXJ/bvu/o+x7OZfC+0Pt9PB749ddfkSTAum6Y
-5zk8dyDPPfLcYV1lHS7LgjRNkWUp+l6ey+12w+vrK/Z9R5IkuN2u8L5AXdfIsiysaVkT67qCf5xz
-KIsCv//xB15fX8NzTnE+n+F9gc/PT2RZhsLncC7Hf/7nf6E5NZjnGWVZoChK7PuO6/WKt7c3fXdN
-XSFNM3R9jyRJMAyDfFdZoqpqDEOHdd10bX1+fuJ8PqOpK+R5jmGcdP8kSQI3zxPSNEOeeziXYVlW
-fXh84Fxs27bp/+dGybJMN5M3P1dVJaZp1oeR5w5pmmKe5d+fzyecc7oQk8Rhmlp0XYd5zrFtG+q6
-hssyDTphfyJNU6RpinGadBHxpUtg2jQATdOMpkl0ocpmk2vs+14XYha+x75E+f1JAwg3Lu+Jf/Lc
-h8Uni0muN0XuMgDAOI5I0xRVVcmzcA7DOKLrOhRFoQFgHAc8nyucy5EkKcqywLLUsnGWBfM8I89z
-5LnDs23hfQGfO92wSQINvlVVwXtZ4HVVYl5Wvb91XQ/P3jmHl5cXDVrz46FBQn4mRZKm2Pcl3Hse
-3uWMJJFnwWc9z4v+ngS3DFVVY1kW3fhZKv9921Z9H/zzeLYY3z/0+vnMs0w2pssc8tzr5x/fiaxj
-e4gBcpBs+66HFJ+DHD6brneuJR5IaZojy5weVgBQFCXKssQpbFZ+zrIs2Pdd11HuMizrgvv9JuvY
-OQlYSND3na7pddsxdh3KqkSe56iqSp6TyzCFZynXI4HbFwX6fsC6ruH5J7qGPz8/UJYlpmk6HCzO
-yRqRZybPbZ5neffruoUIUmCaZkzTiDz3WJYZSZJKVpCm+Py8Is9zbOFFcyMuy3J4mN4XaJoaRVGi
-74fwIFPsu2y6fd+RpQmqqkKSJOi6Ds45VFWJNE1DJJPgkaYpun5AnQB8z2ma4vl8Is9zvFzO2MJf
-JGYV8cYl0u260HmyM8jJZsrx8vIiGyWcuM45XbDjOGGaRl30/HwGkKqqkKYpvPdo6jqckDOKosAw
-ThiGEUmSoK4rZFmGZVlQFrJIJdvx8D5H23YhCDsU3uPZtti3DdM4hcxMNhoXmHMSJJM0xTRJICuK
-Iiws6CIch10XUpqmaOoaaZZiWzcNoAzi0zTrBuA9TtOMYRj13m1Ak8zMI8vSsIkWzQ64OadJMgFm
-CO/vH6jrWt8XN2vMroCyLPSkkw2wIctkffX9U7PBLE303mQjePOOFw0Az7ZFkqQagJjJSrayYFlW
-zUTWdQ17QLILCVapHijOORSFx75t+m6TJNHf5Trb9h3zvMB7CRi5y7Bushb5nJkV8x3UVYmyOmEc
-O+R5gXG6Azh+/vPZ6gHrvdxvlib6/Ppe1hGzWhvE123XYMLrdNyIcmFTSNWc3gwXAX9OFuCmF87/
-pidFkqBtO11EXAgMFAAwLyucy7CuG8qyRJIk8CED4SmUpRmmeQoLzZuMQ05Gpr88mXkPf/z+J5pT
-oxuTfyQFv8E52Sh5nuvJJRt+xTTKC73fb2FDlchzp6eKDTRMsfZ9R+7kOd3ud5RleThpm6bBt2+v
-ckJlDl3fY5wmOc2cQ+4yZGGh8zrXTZ79vKzYwulzu900YMzzrCcwF1Lf9/C5g3M5+pDWT/OC2/2B
-t7dM31E/DPqu5B1IOfR4PPS5LMt8CHh1VWKaFz0lsyxFmsbP5OaX8iPH8/nUbIf/bNuGYVg0SOUu
-w2hKyHme9ZTMXQxwfL/Lsup75rNfwvsYx1GvhYGbz0WCc6Hvimuav8PgxQ3BNVuWBfYdmOYZdSgx
-sizTTKdfh8P65jriRmd5XFUl6qpEmjl8fn7qu2Pg4J+iKNB2fcjUUixLxzz0EGT6vsM8zxiGFE3T
-IEsTJGmK57PVbLSpa+z7Du9zTOOoQZSlii3nHdPKBEnYFBIZh2HUl/31j6YPYRNz4S4hzdz3HZJZ
-ZADkAbVtGzd3+EwGiaLwmgauqyxGbiBZjE7xgmGQ07gsPOZlxTgO8TRMElS1RNyyKND1fXhxKbZN
-rsX7HE1daTSU615wu91Q1xWcE/whz+VklvLIwWUO4zTpy2bq7HNn0tENXddpRsDNmmUZHo8H0jTU
-ypnDskrK2HY9siyWJ/u+YxhGXcBMLcuy0JrVPud5XkKpsGDddmyznOqs2SV1zvS04QKUZ9shTTPF
-XQDA5043HlPFYZx0bazrphux8B7DOGKaZnif4/F4AgBOpxOqqtRyIUnketouXpsvKozhJDyWDKmU
-NF2v2RQPjySB3jt/j5vWOafZhJSEHmVZoO+9btKi8JrN2FOZ98M1lGUZfO4PWBKzV/4s/2Hw4j76
-vF5DEJVrABLZ2CF48vM/Pz+1zLEBK2Yly6H0mKYxZFYpiqLU4DZOsx6wDLbLItciWXSm1/n1z/P5
-gPvx4x0vLxeM4xguHJjnTqOUTauZDXChzvNyqMM0mCSJPtxtk438uN/x7ft3FN5jnCaN4ltIpfZ9
-1xSO0UletDyAYRg0SEhNLJu/KCTCDuMUUqMahc/hiwqDiX5JkuByueByOSPLCoxDq9fgnMPpdJJT
-30u2UZUlXO4xjiP6fkCe59j3XR8kXwyBMZuplGWBfdswTnPAOuRE46kzLwu6rgsvPQOQ/UtQ0G4K
-1vvO5Zim9lDSAID3XmvreR4wTjHaO+eQpQmWZT+8TwZOYijysznybdc6VDZ9zOb4Xpdl0Wzifr+j
-rmMpxAzNZRnWkGJv26Z177ysGKf7IXMj0Et8hnWt9zFbk39HWCvukEr73CFNMwxhHe/7DpdlGEcp
-QYqiwLZtmp00daW4wRjWyTgOWFfBnt4/PjSoSMaTKvBrMaLn84ksk3JIsJc6lHepPsOIc8VUndlW
-4b1mbBL8FozjqBkF9x1BZv5cWXgkIfiMYwR/y8JrZriuK4ZxwOl8OoCVfd9j3zc4l8Odzyf88v27
-qZUSfTFyyuCQikmaNcP7QlFkbgBe4LIsGMYppGdyar6+veHlcoEvCjzbVoG0ZVm0ls7zXGuYeONA
-13Wa3shLiXVr7jIkAUhq21ZPjbaTurjrOpxOJ3jvw80PSJIBfT/ooiL6630OXxQYpwnbtioSzbQy
-or6rvhAJYIOcKAFR3sMC3sJL5LOqqhIuy9D1QwDsKgFHkwRdP+jG5POX551odH88W33RfB/7vuP3
-3/9A0zRYQ/DlZzCAyDUnh4XIf6T7w+7KimmeQrDYMC/xxCJAzLRdAr6UjHVdCfZTV5LKh3sc90mz
-CHZTyrJUFJplpr0XBlnnMs1CuYmmeYkZV5oiyyLwPM0LlmXQ7GxZZs1KmZFIyVlI/VxUeDzuWnbI
-ppSs5dQ0GMYxnNqJBhqu2b7vw6b3GkirqsRvv/2uHZfL5YxlWUNGuR9K2GVZUdc1cucE1BuGQ2a2
-batmPty07KBwDX58XjUYMOPJc4d9h64lCaqyx5Zl0cOZ2EHfd3Cvry/IfQEgh58nuMzpySmnw89R
-j6eZbSexRcfOAVO1ovABIKuwY8e27boIuYHKsghYADDPqYIvy7LpTRIUWtYlpKGyOFnnykbzWk91
-XafdiWVZNCUlyPP5eUOSJHh9vSBJUkzTqBnOtm0YJ6K+PrysTE/8adr1dCCYJxtWntk///oMi+Ci
-z0zR5dwhyySNK8KLWLfVBNCITMvvxv/PwMtsSzbXhDQAVWXhD6DY7XY7gJjDMGCaRtR1rZ/De5aU
-8BmyqErxkRiMwvOeRq3/pTySANL3A5L0jHWbMHX9YVNL8KsEH0kTDGEx8n3Zzc8/LDW2bcUwTnoq
-Lt5r+cNgl4fui63lidsQUPRFhWWWwyhNEiyhVGIwimUE4HKPItTeW+jqxJ/JEBIf5CEYFT5Hnhea
-CXifYxylrOv6DkVZYN93PcjKshTAbhjweD4PKTrBTJsNz/OE57ONXaTcYVkyDVzTNGLfQ4u07zVj
-A+RQBHZpP4aOEbOVLDsj+d//+3/tdV3h+WyxLHOoqTIAe2gnpOELF6235FQSpHvfgWHo0dQ15kXa
-J0mShv8l8CIpaB96lkz7y7LQk7UJrbau75E7SXXvj4cGlKqskPscHyE1S9MMfd/rjTLQrOsKn3s8
-no+QLo9wzuF8PqFteyzLjLaVWvV8vuB8PmEYRuUrJEkaIq3cqwCj8v3crI/HU/vWPvRxiWssoV03
-jiPO57MAb/2AovAovA/YwxI2GMKGYneB4NikCDjATZhi2+REKbzH/fFAbur1pm7gco/H4w5gD4j8
-LFlHyLTWdcU4jmiaE/Z9U6zma7Cpqgr7LgHHlgwA0HU9yrIIte8SShjJ0oQvIFiJPTTk/yfa7dh3
-CTLrKmBcURT6/ZIBBMAynLTe+5AF5aGrk2gLERAQkF/nQ4CQz0PoFMza/ZFywOsaZwAiCMnP5Pr9
-+PiQ9dk0ep3DINdcVQU+P69aoo3jiLoqUdVnDEOLMWQRzNj4TLLMBUxhC1mCZDvbtuJ8voR3Ks+B
-e7Pve5xOTdjcUlrxsxjgvc9xu93R9x2a5oSiiDgG12/btQdgPvnx4792/gderHMOwyAtvOezxa+/
-/orH46Fts0iYyFCVJT6v14B+p/rQCU6QyGD751yIZSmtP+IPrMN4wuz7jo+PD/z66696MhJMKYpC
-ywWmPkmCkOJLRK2rCu/v77i8vKCqavR9h2URwkxZljifX5AkGdZ1wPV60xbP89lqjfTx8YHv37/r
-M4mdkUlblvu2KQZhEd7L5YL39w8NJnKCRsBPUjz2/ZMDQMPP+Pz8xMvLiy7UsvBS2vSDPhP20omU
-82fZqvzbv/0bukCSWZYV5/MZfd8pnhPRfTlV6rrGPE3o+h73+/1AhGEaSsIS+/nO5TifGiRpisfj
-qTjO7XbT989Fx9//+PgIQarWGp3P5vF46Lv69ddf9fRNwuZvu16zL7YlWVJwjZKItK0bmpNs4HVd
-NRW2YCezRa47tpp/+8fv+Pf/8Xf88v27Es6kPe51vTKl5+exXBBQeMAvv3zTLIt7Zllm3SMsd7uu
-w/l81g5Jmqa43e44n09I0xSn0wnrsqALHZ9hnDDPsxLDhnHS766qEmmS4P3jE29vrwo8E7dj9uey
-LNN+KlNKvqiiKFB4j3/+85/Ytx3fvn+THqipUduAegvjrJFI9i9ALNvrJamhCiUEA4psoECkyF04
-YaS1QiLHNE3aA04S2URVWSpCz0CSJInUccty6JNy0VRliW2b8f7+Z+ixh99DoimaBKPUoPEbkkR6
-8WVZhgXvsK0LxlCGcONKytdiW1fkudNsRTYqF56kqoXPw/1tyrRzTtpx87wc0t15WTGHvjUDDhev
-dBAGTa8jHtJhnidsm3zm4xE3ex5qWoJSbAnak5vvzmIPxGQkBZdDwAYulnnPkOI2TaP1ts8dXJYp
-wHdqhCn44/1d61OSYoZ+QOE95mUJPJVJDyKCeNuWK4bD7hNLvW3bcL6c4b3HqanR9YMwTbcN03wE
-RW3qXJYFvC/w/ZfveHt7Re5rTIHjwEyFwHVRRH7INI0YBimzqqrGOE7wucc0zXp49AE3syVPkiQ4
-n884nSQ7e7YtnMv1pF/XFY/Hw3QfsuO1h64Wn5/PPdIsRZokmOcFfT8oDmBxIMeTna2ibZPTqq5r
-TNOEddsDcFLjcjnracFFSYCKNS4/r6oq9H2P5/OJl5cXZf7xu9Z11TYdb1BeZiAoZE5TNgJPSZLg
-/f0D57OASfxettQ+Pj5wPp+VSEQgqOsH/QyeQG3XGcDJacCZA/AipYcH0OK///sf8D7H29ubAn3T
-NIVuxnBgmFmG4Lpu6IceRVlocKirUjc7f29eVmGOhWfKHjxbaFw4Nl3lhrSdAAZAkotut5vWuNys
-XKQEJplKp2kqLahlDjjHFFLpCCbyVJW2VCTHrJt8b1l45SEQnS/LCk3TaPpKIJHlonMCvO4Be7D3
-VVcV5vCc9y+EL6Lzuwl+PGF3fX855nmVNmfukLkc29YpuDgMg8kkc91UQkWXtmHTVFiWFX13MyxP
-6Tps+64Z7+3+EKwol/KiaQRn+fHjHffHQ1vB5L1YYJB09Dp0JoSjkRvsZ1EMiP898jkyDYQ8LJM0
-xe1+l0MgrKlpGjHPcqjbbNYRuWfqI+kR9N/7fsDLy0tI8Uu0bYdhGDRKc2FL6yUCX2VRoG2fUv8H
-cMs5Sf3IxGPqbxl62hoMpBzb7tq2DW9vr3h9fUFdN7her6EF5LGuUmeTLdf3Nz0p2BbiRuILIK8+
-z11AjldlSvHnkyTBr7/+gqIo0DSNdhpI+2XrzmokyNbi9zJtZpdhWzfcB8kYqCN4PEYFE4m6p4nT
-mn+cJkzTFAJYeih92DPm7+Yu03dDlucwjApkEjiKYF7M2NjWfDweaJpG+8jHGjYzVOBEg2WSpsjC
-Pe27dAmyLMXp1EiNPPS68Xi93qeGny/Pz4UaeZwm3O4PfA8AM4HJ2H9fvnRMoGAhsYXcZfC5Q9v1
-uN7uShcmPySu41wziGEYQ8a04Xq94+0tVSajtsS1I7ZgMUGL7eoECdZlASDvRJ5FYDBmKeZ5N5ia
-4C5VVSs+Ro2JpRezfOEfliNt22JdSyV/2T9sgRdFibqOnJYlXK9j7V54j7br8ecff8IXHlVVaY06
-zwv+/PM/Q4TLlXxDUIQvhH3SsijgCxE0nE47TqeTElKKokTXtVq72jYQe8pFUQSAcdceMmub0+mE
-wnuJwuGF9cMQePUlTk2NJBWQ0PsC+xbTO5bZTJ1tWvvx8QHvC21TsWVjazqi76xHheyR670wiEnw
-3A7tNv7d4/HUFy+YSxQ68Tn2fWcWdqTsWk6AZb7xDwUnz2WGn5dwLysys4lZ6qWpUE/ZzmNWwe8p
-AtawrdsBVyAhiO1etummeVfaMIFj5xy6bsAYKNG2FZYkkYGXpbHlx3SVB5AtKyzvnRnl17KL77oo
-5F2yJczsk6Sqvh8CMSuDz4Uy64sK7+8/VHB2OuVBaDWHzGkzQTDVg4zXxeyS19h2nWZQ6yoZTtPU
-AFKs61OvlZhW7qRDdAvfF2nQobMROBjEuvZdshV+X1WW6Ppen+u6SmZpWYzM+ngfjkgwF1nd1HAu
-w+nUoO8H7eOfTiejqltRVTXqWoA1exLu+45xmvBsW72J5/Op7ZdpHPXBuXDDBPd4WtmUlui1jYTP
-tgPQaUfBplPLumJoO6XkkvwhAKU3GgGz2L03hJNMyxirDnw+BdiiUjGyH/GTipBlDhFsZiUA8P7+
-Hlti4fqE3lxiGgXN/fz8RF3HrIxZBBcauegsaxggmRnY5yGAmQQUKwhyzmGaF5RFEeraCEaNo5QI
-VVX+lDFxE/FkoaCF74tkoNxJm1DqUXfQI5DPkTuHHXvAJR4a+C0piKkt01YudoJ/3nvt1BA74SZ0
-gWbNYOW9V/xBxTjrhonah73T35W2aoHb7aZZgsVaJsOH+CoqExJZjmfbout6NE2jJLlt3fD+8UMz
-NB42SZKowk/S9CxQ0Qfd2PO86SHAcrMoPBIk2LEjzVLtiKgyNrQf+Tz7XoIGW4LOLjCypC7nC4qy
-CqdZxASaptH0TjYlDmQhLrwpBBMGi2mSE+Ya2hWsQ6xIiIANU/ay8Pi8XnXzE3VlXz/PhXPO9ImY
-gDMABwAs64I0TUz/NJJPCJQJ9Tc36r5c+7n237lgSPf9ypYk1TbiHJtmMNwcTdMcGGBrAAmlRz8j
-CboLLgLbossy+VwBlNKfWm15LpRg8tgFcFwUp7GnFkFKboxpmhRniF0KwXReX18VYRe6ao4xoNrc
-FJYtSLCWp81kGKPK46c6MFCWlUUYiDH8OX4HM0gLKgufIdeUX07qTDcWAFxvN3z//i1QaVleThG/
-CCfw9fqJqqo1YOfOhe6GU9BZuBSjZsZ57nVtc42s64p+GLD3MevgZxIE5ua3JWkkvsk1tu2odT9B
-Q3vIxKx71extGEYjFoskO5EgR6FUmsQunYtgD4LwRaSnw+2K6/WKruuNcq/VL5GA8TjwstmO4Yti
-QODNVlWlCDNPWda99CMg33wYJxRFiaapUVXloUZnPcbAwBNx3XaVMUcCjjC8hKJaKl+dbcjC5wc9
-t6X9WoGOBRBPp5O2bSzPnp97bC1FZFnr3twhDzx6BlDZ7HPcrGlyUIpRT28ZcrZ9ZaXZfT9ocCPI
-6ZwwDu1GZNCzKkc+V5Kx+LMx3ZbT5Wutyc1vWYgSrISIdL890Jwa1EGown9Enz7rKc3ft5tz33fc
-7w8jtXWqg5d03wfQrjhQghk4ZPMJRbcqS8WXuOmkz3/Ssu09dCOsepOfGQVxWShxxEujaWokSJRN
-S6qyc5IRJAk0y1aKcZpg/cLaJEef3hjEPfi+vBeOP/8b1bQ2A/ntt98AAG9vbyoNJ/W564ewTybh
-IEhNAqgsuCjgco/n8xEkslK3jON0ZFoFfjvJOxaRPPLUowFH7jLk395QljVOpxHjOKlAwzlJS3xR
-4Y8/fkfX9Xh5uRiBxBo2BZREI+24ImQDbaghY50mJcSMNG1EELRuh5qN1ziG048LPUkSXK+fmKZa
-a1XNBFymqDXBwCxN9Hu5OEiRXgK3m1TOJAHartcTlKkvF5yeotse0rnk0AkYhlgSMWjZzc97Jxst
-4h+iBbC1Mr8vS5PIyjNGKXJ/sUPEhON6u2pXwX5eZF7OyHOvmw8ALi9nZT92oSUahTUpytIHZucE
-73MlMvHaRdwyYtskcyL7jTJ0fg/bpwfNe9Bb7DvgcockaFH4rtSnIMs0QHGd9GFtD+OoWg4CeTE7
-9MjzAsMQO0up4RlwfU3ThI+PTxV2jdOmhwp/lp9ZVTnqqgL0cIgdDitIIpfG+1zlySQtff/2DX+G
-5zdOk3IAZB2mqCoPlyYiJ0xVpDFhWYXhVdcNHo8n8lxAk64btaX0z78+0TSNRhZeoFBTi6j9z1Ij
-TpAbTZMEZVUjSzO4oFqa51nbQ1mW4eVFhDt//fWOv368B7Q+V+CLG2dZVgzDgPv9Hii/lVKUmbKn
-aYr7/diCIVouRJb5IL4AgKY5aXbDjcZSyaaQEtj84YUwIq/rGngAudaR9pTs+14XHx2Y+DnMHsho
-4wJi6cJ692sb0LZVy6LQAIwv0lkLvq7brqn4uu6HFHNdoypN3uVyUCVaujAXM4VFs9KSpRPAVls/
-DIcM0foF+NwHSngsTYpgDOKcQ1PX6AMWQAbmPC8q5OmzKP+NJUnEqO73x0/CK1u+jIHVum1bbAkb
-jQIPiVml6Ahq1+ehKzIvUGMYObh2pSZXVa2OWsxA+BxIBS7LArn3mOYJ5RrNWabQ+bCZqZWU7/uO
-19dXnE5nOFejLB8KrlrtBUtiR8KBBZzIxmNt9fHxI8h4s/AiMhXvUCdOCjBBv7qu0bZP9H1vNgV7
-7Su6jw89hVjDcGOQFVYUNcrioVROy42mDRJTIql7C2Wj8eGyxScLdA7uPV0gWayH+o01mqTkTk9E
-vnxGT4Kgqi0PVlx8bsQH6tBJYSDxPkcaEPgu1IhFUSihaFnuuoDi5lj1ngl++dwZwk2q7EdKTKuq
-CifQCmA/gI3blh+YiAxq879webL4EHUI8QSRUoaZDDdUFF/lyjQkbkHg0rZG7SlGfsbXMmKcJs2i
-mCFEUll0JErTTU9nbnoi9rv2wyeT0UQO/v1+x+VyCSB2zCCIwpPJR5zCOjQx+3HO4ePjA+Mw4Nv3
-76EMW1UYJ98p+BYADNt4MDexRh3TNCt5x5aoNlPghp5m4cpwrQmT8o51/UTbtni5/F1BeWbjxPDS
-57PVupm+Y87l0Zwhd6rhtzVTXddClKgrVbzJgi7Vvkkinbj9WCMNe2rQt4/ZAhf2NE24Xj+CR1qp
-9S83QlVVKLxHlmYqA67rGmVVI8+LQ0RlUCmKEufz6eCe4wLYw2uTzseovz+ZhRpPqtgh+Pz8xDgO
-B5MMnhRdIEJt24a//vqBHz9+hJclC3rbNpV19n13wAoIaJVlob5x9DlIzAZJDVeiacQIpa4qTPMS
-ar0l0H4nNe0Yx0Flsgzy9iSyGvTPj6tufouLLMui4F1E93MFL6WXPh8wBmvYYSnT2hpE8pM3wDiO
-+Pz81ExJXIGGw+flAWMiuJpqCbipIjBmMcF0xljbSXu6ONiFRaOYBX/99QPjOBpzkxW5yapYio7j
-iLbt4IsCL5cLTk19AIopCLrdH3i2nQkK8TpyFyXR5ATwmVlcxNrYuX8hOY7PfVdNB1vPlrLsiBA2
-Ta09ajHv8OJk8pMtE9l+/qCk8j5XhJk/fz41+PHjB1LVGgh6um1pJOcEezBp0Xi0c6engvc5ltlk
-J4Fwwo1N7MGCYY/HQ1+2JbBwQQl4lCuHWmpvYR7OATWVk3INJJhUAxo30MVu8gAAIABJREFUQFWV
-8ME2TbIbOdmfz6ec6OcTPj7E146p1+VyRl3XOJ1OISgEvCFNNdLbAKn2UqFEs+41wzBqS4wLgr3v
-fZd2EF/0V8cbZhV5Huvz9tni8iI+CQR5WU+fLydcLqKlmOdRuxpW2mr78Lzmqixxf9wPBjJ2kfIk
-svRwptX0tGOwvVzOxoh2O6S/Sch0+FlDIAJF78LsIDPm2pyDToLt2PtdSkpmbTGjS1EUhfhIBJeq
-aV7QdXc1IJVW84BlmfH9+zf8/e9/R55fMM/PQ0s28iicZr7btuGf//wL3uc4nU7BF7INOpNKRW5s
-RTP7tGYoq8G2bGlFOT5l5F+9IPd9h2PKtK1iO3W5XA6KKqtoWgJ9kzUgXxi982xaxowiSVJMc+T6
-F0WJtm21sxB9AyJoxii8LLKQ81ADrtuukVuygcimsuSe2D5ag/Bo0F63DQT7Lh6GQu3tNbWk4y1d
-YIvC43Q6oSyEWkm9+bqJzLLwHi7PjaXWeshabCoqBCVxRiqKAknQ+0fAMtOSpCg8tnVVLoYYps5a
-L1vHIEuc6XvxJ4jsulzTTMpBq6pU7gHReTHvXPV9sJwRk5TNuETFQ+GrMSWNPeXkS/V05s9pmRHk
-3l9bmRTh8H5ut0/UdYlT04hrlYvlifoOzssBS7Agme2+0FKLh5pz2UFNSsCVz/e3337HNI0oy78J
-dyDQnOMBkx9wInatksRhnu+4hjb2UUrvDu1dcScq1Pm57TpUlVjllWURCTuO/IRC3bDkvmIwbNun
-4ixRFu00gNhDUa9HPc76QXvUzmWSChsFk233WbOQrwwyopgAsG7Sa57nFxUKRdUZKbtDQHjl1Kuq
-UqWokmYuX4AxKPhiRTSWiMRNzgVMjIM37XOHpGm0TKFgZVlWTQXLosCOHS8vL1JaFB5dP2hrkWk6
-PfTGadKIneeFtpxsCryuW2jxrAY1Xw/GnFJvjtphGacJuY+eiGS45U5MNyzKb/0ZyTMg9pEkCZL8
-qFOY51lBJZFn1+b5RV3DNVhh2xadXfg8RK7Xm5ZWLK/atkMV3GgpGrN1rGUZCjU4PxwwcoJDn4X8
-vQseiaUCzyQXxSxqC2Yc8XSkY1KkvMt1p6FtV5YFXF7h+f6hmdztJmy6W8gQRKknG7SuxKWXrWU+
-k8/PH5rB0Udhnme1Xmd5RUD9crlIlqTu2bVK03k/47hr5uBcXPepOfFJZiPJx7oCiy16XCe0fU/+
-z//5X/vj8VRTDrFRzvDb77/Be4/z+aInBxcrRSqsU6lbV5useQl24tHuyAcbL0kbl3BaSruRCy5L
-E/iixDQO6PohGC4kwe64Umvxr6mOJSzdbleUZa1mDYJnSPvEuRxd3wWXlFm9BdVBxWWY5lk12tSm
-F97DF+K0ynsjKMNFFlmLW6DB5iqPZtB1mTDfqImnr0Gkli7hpe8hUOWqracfAGWh+77hdrsbYJY+
-+8vBaisq9/ID/kLd+7atSqwqiiKAXfvhpJ/nGVVZBTOWFV0XsyWdCZA5vH98BE/7AmnIPKg/T5JU
-/e5YTt505kOqPA8KYaRd2GlGJn4Ondaz4zgdNlN0SkpC5id6ezo08+/2fQte+ZfA7pNSj07ARVHg
-+XzGtmySoKrPWGZx7dkCZsJ16PP84DfA05228FxbDERlWQWMZNDNSeyJfgrX201LTV6zDZgHe7V5
-0QxBOgJO1znXEvckM14+w6IokDwf/9yfbXsQeJAAQSeY86nRejsi8YKGF0V5kCHaVlXuMvz2+x/4
-29/+FvTjz58svK0mO9Y0q/aTu65Hnjs0zUlRZ56eLBektSWnOb322Wa53x94e3tV9RNLA74knrxM
-+cn7Jjg5DAMulwvSNMXH+wfKqlTbpwhMrYeoTiBUvl/QZZJDxARjCItuOqTPdpAJlXX//Y9/KJOL
-15bn4u5jdd/zsqIqS01Ref8fHx/45ZdfVL02m3KMmQjNPE5NLR2BgOVs24YfP97xyy/f9dqp+rSq
-Tm4IMSapdLCHVWgKVhJZjGkipBnKodkdsG1SKcHu6qqcJgl+hNOZFm9lUWAYRziXmRIpV0n3+/s7
-/v73vx06Knz+r68vanfPNVuVJdquk9Q59/jt99/x9vamknNiTdZUg+vADpShnPx2e+DXX+PzL8sS
-27ppt4OHxLIsaOoamXN4f/+h4qR//vMvvL6+Hmp8i39IK3nV098CtWma4uPjAy8vLxo0qrLEsi64
-XsU23M1m2o8VyBQ+x7rt+Py8Kjpv/dFlkZUB/ZwOZYC2Gjbp0d7vN0VRrYjEAiRRMLOYm5VT6uXl
-BT73yAJ/XUC67QAokesstEtyvRcF7yLivx0AM0tisRzrLE2Auj448J4vZxRFoToJy9GnSIc22uu6
-YUljej+OA7quDfxur4gy68+27XS4CkuLx/V6QOd5HZYOHU8Ah3Vbf6rz+L5GM8uBz4/PnaIuOvHa
-dxy177HWJMvQmrRqgNt2TGN/mPyUqTlndgD95KSnD+N8GNwicxKE/EMtvQuALSfqDKNIhX3ucLs/
-sG2rHhTX2101AkUInrynqpIAKwq52tC3U8F2QqYkLj3Cv7BlmzUesd2mWILCeChk2jYUyvHtUEJZ
-KvBvv/+u8ykKnyvXwe5N+25YEpJfIG3t5QCME5inj8Lj+dSuR547uLLwaNdVQTu+XDHNzAPqWKqW
-2+IA3PzcfOmX6MQBBnXdBAOOVfXJtu6z3upH89EFbfvE9+/f0HbdwZU1puDRY0BkwZtaP9t+McEz
-a39t6Z1WJcg2IO+rKkvMQQjkMqfKu7Z9hsk3cYoNBUkE7uJCyBWM25RFKKdWXVXB2nsF4IKcOlqK
-83eYLsahHBEITBIcHJv54lnL871xQVufO/otZlkalHOZtg/7IFDJUvHhZwAh9iOjukY11ByV3vyz
-1Xbhc8Uc+N7HadbgxO4Hs7/oiZAoBnA6iWNOUVaaDUYwrURdVUgzh6oKa3mVcoB6BF2bQQtRFF7p
-xTtk07NWJzGMAY7ZrTWIjYKy3HR0oujJ57OuKYKhEoCTn1qEbKM3tZiPtF2vhiA2cFqbcn3WSEJn
-KrY8qYBlV83yP1juu2fbHSSVdN+hqWKahtosTX5KL8jg2/ddI7IVLTBSSstKuOj00+P0IerNLYNN
-DSqKQk/VwucHQs7XwSPP5xNzAPCinXN2GLzAkob//f64BxpqqSAV/e1Yy4oD66c+wL5/6mfWdY00
-zXBqGmzbiq6nuWZ7iNqWrlsWcXYeAcW261D4XFNHEpS8z9VPcZ7jadF1UgtXVS3OSOHZTkZAY3EA
-uuNwM1G9xtQR8Ni2SCSZZ+GKc9ITg7fy94dYAxOUEtJMeujKsEZlyUCyCjeWBaW+/pERXEK5tqWh
-dIOkJRZZmpYgBfzzn38Gfn+NcVx+AlqtgetkRE3TNGHfN6WXF4XH45EdAFob3OK8xU0di59PwdP4
-rOdlVRJOtON2gcUaO17EKpqmhssLNfzg95D5GklPqWJHXdehbZ8KilJEtCzrof1HA1XiD9u2wZHg
-ot7+ppfvc/rJL5jDTdtBopS72oXOGXk8EZ/PFt+/vyl4xtSXRpfWStwqtBh5mdo45w/e9NY7UNP2
-ID4Rn7kquAItZrGm6uM2z5nRoyeHsUkMPIWmuokuYqbtzDDUAjt4JBzNQdxPPAWWOPM8qf8A0+D7
-/aHZCp/pNI3qf2c7Mnw+lOLOYTNwQCafrZxm5ZfTn3MKRXhFZNu6GXkvzyBLU7jc4+Pjh3RedPxY
-Ehh0j8NwUOF6bEZvkGqKvavjkWzU5/MRvufoDmx9Irp+gDMDWMVIc/mJ+MKMTIZqbsjzMmycO5Lk
-fMCb7vc75nnG+Xw6TCBi4KFxCgfTMNuhyQj3DD0AmCEQeSe4TJZsFGVlcK7UzJL2e5ansa4r7vfr
-IRummQj3mkwGGqL0OrgQsZQjmLzv80//3ZL+qqqMcmCbhrOunWYREVTBB4C9Ti5CRk9uRiKnZFtx
-Qq0M+XQKjLEWt1N2483flffPDcPJK4pIV5XxoxMDxSi3TELP1B3kuNYEkmnxvmeK2M9BvMMa1078
-4aIvC49/BD1/HfCBZVnx+fmB0+mMuorDSPjCv7ZI44y5aCBB1p7NWqxAxWoUWNfaIRDWMo0cAuli
-IFC0oQM67YDSNE2xJLOq+5ittW0r/g9ViS5NMQzRzpoppDgWJeofIBbU8RSyAYveksu6oG07FTcJ
-0OXD1KD+wLiMWov1MHTFUpG/KhmZNYisHZrm0gaNa4bZ3fl8xr5t4hZ0veosvc3o/RnU6bdg260M
-pmUpXQ+xz5MyxBcF1q0NqkAxkBVVqhwayyqEHlrhUfzE+6P/AWcLAFI6SJm7aqbLbIs8D87cELFP
-DZfJxOUxrBuLKRXeSwZghw/ak8tO5rEIJwGKOJ7pOKpJUvwCRTEjzwdtfz2CYo9ur7yJ+/2O0+kU
-ZqmJFr4sCh2QwEkq0gVwurn/+udfeHl90YxCRi6neDEuwEztv9ajDBSSom4HCbE13+TzmecZHYCm
-adD3vZqjrOuqQNKO/RBsyHug5j62GpeD3Rmzh+fzib4flDUozkepMbxcD2CmGKPgCzAbx3R3/aBW
-U8J3eChAKhbRnOE4HdxphHX20K6OqMhSnS67mwGxLK8o2aYzDTnwwzDi5UV8GVzmtHTM89gpkpbp
-dKAMW/amLRGpg7DdIt53kiRwmWSf9PkT1eCupSb9A6g1WZcRWTYFsZJXVV1sN0Ml7MyM6qpS/Uca
-XJApNOPkp2Vd1IVaMKJcB4MO26iuS1maHMBEAYK9Blw793DfYbo8TjsVTOmjI3CNcRxxv9/Epm+V
-ISWWX0JMxUU0/YjK26mjFH7M4UPkBJgP4hFbbwtfuzNUz1WBHh3mkOd6StrZdEmSoKkrLCutnyMI
-s267zg+YMKEMi04MNUYVKPncY56mA4JvdfBc2HYTWgziK4JuT18rG+ULFsrpFowtS0VjbZvIcrm/
-ljwRb0nRNLVKUtkqskxLzoS30lFeM7kNbdsFzoK0UUWVuCjmcAt95qY5HWbqEVS6XC7wuUNZ1ehV
-p5EpRZyGI/xeDryoKxn+4nKHx2PQuY4kxHBsFzEIps1MnS1Zy2akYpDRKknLIuzRH284UITr+hTY
-jZVmqUAJn8dx34/HzVhylcrQpLeE7RiRmSdZ36yZK9cvW6CPZ6sHHFN/Aujx72fZzKFcdm4+6EBs
-MGc2/XxOB/NSUoDHfVJmKolFuTE0mYMIiwe1Have94OYgtJg0Tq8pGmKwURYPhB+uaC/ndEKrNoi
-2znUMRAg7LSao6trFlhYucpI7/c7bvdHHEAZggNLjjYstnmehFvfNMi9vBjq59MsVcdh27n4V4w5
-K3CyFFNrN0ZugRhOiuqRtTX76lkm4GldlBiUwJKEfjUOBhlfTzkGChmdVaAsT1jXOSi6loMpqr12
-Bs15jtx3y70/nYRI4s3EGLLgmFLbGtbKTOdlRTIO8IU3bU7RjGRB0huNZIKyUh2DZzPhJvjc3W5B
-3GTLCHdI563PgXWfPnY+Uvz2j3/g8nJBVdWHZ8N1FAeNCPGGpZHFZOigy4wsy1IdypqGMkRS8EUy
-ylLGiQEdXCjbmOWtq2zuLJQLfO+BH4c6eG4suv5SpMGDgXiIHXrKjg/dnKjPoOCOGfBR1hwVjmz1
-Ub3piwrz8tTMl4d5lmVwBDwW4zTKhcQXbJFlKyqxP8eXer3efjL6/Ooqa80srIEHiTTclCQbUQBj
-qb6kWI5hgEUU8WxqxiG/12OeG62NbTtN56av28EnkKgp/05SdKemqJx+MwVuAyXE4lt/PURjCoq4
-2G1bz3ZL7Kiptr0JLdlTtSiim65rcb8/0TQiKvK5xxpMW63Dzel0kv5zWQv7q6gwzY8DiEjnYLrU
-dF0ceMET6PF44H5/4JdffjlYvTVNfWjZRVPT4xhqMtDEjrpUghbfoxirLgeWGzf75+c1DMTIzKCa
-kKG8XHA6nYPg6BFnHIR3Q2+9aewDntHo7EIC3eu6HrgREXBbDP8+zkHo+h73x/0AhNrOyjjN2Pb2
-gE3Qk5HXbYMPZw9wFgU9FrnxibEQBCTGVpUyanwYuoP4LkrpvR5cbfvE89mpgI7ZcBtGtznn4Gxq
-LvVHbIGwjcAW3mpcX+wUFT5AOrlYE08yx65hehAjo3NORx6rXvyLVzrTRdbSVsOtJhvG/825HKem
-DhqFBbfbVfvDtNY+1lS7ahFsGWDTzCxL0TQnNLWUF7f7Q+o2M6xExyzxZMkjJ+B2u6LvC3z//k3b
-ilmaIEszXYiWzLQHq7E8F5fmYRhwPp/Vnef19UVFRxwqaVtcVio6jT2ez1YBR56gbN9mUxQWMbOL
-I87W4OoTx8AT5I3gbzSgZKvR+yIE40xLS3GpifMI6dXQhyEd9DMgW3MMzL5tWwMOkuicClkDQivO
-fYEs6/Dx8SEDRk4nsd4KaD0PEQse2vVu02GrarRTrLwvFNGnJJolHAE6OmUzSBLbmqZJcJi6Pvgh
-cu3ZQ+2r1Prj4xOXywXDMOJ0avSz2ZngoWIPWnkHkQtS1w3u96cGWjt1W0lvX6m5bdvicrkgSzMs
-WNX+2k4EspxkBg4aFPJl78FJhVkCnXoo8iDCas00Se+0rMOmbnBqGk05rU8eBySw9cWUmGVCUZSY
-5zVYhcvoZdsP5axCm3pZVFlqwE3Te6Zdn9cr6rr5Msl3AxCxAo6/8l6kpJfzWX3hSEBidNdTZJwU
-E6DvwbFcgEpWfVGogpILiKXKvm/qmWcHX349haLqcvkC/K4/ZW9U4bGDMBvzCVqjM5hzTFZZeDyf
-Lqj8WizLTdtods3Z2RTkV+z7jrqq8HhGHMR7r0GiHwY821Z9JOiDMAacJnpTxpNc2nITpinqA74a
-sHxVJxK/ii1NYbayBRjbu6sCmwwezHL4nCzQbFV+5ITweqRjIKA37cNs2m8zFErgl2VGXddY1/Rw
-MDdNoyPv7RwFgusuKoUInlQKKpDkw8XJ3qMl29hgEF2BZ6NDFzSVclqmytw8TN9sLWjT43GaAnjk
-dGCEZTqRw02fwGfbKWmiLEv5Dpcr8KW1PY7ZxsfHhwzwLMpDNOYDn6YZS7oeWnP3+01bWWpH7QzZ
-JFB7ZQJzhXnq8fHxGYZvbqpXt0YU7GmTCJXnk7LwGDCHcQy2WO4w8MQOA2HvvQ+KQctKjIHr2KK0
-ZhGWebauGxbTIua74nPwuUe/DgfTFNGxFxrg2cmJcxWcptwsH1iPW3/7aRxwPn07UMlfXy5IUoe2
-FTLQ29s3aZGF0e7WvYmnLDcvn6G1GrdtywjMuS/PYDVdokwp3WxFE4xOA8vQOl2xlJTuyXiYibCu
-ycGUl5uU05dFtOS0I1cEl6F1YwkFXevi6fE4ZDbTNOLzehU5tap1ncrPXRF8x3ijy7KiqlIRdHS9
-Ejv4EC2d1d5YtBnaDwDaMIxomgbbtuF2f6hwiGpCuuW8vr7gfGrweLYH+THrabE/jsi5pMnRI57y
-XY635uKcpgn3e7Ta4mZpAwMyuu+kSlm2Mw2ou2edH1NK4HJ5CdOIZVAjwVJr7En8gkIUmTnnfzLT
-oOEpuyZ5LqaQXdcpSj6Og/jFBW65tTi3nP4sTZCE+QXkpdODkNRpzjRg/e9CO46dBCvKoRkFZzpa
-4I3OR1ZbwEPA1qj0ILBrh2Ufy7J1XRV4Y6AhxmNVoMu6wmfybmVq7in8vASf2+2mwVAA5DRYsaWh
-k+PVZanvOwCZli1fN//XrIDu1nT6FX/IDPPcSkCZJlU2fi0voklJbG3yGfJgsfMGHs9n8M4o9NAc
-Qxlg236abYTsS8q1aAqbJKkGDHnmQjWf0hTu/eNDp7vyNBZGX6dRjeDUsmRqkUxZ59eJqJbqKewt
-eWjP5wPzPON0OisDijdaFPlhjJcFFY+TdZaDbtz7IqrcluWn4Rl5XiBNrwe2FcVB6ZcBpmLIIDTM
-OXDr2RmhH53lsPNF0aCELZo8EDUYfQlqMSUvilKBnLZ9aokVDR7CGKfA3ovjtOtgcLoq2ePrZGG2
-GDlrsAv++lE8FUdcdd1oHH8z5RtQhZYqsy3Tz0jTTE1R4lTiI8BrQT3LMOWCFSxC/Bzv94duVH4W
-dfZrqOH3QAbb9x1//vEHXoIybhhGtOE5iH+DD+amTvX159MpmKPU2NZFyU5t22JZCni/KlIuGMNo
-3IWPQzvshkuSRGcXLMuMJffKKIzlUHIwIrEqQjuQl+tShsFU2hK2Za5kzdMBRLZdm7ZtFWvRATpp
-prZvljkJzCHQBvLYf/zH/9zJCnq2XTCzLJGkaVBkOYzBu31ZFjyfbZjNJ4YFfGjHgYeZzoK3qd/z
-+cDb2zekaYr39x8oy0qdWOqqRuYyfH5eg4KqDAi1zIMH9p+UbtShcwIwR2ZbNSFtzGKdK/W6kFHc
-oY63TjfWEVc0/rmiul812naSLt11qVGvgmVY27UHFtbRxyB6KkRHn0KNGy2ZiTpz61tAHX80Zt1V
-F09jlHEcMU2jYjFxuEkWho44FScxq4qU0k215uwc0DCTwYPfSbELNw9PJ7LTxKNOUnFq8H2eH2bt
-cYaBOEB5tF2r0tbX19fgDdDj8bijLCu8vb0iTTPcblf1aEAgbbVtq9dvS1SWunxuLJmaug4uVTCO
-zOu/sCHbAvV6EHelIjr3tl2r921r7iRJ9UA8qmGz8P0OhS8wjIMBLhd9nsw+hbGYHHwoxDG5wbLM
-QTi3qmAvDg1JA3gYuTHJ/fb7Ps0LmrrCQO//VNoa8zyhbTvVv7NOfH2RyUGcMW8jPNM9ors/fvzA
-v//7v2uq8/r6im1b8f7+gZfLBTuEVca5Z5Z3fTqd8OPHD7y9vR3qTpmyKiafFnuIPvAxIH18fODt
-7e2gNZehHq3R4cvvcNKQ5btfr1e8vr5qGTAbW2YL7nifqzXz7X5Xrf7j/sTr24si3ZRZ22zGLk67
-CaZpQtu2+B///u/aY2fJMZsJP01dhdRwO2AkaZrier3qwNY4tiyWbtbZ12o6uEg/Pz/x+vqqGoz5
-C6/CeuuL+5P0zdlqbZ9PNGGQyr9C34ntfIZBrza4SxfljtOp0RKhrioU5QW321+YphGnpkFZSe1L
-7MTOd3w+Hqib5qdMRNx8Kjyfj58Gb9ANel5WvL+/4+3t7XCiM2vj763riqaptZVq5fVcf2Iykisu
-EudPxmy38DnKqsb//b//N6D4NZ7PFr/88t1QyKU9OIzTAU/hcyR2wvfZPp/4/v07HsHkxLItAcBx
-019vd/R9j8vlgqpqtLaxeu+mkQsqqxpJkmNdn0aS6w5tNEveIFghqqUWZZBg7thRFDWAzgB61mcN
-yDKnUU5ntgVvdXuyW/Se+nAGAmuX/NU+yfoTML0qy0LrU9u3JYuObTi+ONkoV508a0lO27YGiSj1
-DKL1Xr9oA76OgiYaPk2TTGoKYFUenJWI/pZlcQCcrFTbBjcdpx3UkFys/8qWiwGNs+UZvNc1+6nP
-zZ9nK64Jm43ZDi247iEoCkchgpTTNGPCrNjEV0LSui4HO++u77FjVwu3cZoxzXcN/oIHedyCPoE4
-TDxRJySJUL27/tN45MvQl74f8N///Q98+/YGH6ZG0TSF+EC0hJsUCCQFl0GRJZec+onyQpq6wrPt
-NEiQkSr1/Yx5eQQMK8WpaVREx5JsDwmxlOLpoQMnEn6nWAeDOPUp0s1xOm59WRa4ZRGkVFh8p9A/
-HrXG5A9S5kqnk33rvgyOHA+tl9QM4WSUJEj18Sn9+T///CdOp5M5lVbtzSdJIgNEQokg6WyhqSRP
-Qp4iTNO34D3PDe0NpkAlldV45+GkEuIMlXlVCEobgOTgN0jEldr2SCIRk8g4508AmH4Y4IsiIMeB
-wmkWJUFIKzeldJQb1g5ykA0sL14ARZkqy2m5dMLhzHmO3SKISRrxviPMTJTgbN8le9oSXNLDyDfr
-BG1baBRInU4NtnXDSkPWaURVVwrM2qGvFuylLiBJU4zj9FOrkP9Okhclu3zOUfItxibXzyvSLP1J
-iGVPR7FHn0JWuil99/v3N1wuL6Ek6oO2JcrRrW+ilX1XVam28tFMZdN1Iy7Qlo2YHcrPyGcRK/2q
-PqF8tjrAVP0qtk07LV9NR9mVmCbBBshDIAZh5xns+47UuRxVVemH5yYSk8nGqb0+tCM4yotDEtkf
-jidanGCyrit+/Pihc/SskolZgzi2LD+9rHXblanG1Imbre97dKFWTpVVOGtWUJbiJGv5z5aTr2aL
-4fNpMrpuO+732yHVt78XhRjHBcFpuhy3TsdZAm08GcST3usmsK1QO4SUcwycy3TAictcSHVHdSDy
-uYNjOyr44lPnbqWuNAGNWU4Z3umR32GHoc7zopkXXY6tmIpqTQYZMu0oMrLybG7Qy/mMsizUsZlE
-H7oJP5/toWWZZe4g/Y1DYJ3Kzu1kITG47VFWJS6XC87n02HoDdczr+lyueAcphaJv3+JtzBZpyxP
-B/SfTDy7RtmKnOcFj8dTXajpv2cZtELr7UwJhIMk/Xa7KmYhdnI3Q2mfD9dCDEls2rYwtLaVwzaU
-mKRuq3Q87I0D5Vi90KpSFWRWz82UegjOP/SAiyOSJv3/Nn3nQtp3hCmuhf4u7YjeXl+lregLVTnZ
-aE8vAm7651NYgefzSWiiiTDq7gG85EnlvUcXzCj7QRaDdXJhGkgMQLKODkVRqt++de3liWxxEEsb
-js4swGJGZ5VljarsjCXWgmVxGJbxsKj7vg8TZzgBGZqyZwEg6rpZTzzy0ykl7vpPdYO1p54IdyrD
-ghwOarA0zOKL2vdFmYw0WWXwJ9hlTTyHYQwjuoWyPAYBFrM4S0JSv4hhQO4yvL2+qkks3wH5IGzJ
-FUER+vXk9XkQugQSVVmKi461KONAzMezC6rPWTMcOuJeLi9Sjrochd/02uZlxXj9PIC1KqAJOEMc
-1gE1rOGhR9qz+GA+NPOUCUtOMQprVz+rCUqpvn1t2xnLt/wgmLKIIQQ/AAAgAElEQVR4lJWYW5KQ
-cw5rIPHFtYqgkhWeibNtnS5QM6mhZw02TrNuDGqsWdvbIYxpYHxZiiLNOkkCUmPCRcwnkzTFNvQH
-YOJ+vyNNE1wuL4YZmOn8+JfLBS73WOZJnVNInIlEByiTTySZpTnhIoFjmhedAc/R5SRv2GBkCUCU
-cHbGQoyL4n6/4f39E7/88h3ruuF6u+EtjZZVVVXjzz9/N6YqcR79uu2aonPB3R8PpGkSXGbojJyh
-rkr8eP84gJbrtusJamcjdIEpyWyEpJiPz4eeelmW4f3HO85BisyNnOe56v6ZEdgOCPEQGagxw+fi
-28gTh6egdZwi14ODab+ebJRaU436k8OREabxfpZlhi+qQzdnnKZg+W4UroYdKAM2Ntzvd7TtU+t1
-uvyI4/OucxKsiSxxrrquUVcVXO5Vb8H1b6duxdFz0V4tdlicSuHrqkLmHLpbr2uZA3TjcJT5y3DV
-JI4tK2XWRB+MU+QZtJoVs81Mta+bl1VPbhJWvv6Jtd4WZIZH8QwNIiUCDQe0lYYR1hEndxk+Pq+h
-fXUcmWz9y05Ng+v1qoYj7BFnrkCSpDryymoEnMvgMheYhwXW14u2lZYvDD8uJC7i86kJ46qXw89b
-U1GaKwzjdFgU0Ywkx7dvb3h9ufw0YRcAlnlSvkBReIxjNPgovNex6V+ppKfT+dCNyVyOl8tZjTQi
-kWs5DJs8Wqdnx5FaYXY9vR3Pl7NYUmVRpbcsC+gaXfhcrcI42IXZwPpF8h2lyz22bQmj5Eql1RI3
-spwMrgWxPj8DODrwWkm3tFkzJfm0Xa9DZqws3QaQ2+0WMosytJ+Bx6PVE1b+zh9k21zH5N5b3j6D
-yrIuat9u/962rSMommrLU4KX18Om7wc81ShHMj7sEPXhNB02vR1uyoAu+M10yAasJJ9+Cl0vGFVd
-13BVWcq4o/BiCBZZ6aytvXixkdQh9eLj8QzqrdTYHe8HGir/d17WcMrEmXN22qzM/ZPSgHRZPnwx
-wegOhA2e5sIN90rEkDSqx7/9WsMXFcbpfhBlsPVjh5lw0wzjpOIKG/Gvt7ueDl+n8/KlNk0NXxQA
-UhSFpPbDOClXn0w0EZFMCgSu66pRuiwKLOuCLHM4n0+H2rM3zLt/Vbp9FTTZhWlprczGXO4xTbOK
-fXLvkWiqu+q0InYV6rrWqUKbWXT2e2zwaZoTTqdG7dPiXAh3UA9yw0lZ1B0cc21ZKsSXJJCUNqxf
-5gla5uo4jihLH8qy4ECUO2Uq8hmxBZjnhd6PrPXEyIkz5REcDpI1Suitd581+7SAuFX90XGZcSta
-z8XBMMyYvlJ8efgQ2CZdmlgN9THcuyyT9qAGzLIMjm6y0TNu+3r+ayq4GwYYgRXKItfgviqLesQ0
-7Tqa2XriU1giixZK4eUpxUXzbFs82xbrGhaLc8o+/Ko92PddjCXmWeWa8cWsIgJZngeMIU5ZcQf5
-8VcxkGVY8WXyeUT6K6KWPHgr9P1V0+stUJelD5yrMEUox+wDzz9ZQAu4swRvvB5+oXFnqtF83SQo
-2uDMICwL4XhCsFQhAj+MI6bHXYNZ3w+hbo0W3Uyzh6AHkXJvPIyqlhN8PDDZiA1RSTmNoxKQWFqk
-LsO84IC9kKdAMJNmnbxG3cihazAZS3H6G1rXIg67VbPZQHrj5ieLU+7hph0Vmqx8HWpqdSuWLajO
-VcGaXuYULIqtUPdveRq2nqcG56se46DgC/6VLH+s8jJyKLKg+BSXLJbu0zypjL6qKpk98fF5/ekD
-rMSXbQxKP7/SaDnvj+lYEVDZyATLdKqrcgpCe4wofNd1OvSQDz8izvLgWOvboZI2ABCJJw14DESJ
-rutRFE/UdXMYXfbV430YBqX13m43DRDkBezbdrC05sx3RnGyBC2VOXcZljm2WWmR3ratlgZ2s+d5
-PMHuj7t6GpIYxQ2mIpyiwhJ0HF+djARLueF2u+P19eUnBqV122HtG0uJo1GKXYzqyhPKEw61kNM7
-6icoJSe28Xg8Dy43DOg0FbVINYMVA7C8n/mghiODkuPPLD5gefwqSksTAHJKcohrBChrBbvHaVab
-9yKoD5n96cDW8HwpE7aMPz19DUEqBpP1X1p8W3MPBl57D1ZQtaWpll3cyJI5FsZ+3R8wHOJWQ9AG
-HAxXN2O7bKOSrf95obYXTdujiLx6rR01SucOQ1F8+Txo7cfNS4loFQZasl2278D4BRSLfey4gezD
-J388erhF1Jt1lF3YNnqTK872EtV0CRIs27FfO5o00Fp7FYUXEGYYMM1iJMHJQmlwVeYz4kkiL3c1
-qjVxc73fHgoECdaRq2Js2zZ8fn4cQC978oq8ukBdN8ocpKbBPjPBZ1Y1lVzCc7QlBKmkXDz25LXp
-PrGM1KwZtmEZJHT2Y0C5o6TYh9kGo9bb9hmdz+fAJfHhdFswTbNmGZKZpOrFYLM4vlu2ZkkW2oxQ
-x7kMvigwBExGSEDWNCY1gjinY92SZD1I4ilEIo/Cbr77/X7g+8soufUwlUr9+l0GIAvDUrPQEnZ6
-PxYYratScIIgGV+COzefa+FzpYMTMKZxjqP5pDilLEr0+Vrfkk+dJgm6kAbKB63GA/3o7rIZ1xid
-XrNu6gnHKMb6yhcFpo931HWDsqxxv9/QDwPqudEHZlFWLn47yGNZZvx///gNLy8Xcc3xPoy3LkVd
-Nk5mfLQ7ePbzZKLayxcF2rY9eNLbMsECRbE2mw+tLVuHczQXxVHW1ryuG5RFgWfb6si1b9+/YZ7E
-/5+Lfd9z9Sakew/rwK/XU1UVsjQT5uY4HOjUUpJ4SQ2nCW37RJ/GzWgnEX2doDSMIoIpitKkwrNS
-s9nGpFCFhqH2uRFXitOHEXreErQj2p0dCFtZmqHwCQbTiv461coOkLHmFyxH+S5cRixgPhDQqBHg
-qc9yhMxFBm3bV4+j46vg8e/Vx3Hddnifo66rMGZ9PkzAsi5ADLBUgJZlgaY5oa4qXG/XgxFIDOCb
-OmNL2TNrpruEUW/rOgV+wq5dljzPxRIsTVNMs+jOHw9pGdR1dhikwDRx3fYDsYXkkyFciF0wP368
-o++Hwyw9PsijJJbqrmhH1rZPba9ZR2I7hYUtL2vaCQAvLxd8+/amc9+psXeZE+KME0FLbiIqh2Sy
-ZfT+8R4EK7OmmdZdxgKQthzhNVg+uD2JYpsJ2nlY1y0AfvRZyHWw6rqJoefRtckfamXnMq31nHPK
-5HPOYZon/PjxV+iXi5lnlprNV/g4Cs10R7iJisBPkAWWHdyCbPBMEqcDLOycBp6W1obNTlb+66+/
-cD6fo/ErnY8zh2EbA4hawOUe+zCo3ZcFGdkCoyqw0yG1s25YUqfZ8RGcZoiDaQ1VnFmWXG+C//zP
-/8L53KiQzaLr0zSpHwXfjfxTqAU6SzySxWgCop4YaYItWJ/TacrqTcqiQBaGfjKLY1bFk57j4PmH
-bFViZkLlP4lJTe71ObphnJBMs3moW4g69aFlFDe9oLCcpEpSECM7qajjOISBlssh3WHQYB1DW24h
-7qS6MLkZ0jQaN6rrbdfjX/2xTLXCe7i8Qtf9P1wu5+AkLKc39Q92SAcdXSJYlunJOhlPdW4yCwAy
-Rf6qKrTp8dfWUVmWuJzPYlZy/1DHlji2LFU5sLRsKh3RTR9HjqIizZpuQQw0tIKqqko/b1mWsNjy
-AzI9jgsu5zNcXmCZR6WzzssS/O4FB/m8XsO7Lw8Zx3FaUjQ44ffwmc3zruOp60ARJo/gGdaVdWdK
-0wzvH++hW7R9acdtP7np0hAkalGkbKX9WFmWmpLHISWJthOnedESRk72Dedzg5eXV5zPZyX28DsY
-eIgfqGah61BXJZ7PXDGxRTPs8UDbJm5Bl2RmSHyPNMXh5m/qSvkFTdNoJ4gDZJQvMC9o2xYvoSWt
-hKwtEpucbfVxuAL924QxlGgH4I8//tTU5uXlErzinBmuGMEdaRcVyNIMp1ODNnjYc8Fdr0+NxgTw
-LOuMwxGmaTRz3Y6DGQofhTEEPFh7fXxekSTXgxuvTIzxPw0kYfAgFVhaRyGCLueDSQTR3Nhf3dTD
-7XSq1SSEABk3iBXakEBDEY1kH6sGv2ledNiHc5mMjc5zlIFtt64kxcQN6L3gD1k4ebMs1TmG1Pwf
-OR170IWPuoHarsM8X7+Uf8kB1CWxh3oEdnU43TfLsiAnd8FT4lgujeMQgq1T34N9B1xeAGg1UJSG
-5861QQovS0gmAHnoJLAEsziUjrbLMqRprmzLaV4MczRXgG7fd8WCJBjnaE4nscnLaqzrVe+bjEK2
-7fh7zJznedVTnpZ3mZp2rIf3YEtFrk/ibLZU+Aoaei/Y27puuF4/dUYjcTW6ekn5uCneRGOf5D/+
-43/utoYVf/3yMCJ8DPpo6RUH80Uk8IUPwzgyM1v+OOtexRDeBwnrri9K2nsZfrz/QJ4XMqopc0FP
-nYeFRc88KDjGceDn0xld3+kJ6DKHx/OhrS+2mpI0RYIE4zT+Cx+8yOsW9HTGvCzB9y6CQOy1x0GP
-KR6PO7Is14m+7HdTVsw2DdtxxFEsEkwuRTxNUwUEI9MrDSYiSTAI2VVbz+zEAntfSSixZ7789P30
-AyBoaGfZcwNMhvrMkquuKnQaqI89am7A6K+wajuOugHOPHQux/3xOMy453VFVuoaAlyB2+0WNwPv
-Lxiu/PjxgaapzKjsaGlGZ6c0SXALRiQEWKO+JTvY3H0Fwu0fu1fEO2HVTpmMVEvQBsUls8CXkIkm
-gV+hMzPC/uI6oTv2um4KJEpHaNYSmV4K7LwAO7qu17mEfNf8b3aYbgSvMyQ/fvzXblsOjFSsg263
-m6oEqVLKshLbNqmX3uPx0BnwtBVnUPntt9/x/fs39eez6KVMRsnweb0qgYYnEk/59/cP/I9//zum
-ecLj8VRzEdqAaS0TrKCSBKjrRk+Sru1QlIUirBKIlujQE059m3bZCUe///4nvn//pq1C7h/v43BH
-GUfVBopyjvv9rn/3xx9/4m9/+zf1R7CgFFNwK/ckxZcn2O12w8vLy0/26+y7d12POohwSHG2JceP
-H+/4/v2b6hm+moNajoPlNvRhtsE4TrhcLgdFpPoKpFGXTuDQPkPrp0DpLO/VuRyf16ueVn3fKwIe
-uewZ/vzzL7y+vpiW2ao4kJSDYlpzu91U2ccMripL/PHnn7hcLrpGCJYyo0gSwOdebeB4QHATPp8t
-zufzQaU5jkOwiPdo6hpp5vB8PnC9XlUVyUPmfr/j27dvOjglScS3kid8UcgsjKqqBA8KdHCWyl3b
-4du318Po9ljiRT9PAs40jO26Fi5z+O333/H29qYkJckmI+nOsX3Di+dY5qostSalNZjPfRB5DPrF
-cvpEmyO2ffiyCPhVpTj8ECSS8U1DHP6RO+R51OHbFlTX92jb50HDLzW+B1QttejmPzV1GNG9YhgH
-mVYThkAImShGQk40tu1BBgdiFbF+FkSem5mZUlFI4OIkH3YlODuOo8snM8PP3h9fBkk+dqbdV9KI
-BSJFyRnq7nCyMfWLQyLlc3789QMuz1AUL3qv1kuBPXfrceB9gX07jnG3GQQzJGGDugPgxABqrcYI
-3o7jFMo6KNbCYMxOibSpFjwedz1lLeloC179fH5FIRyLl5cXbNsaWozC5LMgrCUcRfWoZb3CuPck
-hs7tjGV5tKMbpwnbNpiBsT7U49FxiQGXlGrrhDyOowaNoqzw8fFxsFTvhx7jVB+CKoVrhc/xeLZ6
-P/QMnAPethhLtyiq20NmKjMgHSMtraKyTFpOO3Y1FhiGAbfbqJpuSw4Rk4czzqcGmSvU54xAFVMv
-C7qx3pZZ9O4wJ94SfexC5hRZpukERiyPoa4bNHWNzOV4tp3KI+u61lFX0zii7wdM06iDLKn4s044
-rMNsKl0UpbCnnAQAOhz3/cdhkfEk4RwA7/PAaoy6d8EahpDmleY714NvnO0kWEqspTL73CPNUhTF
-pLyHvh8MGSbD+XIOLdGL4CohGFlC1DAMSpDJc2Gz9eaebDr8r6zD7WzBI9FlPbSq7Jw9BvN1lVmC
-3ueHNJyuy9a5yA7wiMh9rhOIpmmSCUah5CCBinoW62PJFjSZnNuWHTo4VBuShcfZlefzGdu64Lf/
-91+oagk+0lLPkWbuYBdv+R42i+IamedZW6HExCwoTMpyFCJlBx6LzSitqzFlxGRfns9npTsnSYem
-acQVWOoWr5NLpUVVHF4onVwIbhHp54iprh9Q+CjcICDC0+7H+7v2fkVWWhhTxPRAjrFGEcBuXFPT
-MBSz1ZrVLqhlWXC73w+8dbIR123H0HfaAfC+UAMJIut86WxbSls0MywtYbVNfa8RWrKBFc8wjoky
-1I/Pq57MWRoZYZSF0i0nTTM9+azd1DzPWEL9b0EqOxiTp9YzcOOpMS+81ynMPNG99zg1tbDn+uEQ
-VGjGYvUMz+cTt9uIeV5Q1dWhNPpKoRXAeDBDXqFya1KZv+IBVqBDkdft/jjoQ+hsRL2CFfvwfXz1
-epD5hXkAA29hzeYGxM3DzMAaWdYFt+AMaTofAkr8nkWNWTZDiZ+mEeM4oTk1KIoCTV2j7bqQwYz6
-WdSSMBMehgHX6w1NU2u2xnUo/pqRRflVy6EGqMHLIUszJMmg4HucaJXpXoqEpBxNcwrDYsxId6ZR
-BPs+g922Pc2kxeTDF8pmZ83JsUUSwccDWEL3Fj4w8VLP8Xy2ivjKaZIc0zsTobl4+bJ5vYzMlopL
-IwXWR2VZYgumE23Xo+8jy4zqu23bcLu94/+n6017JLuSLDF7++pLRCTJUo8awuj//xBBgDCD+TCt
-akDVXWSxmJmREeHL29f5YHbs2vWgCBSqm5UZ4f7eXcyOnWUcJ3p6etJxECcDh5ohh01r8+tsICX4
-1kWea/mHCQpsrVHmvn9cVPGIMhHhnZg/47B9DHTAYnAhILvXN0Nzb9OeccDd5bnb0tYKcdjjP6ZA
-DoWyLGiefFILtw6zlPaRVgrzPNPhUEuoB3l++48Vo61icHuBploUpQLOeIbjNKlxC6pIjMRQPblo
-d1Za1lWpXA8c1kg3iuOI9m3Ri8uOEm0lh8+ITYzRI1B4cC7KsqQkLWi53eTvLB5LFFOZ799fKY5j
-quuSXp5fuFURNec8z5RmGd1u90+HkMXOwPJ0GQaRZ5HPAC63u23bKv+AcyrYGRl7cds2xgAAKuGF
-ATCzXu/Q+btRhEN2YYVsyRFWVIMSnvnwpQKF/ABHT42HGCoHBCVqSx4abzVgEs6vblWFHpKEYIF0
-lYcK9RSAP1QS4B/YHtUp5za1/rIjyGEY3LjQlHHcQ05qUnEzNzV/TtIbD1TU0Yx6gAxvW0j7HilB
-ybeJ3kVYlOrzxZx+HBdtNZqm0cWyPQiBHg1IAUrNcyyEmZROpxP1wahmp3bmDxwHseU/Xl/p5cuL
-5hUCcCUKPD+9R899a/2Oag1jO1irPTozqfdfnuuftyNDbKhhGGmSMRhKfLD59njzRER4Nvg8bgMG
-nv+ha00iWY/8Xseh9VqHbduoae4uMi5iXX9ZVkIN5ynFuu2UZ3xBQdAGNSHGgG3b0O16o/PTk6Yu
-oRLAZWdjxwIxDQWYjz0FvMuOeUN7+uOWYsAs9k5DVf+JSw8UgDY6ygJP8F/nYMjMZKRvklePfjrW
-F4+IJStZtbpuSHRxKzats9oehSiBPgkeB3aUk+qYb/Xam7Is6enpTHlR6xzVDHx0AfaSsGv1CrDR
-jiWOuesHdyhuK72+/vhUrsK8I01STybtnl/4SbzTto0GZEJ3AFUlPtMoM3B8ToREoBR1nIDYEEbi
-T/+pqordcvJcrNd6BdBwuINB2vcDh7/UtRhskNjIL+I2tHsXh3VDBu9DGW9ym4PXjyzJNIm9DESk
-UAcB6eEE23o1E92cchM4D9o9ti3rPU79o/QYzxSjRJ9uHOmhClUdzEgsc9UlNbGZKTIheDryRvf7
-1YTgoqUWu7Ys9QxssfmxrqEsZStxfkbWh8NVnCkfyqtLz3b4EjERyMk5wY5KdS5uOdzoq/edRz9F
-kchJtdKvv/5Gz89PdDgcnGyxquh+v+tm6/tBYrVLjdp69Eez1F6UNDbk0c6o2TQhdTLPLGNTDenH
-+ecE+hKsGuty+eDgR3OLDMMHDRK4WRSF52nvwjFCKXnZ+gktR5rE9OPtneq6VrIGK/xcKrCfmjsr
-ucbX0G/euAxceFRYPH/vFWdBdYLfta6JuPNyjPftduP3GAaK2o+jy3Lo+14JWbj5DnWl+MQw9FQU
-+Se9/rz4Go+npyeqqoqWedbUXOslADegYVw9EBEtRJqk6ksBezXwPvjvD2rn1vedSr25l49M5Fek
-LlBWIIaEXPzvqBLw387ZylWKVmNhS/FhGBUwTaW9tNmaUE3y2kDlxJVWPwx0vd1k7p+KeCiW0XWi
-I1g18RSS3aGu2adBWs9hGNUSDWvDqhUxmt3Exuz97Z2KMtcLbt34z8Q24NOJc5hDHppwDZiEoFyd
-55nKMlBWXFWVVFUV1XXNltNSMtVVpRRKXkSJztJxG9jTj0u40AthsMIUoJ3WhBSLMMt4NGhzAdjq
-/ED7HgnpJhUPu1yps4NxLHKRUu52dvHMuaK1QGbTNGE1VlJQ1rRK5QXACc4/A3muzLSsRNs2WZtp
-LtlWSVRiYVOSZhQLddkiyxg3RlFEr68/XF7AyNFaVVno1AXPEN+VGZ+VVnZfv7K5S1VVn7j8uP1s
-6AvGZ7fbTTc/gEsXsMGx1DgM7G0LHYh9lzxSZlLUXay1kHmPYBEGDJ1lmU3KgQVa1/VUVZU3vcLa
-wvjSUrgt4BxHsbL3bAuC8ttWUuu2G6ffSP/3QWTvmG7ZdGsIthhELDSQZNsSz/U5inh83d8Gz7vC
-+idYF6OyKCQIN9KLtaxKOh6ZqwNW7rLMXAFALqqGEjKWA23Qesjjxq6qWmWGc8AmlezAmtO63jXJ
-ZBgGOk4TWxEJWJHnB3p9/eGJfJg8FGoaikV2MZKzBpOgLStoJ30ebmQAPxwRxqQVlL+7IPJ1VVGS
-ZjRI64A+D6KSpu0U57BhpT7wlsi/I32RYRTTNN/VVUZLQnWB2fRmt+iu9TLwcgMjFz5p1Wm2ekN2
-orVqw8+DswxQ+vvtTmVVSlkcCjgbu8joOKGThIlcw0jjvOxoytqsYzGCm2B9BNG+aWSVMY191Njr
-xGbdNGAThJjHDIWiyCkg8eIb+0/WZ1pFmXeKdhIGnlDPYWrAEvRdBTnLunhkLbRTuCiS2OUesNkH
-H0zcEmS0yCQMpqw46DlGnVu4XQD2e9PS5XKhWsRhPLp2PXxAgcqnQZMvC/bhcLJlaYdWHl9/+/am
-nApWfbKnwjRNVJUFY2YWFLKMIi6LHOEEDx9iiFQAM5sW3LYdJfHonZT4QNM00/VyofPTkzyYUD3+
-0dep2WY/fJoxwzXHEmkQnzWKpBMKtT+LcYpCB3Au0n92fU/RNH0yV1zXVcs6FrPMOo77M+ONeV5U
-3YUJyWNYB8JBITRCVQDHG5SvURh9sunGs1/Xjdq28VBiHnulOp6Kooiens6SmJsb7n/EPonSV4OJ
-Cfnyvjsch8vmlfKiVFoyAipwOIOQhYw7bFx4Ntgb9zGVJwgCent7U+6JdbIJg4BmM3K0Y1M8f3bU
-nSQHcfFGlJZYlmaZsWeP1O3KWtYz/2HTdOkgcN8H4zhMZ6zNF/NjNrXEWwyAh1g9WKph6mPXA3/m
-SKpf5trUNVfLACxhggNpsjugY5XPL/NC96al97c3Op6OdDyeVGTH4DQnDg0S77euK1VlIXTk2caD
-r+rIC4VWFEU0a0+2M3ouNEdIZYlmz6hxniPvg76/f6gO+/z0RE/nM2V5TenoYpuxYcZxUsNELPCu
-42gynLpZmqhL8b7vMn/n8RHm7HYzY9FhdAbPABvkaVl21tgCB2El0cq8qF2pCTEJbnTYRyEM9HHs
-ZUUd1iFGzU1k5PXIuLPUXme1xZtFHV+i0EPL7/cbJUmn8/pty9XwM05iut8bShLmsEPnsK7Gv35Z
-aF5WdUq2cmFr+LpFkdrGXy4XjVjHJWG9Ie0/rDitqCxy+d2rHpKP8mkr58X0yB4+jyPSbWOHa1fF
-bjpWXB48Kyw+AeDQsjTtQQ9cQenIIujCz4TZBgOTzr7Nkna4Xa6pKguK4kRFX2VZUp5llGY834dd
-u429w82PgxucgjAM6XQ+i5aBlE7PMfQ73ZuW+r6n0+kknIqYFolKjyFdBNpYloUKdYZhYL+5xCHq
-oMiCLMO+Z7OO2VDK2jRavHCYjsTrpC9q2zYq8px2CY20RCCrBNMTXiSe0xRqqq81C7HeadyHB+qE
-Yo0imKji7MNtxWL7rL7nHhLhEdYQApuhbRnYZOBnFGDLEU8sjRYLxjowoWfGi7bfR0G3eZIDsZVF
-m1M/uUUSGlcaO9JCZFUurVDb9XR7ffWo2vem9cprlM5JHKmkeDativU84PZiFpyiorqqOCrtcqFt
-K/WAfSTwFAUb0URxQuvaakKuu3xCORBcm2DNaiFr/jOCEhKEwLWADgHvDJcGbOLgKYnDE7kRuJQ4
-+8A3ScHzGUyKEUJQnJR4NxeHs6GPIha50TR51eo4TZo7gPh06zGBwx7Sc2BQbozNGFHb3j0rOXaV
-5vTry/WmJjd1XXMwyLpuWjbxuIzHLBjpIe3GOqDiIdpNhVEP/PJmKaVAPwR6Cq69IuKS7msViI5n
-EDlLo2lib75pVgBHqbuU0zCOak6yLLvh7+dqKwVr7wWL/954uXEWiQWJAj3o/d7oHN0RUTLtB2GI
-ChDL8d1DVe3BRu1xpr6uGy2ipGO76kYO2eDB+CLTWwqVA3j5+Ls296BpGpUYs4lKo+0Tekho6K3s
-F6Dd6+t3+stf/jdKkoQulwtVVaVpPI8j1jzPKM9LmqfR+/eWyIIKM8s4DIaFYKFiHAzM5jSo07Dj
-kljji0f5rL2tNUJrHLSFdc9sV0q7HfnZywNrAG0SDD9ADS44tBgAACAASURBVEdFCaotDjN7efG4
-fDe+EL4f4GOVYcNt/Ti00DOizbOUZllbGP2hxYGBjPVphEdDVZUUJzUliQ+KxnmW0rLkSnPFh0BE
-NXL4lA4pHxzKOB6phGoPxZxvP4657wdx79lMFHLisZvWlRRjOB6PWkUEQUA/3t6V+LEZthb3nO7W
-zNKE4iSmuWkUZXeuRUwSYjNSuM3OejtAYmsXEwxPApEUAzHGyBG3P8tjjxRGzshjk81sc/+s95tN
-G3bx0YExFY30lsahwWlDMjcPI7rdV73FASihVePQTP5O4NEjpBR02CRJNJ/Bthd/+9t/0NPTmY7H
-I6VprpLmw+Gg4JETuzjef9t2+p6LoqRKAkbsP9j8uRwAkHJjMsMhGxktbWc8GGcVnvH8mpF2TKDc
-JGVUdio89ebZ+R0mMYNxGP3ypdR9unRsiIkLVyXPCIQlyplMcnzffzBMg2DxDiisdeskhX8PKvlj
-e9i2DZUyvoP6UpWrxn0LICY0HVEU0fV6pWEY6Xw+C67wrnR8BPUE//Zv/23nUUzPMVJZqtrxvh9U
-LAEtNXpUNjishCjBaLstw4PA6ead86wtoSLV+9tZeNf1Okvn2zSSyoF7GKgN4Q4Dog4YfTzHDTRX
-blU7Lf6zNmiCgZJUrMNuhJzEKAyoaTvxpou1BOUDZ/N6TjX4SFOaZMOnwoBzn5E/bxQhv07syGT2
-z71zTmVZsNAj5ANn3zZKs5wul4vmNUCzzmVm7GkQVskRYDux3pTHzmeOM/k2Oh4OtG6rjupQ1ez7
-Tt+/fafnl2d6enqmtm01k34YXGTX7Xb7JP1FeT+Ok8S3Z1LCL14/i2fFvoR843Os+l0Ulq7CcWrJ
-jaqylEO8Nx6QbmL08X6hOOH2om1bqusDlUVOmRCaLIBrDw5L0OJLzmER8BLAGuKIt1meN6qwx4M9
-kGlEqLyBVC4gHMD8sxdtSZCcXBYlTfOkVl8Ig8W6t/6cFh8C5wVMUvg8gBAGxi32tAK6f/zxtx2n
-TmYcdFFSdl1P//Ivf6FpHMV4YfS0xXnOL7ksOR8dckv0RE3T0NPTk3qtgc47TrM6+jw65B4PBwqj
-mG63K91udzqdjtLvH2ieR5UR294Lm82GlURRSF+/fqPz+axWTdZIcxiYx82kHDa1RGpREHCgxf1+
-p6ens45GYZFuLZ2AYwxi3f329kHPz0+U5zldrzc6Hg8eeGT9BjjWuZcwU+avY9QGujFixvDnrTJu
-nieqq0qz7h/xhcvlQs/Pz0JeWqjrWsoytiNDkCfaorvwGLZto+fnZ4qiiv7jP/6NzuczlQWPN+/3
-m3dgO8do/vlod+AK/e37Kz09PX3itKNHh/szSmt85kK087fbnc7nM+37TufTkdZ1Ewnupq2k1Wlw
-5t+B/vrXf6fT6UQBEb28MO/e9uuPiUOggWNtwevvcrnwzzGWeUnC8vbZMg8fxFTwH2zbjsoyV84H
-ql9MGUD3LYqCDgcevf71r/8vVVVJp9OZrtcbvbzw+4P2xFYpbduoYvLj40OEQrnuqff3D/o//+v/
-oepYVDRpmnJbWhQ5xVFsnGzdogCFchgGen//UHYcCCBZmggxo1PjSgsO8WkYarbZvhONs4uGQh8z
-L/7Du95uOtrCIs8yNhvJs1T7b9zO6IWxmKDkA0vOllzwh3PjLtePFbKhh36g0/lEeZZR2zQs+zU9
-L9BeZK0jgy2XEvx8PrHaK03F8stlzC/LzJFMJrmX3YtiiuKEZnH8wecbx8m41TJOsxnSB9oNou0T
-X9+OjhzCLoESEoQJsorlwIPGncSjYhBd3+vh+jiVAOFkUADLn9/bRYv/RqYeI/a9xmEVRak26ojn
-htYCASjWBt4CxhCtBUFIX758kcM9UH28NfS0ZCRIkYEtOD0+9+Bu08aa2hRFITXtSGWRU57l1EjL
-gmeYpgkVRU7bumkSVBg6NijnUUZ6kRQyDr3fb+LzV0jLuamfpj2YbCAosKi6rihNM3p7e9Pnge+W
-55l6X0LDEUUhxRwbPXyyPbJpqvO8SBwUu8pCibbtO41D79kcY0MhIGTfN817v16vciq2Gr6ASuNR
-bAMgbhxHprXK7XdvWrMBgcKG3gjOBoPgZwJlR6w0QDLm7rMTLysde0ozTktOs4wm+W6QmQLVj6JQ
-Z9D22SHngIHTzJOYgr8Nj3ubhMQ92vZJRcYONJyInOeZx09w72qh2+2VAdMs101s2W2WiIMAyWEc
-xSU59lxi8OwHY2NmPRAtecd+D3gJ4KYbH9Shj8KzcXJJQwDZ7LqDmAgtShiG9Pb2ptqSSfr5oshp
-F508/8xRE6+n6UbbFnt8fgvAPY5nUb0MGo0207alypC9XK5a6gNcddZxkQayZFnO1d0wUBRHNE5E
-Ybjqd4BzLyrSYRxpE83F8Xiksigoywv6449venldLh8COLp0KYD3KsxLYvr555+ZqVsUFAgIOE+T
-5FaEVBY5tzZRzGpAO3d/fCAAxuyCA8NsmmZaHh4sIqxb435igbOicF8a82O7+R2hg1QJCOApinix
-PfL6LUKLUd3tdpODIlbAMo4T+n555flzWdI///lVQcDz05kWyeura/Ym3LbdmKVmHiXWmjRgJDOo
-IIkty7ftTtfrVQ+7oijper0KXTilvr95kmsGeVaPmxBFPK758vJCYRTS5XLVgA3ekKCz5hqEwoxI
-8PEXwVZaNVWxmXib2ZQYB3M71+t78bEdFxwShYEnFsPvv1yu1DYtVaIpsBsNPwMx59ZaHsExcRTT
-7X6jy3URQ43FM2hBiq5zXprFVyBjc8yPD5mLMw/l559/ojiOhUcQ6SHeto3yQexYNIkj2uTz4LBB
-hB2qDtjA2XxJZC1gcjQMA/V9T09PZ+8ZpGnKY7n6wK4/faffEVXGMI7UCfgKWrV6WAjBSG3ml5W2
-bfY0GjDo2fadZjNexOUexyxTj29ioIE5uS0heZHsugCmadcXFlDgzUF//PihC71tG0aBq5IWYT+h
-auCHV9I8j5Smmc5FIZ9EP4MNjnBQlInbtlHfd56Xu1WKJXFMd4kXY4vqiIjcDBsjkHmeaZy4uvjy
-5QulSaq5bGEY0sfloj6GznHGjXdUqy4JwRYstXpr5laUFMc8U8YGLWRGbduTefGDPcCpOJ/Ya3Db
-dhWgpEmqL3XfiV5ff1BdlzqHfwx2KYrSMArdGOt+7xWo7dqODseDgF7ynaWFsso5R7vdTAUzeIYf
-h+OBnp/OdLnevb9jPQDAaGPJ9WQ4EKswL1MtY3HA1HXF9O60oHH8pocHVzF8w23bSufTUcEuXE6M
-/Keqf+ASPPFyAOAkHMcOsASbsB8GHXdySzp4HBI8bxzOWcZkp6qqaRg65ZCg/YmihNr2qsw9x+u3
-sWC7trS4eJMko8vlu5cibR2rMcK93b7xaHddvHezritt4k8ZQwmWZ6kktzrnUYQbWmtrJNNaRxrX
-x7IKbdtWqquKivJIbdOpwi5JEvrjj6/Kzw+C1ltcLLhJlavNwNlC80MIhHP6ib2ydBf+Nh5MEsfU
-zA2VknGAW4ZpooW+rDw/0b7PFMU8QnTKw53SJFEGYZqmNEspDXkwV0Shjk6x2dBy5HmmVtR3ibTm
-1KHC87B/XEg2F6BpW+rkhTn14qyHD8u02bI7jEIPII2imD4+PqiuueqJo1h56VikGJOdn87c0xYl
-HY+zKA8nnj3L7YvPaA1SWWCVKlsOlV6cFER01/bndrvrGAqbGov/sVXAtCUKI2Xc4XexOUmjbrc7
-cdoN7M/r+kBFeXSyceFCoNcOArA4RVabpEr1jeOIdtr1MOr6gacI66AVkq854GeH9wOfCvhY8ufe
-6H5vjBFpwBJrmbDMM6+vv/3tP+h8PtHpdDLeAhH7PAgjF+NrjE5tWrFNh8LIdZkX/X4WZ1PujuNN
-F5rdjpMaaDoQdDU9lLmxTWc5Hk8irinEjiqhdR2p7Vqd65dFLgakH1RVtRed7ND7WHrvRRhdo04W
-7LgGbYINoYTwBe7BLN4ZKcszPcHRO217R2XBh8A8NXIDLR7bMU1i6kXAhN/P4E2oJeD5fNToaxxC
-EBwVeU5d19HH5aK3jXW4scEh6DGXZSVUZSj/VgGSQIgZNBAz1ISl0/lE5xN71wdBZzznF6nMMnW/
-xUaxSbVJzDcjTxc6BYDHoaM8izyPP4xdy7L0xlGsbst13HS/36lpWpkC8YIE2OryGmcdK+OdQZAU
-xxGNJkqMmXS78ueLgidP6InRe/N7ejehNqHn0TAMo0e4+bhcVB8BUZXDbpiC7Pz/mYoLfkYcx7TK
-n8WGhFw7TTOa55aGYaC2aelwPFCSxNKiTR6IGYYhvbw80fF4ouPxQB8fF70AWeuyfMqBDEWF+Aiw
-Wl0EuB/zPCnhD4D/tm0sB56XVeOzrYXUvDh/fZhbIu5o38lbEIgXg/mlzYDjh5FSIAkqT0/PdDw+
-0Tz1CgTt+y4WX6v8jkB6+ljLa+s6y+Vro23FrkGPpFwAa+v0iG9wRmGj828LYKkl2cZJM8fTSQ1S
-lI8tgOC6rhQLoGWzCpHvB7IIxqVR6DICMVK83e50PB4oSWqVOvNCy7SFKPJckXhlm0XOxjrGRGK9
-6vtANNb5fGYcJcko7Hu63+/eoYZEHWu5lefM3Bynkaa58IxIeWSaqUEqLM/++fvvdDqf9Ta21RoO
-rbLIKRG2JsDU9/cPxW8slsROyy2tG2TIuZdXqMlG2+7x8fOMWXnrtguj80R1lepNahOuUXh0XWsc
-rlLdIK+vb/Tzzy+UJAcVS0VhpBZpvinqJozAxatW0ySlsuKWGF4YaCXg3RjHkW7+JDlQHDee8xbz
-SBINVmEAPdQcT8vGtYcBxp/c+uxaRbA+YmIMAHNObASAQ0kceUGOaZJSHw5KNbTRUChHrTedRVuR
-L4DRW9/dKM0KmudWudbQds9yM12vV8eii2Lqupvq662oxpbsMJnI84ySBxoqbug0Tb1NYA8R++dx
-6loKKDZgmjFn/eNyUYMJ8NY5bTeVm4epzLHwyjEuto48dV3qpoGdV1nkukE53ZbHjKoajGBiMnoO
-StfrldZ1U7oryExdP9DatJ5BJWsqbJjLqhOBgHw/OuugpJJf0LPlcDg/PdHpeFCm4ONtFIYhzctK
-0/2us3s++DNxiSpp31jdZpF/UHHtAWUTeYOAqJTw1ziOaFlXRebzvJBoNHdIW+MQKAKR28eKQBf1
-VhQZnU5nwbMW6oeBBlHvYSTq2Y7LwYZSe9tWakSxaY1RkyThRJ9I2iqZnDRNS0HQ6UWAvwMeAV8o
-u4d9Oa3E7rXEeGZ4jrzPEs8aLj4ej1SVzD4CIIX+LpHeAYfAKDPIKAwozjOaJidw+PXX3+n5+Uwv
-Ly8qUcUH1MguKdG3MFQbcABzQMnHoVf7IhVghIEEdHJJBk9BHWtlqb7wr1+/0eFQKzX1cdyD74je
-N8v4MHDCCWaSWVooNhhwh3meqW0bA9iwdHYYRn1JccyHVtM0VIkbL8pb9Go4gPI8p6qqiCikJBl0
-AQ3mluHFOmnpZ6O5bVmIMSBKcSTwEDlyEErXPC9pXRsRwCyetwA2AH6HndSoW42M7bDY4G0fBBEN
-w7sGftj0Ziy+6+VKlQiswLbbt4X++PqNHW+NYSpuSCT48PoYVBeBagr05rbtdA0hUi2RQBh3qK9a
-zSUJz+yLolSNCw61w+Hg3JSHxhzwifd9HoNWHL8k8BKH4XgEjwYrQkOli4sA2JmlXMP/IkkSGnQM
-uxhNyfogjuLL+fX1h2phbEx6DDcXlN9M6kiVNGNBAywE+L4BuY7jiM6nIz0/c2kPzKAscs+aKQwj
-ipOYprmlv//9V6qrio6ng2xm3kzzsupMvxQueWjklUmSSO9JanYwTpv2gXCySdNEXYh8S7OQbjcm
-YRRFLj4BbtTJ1NGC7ve7N7rC34WFVlWVKkyal5XCcfwUCNp1HU3jLL1XrgYh07TrDYcTHONB25uy
-jmD95A4LZ1eblWil0GnK5pOL6BAu15vOna1as+87xSzQtuCgQmlpfQRtS9U0dy+zD8+5aRp1rgUK
-DgNUa2SSZqk6Mn1/fVUAFcaxaJXYIHWjvp89z4Msy2kcB280iU3DrarLIJiXhQZ5PxZ0Bv6EZz5P
-k1rdp6lTD0ItiQvg9fWV6rqiJMmNtVnySfbN686xJVFl2cpOcw4WRzfHpZtLOE+R54IjcTW0GPUi
-BHxcPTREtKsnACq7OGbuyZP4Co5DT4us0xg3O3zUVHUlriZJ4ju5Wulk0zRCbsno/HSmuj6oh1+W
-JpTlBRF9qCNK1/cUDOxDV5YljdNIcfxMXdfRumZaksFdh3UAPd2bRi2WMIpj0kOqnvhN2yqXnzX8
-pYwKmeWIWC6X/BvSPC/ag3FPXyoHHTNiaxoJUVQQBDSNIxOhZGGhpGWzilH7ycOxFjVWLVRdF1SJ
-hCE7R7cR64+cdZsKxMBg9GlMhr66bVu63a40TSOVZa6It3XogUMRRnjwebSVBMaJ1rwUHHlbEVjf
-PMzq8yylRXrxJI5p3x1xiqPkMsryQsdiO0kWgAhVfry90TRN9PHxIUS0XL0cMc6FpBseCfBiVFGW
-CUeBwhN4jy/IIbo3jZi1xMZKfqCyLHSsu22biqLmZZXnW2r75RKlXAXjqNPkYRcWi7AsRPzvuK2R
-G2jJb05n4zwtEOGHjAJoa8Iw0EsTkw0FW/HBnN2xYzhBkgm2luWY49RLEnYk5ZK70eivTZR9TdOq
-AgzlTJqm9NNPTCs+HL7Q8djwBg0Dz/1l0T6O1UuwpgrDSAMlEQGNh4YSt2laNpvoeq+KgXCGbc1K
-vXnGaVbXFEQ/8YEzeQ49TMZIKY6YReiiythqvOtaHddFYSA360bT2Ht6ACC0sIECD+NR1w6zj8Vw
-BELPiSn6VAZmqZM7c3lb6nO8XK46YrN5eNxycR/ciyNTmqbq3gTcx2EiqxfmAg/FZZnp9fUH5XlO
-379/pzhOaF4+h7hAwbZvjToqo+K4G4INiFnMSGR9RpIkmr+w76T2bbCuS1NHF0+S2Ku2sEFh5mL5
-I70AbUybhvAplcQfPhDwXMIwoqoqHKlrcI6+IBlxhPriJUM/KgLt2sI7dSYljKVxliDvi8C4HuH9
-QxPBNnclxUlGsRCtAKKDIDdNF70I13VlSzBrKAjJJcQmcI7N80wYYqP235jZJ0lCX799174CD2wY
-7jQMvVoyQz9twyX7/kOz5rO0oCiaPzm2JJKOCmsquxl6IQghJISlyZmQPtjaClZPrqzetLREKo87
-dRNvo2UyHrKl3TTN1Eyt01RLfkF7u3GSb1FQUeRs13Rv9PklMSlmgp8HEw2EQljOOnzpoQVAmbmu
-q6bybNtGt9tVuAcp9X0nJp+uf87SVDMQnBOvT4/FXBnWaVpJdK3yKGz+H8IxLQcfbeH5fPLCZp6f
-n9XCCwYyWMDItAfmwdmUkTEPDelQ17QTj9XWdWMNg5T8qDhiLxnHaejhXCVwkq4nO0IGfwQmIEkc
-Udv19P7+zuK3B+UdEdHtftPDBlZb8MeoyoI2MWHp+14NRrDpHyu6x39vJzM43BF7DkKXvSjwfeM4
-Vum8f1E4Q5JNKNaoImIIC97f3ukgqrVF0FYcDkDveVOP+pDGadMse3DB67qmKAwUrT8cDlq+8d9N
-9DScF6J1nXRWafPP0A6gh7NqKzffjZSiG4UBrWb8Mc+LlPiT58Xm8tdinXZAa76uHPEFVxpYSyWy
-enBQIvONKFKRD8p+pY1uG/XDQOfzmTMH8hO17bsCVuDbY56+zIuna3c+jJvnn7Cuq5qrghtQ1weP
-qg2hET5vI4QTmzEPpx9kOtiWo+97nSLYVGxLIWYLNufahCTdIAjpdDpRnpcym2+oLJ9pGP7wSlmb
-sPRoFxbKuBhMOFQq8C9s2laVi5Y9xzLlK5VlpQcI3j2byKTqUYkLBa0gJiD7vtP1dtd3CSrz99dX
-rWIwckZBAzCb13foCdng7WCtxXChqIGOfAZ4DYIubPMKwLko8lxDb1j9l6mzUSLCIlxq1i4cno4M
-fjrBWfA//+f/s0N7fDqdtaRwHzLxONr35q7jPqa8ZoqEHuoDZXlJb2+vWqpD2x5HkbzISAkTzu4o
-0NMJixwPmeWXiSLa7IAaeJpojAn7oVeNNrLTUe46SnCgZT40+k7EtGqPyLr92XM9ciqyUOXHiTix
-4KQF43CWMnnfdyqLkuIkptvtRsMwip99objL8VAroIp3gXEsq8FWSpKYirygfuBgU4y39m1lAVOa
-6jOG0eY0zd7nw7vkDL1GFrhL0B3k+fGtnipCD6OJvu+1+rIWZtDptyI3xWhu34nBUjG8gDMyyCto
-X5xuI1JPB8dY3L2UHoCfWBOYzUOVCZ57XZU0i/oRnwXZCGzGOnlyZtva4sDNBAMjCunbt2+MBYh/
-IrQlaZro4d91HZUlqxnZrPOuVQ94/LYlcIYnC7Vtp/sJa8ONZ5HiHInZyEqTcDy2baPz6aQ8DgC5
-8ITAhV1X/I6m2VUVcRxT8Ntv/74jHYets0L6+PjQ3rC53+nl5UXTYRySftNy34JVkP6iJ/727Ru9
-vLx8isTWubA6EHHPBbACt823b9/py5cXT4hjI8vQH1tVHhBUIqLX11f66aefPN5C17UaKIGSG/23
-zl1FKdg0DbMTjTWYLdUsCw6gntWZv76+KnsS2gKIZrC5eBy3UtPcpaS/aU7h6+sPOp/P+mwhRLJj
-MXtzPvItmvudyqrSdgr9ohW+MJjluPjMemPA9f3tnZ6ezmqwacFGLHr0vU5xGKqt+cfHhb58eaZh
-GCnPMwoltgoa/CRJnONTlmpcGn7e5XLR7w8dhR1z7kJks34CeZZSLqYgX79+o5NMmvB+LdBqzWJx
-mTVNwwaaRU7/+Mfvyp47HA5ijXZVQRAmYsiPgDcDaMBd21JRlp78/M+8EfB+IM8Hn+B2Y3mwrR7s
-gaVmLX2nWRR930sAT0Ft29H5zN8FY3FU/dfrlWI2ImBziHVZqB86RZb3fafL9UqJIP0ujSeh8/ns
-5qsmqhuo+ob8NBO8aDnqlt5rxyjWk856srmgicBzVekECIJHgUZzp5xR5zL5Vh2VQfsAk8xHOS9b
-eTFrjTMREw3OnGaWBgNYsfLYcdw/ZcjxSy3U/ALe7lEU6Tx/HC/6GYDmpmlC+4PhpWWfocUB6Kl2
-VIYsNAwLNW1HhZCM+CbcDLYSCe26dWQv4cYjzXleFqVl2zRh3KhbntM4jlTXtWIMuHXatpEIuU05
-/2jlkiTRZCPLKmy77k/dkAEawrcRt5/dFPjPME5qOIMx2CMGZHEWFVhJpQMrOGxu7qnZoWkSMxjE
-2KElZD7EJpuw1/U7LysVOkrld/JnbSzG5hwtvtE+DJRK1biuC0e1Gb4LJhJoGdhladFWPI5jyU5w
-JL45ddOF243HzjFnrLFPu5XvwqWG+2GXzw76K8qNfSdlWLkQRVJOteXvo7xn1iB581Cc/iix7KHx
-aKYI92G475xORzVQsAQWe1MBgYYTCrAL5xIbKa9eXV+xSQzYOc3OcYgNK0BySbWlwVwcn5Utn1PN
-UUB5DtcYTky+a5XB8dwt4d20bavjJpsN/2gVjsUExVgr6DFuxlmsoLGJQcays/44ioUUFunzwkaD
-ExK+XxTG5jm5Vsqaa0LPgCgrYAZgpimBRWLXbQ4CDsVHIZhda0ppNTN9RIxbXwW7luBGhH7e2biR
-FxiayXrAcwgEh8DPseM8HCSxtLJoVbitXBU8tu7LFmyGccc8t17aELdRNR3qihoxi/GDQF0ep90r
-PO0qqe9Hj6wFVeE9CCnPE4q3ddNbySKw+GJFXqibCUwOcZKOQoKxL+hx1uoLGIi+fftOWZZQXR+U
-2TSOA3XdpjmDeEn4HChPsWjcKC2k47Gm56cnvsnGkaJo+VMvfXuAIJXlQ7z4MLu3VstxnFDTdhIT
-HuhtZeezbC6SqHaCN6KLLgOnAOagvhw2pKEflAyDFuVy+dADBsYWSFdmh5vF8wuw1GvQsSGiAjsP
-FYEVToUPnoaO579oOOfhcKCm6bxDFFRhpPdoXNu6iFR6U3ltnuc0jpN+FyDh1gXKXgwqioojFcDY
-1o7jsGO9ZIZhlFCORVWIoM0CfLNVhw0OQfkOh2lElDkKLzsVgaTmFICh8gyYrn7RUWvfdxRFBy+J
-ehwnquvNc1PC2gB5Ca0wJMpY98gfPNQ1xUlBYTjogeVcl1J9n5PR3swze2K0LbczsAfHJYYWOZ7m
-Sfqeu4RlZp5rTpxEgvJP3ukFD0H4qLnFHenJj5eKFzBNIxVFTnXNJ9o88wHy22+/U55n9PPPP6tZ
-hKNjhh5aisWItJOqqinNCtp3dl+xfSjz3AMPVbfThLo+6NhwWRY6HGrtk/AQUTJbrwRk753PJy3f
-bO8KgopdCPb3opw9ng6sJJRxJQNPTzqXZrv0iPKajUGPx4P4KIaf+Pk6z5bNiR7f3hbAZ3Bj/tno
-CVRX+NldLhf6y19+8aiuYRDQMM+0bZGW5DbV2ZJw1nXR8Sa/h9hzn0bVBo9Gm7dnnZTtAYTEHfSx
-4JhgI6MyYFXe5lUSqFjcDbzohYBoeBsQ49ylGZgE/dkeXkXBPgyaCRAG3mfFfmCQclJbL0u15kMh
-1LVLRHS9XPnvLAuNtw/FWyyWoOtp9h2IofVI5PlZpiK3k3yRxtZsgJHkWOmnURTROOwUJK6PVvQ1
-gcVWZII0Ji1RMWu1o5h9J938cZLR5Xqjfd/o5eWJwjCil5cXJRIFAbPzlnnx6JsIYEwSN+rouruO
-UfCy7bjS2n3f73d2lBEz0DDM2KFXyvXD4UTrMtJibiS0D5BwVhWPh07HI0tmp9njUmAkxDeS34pY
-LITn2itNo/HRT2JhUPKsue1aeilenJd7GGklYstHtUNLU8VEQPLClMRm9D0q2XC7sgox1568aVpl
-CoJcsytiH+jkw/LgsXn48AmVnoy/g4sBjEIcRHme5FpWKAAAIABJREFUi2tPbA6SwBvfxjHbXe87
-qU0diE5oQ7q+p7/+9d/p+flZrdwRQIs26/ff/6C6LlWWjv758fPjc0CLsZuqh3UsNdUVr2c3f2fq
-Oq8pUgcnduSNlcsAFaOjCkdeNmdZMTjMLseNCSQlWtdAAFzycg1A4cZn3kzlhINuFjpyHMcUwwkH
-2eWryAcd0DFTRpmHQmqCyrJ6pBYr+Hh7f/NUe5ZcMs+zJtWu60rH44ktjKKKsnTUsM5hnLS0nGeH
-9Pf9QH3v2E+h8d3Dza1l7ea7+QDXsO44KHud/ffqiTzY8XbWzVYUpXi2HWmZG413srfVtq1ezDPM
-TUE0cvHPDOaxXj+mQG61R1cfVo9FFCcFRSIi4dZiUpBr2zb1DETFxEywWIg2o/bosEKD8zCAI1QY
-19tdA2GQa4fodzjUAky0vIZ13YxpCVt64eAEDhKQ890Hgs+HV0J7XcscO1YMyU5+5plHujAd6XtS
-ang/DFSI3uGXX36m5+dnbSOwWUEXrqqS+RNC+rHEKKDkTIN3KUU4ANXKLI5oXVlluG7OZanre10v
-1kMCGxXveVtmT5X6qEgty5LaptHoPs2/EDs+EKDs38GaQcs3z7NWDexjuXpVUNwJ8BIEgRIM1Bbr
-44PatqVM7KuwgTGjtOIQoKJsybRJL5NSEs8eR31dN+qlp8cHA3V1vH9X1pW3cZbVA740/ktJQ7vn
-VOMird3IZ1kWWuWWwYwbefHWDBPtECcPR577kbVPX9aFxtsPL90XLwK3AJewzoqab5HxE4inBpvb
-Tn1717bhdrvSOM7yLt4FrOq0HE7T1MNKbFqPE6YEqjeA3h74CeKp45h9FwGyjWP7YP21iDakoG1d
-NAjD4hCwP1NvCKmKPL77ttMyjS7uTA1JVrrdOgEwM6N+XD9Roy3ZKssLFWMBzOyHgW63m9iDH+l6
-HWnfezEInZkwlKbUioFHlpXqTu1s3wdlUSaqzttUlqyYlnx/aBWsn4GNtstz9nvM0oIPB+Ph52zy
-Mj3wMAmbponePz4oSRPFNaZpdH4VIn7Cbf7Yoj9WzZjEWKBaydlW/cVkm5gqmR8fDwfq+p6maaRl
-iT7Ngq09tFVaZWlC85R4p3gQBHS9XClOHMr88fEuIEpPbdvSTz990Vz00Bwc+G/0exbdxYNgnvdg
-TB3WTwEQiN+Gnx7MSPCQ8LNRYsdRrP09NmqWptRMrRcGikPJBkfixEdSkCVO4SWBfejahI2iCIm/
-KG0d9oH05GWZ6XplC/VCqNCP1lo8D849JqG15cqyVJNmb7c7NU0jZXVBVVnSKFMVBkHvn1yLAcxa
-Gnkgt52VYIN7YcVDzm47obpO1A8CakdOm+o/4Rtw0b1LzJmND09ip/XoupYulx/05csXGsdJk4NQ
-lvf94MlzHR0+UbLT7bZ7ORR936nrUCTtD+LhwOjDJYRDsihKniDMk1bVIDM1TSOOzzlN090bT377
-9p3WdVGvCHbXTj5NWyz3AgeItZez3hF2jcZxxFqAx/GKTgDEZCGKY4mljtSY4JEEg9Nu2zb69dff
-NBij63s6CV96GEa+cRIm/Dydz14PmKYpVVVFT0/PagzBJJX5UwCD7SUBcljHWjALLUCGG0UrAqN/
-YIAGrjK5ovqsflwUnEQ5frlePBqstXbyTUgWNT7F5ofRJObInKnHXnXfv78y4SSOGOBMJ8ryQj0T
-8qI004hEZKmxuuzY94ES3WovLF7BtN9Bqo07LcvMEeJSqi/LTMM4UCySU9trWnBRc+klRBQ5i4xQ
-Rx4LEbFluM1A8Nl3FtUEAem42QrVJpOabB1vnK8go+hLltO+b5SmufbMqCbRKoXG7o7Hzr0aveL9
-RRHP/Yehp7IsTFSdc2tGPFocu2zIeXaJwLD0CgLSCDkYctjRISjKTsLLysXz+UR9P1BVHajvGomp
-I60QIU+OY35/j4ehtXHDgWGxmnXdKIYDzSNXGXZJ0zTR169/KNca5iH4Qkyumbz59PPzE/3ll18o
-lkBJgEFcWbB/YJomYhrZU11VtG6rxiJHUUKbnjG798DwxZWp9v5OWZZ7Xv8IIEUFY28oy8SyCkfb
-xqA8xedumkb75G1zSbXWqgyKQCDJVhuulYD0lujpmAHGC3OeZ8qzVIVEccwg5+XSUxS9O9uzeaY0
-ibVvZZJRSUEQeSCcxVwY/InVHRY3xroGynpECZ9nGecrzjNdb3cxP2FfRyteAT3aJunaQBJsFLw7
-y0/AAVCWld6e93vjuRW7g3qmOD44LCR2IKh1FsbmBVkGhxuSd6yNGkCwUWzcsXZaoVFbzAEXlJ2U
-YWKAuT7GxBhtYpSXxDGNwyAu2IuyXdFaJhITxz4WR48gtO9Ex+NRXKASBWGhU2GjmUoMTifPSWoU
-fOB2u3nYla3Omf9yZ1PQPMuoaVtdOL49OB8EmBuuwpfHTQu9gG0Ljscj+8+FmXdrnE5n5o0nCQ19
-R8vc0zBOCoRgg18ub96MGskziPAKQ9yemzcLxwLlcoo3YZok3me1SL1F0T+PD6H849FllmXiNPRQ
-AstILIp8lR8onnZkZLX3LMDZ5GDcRP3FmXNxFFMYxTR3HW3bquMfJPqgTcBn/vh4/9SWIdATbcG2
-rWwiaUpztCLT7A4NCIeGYdCRKIeEJlQWBScwZ6mHhlsFI2ba+r1Dh+kMw0jfvn3XiYANDsElgsVp
-rdHx/eHpD9DVchf00AtDKvJEfCJIDyLrZGQj8Hzk35mLvL+/0/F4VMt0TMqSJKHr7a5tI1yFbEYE
-ngmb1Ux0v9+05Lbcl3VNhPe/0jT2oiuYFMjOMg7i+e23/4+enp6UKszipVlThZqm1YCULMtp3Vqf
-F2Hi02xYTJIkFHM4Zuj1Cz6QtFGeVxrgOJkSEmXlME5eJHMYRnS9fuj4xYJJoyTdfn/9oaMtkCTw
-8lEeO7CMVL+Nw0aDJrNcEWH0PjgEioITUayLsL2VLCcct+diUGm9VTR7PaV1WajtOjWiAECJGxGo
-7N///isdjwePFYhbhohoMGUaMgZRIs7LQhachRIMGxaHLnrmdY08Q1PnhBtr1QG5LfIZLA4B1pp9
-/2VZSvZ8QOfzmcZx0OonkrK+ae56i6dJSpMw/Wx68ibP+TEdOE1irz/FRsV7xgFmDVHCIFCji8dW
-B3x+dwCyyQyqVExCuq6jSezYcRtDvNV1LftJiiCnLHKaxGRjE5ffWDAGeBmCA8OCn0RbM3uQOfwp
-VLMRNsFZ9WdleSHxaqNiNHEc0UfPictZltHpeNC2No65fbFjWGBbOOSzLCPayeQixN60LklSiqdp
-pmEbvVNSraIxKhDyBiKSWSk3qlGIdbMBDmCJQXZzYCECUc3ShJqGD4e6rqSc2fSkAmmBVU6hlvmY
-oeJnvr7+8Bbe29sbFQWbRMSGsw+9OCidjwvJKapCIXaQ/rvb7WYUYwuPqzb6k6iuic7nIz09PQvw
-FOtsnoMiSp31gsEHlt84+r0uqh4G0NzBjPEnxjrgmrvv5XvAb2rbXSjvvRVqKdo3x6EY1JqLK6ld
-Y7/TNFPCVZrys2Yl5qDrxo4h1W5rnr2KLi9KWrddfSLtpAV+AzhYITaydvH2UsEzUUNbY3y6rZtO
-FTCCnufFE0yNk09RhlrTOgS7Km4VxyO+bbFhq6oSxmZKrbhUWSNaVG2sZ3AZjSBn3e93qsrCrLtd
-cJGEfv75Jzodj5TlFV2vXO0dDgf2RFjmT9FrPPdHtTTRNE9aBaNiUkMZ9CAooXFb4L+xoewXWZZF
-F6S15oaABYsSH4bzzZlws9NOAXE5hISVouDeCP8eOmYAFXya5SpCsQIenyTkePFlyV74aAXA9gPt
-F85EdtE6xlmiJR3m3KPhgMN/3uoNsOj4c0tOQl3T9cqZiFVVq5hqXTfK5f8Pw5zGaWKHWJlwWAo1
-MyETPUQtE3CaHVUWh7Fl0E3TqIvJJS3FXo48U5HZsy8MArreOq/Cu9/vpjKIKE1iPXyBgTyO6hzn
-fjRp0aT6knXd6PX1lcZxlNSk2BPocF5hyZwUuWF7sURno9FOJwhoRwFegg+Adq7rOwqj0POZKIqC
-zucTLfOixh54Zqk4OE8zV2FQBq7rplgCeP3QczCL9KA9uJ3DW8svtHs8mRLAUVqSdduVIIRnye3Z
-TMfTSTCbWeXFibTRgRk/932noLQLy3VAb2SegwL4//2//187fP2c0QSPnUBJdL02RkyBnpTct/m2
-VOBMMyrKJ1RVMtAHAYizRYo01z7PUmq7TvXvDhCKPI09TvnHTHS2ZCpU157IKfj99btIKiMr4tWN
-ge+JF2V16Sg9p3nWEFIOLK0oSzMaJe3n0afAIuMIutyEoQiR0ThxDnyaZjQMvZSDpIflsi5a5dgo
-MEd3XT3qq0V4NY8hST6l+kAYxOSeWpJsOj0kNG4riWgaJ5nXb57uQNVu86KVoUPnQy/Hvm1but9b
-Oh4P9PL8zADdwCPfw+GgNz3Sk/Ocw2DB5kR7h3YM2AQfzuzpwK7CLu8wFCXj9XqRiUDmuQcdDgea
-xonarpUq0gppXKsFfUCeZ67yCiU9WTQPyG9klD6kIpdDPY7ofm+klXLPBM8ROMhjgjIo8PYfNqNN
-RQk56t+/Xm+6Z6EOdUrPlC6Xm4494WPhuU798cff9r7vFeVFSY3b7e3tnb58eVFgCDenl62epRRJ
-ft8jAeE///M/6V//9V+pLPJPjCvQGlG22oBGxHu/v7/T8/Oz56cH1p6jRgYPoSa8eaZppre3d47r
-Lpm+u5gYc5hzYAwDtRr+f+aa3+hwqLUi+vjgmPTnpzNFMd+QMGq0ACPUdD9+vNPpdPQio7IspYAC
-ZYyxWxK7Ij2dOUgyzTh56OPjg56enlxak7EU8/3nN514uJYhoKZp6Hg86uJlK7FUf15dV7Stm/bW
-SCjC3PlyudLpdPSixi2aDHaaJQXhImFA90JlyWarX16eKQhj2tZFhDYuJ7LvB5mfR0rtBRD5yy8/
-iWx6YM69HNp5zrZruBTazlUJaNW+f3+lX375mer6QG3beMQ1cPJt2q6Vd3Pm5Rudzyet8FDN8HdM
-lftQlDWNQ0/DOHqt2MfHB728vKgxrdKtRWWJ0a19n5Y+3zQNPT8/e5JvFaxFMV1vNw0ZGcdJsBW3
-zv/5zz/oy5cvlGepRz1WjgsUY2VR0JZlNIoQByMOBF7aiCVrEQ1+vUVw7S21LFzWbjLuscm+ViyE
-UYxFXG1U2cOH/rQgLcEE5TJO8zznEjegXcCXTUt7/r/Jo1FaBiAcXFR3LcYe67rRvbk82DuzTRhK
-xGWZ9cQfhlHos5s3ZcmyjArJrONo8oKGodNbLnhgRgLNtac4Ji0XsY6G4+4kijocnKDM2jTltu1E
-LxFotYHsenYXbqgs809ho/jzwQMN24FuiZqXgAYcxQlNknoLrsEwdMr+LApWnuZFqZoAtCt8MaQa
-WDMvKzVN60V1A8G30xz2N4hFPTiYFKlF7bPASHyU6QK5B/IOqy1E31n/zHm56ibd90h8M1JvkoFn
-EQQkzk6TN5GCLB0THwCFePeIq5vmRdykRgVUeTTYfnKYRvWOww1eGtpC4yaG0Qd6NvxCBEuM66p9
-Beya3Dgp+kSFBXHmeDzQ0/lMWV5R216NGm76pBVAKAM+MIwvYCphR4WIV+Y/M5qgjJne3j7oeKyl
-vdiMNoA599b9B301Tk2EVIyjawUs6YRvjNQD43AAJQkrsEJjp6YKMSlzcVBaIAsmGBgHPXoiwFIL
-VFmrR7dRYgD4MFPGxse7uTetSZpx0uu26z/lEazrSKfTyfPpx5z7UacPIdjHx1VSjio1oYxjxobg
-Es0VT8ZxdPOgFSF8AOdlpbVtVbizCBEMG2pdN4rTlLZtVg6CpcOCFGQPqnXj5wf+BTZZkecUJymt
-W+cRzOwIEoc38JpJuAMYsa7GoQdTDEs62o11fFEUsglJKyfbtqmfQ8ouSQC1szRx41LjlqT4jxig
-2CmIdcy2l5od2a/rygcAUysnyRBzUl7cxriJQZ3th+HTLwIRAQcAa/x7Hb9sm/MwA7j2mMWHFwi2
-mA02iGPyRDT8Yjo2sJhmb+pwONRiDBkrCQibNQoDb7GHYahGJEuPvL7J9NGbHlJxHGlvqdFK4vLi
-WIBEs1G74VDl3mtjuXWc0eXCsWds8uFm6NO8PBBCdu1BYUkOJPoxXtyVs5xGa//hwwCgLnm8cwv6
-hmFI5/MT7ftOpxOHvODAwy2CcSYf8EdF3w+HWiTLfIDNhjk3G/JOGAS0mwMYhyNuYi7jcwHEVp0C
-QWsAuywl3Ch127V1wAiALfB3nlW6y3ySkC6XD/1ctj2wuArezyLVICoHiOYspoWRo5vQOOdohNde
-LleliuNZotJOJU8DRjHLPFOaZcKOjPTn2kwOy8lomrva3cEty7YW1jBU1LyhxxEOw5A3SRjLzDHy
-yr3HwM3g4QQEis9OOIVQFHmEhlPcZ/aFylpipmFBaZZpeIFNsmEUM/xki2U/D6LGDoeaoiijj4+L
-Y/7JYWbHkhjtsPXS6rEhUfaD2+2Hi646irMpLOj9oKt3N07lsheiWNKYMqqrSu2f8Vwu15seki63
-nunDURjRsIw6J4fEMwwj+vH2RvOcUGKIMhYw1YgtMcpoJSkY38WCoOzKu1FAgWfTBc/7ICCJzapo
-l9aKe9GSoiihvev1GfB7mhRQtvwD67VowUu47bZtq1RcKDoxkXFe/7wxAo/KGykJCQy6snTeejb3
-Am1PkrAU2h6GtvVkMtokB4+jZCMwFZgAi+JSkQ874HWaZnUjqqvSi86zUl2oSNXXsWl19AyuDW5z
-jBHxObBfsVcgHtI2WcaLSoO3gQT4g4u5OdqupSgO9SS3fHyrSbckA/Th/MUyeWB+RBI2rhNMFLoQ
-GgmGsGNHqLRQWuFFwL/QHkz4GVE06Je1L9UCWYgKQ3TZYwaAPT0hRrFzV5TPMKnAYdm2rUhsEynj
-WE03jT1FUUhlWWl6Erceq2klEuVIgNCDg+p+f9cACqU+j5Mi5G7CMH8ShsBqDJsHXnjWxRcUVVSE
-wzhQWZXqNsT8jUQPa/T1ThTVmXe7PojFEkoSH+yFohFrCOaarHzklge5CfM8K9KPgwuiIttKqGuV
-VEp5nrG9GvEtjgsHMXMw1kTOJMbMlsDkvAEirZijKBKswll/b9tGl8tFCU+P9mGq3JSfdbvfnPN2
-GNK2zd6lNw4DRVXlqS/DMBLBVq4/Gwd4URSUJjGlGac7l2VJVVlyRPiy0v3eaKXCjkCmv7JlsS9V
-jR587gI1H8AXt4GINjIcI7osTU16rqOxWsUYEnfQiozj6Pno44R1lmGp0iutqSZ6X1+L75tIQr0F
-bAF6fFhW4zs1TUtVValT0jT1XpWAzwOhBlSMEO9E8mdZBrp4Jfe8rNT+ePV84C3HnUtiUvsxHKr2
-s1umHTTqaVbo7WRRbfvuEhH4QMQyjBPlWUo/3t6V9g38AswzO3VIhdx0uVxUyAV3H7QbkBxjc6K1
-hCsyxo3WQQitI1cTPB3Z9p2mcVRRlZUJjybzDxJauPgg1i7Lck07hrEHwOGqqllEtCxUFLmuZ6s8
-tAnJ4JQkhrWaJKm2rUxiEhJREnsgsc3J3LeNhmmm+70RR+5CVYfQL+z7rrZrLs5898h30DvYKorl
-0Y1iWF3ff6reoSqNcaL41lLuhrbyYJvdbjMDbNADNkae59R1XMp8/fZd6a5WFWdJNOiNgCADIR/H
-UUcYjxyCJIn5wNhGT+Ti+OXzJzkwHhw00fxzUhWqcH7fogYXoBVDaz4Mg2coYinDQOnBmNu2jSO6
-zGFoDyYbNmpvbStSwYv9/Z//pDzPvPSaaV29mTzK5tEzrlzVbINzFxJnbyXGqOC2z3Ou/TxorfDV
-t2zDfd/VxNOCWIxNrEoMs+QX50rsDGeRS3m9XulwOLAhzbrS8ZioXfrteuVJRZJ4GYz2AIbP4KZu
-R5FMijbzXCbFgXBQ26mGDQiBM1YYuBg33pSjtiIIq8HFkWaZmrHgEkBV6arYjYIg0haEx7C1BOoc
-tPS3lQJo8PbWBpV5HLmaQhIXPpO1Gm9bTqfG1AOfK80KxjBs78/o96Qnny2B7MjHGiNi7vjx8aGl
-qUMgEwGTjnqqslmkWGGZhYpeDKMOq6xKM8e5tlHMEAj5VMj1kzsRPgs+K/fmkffzLperByjB622a
-ZrVkQmIORmxOMeZAOYyM0oRjmvp+oPPpSOu2i2nm7lVaeZ6Jz3+iyD8+R5omYnTKJV9V1RrBNRt/
-Ai/vXaYSkM+inYAXv0PtrUou9CTDKNfv90Y8IJzO3CoYbavnnItS40rsoraZtHKVg9G9I4C07Dkw
-6eHGE5SRun6gU5oog46fG6+r9/d3LYXnhSnVAPp43EyeWeqj8y8R0TT2wgyFAUgsbYIzGdGqJ810
-CrQKvoPN3PWDYhr8/Ec9NJYlV5s7tG33pqWmaaiua3kfo4av4LJk8U+mzw/jWwugq6/gungzfrSN
-VVWpaAhhsNw2MZAa+x9680I+HHuIVKjCxgrOAut6u0uZlUkr4ayckiQh2olOpyda5pHiJKGua5lq
-aR4uNhFOct6ks5B+errfG7k5+dCAUAXjSJyIlsRke3mYJdh+/fEws2g6ytUoDKiNhbgiijSAN9wn
-r0Ztt3mGpRBtZFlGeVHSm/js2w2r3gMJP/eyyLXMZSCWNQ/cy1VU15WGV8KVxzrI4HZzB0KoPARr
-mAn3WTXxiDL1ll+WWRc0m7CGHtDLWMSmZb+d3uCSAIEIC9Zt9kli2Uvqulbp0Tic06yg2+3KNOXr
-zZiZ5qr/QJWFLD6MgsdxkF6+9sI6VPQiz8aCooinsy3IMI5eSKtVTkZRRIVJXbIXD7/rXKcsuByt
-sSnCOjdZX5wazQG1sIFn1eRgJMqj5jVkaUqt8l9CDRBBK/DYSmqisJDQoAkAEHy/37kFeEytfQTA
-YBm+rolurvv9rtbKmKuO4ygpN45x9fXbH7Sss4wrWG+P8k8VWaEjs6zbTm3X6Ak9ygvB/88hoMxZ
-uDeN3ngQF2ER2lmpi1mKvAhmKyayNmLjuAvowzfIP//4g3vSLKUgjGleBg+QtNVGFIXi7y5gTky0
-iQsuzEzx56E/j2M+yNDqoJS/Ny2N40hHyWxs205vM1sm8uGUeWUyqinITRUdDwOP+w7J7jQvagln
-gWGuPDi7EJRi+AZwLkSiP/ftetFN4HrV2ESPsxnr4XCQg8JZVa/bLtOFwFu8g3ymeSFFtruON9+X
-L1+oLCvaNibnIFsijlhzgiAVvGdUtnj/jwGpTkkZeTN1uxc+LhevB7cXzmPZju9v9SqonKEELMtK
-R3uROZSLIqdQhFb2vdoJmHWpst8HI0BwIuZ58QJOIevPsoxiBHdCGWb9xhDZVRS5arhdFnvsWW4V
-BfcZyzxJ+ugoZVOu5ReflAtLXmWmvO87zYajbZ1LeAEWKsfFOEpjpKSXLsvSlI2zUimxKR/993j0
-GBn/uumTl55tTRBXFoaR3lAYZ6KCcEDRpm6w/Fxb5ivEkVpJ4bay2AkOJFtB2V53fwD71EdwhZ14
-rrRqHGhwv8nzTM1TZiljo4i95Fk3H3pqQIiW2JWHbxcbSooDy7oJw3QTIS/cH7vAEGx0zPaxWI/H
-k1JrrZrSElbwnoBLwcMwL0qaxpHehZ4dxwnd7neK4/WTFBeVGlKVgebb5CieraeeshPrAWNq1dHH
-Mb29/WAHZbnQ7O9Be7SuLnMC4C2k7tu20f1+9yoS7C2wGPuhp/pQa8uG9wKOg12naA8gMXcZHpM3
-qge5Kk1TivkkafVUVNqo9GWJKWP4w0W66ZqmUSILegomS7iQEAgvypK1+Z2o5SzZx86hH+2q7dzf
-2jst66rABzz0t3n6NMbzBUCkAg93E4ceW85ODfCPeqynKQXCOkuTmP7+91/pcDzqSM6aVPBL3YSJ
-uKi7bBgEtG2peNbx7LyuSmraTqsqTGSsbdU4Tao5fxwtFUXhHT62FZrmWeyoE6qqWkddXT/Qalic
-lv9uWYyowDC35/4/Fhpxq9VfHHPvfr3dJQCWpz7jNFFRFnozIWBFb655olRIMY54E0moRUtdxwnL
-iaGf6yx/HGkUPn+SxHS5XhzBJY49p2e0AOMYeeEbWF/7vuvkpqpKvRCxD6Bcxe/Os5SyLFcAbhhH
-xVSwZvKcHbSsC+/j2M6u70UOC7hPwasATEsAjDjA5znwvBXtd2Uad0ePIL+djAVBQHEvybKWxw0O
-NBscyuklmwz6Z6TY8sI60L6vEv9kgQjEZ3X0/ft3DQnlQyZSlqDlB3Rdp9MFHEaLQTfVilrGKPjf
-HxOAMCXgqPL9k4+hs5lePGNFpxvHLRRrybXvnaP+hiEVZSlpsCcVmqB/5BN6JiInsNl3okHAORhL
-4BmgnUIbgnn9tq2qAkQ/i8PTkVISzxQDIh33LmO9OZkOu2kL46jBiReXfb1elYCDRV+WpVYxcKxx
-tmirI6pME1VVSfd740lQH8MsOMePbeC/f3+lqio02vt4PFJd19T3Pctxl9k7oGFCg0qo65xEGFgK
-+x5kXpDG7Xanl5dnvYnxmbmKzYWkFX7KWygKDs/d1k1FXPYQsZ/FS1paV0ozdgVG1Jfl6sNmTG3C
-pLqoZJTYSIUA7wWbiMzrdxI+R6IXbxxHdLlc9RmfjgdJT169DI+u6yk+Hg98KwmCjh5o312cV2xy
-3/Z9p7cfb5RmKYtOspSINnp7++EBRviANp4KqkE2jyDPpwxEGixKFw+1fqoKuFfzVVt2YTHifKG6
-5i+eLYsnnHFxy6Hnhgyw835vlHoKvTtOWuu+cj6f5UXlFEWd2TilZuqxLRnzC5AvADRdDRwDx26D
-SMYJqxy4pjyHDQeh40VwtcVmq6FYmdmDEQfNPC+6MR9dhHDrzPMiugJ2lGHb9kUTcrBYcWgDhGIf
-vk7BQVcGr9qSPbZXzgO/4JCNuqK27XQMHIY7C+wxAAAgAElEQVQJBUFG6zo+yMD9gE3cjucT29HN
-tyu1bUPD0FMcv9A4rnLLl4qKo7XBGsANfvnjD8rzXCda1nMBIrl1c7023rnlOeBz8hRpV6djJF1Z
-qjguq1lyJ6MoVMtxhLtq8Okw0LbFXmBJGG68h4kPmF0uQLUBM5mGsR4e4p78P/7H/72XZSF66F09
-/fmHG+5zltH9fpc+igkL59OJdtrpcrnqCQp9fxCE9PXrN6prdsCJopiqqqRtW1WjjC/AizFSRZ1b
-1L3aKDmtPT+Ir1+/URSGVB9qwRRmr42Atvx4POnDdm4piSDqkYA1sTFqCLT/KgtmUKHf5Wpj1c3D
-v6dXPTaeDasrc/r++oPKsqDD4Ui9xqs7TwVQP/nfBQqSoi0JglB9AxwYxZvuer3pDb2uK7Vtq2zK
-NEnp67evPDkQqjHeZxAEdL1eKM9L9jjcNq0wHklgEB85XYENXWXde9u1WnF1Mgev61oouy5ODlZk
-lsjj/ByY5lpXFWV5rvx8pE0z/yHwEHmeFLFlHacwpTKGzmiZufUYxb+wF1o5vAzTJKGirFQgxIdI
-rDyTprkznVwuEHx3pEKnYsUFP4ZlWagq2fob/HtcnhbH4VaQgUG8C76MuGphOT1X17YaxDsfx5Fu
-txsdj0eqyor6offEeNh3WMfDMFJdV+pnEQkF3Zm7JhT89tu/70mSUF1V1EhPB9FM2/V0v9/p6enJ
-c/6dpkmCF04SXsGsvKos6Xq70ffv3+nLly80zzNN00T/+3/5L3S733WOC2mpFVvglm3bRm7eWMCX
-O3358qybGn+3bRua54V+/umLloThn7qjBFTXpZao+OxOZrqphTg83aMo1Jz3f/zjH3Q6HT2LLksn
-xtwWwCYWaF3X9Pb2g4Zhon/5l78ok80uYjgowcACOgWrO7jdbnQ6ncyGIW0RDnWtB7DaoWvQ5UDH
-44HutzslwrbDxuNpDbPg+P2NniejJWddr1c6nU4PzE4HRoLGiylQWeSU5YV6J97vDX15eaKuHyjP
-MzZRFRqtcwsKjF1bpBl668o8eC7ZI88PAgefksbSRJ8vLLGSJKWhHzRiC9jHo2TdthGYPhR5Tkma
-0X/+53/Q+XxWVR8AaMu03LaNjocDhRFXjzZC/XK50OFwUGAQCcIY26GV4PW4KbbC76eky8eVDsda
-n9s4jpojcL83WjlM06QHrNXttG1LX768aAAwFLPgbIRlWdLxcKAsL7ScXpaFrre7h0DjRsBCHMeB
-+q7R0ximCix+YLbfX/7yCx0ONSUpl13M8d/cLNL0TDb6Gz2zs5neRNEVKmGpLCs6n89UlEfK8sJz
-H8JUgu2QepWVso8d++EFFOiGHcXeyQkzMlq3nW63K20bW2f9/vvv1DR3Q6VMdeHnGZND8HmnaaLb
-7eYi1LfNU/mh/B3HiZq2pUnYeNCrw97adzziZzAMg1s8y6LZjEgZDgLSNJtpmumPr1/per2ogAQY
-CttRLd6hNk0jTdMoWMhKXdd6h9rjWIw/S69ZkGAIrstCt/td7NnZ+RktFg5wfGbMqTGyss7JwBgw
-A3dWaaFnTAM7dn8kG4lib1DX6VRQfFt+W0oxDuUkjiR05UJt66TCeMZpVqhFGX5e1/eeAhOKTfu8
-cIixYnHzMhPDwM9ARKJy07Yc6iGYhyWqYW/YfAQQuex0w1ZcqGJRNYTTNNH1dqPffvvVc7RBqQNb
-bRdeEDp+tRgY4gO9vb9TEIT0l7/8QqfTM0VRSU3T0u32rl+WTR9SBQvxHzDX4MaK/gv216g+7Jdf
-loVutw9aZYTGVcFEmfDMeU5PGkCBh962Hf362z+o73ulTeJ2wSJ8TDnifptbBwYC3ahpNi/Ijvf4
-mQXqVGN7Xvd5kKwT6mLf5MCwQSMOBU7Vq6/vO3r/uCgpiNlgqybzgO785csXenn54iXWruuqiksQ
-q9ifLzH+eHxbff3jD2qa5pN1FdYIbhTcPqP8XnAcsGgXORjgb6CbLnHkFWz+OGYLbABeILxYm/VK
-/ATDMBIAejYblSsRYAn4u9ZZ2bY7OFCgKpzEMg3JwwD5+ELoTPJv/IkrMI6D+gK8v7/r2BemLdYI
-pOtYVg1c5zHJFz27HWVPoiGwOEqeZ3Jp+JgYsi5cUK6zN6+qkmLLjAPXG2YYCFGACeaj4GYcdy19
-p9lZUfMIpqEk4ZuXS/dYbsuMYuPT/2cuLMx+G4yxyKgYAQAlVBpwdcVCxox01JhvTjCeyDdMqOuK
-DoeDsN8WZSEuS6LKO0uw+OmnL3Q6nSgIMuq7D9WuP7IQH2O7M+Mqa5lxAEAdASlWJySevbPlFBOw
-VqWq8lhoVdAry1L69u27nOiZ8yCU2/X56ZnKsqIgcFXXanLkraAJASe4fe53rgK//PSToutIdMaB
-bCPNiiLX6QVKXn6H9ImPgU0JdxwnMBvF4DPTiQJuOcflZ9fnw+HgIfyW4LNuu4p8oEOIQPeVCjSO
-Yrrf7zqyg4JwHMUePM8pywY6HQ/a81spsqVOO/SfPE8BVgWy+UjTtkwllpAUBhQj3XdgaFrmYVmU
-VJWFslh3dUT6PNqeTUQ4qkmIklgj4rwtxpFb3RgbuKpK2reNk1s0nGARcUclrC9H0AF5Zl0Den9/
-5yy5qvIoiu/v758UbOM0qV+Zj+rP6mhqkVSAHLZdKIrck+VaL7pK3XbdzLPr3Tw4ikK631mTzQSf
-iKKoUwoy+tBEWYWhGjx0XUth0KlCyx5eWGh2MpHEEe0CrKrRp/RnbdsyndlMWKKQOeIuXSb+dDjj
-lj8ej1QWBcVJRlXFYF8nFY3t1+/NnaIfoRKX2N12VOdjJuUkNM+OjISDAQErp+OR4iSRQ8S5BtuZ
-diwV4rJcneLNLEyX0BSqwzPGlvYW1s2ZxPT9+yv1fa/P1DIUj8ej5hG4sJTdKO5Yl9+2DR0OB6Y4
-x7NXjjssh8vycRzkorPxcYuwM1e1qbOS+M1wDGzZn6bJA/lpMyYurCto204zLSxD1E43pnmirh+0
-9dl3Ukr0n01UnFWcY/BaHYizKueJUIyyCzNWgGl2rgm+OGyhQHOE0cK+7bTvG5VFTk3bef00qKQB
-CZff6N4tE8t6C1i7JBvhlaaJOMWG3szd9Wi5ptKweeYuhhSzfqemuaszzjTxIYUZ67IM4g9wU2GT
-OgaHIU3Se9uHyYrBUumv3mx4d0YZ9juCYFOWJeVZpsaQsHVyz2XzWH/TNJuDzE0H9p038vF40Mg2
-FpZ0MiaKHjz7IwX+WAdBEoqRyI2Vyviq4FszSeh6vXqyYtxwuIFvt6sHVHLuAGtDijxXZBoAmfWF
-xM/QNRcEtK2bVhiI+8KmwO2WJinFSUa7HHwuUIO578vSOz8GvXF5fQ3DpjiEnb8jhQqsTFd1ur3x
-mIn4OPrDWBQXgTWMHcdBvCGdBoYPn8mzlMPPhO7BXZSOqmwrTbQk+B2agxhGn0bk+O8gCJgJ6Nh8
-s76QaRo94GhZFiKxLELfjzLzdD7xg08KCsNBNziXH+yzjkRbi/pbv7wwTBQVX8SNx94ODNRMCmJY
-/gBKLpghZHmh0kpUMZBGghGXxDG9f3xISMRBe29sDGyEMIy8l2ldYhCOweVxobFl4zRpyq1FuwE6
-xXFMu8yR2f2o90gyllE4z7MyBFGhPAacJknKISPbrrl1GGllWarVHfIaLPqMAwuHYJrwjDlLU2ra
-ltqupfAt9A49/H44EbmDaFcTjEgISjGyIIS0gsAPnnmnnh8jfvY4zdQJe7HImRCDBCYchn3fC425
-88pebOhpniTgttAbl3kmTOdm5Jxt0QsBT8HJCMQW3MqJH0NksMYfDVdwiDklauRNGsKwNsKr5U8D
-O2cvmSryDhbbxlpQ1FYEeK6wc0flCysyAOZRFFEMBBU9L6in7HSS0Lruao7A46VFfyBKjbqupKxY
-PHJNGIbUDwP9/s8/ZGademWIjTm27sKuhPdvzUcvv0cCEKSZ69Zp/BLK3ixzVNiqLIQZtTCZp2JO
-OXo2RHrHJv7a9ay+FRWz41JOUO46WtfBq0ogYAIfH6Yop/NJlWU2LvrRcBPAKKfOZJqmCxNUT60m
-oh4smG/fvjHLLIyoE8vozSjF+PsyIaYoWLIaRxE1bacMOcs0tLbh+84LrOvuXl8NYQs894gCveW6
-rqdlWaUkX9T0ZF0nD0SzPgvzsmheobXFtrLz6/WqrRvWn036YVu1xuPLp2lGdR1oa8ZU3tEztLEB
-Gn9Wmbpsgl3xHR5huvj6t7cftG0rnU4nozSNH+jukby7XaY9redubNmY8EcEI5Nl0R8SmNKrE9Em
-CceoGn1Ha5Yd13VNMVszj57NNNR2DLrwS53kh0BMYQMiUM51XatlZ5qGRldfaN/Xtp32+zgpnbMu
-f1nQOuua551pEnvpwEB7bdinXRxA8rmkSrQyQCkPJPVwONDxeCSikMapURlmKiEebddLZVGqDhyG
-lHw772o/FsejZ1XuEn7A/CLPCp2BqpXCzWEP9lZx4Gyo0eF5XtI09nS5XD0ZM0hAqxwgEIx8+fKF
-Fol33/edPi4XsZPKvcguAJNc+q66mC+Xi8SVjXo5wIeBQWDkKhRKs31EseEJyC6/HP9eFLnXRtgb
-znpNYo4dhoFUDqFWf056nVJd19p2hFLFgGtgzWGAt4BBycS1xJsygAOAjAuLc1i9hwO7B8VNMKHB
-Jsf7AV4BWj1vyk3p9rxmV8/aHCQwXLw2DAYmK6g+sGZxSYFIBI0KPAiaho1FijynWUxt4v1PLLym
-2amKMC5yo5LME+VYdHddmZXFfVtGy8qmnfzia5rGnufUMj7CIn5M+AXzsK4qIZpERDSrDNl6uGG8
-gUQYfE5YibdtQ6fTUd1i4C4D6W3XtSqrtKcu+m+rIAQNNgqDTziG5fPzgnsEORcaR8e5R1ruOLq4
-KTundzeEA3z6nisbHMD4/XVd6xRjFM96Dd6cZ6HTBgqyYnEyM7LTQ8qmO0HkE4YstoFFFfIF5tm5
-OyFcBC3JY+w6Do2iyDmGTMhX07z/6XjUfxaxoRWHn8ao4zRRWRQ0LwtlaUrfX19pnmeqqlp4Ef70
-wX5P+EzYSnJdVzUm4X8deGW6BZhd8nWolvkq+eWxAxVFQcfjgaIo84I7scYcFXtWARaL7XJKZUN3
-XasXATNtV88EN01TsTiPaRpHyrITjeMk7MhYR4lWvp7nOedETOJegwf0qHF+f/+gX375WRVw96b1
-eng7GrQOp1EUUj841VPbNp6FEmb0nXiaPXLD66qiCJRgA1LCm9+WwY+x3MsyCz00cyaOMicGmQmO
-Q3aRKtiYpNQtvRk3hqKT4Ipg+f9x4rEpxha5HobBux1sLoJdeKo8M4fnJI7BqAzw+xAG0fWDZvul
-WaHpS1i0rKq7yu/dVL56vzfKr3i0BYf5SVWxkebhUFPbdlQWDLKCIVrXPF5klplzXirE0QbVkvV+
-CMKY2ubuWaOB+WjXEcRYaZrRWTAmbhObTwcFvBbv8yygX67tg9UNWD0LMgXsO2GSWqAXBV+Mdn04
-sZqVy9d1TcfjicIwoHWZqWk7+vF2dZOYe0P7fvd6eBc6u3l5lLgg2a17UD9GPFtbZeIyCuS7Yhpy
-vV7peDzqJY4pDNZNLJOTcV0p3raNo6xPR9VJ84J1eWY8jyy8fh0fBMGGGL9gdJTEkZB7SMtvAHFb
-UVI4Lx7l1N6kithfr4qWv/14o7IqVfqJZNaPjw8tER3LMKGy9EeHZZHToGWsr/u3hCTObV89CypM
-PGwJaAkldq7PsdmONDNNoyTJZp5e/zEXwSOSKHff0WPtzYdDj6W3Ia2yMObZgUo2UQa23Hifg8kY
-tMQlvN88z/VQ6YeemqZVvT50CnXNo0e0kHbujwh4+1xxKWzr8imMFWNJP6GalEOwLMzGTI2lvJ2q
-2DId8txYPPUt+m0rFGxiGxOGn7l7DL5Qb20brIH3AH/IeR69PImiEGatOczsev8z0NeRqxicvd3u
-tCwMVMKuTEHGkAV867bT/L/oeq8dybLkStSOlu7hkaK7SV5gZv7/W+ZlLgZzQRIg2dUlMiPC5dHy
-Ppgt27Y9ahIgmlWVGel+zhZmy5aQNYvLlrU9pLiW8wWYaZDLT63xoyiiLM+pLCuqypJaI9pYFr4x
-D3VFUZxIgEGspbB1XLEgEcILsyyjtm01TgkPniOzSF/uNI0yiXAPFl75ePhFmevYrB8Gul6vmg/I
-6bCVij7caITjl3nenlA4O+8AO5Gw45QkST2PePRb1oQSC8neKhYcAhJdliX34CCiRBEFwWJCJCJ9
-js+bwo1hI9UqIKHWxoRBAGTHh2ypnXrVHBYuiESDfC7cgLYCQjvF0tjAO7BADQYIBYq1neHj1rO+
-BOCVAJSCFR2sy9DKrduuF4dLJSZN433eMBYHwia9XK9q/IlnDDIaLhBMaUCqwUQkzzMKKDD5AqEn
-6LHR55bWbseAOHByER8BP7AeEzaMxClw+bvD2Zip75Hy/e1ocl4+U3yhhwgCppKnWfanPoG2Koq3
-bRNWXE1xXFIvwQVRGBBlKd1uD+r6gZrmTft/SD9hJ/0sy03TTMcQruxZPFfgLOUyJE13LxDymQSE
-8ho9XZK6/MJlkamFmDOA4ACHmX1PBfQqOeRCbqfnktc5BPMMuCwZtMzSlGaTioQbyVUzrZe7zlbm
-fBpXVUVVVdH7+ztVNYs59m2jnz/fqChyAa548//6669UVZXaSQPD4KkJ8wOsFTbchgBuJkkiiz40
-zk27VkMQmoRhqKGp1uhV3YNkkrBgw9HszbvhsY+Dv2lb/fkIl9n3SIlP1hLMklvczD3W952YTWQN
-NHFBoJWzGZIKpsr6A/0ZgCZ0GYggh19jGEbaNuBnaDW4bbSb9Yc21+JdAEAt8cs6NeG53u4Pejwe
-9P37d09G7ZyvQnVSfqa5R1EqorfOO2TxHm1UueIJcmBO06ijVJ+lCD+BmAbsLeZK8ygoCkc5qWda
-xPQDHxROJC6qOPMIQ0BgEZdkuc27AczwwqZ5olKCDXAAzHK7jeMgUsbaM9zs+p7IsN1sHJQtvzAL
-hRjlfr/pLQbQCw+v7zvP4Rcegtu2UZywE08hmw8Cn7IsXZ6d3Chc4YQyqps96y81MRGM4Hg80PH4
-QsPQ6Uirrms6Hg7ax0EUBTEQFocKaIwl2yBmm3i2l8tFJyiIJLOAFfgKwCCwwdjEZHsqrVflRgC4
-xC2EGzaOYoqi5VNFhGg5e9BgFBkqil/ooYwIOhfHRcpUxKFox3NIasboFu8efTl4HBbFB2/Btp5o
-2Syt2B02n7n4wJmAKVl7NtvO8npI9WaeplGt22wrAK5AmiZ0Pj/YFOUpbMTmNtpcSxx6zDdxvoNJ
-QnoBONk5STS70yYE//Wf/2ffQPSRhccz91BQ/Z6mcabXLyeqSo63ut1vOpsGkARQDn8WCwisrK7v
-1AocJTn05VhUGAWiPISTCUon9Ib7vtF//Md/0ffvX+l0OsnDjj89LLQweChY7IyoZrSumzobwVVl
-mmb1ucOf5T/PNycz2woaZTFCLHUX5xag/EkcixHDJBhEwcSatqWvX79Snh/px49/yO2z0evrScRT
-F0+jjkBLEiYlemVo4e3CxILBdyrLwmtVGNEOleJspzA8u2bfBRiYWnT82Y/BzfnJW8iM7s/eRrAl
-up2hI94Mz2wWPYnFOjrhwNvQDrb2GtW4hKvJ3szKJzocai/RZ1NyTaTP14Ggu0aF48BlVN7ZyKNN
-y7LU+055ltNOO+0bR6zbCoX5J8wzGA3HwOpHrL/CPM/09vZGr6+vVJn8Qn5uoefpgM9pfQDsWJcN
-XRKt9mxwDVc1MhW4Xn/bkaDr+jz3F//xxw/OV68qCgJOkrU3LUqaZVnocrno3BPA2f1+13x7S/2E
-+g8nOqSdP3++0eFQ08uRJcq//fabkhsQuYWe7tu3b3Q4HCTOOvRGbtiMt9uN/p9/+WfVA+DfYyyJ
-FCLYPU3zJA4vnCP38fFBX758Mc62uc7j4W1n2Yp2FJTEEf32+x+GBMIbqK4ryrKczuezAmR2k1hE
-/Hq9qh4dSjkg4hYwtSSaJIll1p/Q77//phULeA7PYZqoMGz8NW7sj48P+vr1q2fpZclHz2vBjkb3
-fafb7U5fv37xHIJA0GKwi2/Ipm01DgzkpH3f6MePn/TXv/6FyrKk8/kieE+tEWZJklAUZ/R43DyU
-H1OkX375hb59+6o9tG1Vn1OJizz3Lhx2lrrT4VB7gKwFIDHxcJVb4LkstW1Hr68n7x09j4cRjwbg
-+euXr5RmGd3vd41J37ZV1+RzeKmdntgRYZrE9PPtg5mgJi0JeFyaJhT/8fsPqupKuey//fY7ZVlK
-r6+vyvoax5FOpy8ikug8Zl5ZFPLQJgnNyJVpt22rF+SBRWXde/Cw4CfAvnCs6uu6jpqm1QWfJLEu
-GvaErymKKgqCu5bb/N8iBTHnmccyqDBcpFKnQNO2bTSNoyquwLiz9EssgGVZ6XI56wMFCOU4BBFn
-0C2jsvKsJBU3Og4yEFj6fv0UxmLj1qwfAyzGcCBi9IpDfN+JLpcrH6rk1JTou8FWs+QW5fAnqQHb
-yJtwWPvsZ4rss20b5tlI98V7B6sySRI61BU1bScWaNyboy3ELw56PSihC2KaaWJq87rtROOk7x+t
-E+KwiAKdItjDE4cR5NzbttHH+SzMu/STug9gdJ45TQx8AJ4pvTat2Y0TdyWIKX5mPpNmNYr5LJ5p
-07R0PNYyvs0kKHSj6/VOdV2xFse0yZZqDx8G4B9d16rnIiqluKor1YOP40RFkYvSjIU9ccyimPP5
-XdNdLPI8L3AjybUaCKOY9n1Saa7NWbMuptYJaN3gmJJr8gpuLEhl52XVGyOOWcqZZaNHckAfzH8H
-+w8UOZdpNl3VGmJO00TzHEh4ZqMLDZUQx127GCyc2Fb/jdASjNFsUhEzsXj6YEMt0Zviz2GEiA1t
-Kc+KbcQuLwF6cR4RRaqtsEDqMA5UxaUab+AgfTxYj5+mibI052X1jEt4DQbaEqFkBYfBhqy6sacD
-p9CD8vPhgwkbP80KCgUf+P33C9V1pUSleVm9PEGMtNgss5SNcdafz6PNUdZa5NmJP0uQ2Q0pexpD
-TiZB+Wldrs6JuG0bejweGolu9SjAssBUxESjbRvNdXh23IYy0nkgROqIbL0K0pQFdUmSURzze4eG
-oSwKut6uehkREX18fOi0Dqa0vJYjBQEfTcP2eyzjLZkOO0708vJCdV1TGOYUBL0ackRRpKWQJSWg
-fEe/cblctDoACgymHfvR3dQbAIcO2gX8PbYMswmreEnny9UtpDRTkRBSb4CUcv4533Jd39NNgitQ
-ygGF5e9IQmtNdAoyyEa6XK9qMQZ6JZulxCK84U2EbAR2P2o07z2KWBYMIo8FRO1iQ0UCu67Hg0tA
-VFYcfRV5IJUzLEloVSkxZ84fj0dh+SXqSmyfK4AvtqLmw9WnhDMNeJln5WDg9gpNFPefzbP9xOld
-M+u3baM0K2hbF2qaXtbVwR0g8+IpURXNh6RYvP7SNFMyUpKkaspZ5DlNs4u3W8RNmLMlElVoWotv
-jEJBmeV3ihbVmcJUVc3tY1lIr+2APBvOiUPMui8h0s1WTlmWm2kNqxvvj4f3XJNEHIKjSByqNo1D
-CyigJC0ojlvd5OAgANM6n6+UZamavha5MAybhtcGEakHOr7M5XLxuOg4JR+Pho6HA00S/gGzBqDD
-IEYURU77tsn4atGpAd82mR4YUGfBZ9DJXifNn8szSQA2fQ5O+LbrvTEkZuPYqEFA1DQL3e53AZJK
-lYau66oBmU46GcrNTpRmmeQWBKqWrMqCgjCkvh9EMhzrPBxe8UscaWiDvVGeyU7Pv6wTEUxSQd8F
-MwyGlTjE4AMHujZcedldt6Y8S6k3YN7tdqNpmuhwOJg46ZKSOFZjUFs98MKOJR2ZDyV2XZqVUPX8
-nWxCEgOMbk0kScYmHfNEnQCVdhNWVUWPx8MzEIWjjSVcuQBTpsAGAXtCwpwDUttFbOzBF8EhkiT8
-5643NzrFwY2EX6zJ9/ezOgRjVBwnGQVhrCU26x2I9j3+xGjV1lCmES7FKfVjxdKUwij2Mv9uN97w
-m8SRO+4AiaX5LKK2WcaxqRvBhgHlRU2Pe0O7HKhtKweFfFep7CIZIYyfiAUOuAo0R34VcQfLOWNv
-JmlJBmlWmNGDK33gvsJAIJRKszFPiNUoAn1MWZVavqu5hqgWp3kiokSrDPi3p2km1cAq38FVHXya
-PtS7H5RQvDCmTg56A/R9R0VRahINV0CxItjo64ZxUq06iC1JHH3qoe20wsqtYT02zwt13UPxAf6M
-AXVdT1mW0+n0wrkIcqNkaUr3x13MSA8MgEUhLesqxCvHgDscDnR6OdKyrtQ0rQZ4ctJy7JFZoCdn
-AlbqJLOGBu58EXpPJMY8DHY75pj0iLaVtQebuX2BuA/DQFHIoBqMWzEGtF6P4GLMxpQzzQpa2o5W
-STqy7V2aJhIbx447uCBGaVux5tHuWZo7nKPQIvOUa9Gb2I7lrKEpKs08z71wFYS8IutwnGbPdsy5
-WO1GmRoI5XjwxqOY3tiUbnx2tMvT/Upt11IiVShCZWyoa2xzw56BjHVd6Xq9KukkikLJI581hdVq
-nfGl2IRx1IWEW5B780mpqM9BneB17/tGeV5RkefSUnwOa8SiBkWZjUIi9exHxgFRoGKXKAxc0IkZ
-P+HE//j4ULeZREAre0O/v7/paAfEpFgcX+D7Dy84INXjNFFlCE72JsOhCOwECa6Yiz+P4k6nkxB/
-Mi2LucUIVYTFFuzsK983LXV9p3wK0GSjOKN17Z+is1Z6PBpqm5aOLwcvPhsL+M906Ou60eVy1o2O
-9+QCMbmf74dBSFLbJz1EkqQUBItiEM76zM3ILeAI9Sk7B69EBlBFxWrp6mmaiB1YIsSwTN+FdQpO
-00QdhqBKZRDyhYg2nY7Y3r/veyrLwuYt0FsAACAASURBVPEbJEQEcXaWyo2KDlULkrFgpmonK2hb
-7veHYkb4OZjaIbsClxeqd45YPyogjACRJEnVOPbRCItxXVcaJ6fEs2glKKUgcPAIcJPEn0RHDWx6
-OSvPfBwHqirn2mojqPnPOqou996bh4rDRinUPxMLj34yRqF8YHV9T9M0eo6qTYPbfZWXWCr6jI2I
-AyESLQP2QlEUVNeVxnLbA6wsS6OTZ3szBGryz4vEZiygqixpmifjbLx6Cr4oipSwA6EQbzL6BKzF
-cUJZmlBelHS/32nbO9G4r95tURQ5RSHr+d1t4Vx7mBCy0P3xQycmz242QeguAz4Ad2Wq4TDA4W0X
-dZ7ndKgr9jMU8VMYhrStKyVxTP/4x6+UCwMyzzKaxfrbXgIKcE6zR1Z53tCWMfqs1AOuAhsuJZ5N
-rsrEpGYWPUXXdfT6+kpxFKuRiObsrSsNfUOTjBFtddy2DRHt0pIl2mqi145MIKnVXjRSisOCnsvx
-Tn+vzZGEliPPc2qaxsPEwI607xDahLquNEUa3xkEPOazcLUdWw88e+Oh1CjLkl6OR3kwm+fistNO
-AcEgI/IAlbquKI4iuih/3r2wxKSTgPPP1NeESiEbAfl1Cb+r2eSpviB2Q0kUGErk4XE5zWYJmA7Y
-OfYufRU2JnrLuq4oDBOal05vIHvzgEc+S4CHZb31IqLad6IojilcnGmHS/oJ9TZlM5FM9Q3gy4ON
-aWPEOVPvLoSO3KMyIwYcVlM47X1XZbYo43BTrlC6rv3kD/D6+qrKNkivIcxJn0apeJ7suhNT1w/q
-qwfeQdt1lKSpkxiL0pEnPInmMwA4szHnwBCe0fZnZybo6i2vZF4cym+5DrfbTcwzOmW3vry8iCPU
-qmo/ENpcOtOgoaZ29FlVNVVVrRbr+IytCTt1lPbI009gLVvjGJfo4zIGWOqbmkxB8i7G9/cPIf6k
-ymnJspKicDRs3VAdj1BBb9tGMW76zniOo6RlM85YRnKjUj95bjp76C8WonK9jc+7TT3F3PX5sKmq
-Wkk2P3/+8NBllMs21RZe8rsAXxDGbLLZgG3kOfsKwJ3IevbZ8RuwCm57ziJdTnU6cb3yXJ03Tqdo
-q69g23UBYvPYX1aYoU5BWUZxktIuoBhaAjxTHNCY9yuqLGnJ4IdbhmCaZnqjWx75MIxit80WZvjs
-VVlqBef5DsSRtFDkvQ+MNWFC+uxUw+X9qDN56/OfZgUN96uX/GPZhM/CqmfVnB0zPh4P8YUoTby3
-09XbfhqXQJ5nMhV5UYNZTKKWZdXpAE9xCmfxJu8mTWJ1KMoyVk2GYUBtP2mlDI6GVU8iG3AxEmUL
-LDqTkpKCoFPlYxSF1LQt7XujVetmDEAhPgO+1feDxMjztKQVJ2LwZ/7r77/Ty8tR1LMrawGsVXQY
-htR2vTd6243PWRzF1PeN28wmhhu3PBMkBo/E8owOW+GDqs2CgLZ1UXIDQAvbF9l0H4z7+CTPdDM1
-zUODH3XUFoUq4oB0+LPHn5GeykPDCzydTkJ8yo2GO1KePZDxHz9+0rYudHp91enB82K2JqH9MNAu
-4Rp4NpbhRRRou4SWjJ2Oe681AsEHv3ddA2HKxZ+ixCXky7x314/inWI9EDmQad12BTzZ5mtQiykc
-/PAfdLNzpseeXk+C16zqP4FS/XZ/6EjWjnOrqvZGi7bkT5JYx6NFwaxKtEvO2nww34MoCgMF4NIs
-o2VeKM3YnReTKhyMZVlSnmfU0+iHoYwT7Ttpa8wWdK1ueADfIFsp1dpkXH6WMjuhF7cVRN3S6xQJ
-E4nAxLnbSgQ5CGinYxPJnucFt5nCASkKVtXW9YEejzvFQLSxmKz5JW/SXa2q3Q2TGlBuo20LPD80
-oP0WbMMLAI6A0gdaaZhBgoiSS9bbc2Q4b1b3RTkUk8eFO+00DJ1Hpd33XXuu6/UqAhGrhXc2U1DS
-HQ4HLbNwkyJNKIozSpJJQj9TWoJZudUw4cyyA3398oXGaaKP9zMlSawMrOfvY/tauziMNYv2sPDm
-n2f3nPDZtfSV5z8MA61mNm11Csg/BMHpcr1SmmaepNtFV9s0IHd4fXx8mDATly7dNK1OBLhVDBXf
-iCJJIzIgIg5/vgk3nfLAr3AypiLOcJOrQAZNI6k0rDMu/3dshMlIy2Htfbs/mBikSlC+vXdiKnQc
-x3IhrbSu/iGOUfL9/tB/tqQiUL6TxBHh+n7wQkTsYcsWfKlJpHbOvVh/uVCO953X2DMdeBgnbREw
-jcB6qeuKiDiKHWzDMJQ4NowYbDgETheUgG3bUlVVKvFFTwGQyfKkUVE822WB1QfjQvQ6UOZZ4QIs
-smezuC35xQkoDEAkxgi4HVg/PnrcaHDwq6qiq5B78MBtJh2kybuIk1j622kbge9mxR/YyF+/fpWZ
-94HC6EH1gXtE9PnAIqBu8+2lt0+2YFyCB1rCzfNMwSdTDCdFZbAv9iYcKI0BGsHf8P64K/BUls5/
-Ds/6/f2Duq6n4/GgwaexAHp1VdHrty9UFrlWjGiXVFOywHyyUt4G2HJcfWy0GKeaJEnodn9QEscU
-SfApAEw7ckRbE4imv+3OHtMRLs78eUhUkX47gfeG2bjKhbOUxnHgKVKaUtu1dEpPXrUbx9x6ck7f
-gaqy9LQAcZw6x6h5oTiKJfjV5T5aQpVrlUbKMnqKy1s9N6yqKikVlaq1xcdoj4F3J4KaZbqDy5bF
-fA+1oI8ZLY09iyvLVtt3RhYPdcVzcJHE4iXoyY7MPAk/DAjpsJEXIoGyLUtTleZawAW9m81tw2GB
-Htq2K+Dtg7mHeCeYe2CchfFMHEe0StoO2GkudnnTFGQbZsKLdvHENwDa8OecRJMPO4SB8uEYUZKm
-9NvvrLMoilKdaa17z/5EdsKNbq3UbE9qqwX+PQzALuuiWE4qzxE0W91EK9teg9m470RVVapPHrIL
-932jPGOL8K7rqCxL+vLllV5eXuh0+ivNc/vEhNsoTXPFCcAVAXGItQbtJw9AVH+w8goCop9vb9Q0
-HX3//u1PAzBw6MEU1YKm8JHAJsF4FRcXbtiqqnRjA7tBiZ/nGT0ewSfLuHXdqJ8mzrwoS4qTjLau
-M9FdTtY+jjMV4vMAQ5bRmLpglBhFEdV1LSBeSY/H3RMuWTARmAvovnYigp/7HKaCaVaSBOqLEIQh
-ewJaRhZSgJEEZEMuNqPxd+UO+O6uv2Tb4UH57JYVlWcZbdtKNzlIMDVAP2/HLNaEAX0hDpw0zTVH
-gBfP/km4YufWuO3neVa+P0YhlmOAMAoFXNQfYPXCSTCfxonOlVRnXG6ci8zj0dA0zSLeKJWogQMD
-1Y/1nHs2n0SLtO+Tbm6k2UK8EgaOCQduP3gIalohfzdKaE7BTYWh53sz1jWPPYvySMM4CcmqlP44
-F975u5b4YOgh4NPansF6e547r0e2mgKLC8VRLNLVm1YXocmitOsEmx9TCqzZosglX5B1GKhccaCr
-wCdnEA2VAzgBcRQpr8AeuHakPc0TrXJL2/wHbjcOFEW9176MsmesCQueW56l6lptLcnsFAS8gDRN
-6X6/e9W0bYGex4NWIevWQkTBv/3b/9qZYtooZ1wZRcY6Gmkybn6/C5jnct7x0MDXfiZw8I0j1NWu
-V7oq00Ij9h6QPHhGsl3AJb5IlnHENOKRkC0PsA46d5h3wFKJhSixzlURBmFTg/A99n1Te7S+H6gs
-SyLaJXGWtedd12ugJvrpYRxUw2+NTqFyW7jnojCKROoJg5Fa/QmWxaUDwYIrlpt8mmc1L2E682ZI
-IKsuvOfIqGfVHlRy8Dx0I7ZAmZ84BHg0W9LQ97TJZtnWnTqZvLgc+0S16mCJ2tYNKc0+m3AR/In/
-rLXvxq11uVzoy5evaoltAzJRsmNtVGVF/dDre0cJDYDZovkQOHFbtMlG3w23gSdA8ICAlR3WmPb5
-wq1gnj8JIJ24+O0woG3bqWkeFEUs63UXlPs70yShNMupF14LLkS0TBB9Kb6SZdQ0jVa48FV8fk5Y
-NxbbwUQpzwsKfvnlX/ckSejt5086vb7S4VB7LqK3211CPRJ9kTj9vcy6hfPXh3HyaKKPB9ty42bO
-80xpnIiMatpWZ/vw0sNt/v7+Tt++ffP018vi8IFFmIMYUeJhIUL7fL7Q9+/fPPBoENWja1OcwScA
-mSxN6NG09Mcfv9N/+2//3SvzQe+c51lyBchDteM4EZQ+ovf3D3p9fVWRybKsn1yJcCjiMxciiZ3n
-hW63G72+vmqVwDRpbmcsEARDC4wsUeHcbjc6nU5edWdDSq1yDjiBVbrdbndVs9lRIByTUS4ji8/Z
-wjH77h+//kqn04mWZdbPbOPAcGmAjWe/CxHRP/7xD/of/+O/U1keqOseYi7TezJyjJXjOFaeAbIL
-LpeL+lFYnwIrakPLaydW+PXz5xt9//7N4xpgfQP3QptmA0MxVYGfAg5KvPtcQ2EWLwnq2W8A2Qwv
-L0f9XGWR6xrLs0xGhZ0HHLrq80Ffv7yqOOnZhDZmU82YTq+vdDq98MvoOu0Zt22l6+VKlWiPUTbO
-UsLB7z6KIhqeeAG86VftU5yIhP/yZYU5BN/SWcoIbSJxUvZBYFxk+QNg9m2b/J3KugM5Z9VsuUE0
-43GcqJTXJsBYKzHWPPDtdzy+qOEoMhTBvOM5bqSLDYSd2/2hZhrTNFNVTbRtsUF/QzWNhD06lGLI
-xmN2YmBcfgbdOEweSkUMMutoMUtTmgVnQfbB3fSQ7obYlINuzVEhKbXEq2ka6X7f9WdyDuBdJxsg
-hcECHEy2fduoHUa1JgeTsixyCbskYzk2uUxHmSokSazrkO3fHxLCsXpVQpIkMhePdU3N86Kg87Pv
-v93kGJGO4yi2YEyXvl6vKoACeSc0VdHz5sfm7rqW1jVTlicAVqRegYNgR602adn28mixl2Wlqip0
-BN20rfr9hWFIl+tVhVP8fGbKMlaOAl+D1RoOfcW2ImECxlFMh0NNURiJ5RZ5RodFUaggpGk7mpdF
-mYPPQAVONEYlZ01Cga+c/SAIrkSJdrs/vNsUNxx8z3ADq6uJoa1icuBe9CpBDIs+YHvKos0BNmBH
-M+62dic+0mwmMzaCXrws2EkGZSnonYdDLa2Ocyy24BVoodYsdds2bW/meda4KrtwoTFAJaU25eui
-hwRs1/6sHQB2AdYiosgta4z1FYPLXBReRNO0SjypylLLbDwnPlSIGgmz4BaHY+E4NXpSZSJYiNap
-KBbgkINESmrbThe2tQ536cetJ5+174BlzpOuU48GLsQfTCR41JZRUZQyass0um3fd2UpWmIRkHbn
-fszvpxY7L9iZ5Xkm68YF0jB/gygMnRQZlZlzhuJ38Xo68bNJWGDHbUfogeUAHsuypEK4GWhZLJ4G
-3Ot8YXel2MYiIfgCNwxTZU0OWxR7Pms+FdWVXPgizNKKdeYLP/M4z6iX8EeAaOPkACH8TCLetL//
-/ju9vLxIpBgvpDlY6NG0XriGG2WuOv5p205jnvIspTDk6iXPUpkBJ4bItOimxKGBRQXTURxy1tdt
-ngUDEGdctCNFntO+kWYYWP4BqgUsbNhRW9deq7C0s3lEOz8n2nh6dFFs2pGZy5LnEM04YmT88Wgk
-vgoLZ5VNmEmfztoMBH7CiZlluKN+J5vyiyonimJl16VZQTt1NAyLylez1NnNV2Wh9ufruqpZp+Nn
-HFWObMVkIGTZGDAm6iQUSMm8bs4Sjd+fA3JByy4lphuuy1GUfELgIWj7M3tykJKimAHMuqpoGDeK
-xZ0qz3NJ1x6Ut4CWBe/w58+fdDgc6HA4qPgozTKaxlHbVXcIrJ77EGK/LGEqjie9rKwSkNu3jWJX
-Ho/GmCLQMlZPwHmmnz9/6ikPkMSimPu+UyW021SopGEYeGOobd9pltIQc3dUAzbwEQBREIRUVSUd
-DgdOVF0X1iCI44yV48Kh1kYoA+gDBoFblkvOxRMq2VIZBwp82h067OjIOMnnZRVMYvUW5DT11PUd
-Xa9Xj9Jsx3Ef7x90fDl6VFa3eRj881mHm6q7rOz12VJ9N5Ro9Mm4OTkZ6KGLuCxLQcxLOp/Pn7zr
-4jii//P//St9//5NMQ8bBrIsi44T1RXKuOSwHRVPcLI08aSxSZJRnvOBZHt5/Pemab1wTLRfFmAE
-2w6tnHVb6vqBvn9PiCTvEs8Ehyy3GYkg+osahuBngsoM89YwjOQzJtKy+mKlaZqVCTlOPHHKs1fJ
-wkRQba4EtGVdVLm67zudTi9UVTUdDgea54k6AaKtRN4e9GjHqqpWleGjaQ2uwM7M6+pT1uEvGC8y
-p57n0HN5sf+LB4vMPkdbTdQqCeMoiFt2khe0OQIGSmrcnogQx/+PjYYZJ3/HnV5eTsLOi2nr7nqj
-Kqde8uND8YIDkAcqZVWxDBYv9dE0tK6RF09lfzl6sCuXY/EpaJqGDoeDSJFzCsJQwjojb6Fa4onl
-9zfNw5NwHl+OdDy+UFmy0m/fSeKsuTyHvfowjOoKzOUhfepr7cjTjuAsDXX3HKADmfowuQT+BwDI
-wOmfppleX0/05csrFaJItHNmXADADuzocppmKktHDgK2wfTWmS7i7hQEJBdGqK1dGJY0jhPVdc0+
-AuuilwZixnEQWeCLJzwgoPV0fzwU79i2jcIgVht7bb8Ef+LyP/feI96/i0DnSikwOJdv4R15btKw
-yge+48bfkzI58a7AkQkCNrAZx0mswkKP22AvXOtSNIyO/IYWcjIBrzgY4bcQ3+8Ple2CPmjlspP8
-N6DISZKKvpwU9WWaa6w3QycLQI0qTUoN3Fng+gK7JBs8sa6rKu7wq20d33oYr2okse87LfLZ9z1R
-BDxN+eQGH7vrB0WmrTIM0w2O8GLbKyjGgqBQJRximSwZqWlbdRlCUiwSaCDwsJlyXDq7LARYU2Vp
-quWok25uurj2fafr5UpFmWuqshqYxBEN46qVAwhPSLm9yThMy35ZQNzHZ5RlJbXtg1q5odHHWjJJ
-EATsE1my8Ibo/hQ+4oNYDvz1tfw44LEZ8Bxikc3O4kBkQ0fgorNtG3VLb9qw9UnItXnYCrAMGIpm
-4vqDfh5O0mVZUlWW1LStWoE75p0jDKEtRXXAaH8kbY+j3oJgY63VQPbBhcr5BuQZ0mDqsa4r3R8P
-2ve7THW4BcVkKAw4uMUd4NKOhTENox+jHoahOk9jNG15AMMwshbA+tKhX0TySdd3lOWZzjXZGuzx
-xBHgQM1QLLYs1RLltJMvBiq9hfBi21Z15F2WVVODMGXAaWZvU8x6ne7dKezKsqSqKukuIhM82Lad
-tT1Bmi9Gfj/f3lXjgEyAXPL8wJyL45hOpxMdjy+0b4JBxDFt0u7gEMDBp+GVs4u/wk3CbjGLZgEy
-7hB6M3jr9R+EgWTaH2gae1qMys4SabyWYHNAkIt7W+h+v9PhcGBXob75lMIEEA4TC6yPtm2JqPW0
-+RBoobpK4kgDO5JELhGZUbvwVaeYcyavPNZyPgfMqDx/XDwgkmPGMxW32LWFQwtVCzz53YjTgZxA
-5IuCPQSHYWDTmzCgcVxMS+ZuW8STgWPvR6/Fyhe4XK+0LDOVZSXitVFB11Auq2dDHJurYZWvmAbg
-n62JiDOlnXSK5KL5XBYhJmzTvKgXQxTKCN99CKO0iv1ZoiWQYPNYamwQBOr4AlQfY7+u7ygXBN2p
-n7hE32mnKIzo59ub9vNsKDIajr0b0VmKMkYxcFfFGKiqKuq6TpFQHDh29IMbZFlWKoqYsrygl5cX
-OhyOFIaB2j/HSaoVADYHm1wsLo9eNgfMLKuyoLyoaZlHzxAEtN8kjulyvXJvKH1zFAa0PGED+PmJ
-ADh1XVNdV+LE7KPZhQpFds/Gehg2L9kGtxhGXM9pPIqwBwENoj4DvdiOS6391DOmMU4iy4Zl1rJQ
-ludqyMIyYTeLZlAvURmxL0QjejkdaZeRbCYsUgvOPhuSRhHEQUiCGjToBJccV66haDYSEf9wG5Bm
-GbVd72VB5lmq4itMw7K8oFXYhJbotkWbVmiFjBH18JOxrt1n8CC0fhm4iGdZUzjcbPYm9pm1MnNj
-2MTsVwZ7kzSlaX7Qx/lDHLz5GcQ2ywyl0zhtZtzyORrJqrMsOMPosU9dtBZNasQxjDIWiuj946xj
-M/TjQH2xCWx8ts2Tgy6fS3W3QFFaVWVBj8fDW6TzvND5fNYbha2+3vWGYCCF0fhff/tNBS7jOOmt
-ABtmHCQWgGra1psioM1pmodyENqmpbIqneXW00J2GAxRP/QUxVy17NtG8zR6i9NOFhhoS5QdZt+p
-9SPAlIcP18Wb6GA6YYU3lvyCxYsAT7Q0ALjAVGNEvKQougquMyjXAOuGXY5n2Yyh+ik6diE7LB2P
-B6qqg1fa80a9Gusxd2vDGCPPMrpuNy+OGy0LvAiAJaVpRuu2qxYCLVYYsiGtbV83aRmxJmy68az5
-h0w/tjoNJuMsyq8AGOrckzfvGSsHQSjQVjNjMQmbRA3qMLCENE1op53GoRfODnshHg4HbgGArEOj
-z4y0XsEdINvPiiwk0GCOjLEOIsMxorBiBSwwlIcMeMUUBAzURWHE6cTSR80zM98Oh8Mn+2nwmrlc
-T8UHcNGbgogoF89C9L3IJ+DcuEzn85aLD4sv0JXZRCM2oNb0yZ7KVkJMmR6oKBI9FOEspOEgL0TH
-w5FSER75FF3XLyPXD4ku88I5gJbK+mljy4u/y8+1hpqWf992vlmGPUDtXB4tEOLabGCGFXrhz9oJ
-wPl8Nhs6UWfmYeA8xmVZqa4PVBY5ZXmhh8xDQDuOSmv49g4CyotSN8q+D588LJ2eRSTRYlKC7wHc
-YFlcXBgOEBuTZnMo9t2ZlvBkizUN+Fncpq4ajwcW7SJKSJf8tKnoDKnPDmid1JnY4hqh2W/AkIqi
-pL7vtN3atthcCIkn18cB9Hg8lAF6OByoqkqKYXcH5pSlQt7vD8pEj2+jquwiRYmyKCNw1ROLU0p3
-ORyc/DfwEFCXvxbHMQXECD6TJmaa50HHh9bFh5FfFzaZQX8g5ZP1JLhcr8KmWtRfvyoLojwXbfqm
-PTsbfKZqWR0EAX379pWWZaG6/kLjcFcpMFEoICGpHmIyPIayZEPTMAzpcrnq3+0wj43iJFYHInsL
-WLYZJgJqQybvZxydlxyio60jLNx0gyD0WjVMWDaRsgYBefRce/sCT3BuTJnacAOgA6kEQhuLmHMv
-7SSzECJtst7GcZRcP2YSrsuik4/D4cDjSvFuWBa2PR9Mn2uRc1wy9iCwrSJEY3YCYinQAHXBEMUt
-/9xeWJ69TW1iZyeeRAFsxTpnPkwp4buBGU/7BqsWI8P3G8ZVR9xwE2bPST7MIMNWz0f5XzsV4e/F
-QbvWkux65Si1uChKmqabd3IeDrXEW9d0vV692xf8ZqSyYgpgT02AOJawYckabla7Kz+6l1sCYx2U
-UcgTiMKIpnliMY25eS311rYO6IUsZRS32jSzX7z1QRjGkTaT/oNxUt/1RDTz4SDEFBsTHkWhLmhO
-nXEtRLgFtCwzHY8HPcS6vtcTHCM7WEut624qHB75pWJT/scfP+h4rEVKnAqwx3bbuHUgqx0nhyyz
-x6FTiKFCwvvADe/Hu6fKZ7BjUsdTCDzlJbghyPxDBZGmGc0ilGLzWUddZmv3WME/Ta6VEebhcKAg
-jJWJiug44B/2wLRtihspj/qcnEM0eQeDOyxICU92fm5BcRCoLOiM5+aPCDNtefadqOt6ejwanVZZ
-FiMqHhtZbpmYMNwBRZ2IaJ4mut8fahy677uQgkiNci6XCy3LSi/CL4GtOcamODSLoqR4390tiEVa
-VZWUM6OW9IjucsQRvtFghBlHES3rSlnKpddzyR4GAS1PjDQXLpqowMb63sWinurFXgw9vAUmHQKb
-eOyoICC6Xnl8ZEEyK2JClDTAONt/60sfB/r4ePcimcFR4E0/eGlDFhmHeKqqqiewzAKLbj5u5/pd
-11NZEk3zTOEwUFHkVNcHlSPHkjeA8i4ShSH6b8tJgLwWbR7iy6ZxFHceFh1hpoxyeBxXD5Tb952m
-eaGua7Uys+w7TUaWf49Al34YtE2x5qiYHtgDhcEtxjsej7v+/dO8UJaltO+Lp3vHxrYpS2AiwlAF
-Gw3PHBMutHNg0eHPgyi0LLNOV6xHhPVuUA8IqU4sxsAj7uETtf0iNFyujCPBXBbT/s3aVttAXR5B
-rgafcD4Hl8tZNjq7FdV1omsLvz8gZ86jrNz//I//ojRL9cOgpIX/P/cqEa3bYkofSfSR3ngYNm9T
-gi/gSYrlFH5GjkErhlVREHJpDjMNa5zw3Cc/TwMsWAPTRqLJyDhZ/ZfEEbXd5L1IbCzEVmNDo3zy
-DTvJAzntC8Ehpmq1LOMQ0zBQ15gsy3T0Bd86bBoAskgdgq9+XddUVQcVDjnvQDdeRGAK2qimaeh2
-u2tVggWPDYt0Y9jCwbUXxhnc58ZPphKRUJ2N2YbhJAA4AxjWNC2t66ImKBYQ5ViyQUdWEALBaszm
-FHLbMn1yiLKb344zbTDLs7W4c6xCHL0TYvH7nzUkNo65dMdnK/KcWgGfgXvgtkfJ70xIIs03YPdj
-h12hXQTd167tHz9+Upom9PpaihhqMhkKibYbMGaFaApeE1vB1vSHQ61/N2siFsPQZF1G8L//9//c
-Uc4v80zDOHg9BPeyEfVDr7pt9PtQG6G3+L9FX+HG5EARUHwDBXyiiN1awzBSLjN03TjlsanYwTX8
-FJxp9fxEboFAZ81mi4GqoJxuPKQiLyiMIjUTxW1VFLmIPZzO2nIQwJo71AdaxbsAFQ0y7J+foQv5
-RK7gqOBhFAY0GSk1rL2GcdKF1Ha+A8/z8+XZdkGtxG1DKu209pHq2XmzoHVbqMgZB0HUNvwA8XuB
-2MNXARp5X1MvClJRqWlVKRLv6+1Gy7LQ4XCQvMORoihWTMK3fMMhH3qfHeIj56AUyAE+iKcCVwt8
-wPZeBQOgD6AwKwd72tadXr+cfFNg4wAAIABJREFUtDJhjCUxh88oB3eqAi42rQ2FkOYYkTwJiWkc
-Jx07g4I9ClOPqcQpXa5XXftEDAj2fU/H45GOxyMt80I/335SURR0PBz082Mtwfu/yHMetw6DXjTQ
-pAQU0CD6A7ynLOUxfHC9/rbzTDhUR1Jrqdy2Lb2+vnpaY4w14ohPIKCfzrfcvZzL5Upfv35RR16r
-94f3Gs9WmaCAvgsLgPPdvwn1k11mYcKICgEMszRNdTzFoaEjXa83+utf/6LEERvZ7URHpA7CTjLJ
-KsmPjw96Ob2IocTsudMi0ATjqkXn847Jd71e9flZTTyQ9XXdRLLM9GnccvaARFqxteC2ikRL/rH9
-7bZt9PHxQf/yL//8FCWWKFZj7drxc8C8y/Ocrter6PkXRZizlA+lZ7q4jYgDsWYcRjocOA14mSe6
-3e9SFR0ku7Hx9Cb2AICsFvbrim4bVyC0K89W5CjV398/6Pv3b58cpqwDERSex+ORpmnUGK4kien9
-/YNeXl68KghzeOt9uSwLVWVB67arurLrWur7gf72t7+yBiBNtT3G50D7neeZ4l+4vcMwob///T8p
-TVN6fT1Rntc0Dq2XVI22CjF5wLWwNrB+0HrhUtI2ezGmgX8W8ogYL2uhFEpAJm4fFr5MCijZ/t+W
-YPjv6NGDIKSyzETw0CtHGbxlB4bFGlcOA8k4ThSVRw/HmgZuP1LRk6s4x3i14wbAYmvbRok6jnS0
-6k2PHEGUp9a8U/UMBtu4Xm+eYalz/42EUryqFTYTUcZP7RFGQ3Y8a7n3znjCf28YVcZxTD9/vum8
-OstSTzZt26f4iebs3k9gpkCOM4/Fb3PqbOQ2V4Q5lUUhaTQLjdNd6eHbtnFOoIxcoU5LEt4IaD/h
-XKTsTEn3hUsvfPfQQizLSnmeGEk3UndjejStmtsCI0Hluq4r1VVJYZhQHC3eyNpKqJPYGZdYVisO
-z9msGd4vm7I+r9ebJ5+38lzGu3i0u20bVVUlNPaGbrcb/e1vf5PPOdPlevWi2q3pK/NwEgWp8Wyf
-nb7R8u47UYzACyugsH/AUUI/9952ZvlsZYy+ahI67zxPuuGdFJetmGc5rZ8XOv8dibIP4UNvc+xB
-c83gP1jwuAk88iAglb3aXD6L3qK3ShNOh7WEinGaqCxzk1w8GyLLqA8zjhOVsuKf+VncVeuAeGuX
-K+DrwwEQWp6B671jb5KCEty+CzviYv7+gcYxpaosqGk7baWgJEQFgPeGv5P/PEtVM9GCANMJJBIN
-iDvoyPvuwjlwGHZ9LxHetQeiQt/P2vtdD3/Wb4xKIc9SkSHLRGgTOq497IAl2EhxuAXjUJilTEbQ
-J6PznTMU2TZq2o7yfNUNjTVs21oO6CDFq6BezGWs7KqwWEd3WGPPFZoKkwx/AdbfaOkwieK4+kiD
-XG2VhJ9h8wJ4vzmMKo5jxaaAbQFgj7H5izzXcYzlE/PJsijDix1MQ8qyXDc1HgL72Tl98rNkM0ki
-DbgIlezCi+9Q15SkKf38+VNMPzMNrcDGQB+GDEPLCrRU5ChiZLUoCr5daP9To1CuSEhSWZDWOhmz
-ylTZa1kK0Gr0sv5A8bQbG1z1JGGtexRG+nmjMKBhXPXADcOIpnlUKTNKROX3h5Z8Rd53t4nO27bR
-7XbVeLUgCOjleKDrbZcw0Men719XlQJawDhsWTtOE23mgGmahi4XvnGzLBOW5CbMzkTJLPj89vYE
-Y47fD6+fKAyoaXqn4ZCpkoLD267qQVSZaDF8c5OI9i2g1QiT2rYTYBVZA7xJy7KibduNOYh7N/B8
-eHZmtll8qEC3fRc+hlPqDcOolSXo7kGw0jIvTz4XRMtijFyWhR6z02wgD2FZdmOiMyuIiwwPyNkx
-8rYVm1WnPrd6XdfR4/6goswp/vL6ymypNKW1abQUwwwVABgefF3XKsGF/591Ju06jtK2HxaUWNcf
-jp6QKM9z6oeBmrZVB5R13eh2v6vJ4v3xkEqFo5wgsHgGiywPIBWVXUCBZ4pgS22g7mw1NQnbLTIm
-IbNHj8VNaQkvm2S5T9Oko7RpXqjrB/rx44eSSzB+QfnOzL5RbpuN/vj4QWVVugBLUUTWRuGGPtm6
-x6CUzbJcVX7jONEshI84jhR7SKQ8t2V+lqUclilTCYwuq6rU3t+BjZkGp3DWPY8nWSG6ebcaDgOb
-6YjFiT8L8RZATqtBeQ5JsUo9EG4ADLsenehyuXr6DbQ4TDC7SUI1E5SemYGW7QmzU0zF7Awfwp00
-DZ8qkljbPahY0erZMbb1bZhnNmXBeL1pWu9ZLMtCI2jIZiqGdguf345+wX6cppHmOfcSsIKA6HA8
-MB8EdNTp8dAHDORy30kYXYOGdzB1eFXutDWNqKpSwQ7ndU86OoGtMT4gjEXyLKVOT1pGx7OkoFRe
-8jCMetAgdxCeeqPc4taIAuQcjCxRsj7bgS3L+icTi0gByUxcZaCkmk3OHghMIGhwWkzGTEMTdJnn
-hSz0jMYxMJ57jD2AQ7DvO6VZSl3b0ddvXw3Is3lKTRCesjRVQhbKWICJSZrqAsXYLgoDmmdnuAGp
-NDaQUy+uHIldV9piWJIYx39V6lMYhiGVRc6W6CbPDiWsLX2de02i3vRxnFAYhbStm1agFodCBWSl
-xsCKnvt0l1MR6cju9sSz53fvrN93E8P2PG6eZ0bkQRLChgSYyvLxRLgFjqWIdi0UFqIFVqFG9UG8
-RMfFRcEuVhaHsJs9oFjBcl5HgQfg4rtaPQ4mQeAsoKLN8oJi8LXxcBxXmU/waZ4pldub+7pB0O/O
-e1hYDEEQ0Cr5b9fbnemu2+opCJ2LbKiKP3uTsyCDZae//fY7/eUv3+h0OlEtuXM/39505omeHKXQ
-c5KspXsCRbb0ZjvPxcm+RpuqFu2N5Fucr9L+sLgCCy5OOGV2mltpJWKRHSdykE1edWVBoePxSPM8
-08vLKy3zSDcx3rD4SBzH9Hg8TERV5hFxur4n6nuv2nHJQ6tuEOQYnk4vlGWZUqgRplqUR9q2+VPF
-hMkExoPzPNMoVGhLB7csOugQLPKOtOIgIPrx44coSDfloyhbTsDR/YnjYct/HGC2J87ShGIRHmGG
-bpF8XDxsmjF5JC4ckGyAk6qGBL/OH2et1JaFD7u7TDfsRCaKInp7e6O//OUvOjlTebcp1zkct6I8
-S4nI187Y5KlWQHCAxFADguGpTlXm2bNGITMSbF5D277T4/Gg+M9UaFzGF15wJ060WVJxLPCHzVJX
-FWe7S8ACf9hAGUhA7HHyz3OnsmFnhLh7G7euK3p95SSadZnpLA4ySeLYic+RzZv5jHbkw5sxp7u4
-C6NEdDbRkbodzfNC48ToKlDz55EbQEqmsPZ0uZyV8IJSCyUmlGNAiLlfntVs83x+UJYJjXgeKYxi
-vf0x+nrOa3g5Msc+lQ1sLd3wTJxOfvdMK+ZlVTlsWRR6gADNH4ZGbyJbgtseX63TolgPTeYjLNp3
-4nDFyPNwONDlclZuAjZ+kpBKlCHhhevP7XaT5NzC8EEGHb09x9GN40ht11Pb9TpFieOIzueL4kvz
-PFMrAKSdellefpLEVOQFpUlK/epk6ofjQd2xGRjcNdcBgDUOPaT3WBeeRTz9JtMOBEGgMmRfq0B+
-cG/bqsLU3vwgFWEyAno52rJ5WbW1wXi8rkuKyyL35J/YFGVR0DS7P9A0s46f8OIReoi0nk3ah/P5
-orNrRnGdGy425jjN3uYFicZaWQGlZYluQl3/cKw32UDYJM8P1NqD42e9v7/r54de3AIkuHWswaRF
-aZ3sefEkmUREx+OB5rnwXF05y+/mWXbBkzBNE4mCDmjfNnNwMKDphFATe7qZWxAtRRxFdL3d6SFO
-vaAHA/EFcHW73eR9hPr954U9Bg51RXFSUJoOSr9GBqI94HGr2LEXwEc1qxThiv3vMG1BLDkYjmhl
-tm2jl5cXsQNjGjmj6pFyN7Duipzdl13oBk8BoC/ArY3LC8xFrInD4UC321VDZ4IgURwBTlTLsn6q
-VOCWhCp2XVdW1CUZRdGgNzXMRJ3lN+NSnEdZ0zyPhnPCFxi8/myLgT/PeMLiWe6B6m3zFTDpUnMe
-KfctM9bZ3ieCVTHLMM6LksaJFylLL/mk/e3337TEQEmC01fniQZouVwuKkApioLquqJlWalpWgmF
-jHX0Za2J8OVC4zjr22CH9Gga7Q9dEMksXmuJHihAOPn0TilNA6LdCUcQ+nmoK5qXVeiZIc1zoGVe
-aOzAYYuNHs56sD0Hn+57qkEnnEDLfm/TNFPbtlSWpUdjHYZRHWLiOKFoWVnJZyTEvAH5u9lQ0Xl2
-OnZUMAAyrZYBCwhzb4Sl4vlCznq93XUzwt/fsi0di85VQM8HLvj1zj1n0moKBw9GhIdDra67bftg
-3cE0U5L4FSBjLqTtVSrYjP27mral+/0muY+x9sr7TpI/2WubGYYhHY8vdDy+0LYuNM1MC7c6DNu2
-rOtG/dBTLpUS1iys087nd71t3QYe1CEaZDd2MUqIOTcPAYknFYW5qnM2OYqBmuJycvOm75q1CpzP
-gPW4rptGk4GvgurT4l5cAfFBUtcHillM4qyS8LC7LlHBArLXqqqmZZ4UuV5Xl3IKameepUK3jbT0
-fzautKorINdAM3Gzv3/ctNQBCQRknsejMXr1QF5i6CHkUG/dHw/a9tVTwRVlTdQ16gEAHjyMN1nd
-luttiSrGmqNYRRrSWGfhgaMsZmJKJr5zhUY4Wzk1FHx8szgsBhsIcVvbttHbzzcqypzKsvKANetS
-bDXlibEfY3DzqLc1+l1rMZUmMafzJgntu6tuAHbisN+2TceD2OxYsLjhbJDmbDQHkMxaPX3fd9Q0
-HZ1OLxL5HYt5hfNmaNqWoqdAF1Rvx+OLTlaCMKSAAiUZsZ+ePwKe55GyzGUaoA216Dp+b98PVNez
-SbMOdCScpSk1piXDBWRxqaqqtLobhlFve9zYaLsCCigMZw/byASzmqZRvSO5wpvUdr8ocvXPVEu3
-OJL8hVmNbXGgn88XHgHXXJHE1i6blUQZpVlGQcCGinG8UJZyeQ+qsKVC2sWaZynFSUnDOClYaH8B
-qXcediERsaY8TlIahruKKbBhl9mN4dIkplVuJxtEast1tB1YuKzIyqmqSr15r9eLWn7j5+D2xBwf
-6sKu68XsJBPwKFEWpANxOEw1Eedg9KE6KhSlZBQGtJmQSXtbA0fB3wPOhZ1H50Wu0muU+ejrrFIR
-G8RGVi/LKvHTmVqlO5s0wXhkRm/BUVexDFp6WuDWEltgYuH35Bt9vH9QWZXahgC4jGPmFvBtxKGj
-SRzr52aDi/apolm9cBBsyDQriGij+/2hmgjIaS3TkAlcHOJifxaqPDhFuZY49KTR+87chKFpNQQE
-z3NeVi9u/rlNxMibvf0mul459i0KI2W1ooJBrgNXcKX4ZnbKU4GxTZ6XtG9sZw5wnSvQ2Sf1CTkK
-7VSa8LOM7UwSHG42oeCF3ncdhWFNaRJTOwzad1nZJA6Crh9oE+DIctKfNycMQFGy9MNAJLFbAIyy
-LGdmnjEVBdUSVN9AXqY1M8HvY81BRUmc0On0Stu6eAva6haso00UJRrZBYqlzaJ7PB50udzo9fVF
-gSwQlkah70IyDUzFKsSAh9hEGfeiYvPyJ201YEtWVRVPQsQw02bbWxqzM5OcvYMG7U23bcpxwAJB
-u4J3aw84xErneaYzZ/uOtcSUmwh8BXx+PrhY7zFIpiK/4y9ejHsSx5TllaQsufeKVqlpW33/9u8f
-xkkXvJ2uwNTU8kVcCb+baO7QgN2xV7EiZSlNUq1skC6MFhGAn2VTgikI0BezfbBJ53mmL1++0On0
-QknKBChUNfhszzyIzISOam7F2Hu5f6hA7MQDTshYj6kcmE3zoBjKPCvssJziaZ4pk54YAFaepbTt
-uyb0WNqq3Yhc1vogxjg5yiZuArDMAAyhZOKxY0epsQ23Udno1VHyw2oc5qKQPM7zqGPKZwELXFMt
-t98FfWxebwj67Zcvr3QQemsjqKzln+/SFs3zTHEUq804LKQtB9+Kr+xhiY04TZNEj3EZ2na9Jt+g
-/bAecjCStLLf5wMZ3x2BrDZRyaLpduKBhftsDmoP0EfjIuFxC2ZpSmVVUV0fNB4bybh9PwjZiMeH
-DxEG2QgvZAPy4dvQ4VBrOc63diubNPO48W6s5yTfWZbqd7BVBaom9S2MI+r6WZ2ueMMuT8k67lC1
-uBEOvdv9oXiN5UDgWUIAlGWlRoDZz41n+vb2oSEpVwlqFTdflc4PIiBzhqiBF9b6bOjD7sZsix6j
-lLOjBqtoc1ZXIT0eiGXipNKP84eWjUTxJ9dY3CxlWaqvnY29gp1Uon27z36K88zjN0OYZC2sYeoB
-22WLogKYwfzU3kqWPAJN9rOqzi380Qsw4Zw2jn62Jfq277TK98ONBNkxj4EyfSmuCog8x2MrbrGU
-VhY8RTq+ZForcyHSrKDH4y7fcfEYjmq5JuMntGu+mMkdAE3TeNiLnaLAtAUH3vPY1s7r9ZCV38OC
-q8RT+hVFTlmWayDKvm/qI4DvjyqMiOjr169UlQWFcqg6DwG2cGeZLvMzYPHFfg6rEp7sAWbfsTWN
-WbedyiKnKY5Vrm1JRnZUCBs2Vw2FmnLV972hsu/eCBcGnaBzW4GRnT5VVUFfvrxKmlPDIaXbRjdZ
-07x2ZvVntGNB29ZaU1f8vn3fKfj3f/9/d7tx7cw3FLtviG2ut5uaemJxBgGJq04hC3xRFRfIItAf
-R1GoKjjLhLIe+GzQaUUYgWao//jjB72cTlRVlQI4uMHiOFHWGHT2WZZJf9UTUaA68s+eBYGWgnyD
-BXIqx4Z+G3l6ajL6AhxQ1idh21Z17kG8WZZl+sysRZXrN2NBuEM1jYS2nFuSVRiObt4chpFKQdMk
-pbZzYZnI+MN3hyEEpwFFNAwua36XcR407Ha6YDfMIunDaOGs/h6XAbcCiwacwNYKzxWbUBmKhm6M
-nwFjmqZp9fDMcx7vLfNM4zTq2liWhcqylIPe4kOboucMRs5eGMk4jjKhqYQMNevzhFEu3jdjLrGO
-Nnken3r8GWBB7qBwBwuCW5+9NRljspcTee5BcRxRVZYUJzndbmcqi5LCKKDb7a7rzrFgI90ruFSm
-aXbKv9glC8G7Ifj113/fIdN8TvolIrpcLvTlyxeKolBBpKIoVc6JGxkGC2AI4qa9Xq/07Rvnqz8e
-Dz0dYcbgypKJ47bKUllL27bR+Xym0+lEQRDQ+Xym4/FIr6+vqiN3kdKJGB+MnhHk+8eFXl9PHksM
-bEf4GNge7tkI8uPjg+pakFwBqKwJiWenLQpHRdjHkbquo7/97a+0w9BTKgObHPOMl3C/x9pxfn5f
-lcCEXxgrAYXHiMqSoTiKjIM/fYIQSYzaoJMRtEi4PaD1uF6vwv0PlCRm+Qzcd/pluEWdf/vtd3p9
-fVXQ1YpnULEBVFXbMeN7//PnG/3lL9917LjvO/3xxw86HGqq61q9ALHpt23TidG2bdQ8HvT161eN
-oge4CL5E23b0/fs3Korc+OVFqnK8Xm/0/fs3D1vBZ8YzR1WG6s3exOfzmf75n/6mVvGImEOLDRfu
-sixoWfx9uO873aTst2vStjqwCs+ynF2C910BP/aDONP3798U+wCXQr0b2cW21EVhbZh2b9Qza4nI
-Wee5fnkXOlkqBx8v0aHxkXAABkUln9F7fHkAFpauSyRyziKnMEw8vCGREeI//vErvbwcqSgKncNi
-zGONLc/nC9V1SWn64hGg7KiR8wI+aJpGp8+WktSyB11O4ua5F+OfU9EuXB4PtQ+zTrT4TCAluZbC
-PgNSQ0rrAGR15Tagwv67+/0uY8BYOepN03qtS9/P3ndZxH4cd4G9jVB58Kw90pucJasBvX+ctapA
-fDrIWn//+y/0ejrR129fNdHmeVIE+ioTnZiNl0i4BrgeLy9HqqpKPSIw+gpCvqTAEGUPQwZxATbi
-cFoWXj9fv36h0+mk3pOBxsxtytFPUTGJ8atNLE4MO/J6vevBhICbeV5oEuKP8vnlkEmSRDgMBZ1e
-TrRuzJthKjNfAAjpseAkTETQpmF0CpLUYFijTBdnj8VFzG9ddTBSjOSTZV1lbr+YkyXyNiGALXt6
-ObnvSn3fUVWWNMptjnhoeOWjl4WgAgvL4wjEsTrj2MMB6Oe67XS/X7yHwWwqLrOPx4NYfg0eGAmO
-N6cHlVRVNZVlJf3n7s3EUQIfDjVNU0qvpxNN82Ty+py5pg1VccEni3IS5mWh6+2uiDLKUAuUgdxh
-xUlt12u5bEvHyfgaWDooblSYWaIKw0gzy1IVVVlWG4BYkEdQlQGfgGkqemgEu2J23fW9jtoSIUKF
-oYuXz/NMq6fv37/R6+srHY+vdL1+KKaDw89uvtmwU6F1d8BgqmsGz6LrB6+qeh5j2jwJVGgYOxKF
-tIvuwbUJiY5HufKYNXkJxpvP7k1lWXDMeFlqC7ptu/osYi0DEM7SVPkmYRSKZd5Mh7qmnZimfH80
-9D13eZLLQkrk4fcVqJLSHv54lsPQU9t2niU6S/cXVCQ8o4aWOZIsc/izaa9gEGSM4FzMkkOCp3nS
-TZGlCfWit86yXHnm+05emW/FPIOwvOxt9vb2psYIll8OMhDmq0FAVJYHZ/P9JJ20iarcv4WekYal
-ECdxRKfTC/fEaSE5e74MGBMNu7ieNzb7EPKIL01cfl1R5Fr6ohTGz2jbht7ePuj7969aRdk2AUo1
-LFLYZmHECI5GEsNaPVVffAsMwmFH8xyj2COxLMLEAwqN6ZBNRLKpO8M4cpLP4ag5djAV7fqeTqeT
-kFtSfXeoSpYlNO69kaEcs+9BnmdC4d0U/bc2XM9GoTbS3bIV7eZwY+PHp8kGRmo3YUliTWYZawBC
-eVa25YI+wEqRJwkn4Qsw9eLqpnkSnCqgbd2o7XrlCQALyLKUysLlFNzvdyXmcUDMoGNq247i0mua
-htI0lTWffbKai/O8pJ8/f+jsHZs+CAI2tZDeHcgwgw5u/l0UuSdYwIFgFWjolfp+4BjjdaVtIwVb
-XEILtyGb9LXn80VkwKDYxt6MEyUp05fZ13DoG6Uew+DRvlT06X0/eDJYp6iK1MaKU1Ua9cKDOSQb
-jey6CS1KbmfoGA2qVFN8AfkwzKUn9XPu+IbI6XR6oS9fvtD7+4eU8ZnOtXGgYgwIWTV/9sGEg+6a
-DIM/a6WoYRhRHLrE22eXZUjD88w5Mlk6KjzsIPBidmDuouFFjm1DTPthoEfzi7Y9yDZYV9dTszmq
-m7mjciyLXEBkF76SpCmNQ0+jSflJ4kis0PzqrO87TU4GVmFLZxfCkSsL0V4yqMTshrMHB4fp9jRe
-r7I3Cg1+5cM61vBT3kuk5jWjTNvshYwxKqs8B3XPxt/XmkkAWjc7ZWGNylGp+drai+3Yoa4o3jcX
-eng4HBRI0/GBQX0R/vA8KdgEebRCGJRlYPXxghmo7XrxulufmGo+9sAHUkpZltLXr1+ZyprXtO83
-vfHwEh+Ph24+lPrOGYXBDsR/o+R1c303ejmfz+oZB00BEGwcEGqpPY0eG9FWGja0YjOfMRV/gXVd
-6Xw+s3dCFunGBc02iiIB/moqik5vj+dKIFFPeRL0O6M4HvU53MSBF+0T4tjQ+1vqclmWVBa5LjTL
-CUCmnTtUZ81q2DbrDUEmoXfWDeaoyRFtu0+1xWjueV6tkwdlj/r2dLxRFhqbSTeUbVvB/cfF5WTd
-bGbTSvu6rIsXoYbSGoKaRRKLrGrV+hJY0ByVLycuFTptgf6e3ZPJu6k5A6JTS3F+j4boI99L2bZ5
-zpOLwmVRBAEp5mUrRK44YEOeEdFGTdNqgAkRUdy0nQaBZBlbEeFWnJdQNzWPYbgEhyXSvpNyu7ll
-SP7UFhzCiqIoVOFl46XtL9wW4zhpRFRVVTSOA63rzOWSWFelCRN9wB9I00QNPLHowOirqloXnuUD
-uLLaZys6FyTDIgsDGmUhlWWli3qQReymKe4gwmZDpYJFxfTiUBeXsinl4GHzlItz5xEn5X4Y1JwS
-txLMQ3/77VfdzOq01Pu8Aoz5rOlEkqTMyjQJuu5wDD01GZKY3UEbUZalHN/Vdfr7bWp0fTh47ss4
-TLFUbDTdsiw0S+la17WWvrOkOdlJFYd7DvpssYFddZFp2c9+Cy9UFDlFcUJRNHmViXMA4mczjiMd
-j0dti9iRulXxja0q3Y1uqLZpoocJREtFUXqaA0fISnSyAhIPKsJxHKnrB9r3je73Vh25AIjatWwr
-WHhO6KRpWyQEJvBwphj215gB+84poT6UYRh1pgi3G7Cinum+z1lzAOnSNPMSVNgfb/IeJjThKC2n
-aab7/a48fizwJGE64yBppwiYBKnHqp9AOsH4cpSRputnF01EIiL+OfOiggxLybR+d0z+CbXNgUrN
-ft9pmtR9BrgH+v5UTnrQqcGTRxkLy7Vt26gfBiqkP+z6gZqmobIsqK4qCYmIVD+Pfn3bNjoeDnLI
-bNq3Q7f+HIgyTrNyOVDWJybzYVCZcurbdIl3oevVc12YzDqbNJHHLlIrabU2XLi53RTBxz/wOYCk
-53nmefIx94HX17qstMarp4mIo1kUnJtnU4aLwFZz87LoJAb8E57bO40EgMFWEHyMFB+Ph2YjctKS
-W3OomC3jkttYoih07RWIWVVVKeaT5xmFsoca4ZWgesShgMuGzWgYswNPgttfXqsxynx7EqrkNww8
-zznf5JNvhevlSseXAx0PR20ZbP4fSqXUKJtgwrk/AYCWAQU0H6CUPbk0mnt2yOq2cwQyPnuR5/T2
-/kb3+52+ffvGnn/TpASPbVuJyJf1ogybplFtwcZpEpxj/1NP+VRUcuM4UV3X2vvxLR952gN7uO47
-aaoL97n+QbM9CXKsuAfejIy4RzTPg3IB0oTps/vW07rynymrUm3ZbLURRaycQ5u2yiRIS+pl1RYG
-VHDb4jgLKtL+FIdxJ20vxTDQAAAgAElEQVRJmiZqeoIwWBzoOLB6cTBiTkJsIr6dAg+HNP+zLway
-/A0LUI7T7FHJnSMxWJLpp1IerUuec4T2NI26WfWmlooLzsKwlC8rngDgmSKbEs8OlnpN23nMPKwP
-XLD/+V9/pzRN6OXlhXv1w8Gb1CVpSrfbjeZl1SRtu09sqCvHii+0rp0qUK0GJU6TVIUIdhyHUhSn
-sL3p7aZha6RUFU4QSji02Uknd3KBncw8m0UrnSnIhl4LJSb3Mi4WGv29M01wiadBECg+gPSVNM3o
-UFe0bruCPfhvlh9g+28nS2YtgwItoc2940nAuq1K8uGTOKI0ccw89GN2mvIsjcYzBcJrLdqsIatV
-r4GIs9Oull4YWU3zwxzWfn4eDjIwBVF+owdmwCr2jEDA6YCS0LoXW/086xJCGmRcaE011bQ0TWk/
-HMSLv9J3AiCTLb5WLfu5FD94IC6X2rlGXmGaYgU/zzoIKATxbDXOzPhA2A2kwTXzqpMcG+pZFo46
-jLaWQ0xTCqNYHYVQ2SnF3bxDtAi+m/BKVVVQWVZ0ONSslhTeB3gKFoQ8X660bZuk/8ZGHr/rQfnc
-lmP9hmFI8TRPlKYJNSJvdKSPWHPMLWnFzmfZCkncaZKMfv3td2EKFk/ZbZHHDQgC8kIUAPJgfIO+
-qOtaatuODoeDdwPbcQ02Pl4e/AvyLKNGvNnzoqRxHGgYFk8E4ma+sfegmqah0TDr9ObXOT9LYymO
-aRTJMfp3nOJZllO/DtQL264oMo9/b2W8SvkUABKcAAfgcTkbhdxCIGGJNyinvF4uZ4+rDtSbc+MS
-VS7ag9byxsdxoLKsFOEHFdf6FzgX2+WTmxMswtB6WFPTeV70ZgURpapKSrNCDVSyjH0T1mXx0ngx
-igTOUBQ5zfMis+9VZ+O4oHBA4JbD5wGzEN/Boeb0KS9CjU23jYZxoDIqPdPNcdpUnAWpOtYJG8F0
-ymzlVqAxwi8/eCQ0akrEwJclYz5RxBVp1/caP2a9NKy6DzF2NreCKffhJz8OG8Yas4fbatDV2DPQ
-zIXv7CyWIw1vwAcBPgCABKQT5sfPCvygLLHiI8RE53kuCKULT1zXjOZ51QkC2hH4zgGHuN1uLu5Y
-Dq4kTSkSrjrGYLZ6sVMH9Ob4edqHpr40FvFnz8oubOCuW3WMhxgzzhgsPFEN2F1AladppG1LFBiL
-woimbVZ+ubV+RvWDZ8SbsdH35tuigwSUmxSkVp2CbTWCUVeWcmgLmGgIIIXYCgeTiklkk2+b8wBA
-eCU0H6g4gHbDg98i19u20WjyGgFqMXOOQeGPjw8JPDlqNdkqvZfX5o8//qDjy1EBa/THuHjefr5R
-nER0PL4YRtykwN08L3Q+nynPMwWO0Y7Ad89dhi501qUWbR6tmxV/2adIczt29LgjoHC3LW2Phx4s
-POWKdI0AG0GOQJJkNE2Nrg0bL24vOrw7BT7n2U8ndTpmPv3vjwd9NdFbz6GcFhdAr7ebnDjravpn
-aD+P8xzVlfEBdr5FOZMkGaXprGAMWgx8dk5gwQvkl9pJ4AXRrtRcWwrZlxSEIUWEG5UMbTYRAcvu
-jz6fkmid8CZRn/t9hxtNrv6KaDmGcdU+lzPhnIkGL7DNa0/QFtnSMctYP29HtmxiwkxKPG+Occ8/
-ORnhPY3T5vHjd3le1sDFWWGxqclCfmmJwwS3qs0dhFYBOBCYiFYOjctgnDavveSNG+vfjfdcVxVt
-20rdOHmJ1Pue0un1Vb53KUk6rn3r+oHSLKW6rj1WJiTVURTR9XoT6/Paq4hh0PGcyOPG5auW+vy9
-N6bGT7Pv27f4TFuMZlEtPKsrQQQDY7AoSlrmiebZ+mfMSkrCQe6b67pD3O6BbdsoRt+LHhjuoRas
-Qs8AooH7M5Hm5OF0RwmPkxeJvG5UGCufOs9zytJEhRJW0BEL/3uZZ7rfb+pahL7Gxj3j0AgtoScM
-aNucIurPpKrYUG9v7yp4sQxE9KdWP25/RhDQ0yyeb5l1WdRUMxaiyf1+Y4OSJFbU/5k4FYUBLSJk
-WleUqBv98suvlKYJHY9HXahoAyzFE+lN9kWD1BSok1LMstKw9uynbZxbbERPziMfM3A35oP/AlKg
-pmnWwA8+zCbPMMYdJqEe5FzZhd47sV4Ny+L8D+HDn+UVDUOjaDdMQGDEgtbSti7zwj/3cDhQXZUU
-xQkN4sk3yN8JIDLPc6qqyk16TIw8U6JHHc8CE+LyezJy7Yj6vqP740F5kcuFOn4i6li7cWdZNikZ
-DyNujKe3ddF22iUu+e0ksA3Gd0JPh+BAbM2QjL2eDbeNih2S+FMAg3U+wcaCkxD+OxMVEnp/f9eR
-GxY5UNayKChOYkoNmQXZ8RiVOeeWzsyPAw/wQT8/yMnLJ7YP6FgPOfsz7M/Ms0zNR20JZUt+mxOw
-LCvTbI3Ec1036tfBePqtkmKTa4+njC/1xxOyVRjrRnLfL6bjkU/+4/FAbdt5GgqU9tDM29Qg9Oe4
-6Yoi10N8WZZPibTcVsSew+zzd8e/04RowW9QGjP+kSmyzfiDk+fiZ7j4q0XB3izLtSQHY9Fy/lEy
-r+vFe+Z2LItJztA3VFUl/fz5RvM8eRfMo2m1VC6K3LtQMB57PB56mWGT2TbueDxSLhJoG9iJzQ/n
-K0b+E801fKYbWwZf27aaLsXy6pCapnHkpm2nUSY5fzaVspUpAkO8oFNTUSrP49/+7X/ttlwA+GMf
-CuvaY5NJv3txzsAB6rqiLE2p6wflpWNBY7HwREFy7CUSjMEcLl8fzUM2JGvukQ67rove8vdHo6AJ
-3GWg/OM2Bv3Y6gGWIBjlYjRCtNP5zF7+X15fKYojOp/PT38/qZ7ejv+sjPdZOYnMeD8JNlLgatLS
-0znWMOjZ6+ltF8myLHQ8HChOCuq7uwCo/GwYCXeR01nKzLdH81DvvudxJPwJYqGu+od7LFTcWemm
-wGk4ZTjT5xxF7DoMwo2jGyeaSY9NwSXq5t3K0MzjgMLBAQMWPHOYsbDPIpxuQ61M+r4XvCNWXTzU
-lPadYN26yyvSTEQ3/eqVVOZcsCNPeosqKc8zattenYdLSYVCL98ZAPhyuSoxDWnUzrI80F6dbcQz
-xb3Q2o2iRIQewnomILAUtGabe8nfLTA+FqTfIwwjCn755V93WBKDJgo2ExHRx8eZ6rpSIosl7tg0
-2WmaqCoLJucMnc5U7/c7vby8aBjFx8eHot2WL+DP+WMxILnT7XYTP4JIZ7CX61VBv/v9Rn030OF4
-MCYZDLSN00wfHx90Op20UgD5Asq5UXzoUflAOsu5arPq4a3pJgt2Wu35rY2VjYDuupbGcRK56fbJ
-Yssh0pEcnP2TQUhEl8uVqqr0BEaWdo0+1TrbIMyEiOj33/+gf/qnvyk5CDe7fX//t18sxHqnv/71
-L+wJKTRui5jbNbAYBB+f53K50svLUW91O33Bn4Nyzh7YuDXf3z/om8iH7Qx7WRbK0kTjuoFBOQLS
-pH4Ir6+vHrHKkqAcxrJ4YR51XdEyL/T2/i6tl2+ECvu1rmuV+4AwXWRewOru+7dvOl5FVHmSJJKS
-PX/y/cuLkqZxpPvjrn4FqLAsC9G+BxixgGiHdXq5XOh0OnmXlTuAYm4B3t/eKJVsMpgPnM9nDeZU
-FNU47VgzyEI28zjNCgA1TcOMJQmGWDfedDDXKIpcdelAOVEKssVX5M3OcWv0MoLD5ACuNLDHGqXf
-n4wVNT6nFeugFMd/R6Amxk3W/NKmxthN+8wBf+7DbAyU7W/tBkGVNCBqPHGjJSxQbHQAs70cFGma
-0uPxEKZjIfTOzpt02IWCgxZqzqaZvLLRMvXsYYyk4yRZFPNwN3ggZi+Ntna+B97uTQKQP1GWpU4V
-bArvuq4qJbbAMdolbII0TSmQdgSbKQjZtg4VFRyb933X1B0cCNy2MrYAsRUSqaMoomVetIKyORWP
-x0P8MwKT75ApKw/Vm+3xB3GIRvoP9Aicc7B6beXt/lDTXBw41mkZbTSLh2LVWwAMZiWvc3aGR6TF
-sKyALc7znL58/cre9dWBiDZajC8++i78n0tkHfXh32XMZvsQ2IxjxIhEFR7VMZj07MNuqaY46TC/
-tlruPwtCqKoDrctIwzip1TQCRz7eP+hwPEhkM4/Ftn2XwMxNOeiVGKPA1WjfN42WglYeNwRukQQ+
-+ZvLEwSinmUZ0U5UlaWSrWxLYvkVuqDGSauSHz9+Utu29PJy/GS2CtLJLIAbBFT25bqqKRHGIGMt
-7x9npVNjjo7ZOHAfkHBmUarhpmq7XoVVfBjsEn02UF0fKEtTuj/unruwxWJ4Zl1oRj1u3kZav+Ph
-SHGS6iSq7wfVAABvQBmMCDEr+0Zcl6sUZv09aZrS4VBrIrLNt0QQqnIdloXu95uyF/HvwVYEs5Kt
-uXNaVk6XxgHlftbmAdb7zlHlaK8sxsEuz0RxnAtBaeU2a3N4x/1+k4kXsxE/Pj480NIBfrFHlLOV
-GQ75LE15CoBZYhAkdLn80MXDXyb20mDwC+msz+aSDFqEyuqKQj/zD+O+KBo/AYvY3FEYSHTS6s1N
-8zzTRYwFA9FD1z0kGvqiL4lfLttSBwHR8fiiopd5WWkxQNI8T4QoPHcohYpQYzQH0A09L4Ava6Ht
-YsW5F4Wdta0C7Jjv2fMen72qKrVx6vqefvvtd6rEXz/Pc4qTlIhaZSV2XasjOTuHDqTPfXZggqkF
-7N2tao0JNKui93bsicpwmp3xSVXVSu6JpSfGoW1pw5gKAPTVkl+4Cpx/1xhiFwfHcIu6acbDMi/0
-aBoF/lDio8VDqe/nJEbaimZZrmV1XdcKSFv77TTNxHbeYTxZlol/ZGQOBF7nUFzCWSswN7djxybq
-WzgaUBCHI55nmrAOJgr5Gby9vYvsvdQ9ApesJOEwn/ePDzMFIs8l+HkUj2o6hpqKSSutxwfo+oH6
-flQjDKLUEyjAvAAWWrAnUinjNFM/9BSEpB/kuVKwozfoD9j+adITEwsJBhcoj+a5p9MpE9YbHyzI
-u0NQBFEgJ2RJeV47Zx4htDg+PRMtkJVo6bjOHHN1dtdSCdn+EZsLzycIAjVOGcUsA9gATnGM7jC2
-tO1FXVe0rRuPvcZRb8+qLPjzz5PncXg8vnDUej945T9AWCu44sOWFziosGg9tm1S8wt2tEm118Yh
-CAdi5zocSLXX6SjQGlDY4A3NOxB+AFKA1pW1DHbW3os8GRHy8OnD76nrWhOQ4BC975v6BfgGLrNx
-Nx682PplXWgRoBlhsDrVkedptfjLslBdVdQPg1Yibvw5e20rcx9mNWqBzThGt5As88GaCTYwqRgJ
-lQq8GlGxMIuXHZHjJFOw0K5FZhDuSmAbx0Gt6ZZlodiaOdhMus3w3bGpAayhtMHCg9oNp2cQhhSF
-cNoJVOgCAOhZhWYR6mkalVQDFSK0zbOUmvgCnKle0Y8fP9iBtSgEe8gpLwJ6PFyJd7lc//+2vmxH
-jmvZLnIeq6q7SUp6uv//M36zDRgwYPvcI4pkT1WZlfPkh4gVO3bxChDOla7YXZW5h4gVa6CiYLWa
-jcdS8EyCOuE954DJwJhjpHpz7UIzBtvvEbxTmujMCyNNE+1tgfSmSayhIWgHcCAhn2EYB3p7+0lx
-HNP5fKaqLKgoaxo/P9Trzoq3WOmXePx4NjKZvYUB5yEs1Edxihv9kurRgSTjszmMgAFMeD+iAovC
-QP87fsaFRs/Ny2w2g3M3Yg67s3pXcs1+KNJ9u900VDQKA4oTdt5xNGa+9eFOBX0IqqxQvAOtbwR6
-fRsaY29S7AEen+YSP55QKBZtiDiDrgXPDyxUvqkTbSXBh0EliA3JHICAShnZYv05HIi9CcfJCeH6
-YWCZuOyZSnIo122lt9c3yvNchWogBKE1iANx4HlkN4HvPS8LVVIRpFlG08yxzXmeUZqk9CY9SJIk
-HNUchmo6wBv7cEi3mZnD8++RocalUORSgLNU883tBIKVZCERceAjSmWo7sahlxBNdlzFS8GNbTct
-qJywKHMhEZFWIIhHRyAKTxCcb2Ep7i+WXFPkOX1+fjrLL6FWJ0mibMFfr28q6+VEnENJVnyzOGQ9
-TfkQpP6uQJrlqC8r0XGsv4FBeCY+0SrWlm6SpBqAojjsl5VkbLkKsWVSMg7Ay2EYtZSGxRqAMPA5
-8P6tjySAVsSfoQTO85LmadDbVunMKYvWMLas65pOpzMNQy95FbNcDCkVRazSb0R3p2mqACaqLoyR
-IfwBaGsNVNM00/gvHIZII5pNCMs8M4CM4A4w84qioNPpRJczq2UboffisM2yTIxuI/XpgxsRWlhc
-ytu2USu8AJuP+Gimcr3x5GpZVqpPJzqdTlQWObVisQ5S377vFA/DQNM0id449man9odO86J9jQVY
-EAi6H4dok39XH63rotxlawTBikOfugiDC8Q1P7rGQtEFO7FhYGJEIT0xAJo0y9Q0Y5pGXbgBBVp+
-WcYVnGQdKBd64zKb84by7DH7zbrKsCPtrJ83DDez+FeaRo504lsx09ElUaojHQipoPzDAl4kbAUm
-LZimuECI1cv9c24zkUegQdUXBAG9vb3Tly/PVNcV38rr7x72PO7iXvnnz1+q259nh4TjZum6nsZo
-0mw9EMBg5x5FvtstiGdddzc3XqiGl9j4jq3HDjcuLcrP4mvbRpV+HDsWSas3eGI3IO0WPMWNjtKd
-jU8Pz5cAVQW4C5huVdWFjmNVv0z9XXFMi5CycLjhUA7CkA46TCsc6Wd/NM6F+IczKHn+//iejoPE
-xi9XA9x5GtTOzhqhxDChYPeYnsZxUjolHHGwqGyFYI03gjCkPMmIqFfE1sZEn89nimMyllqrOtHY
-AwNmpGAtQW+NESNKniBgZxxWfi16esIOaxhHHb1gYeIEtR6BKDvxO/FSgOTGcaSpRQgOQRvwSDCy
-M3wVf8jPg3iKk5acFTZosHmWURTHdGsax4/30n0iapqeNvkeeA9vb+/0x7evv4V52u+WiveCCqmE
-oDIMvd7YYRjS0xPHZmeZ88e3laCCWduq5TyYdKBaR2GgJqN45nGcKE183ze5jRMJMXHuR0kceQck
-t4srTfNEURxq6cqBLVyNdV2vFFxQxyGUQYXiOC4HHcfsKT+jMKJ9nzwg1ordLA3a5gvadiaKInp9
-fWWuSBjQugyi95+FRu8SltEOaZstrtZdd6eyrLyQGRxMjyxFF6zKgh8kOjvQm9SgpKpKut0a6ro7
-9X1PZcm+EPfdTbbi4yC6nE+UF6Xw7EN1IeXbwW8NsEFsvziOkz60MAzp+/fv9PR0UXUe5tthGNFB
-h3eYzMq35/4S7r74kvCIH4bRpPG6+S9uufu9pePINEyirvnkcyzDSEhKn6r+Au0TM3SXWsz/++vX
-By3LSqVUR2wK4Y9UUDrbxGO40yzmZLa6eZTJQVCoicq96/SgtaSjpmk1tAMvzY1zmJyDTWhRd9wa
-wzgSBSSjxYySJFUJLjQU9iYOgtjLGcD3YUBuoG3jkExgR3EU0RZt+r6gznNBqKsy9IIg8SYC+D3W
-UxFzeDD+cCNic6r3QBhSGB7KzMM7ZTJbSPseeenKj8IjmHuijHbpTqtwK0JRA4Ye3XxZFmGPFtxy
-bquOrcdpVkNa58UXK72aPSAz41SVCVg+6edjNyk3draXDExFrKCL7fU3SpJCVbho/eBIvG2bp46E
-bfy27RRC5z5N3G8WwmhC+YEZqi0zlESgZZQLTCQiulwu9Pz0ROfzxZtHTyIOefQLxGjJOgPjxufo
-p83zKcAhBB4AWFg4kYsi57FUWTg0dz9ongbPYAOsP2u4gb9Z6JIqeISDoipLURt2+kCHoVc6Lls/
-zaaCCvU5OtZW5H33LHWuuwDmEPMM8BATlzhyM+myrDgsRW4P+zMBMMFBBxvUxmRlKWsMMmHojeNI
-TfPp2YBx2d6KsGfyTGHHaabrraFlYaS6aVtPiHS93pRKjBYGEWrTPOsYEO/VypLDB1DVJRhPWl7j
-f9HT42LhXt0J2oBZIJLNHsbOGizWOX6eZ1SWlYC0TjHIDEM2q4Xv4jwvdDqd6Hw+06mu9Oej9QJz
-8v3jXSYdktAklXUcR0KM44wCDRM1hjDOWIQrnziKDY6yUFXVVNcVRUK6G4aB+r5TkhF+zjRNdL01
-1PcDdd2ddTccxcVjB6voAoPKItQWcQbfGL39cTCqPI4TnU41ZXlBYZi7xe85szr6L9/QMZVFQeu6
-sGhCWgTnXLMakUWsPgPguGOysO87lQVbOWVZSlGceL9vWXbtN7M0UXZYUTDwtCxuHAZuxDRx7hw7
-s7CxCXr8ssg1Ex4jnba9C+Ox1s8OH3Z2Oc4VRQedFCWvTY3FYscBDbYXRk7gYrRtS9+//0MvLy/a
-N6JPdovQhXPEiaPiBmHIvaEAVugvozAimri9slz8OGbqc12V9Pr2rmlOiUwz3CTCiaw4GIQR7Vla
-A2s6Yr0Z8J6YGbl5BBqwH3GgYgJlDzwNTJX5d5axYxDkxJZ1aNci+zdEoptI1Kuf28BE3xc8Fooi
-p7KsPE5H13UabedlC+674hCoVrdtU0dmV0nePHPSXYhBu/z5aRo1OgwTBFR1cRxJroCLbUuSRMag
-yYPYyxnmlkVBMQgFlheOB4HFA6ME67RikXu1IpKc9zzPaRoH6voP6rpOiSsOLMMEINY8OSTvuJ5t
-9/ps3KDOwivxePAurWhX4Qq//FhZiy5HkNF0lwPX6yzcGjWGQUA/fnynaRrYrWY/9MYoipLSLKNt
-d/7xbMyQ6CK3C7uuK7XEQqqy9XnHS8mFiuwCPnjisAQO2OO0nkxn+7zouF2a58HDM2ye3cfnp+oa
-MHfn22RRMtQwkOFAREJIKimU70BEFCeZ4kSI3MbixqQIU4tCJkQYQ1r672OOvcVgrPsv9BUYpx77
-Tu298xY1Pzvpj4UghYg1cEQsyDcJRgTq8mFakyAgZT9yRFikF50r1Tttu6y67v39nc7nM9VVRes6
-qd8mgljSjNtZ66tgGaKguccRtzwANyHqgmYCOAT2FVpISwCLBd9yFvkOP2IwN6O4vXeeyyuAKQuO
-hWr8kHr6d3f7Hyr2ONU1pRKJhDKe04UTRZatPhkgCYglruRDT9pT09wUCziO+DdvPTj4zvMikwHe
-lFikAArRq6VpQm3b6s9M00ymCTvd7634zaVizBmKZ35BvTDAmOHHefWsREvF+7+X6qOk4+CoNLDG
-cBLHSaolO0pstFBpyuIQFaRUFW3r5nEl8L2qqqQkySgMRBeQFYzhjKMyAkHlthUXHzopvb290bbt
-dDrVv01hrFVYIoQujBXTNKUoZD386VQrW049BYSIYo1F7Vh4ErbeOB6/aSegILVcen5H3KrlGdNf
-V3FvQvvHMWoHrRtbhY1j77nkgmgF5p016USM3LJuEjYKnUhsotY3r2W1LWnTNAKGsuX96XSSkNDY
-0yLANGRe+FmschHaKZgble4URbz2kpirsn3P5QBhsR1MSvFMxn1SXIt1DqRRcI8GIYgUvzUNxegx
-YJ0FExAswnmedP7+aCxoT2vt07aVhtuovQs70hQUJynduzfjAehYUdDOW8Tz/e2dnp6fKIpilVle
-zidaxfcMC2UcRxNX3eq/54Ua0LatVJYnj/xgJc5wH8JEIsuYNFGWJc0zT0SYaZXQ0feejhtlOHp9
-jpFmk8q+l7wF4/bLQphWUe80K+jYVxWMoLy1Tkr90NNz/uwZVqL3DCjQQxXjM4ww8TzhqrSsDASl
-SUyx3NZ1XVNRcHuDUjPLElVKgq2XZplWhOM4anoO99+9d4PNi2/hbf/q+06TeSzCrTPu9k77vqml
-GqPou7YWy7J4IiEEguJnWYYd9CrL4kxKbrebRKVBP0GaYoSR6zwvRGYM+7jmXfpxJKlVhW72XpKv
-mCjE5ChImq1234agAqex1Glen7AG6ymBlmMNaT96WhaXZN2JfBnVK8aMID3Bmg/mLcBjlpVl18H/
-/t///eBEmEFv8TTlLDmejfsSTGeuseupzV/OIcagI1p+/OfnBxEd4sUWeiIJTBss57zvB/EXyKjr
-O539juMkXOvFhEnC0nuRwBCWiVZVKSmts/RKsVYu3A7EVOQF3Zqb6sjneaJKhDIcShnQz5+vdDpV
-Oi0AQDqOA0URS0cTCQJF69APo/q3z8uitwhcjQCGOTuqWG2roigUjr47tDBKA9sLfx4oOI9fQwX5
-KnFr7rq76sFxOKCsrqqS0jSl6/VKURTRzx8/6fL0RE+Xi1pXQfuPnh5MQ6UFRzEN4uX3//7fv+jp
-6aIb7NEDAii4ajHWxbO9AuBs/xv4HhAd9Pff36mu2SbbEccCr120Gw0tZRhGAq5yqGlVVupDYac0
-TEmePJcjYDVgrfJEIyGiQyLCYzrVJ07nUV0FG5DkWUqf15t6Rtpy/9FvwsfUdk8qjyph21bde/he
-APeOY5d2eudE6jihYRxkJBs7Y1QJlQFuE7y///uwNtzWZ7zIc/r56xfVdU1Z6sQL+BIofzGbtHpu
-nO6fn5/08vKiWMDpdKZlmbxZMxHR6+sbPT2dPX/8p6cLNU1PRJvHwXZe6k55V5WFfr48y6i931Wc
-xL2jC2aEDZl62MumA8BmqZzfv/9DZVnQy8sLVWVBd1EM2Tipqio9x1f0fHmW0q9fr1RIK2JFGdAL
-4LZ/zFxAFfPvf/+bXl5e1JAFno12BAknXPTCoCmv60avr2/0119/eqnEaIlwQKHtQIhFVdV0vX5S
-GIZ0u93o+flZD2YWPpEHAONz3243qutaOfJd19H1eqNv377qhq3KQqWz+MzwGsBzq6uSjoPo1jTU
-ti29vLzQsizUdXe6XJ7odDpT2zb6XaHJtyM/OAsNw0B//vmHrrc0iSkvSmqaxhu5ProeAdv4+fMn
-ffv2TfwFGDDGhAVtSBAEur4zGc1htHi9Xunr169cwaybly6Nzw/WKNOpBy9/4fPzSs/PT1QWuTgO
-bwpiWtWhdXcGc7nZ1KwAACAASURBVHYSP4tv375SHMXawkLAtm3iCWhVYvwhZ411Wk1+nP3A1tQS
-vTMCN5h1l3p9K2f7ZWKSMHsedlEUiRd6SXle0sfHmzin9HS9MtXYWY3vdL8Pehti0YyC9t7vrfbT
-qu2Wf4b+YNtjJajg4X1+fiqFld15enV94Ujrs/jhtbrRQGiJk4zmafCYjeu60n1d6e39nb7KwmG6
-qJsDp2nqub5YeTSAoKqqFRyK40gi3H1cAHHPCBCFwGcSyy0bwwaSkA0kxYK8XCQ6K+LvcL1eNS0K
-ZS8mRpb3gfbkcmGn3Syv6CDnZov3kKapbHQ7n3dlPPwgPj5nLVVZjAP6r/j5RYnO/XEJ2FQquyHa
-tqW6rrXl5Pfe6YUHgI9xmEXFNQcdxpk4Vh4A8iLw+6zEFuNmm8cQBE7gNi+rYim2QsYzsjRyq5jc
-910PSFQFsB2zlzJXgIkGw+J9D8OoLQurHytto2NsbivSYBDDBTrYTYQP6rwAJ47lkrLPkkBshgD6
-7kcLcn2wgpBD8IAS0k0mNp1KQKr5GCqZxBFVVa1l8+12o2EY6du3r96isFhAksQ62y7Lig+pMNID
-AOypfd/oev3wDCtd1l2nZZ0FYngMVqjfPg7bJInV+51LsU3BLGvNFga8KJ+eLpqPCEospi82Bhtz
-cfgJpCnzGDAFwc2Im8tmyjMzsOJsyLWXQ7miMIxkHDorJZfTckiNQbG54Q0ZBJ9iEsMb+eX5mUNE
-s4L2vdG1g3J2Fo99EIZ6b5w1Ul3XrLYTlRwcdaxRS5HntAnibx2pi4J1FiBcIbClbe/0n//5b/rr
-rz91ps8WWruyOhfj5KymKcaAExMNGKnkWUbrZuzm05TWZaVdSEeWcpwmsWesYqPO4CKNyZvv8OuE
-QYGOyRexVgs8+jrwGkzpMEJEZFsYhhSjjED0lE1htWmsTredKUVXUcv9UI+5IIyJiOef4Jnb+CSM
-JWwqDk7Pddvo7f0f7dWRac/jjoziKJKXz1OLqixVgIPPYYGlLMsEJMxVEosMA/egdjE/Sekk8WZt
-29DpVCvXehhH6t479YmzYZko2UFA4hLL6uc5XwC25VmaErIYenE+yjJOk8G4y96czlO/oziKPTah
-deWxwKaaski2H1oaqxm3IyE+tEa9OSx6Tgepdt7y7i27zrYuYMiF8lnb9i5S5ROFIZfK0A/EcUJV
-VeqFA/CZBTKFqulYb8+3aD8MCnRhIjULqciCYxY0PYjn97emoSiK6O3tncIwpK9fv9DLyzMVRSkA
-YaKALo+TU8/W3kXIxXpwWf3BIiAcRuLwqQRmZEeRdjPbS27bNvof/+f/0rdvX9Vnomlu0mrWjigl
-ZimogJhvM6utH8am8PTAGHFZVpVTp2nK2YA4kcbJpfKwtJPdU97f3qkoXR+NRYMHDS963GD2xPrX
-v/6TSF4A3xKx3jqgAXOJn1NAriqwtl4oV4/YF0Z8Xq88AxcKJE48/myL/t9xFNFMi24QOABhfDnP
-E1VVTfd7Sx8fHxTHMV0uF15g0yzxZ4mCKM4Hzy066+uvVE2xbGKLp5nyjDd/1/fqVHscB318fKrL
-kHW5VZWf8CZA0HosdSHDXlaeLgAMi+NE59BZmqpmHNUeo9S7cAkqnVNjbMdt4EBt2/5mjwbQCuNi
-+NGx/VZvWImhHpp933n07eMgYbxFHvfeXkZsgTZCkaaXCP4CWcpSobHxYO46jhNdrze9lc/nM3Mz
-qpLipCaiXScFqAQY0HbBLPf73QPDkbBk2bGgzWOS8RhGg7W877tOS+y/w2Hy/PxEZVnSqa6o70cq
-y1wFRwhmcQ7XqY7Y55mt6kFk4vfBz/gq1nHA62A3HmP0MRn/du7vkVIbS6+fa4QYghb4YezKInyM
-IGLN9pkulycvlcQZZ7SevBQZhCAyYJEDgNn31FuEzkfAtRUw0ET1wWKWXeWtQeCIJSidrC4AhB2U
-lNM8U32qlT8Q2FSgB+WjjYnG3Bf0W+Ark+jfmdXFt+g8zWaaQl4CEJfakTHdWD2gENXHsrpMRatM
-JAoUz/n+zz8S5ZZ7ixeTG0x77XdCdXi9XtXM1foL2nHbSZKIQYW2N1wYMAiGA4CJMsvDBgG4OosT
-b/SbSak6Egkaz6M45mns+2Y8KTt1YrbtZp5nSvqZ5pne3v+lqUfYHCBQsQ/hQHeR0drR6mP7CVGS
-DVnBO7cXosXTgiCgv//+m6qqpPP5os/q69cvEj9fUBT9YjlyGFKWlRTQoCpFG2uGUh8t7LZvimts
-++EpQ5lZuVCWha4CsNn0Lss+pDRLmR4peXe4RZd18ySRlvkGeSj03HzSFtR1NwqDgNaVb6i6Psl4
-r5RxFUkLsj+QL1zv5IwznMsu3GIgcOgEqYdy0Oapg/GHMs2ewkWeUyN+8IUsdOsptywrte1dyzCo
-sIDGW2AH5hDsBFRoIAgQ+HnmCco0TZRLdPnlcqFefN+tTz/EWbFEioGZaf3dePPExjuukUxFJ5nF
-5o/jiMkvpgqxhqO4Ce0ti3/Xi+koi7YC9a2HytEFnbBasRffPBcswpuFw2D4d5wk6Rjy7UdpLlKl
-USlAHTrNzsPgoEPz+o7joPP5TOfTiW5NqwdAksT0+XnVZGKYjsDNB7N7PmRjPYD1XQjoZs1b23un
-XpM2zyI0Phv0QPqxCcvY/OfzRaXtmKiEYauHT57nys3AvlK14upGtbC5By6DyxpEJQi2gLXEWZqq
-h5nNcsOCf3v7oD///EMcf1tPcYZkFOtAa/nMrZgfjNNMwczIdCPZdJaX3baNQeozFchM8mfw4ACc
-PPadLodg15sRC/Z+v3sJP1B0wcTExm9v+6YYx+vbqwKbIGqg14R2wRI80HehysFMFlLcRwkytASB
-tFMQBDHKvAi70bkxz4LkgrOOhB/LeHO/gwG8oshp30yyjABM4Hw8ehRqrqIw51DSMz8+V+IN0pPn
-ZdaWgkfFKYURO/MilmyWePXZyLnB7QcgtawrJWozxu5PLtwycGi6Uck5F6FUpyPWYHXbNn3vbhOu
-GiDrvP1zqsqCcyTENxHOPbYsR+KujQkfxS8Q7S3W4HEQLQbRV6cp46gN23Iea9YURTmta+MxcvE5
-wKS9Na2H0aEqdVqHVQ+sLE1pkfYJdu6oQNEKxXFM8b3rOQVlmqkoc6qqTG9ULi9Db8RidedsP1So
-Xxx6wzzPKQoDGqS04kTXRUgkqY6r1nWjJI7o3rFhBwdScH/TSM8CbQB8/B6ttW3bYTPXCtUe+Hn2
-t+uNcgHr0LOhVEVp23Ud1XVFdVXpuAkvclkWPf0dAzBQsBElOsp+8A7w8tI003y8/TioSF1w5M+f
-P8UpiA+2pmno+9/fKQwDqqpaS3ubCoSFtxrK8DwvYjmW0pTM+jmiiG9+DphIaVlmWpbNG0FadeJm
-WGZRFLJQaxglrjukVWbWPOLlpJ9gD83CJ3E/qigMejURtZmDwG/Azcfmx/dwFuIsOmJZ+K5YCEJY
-u67TC8k5Py0yanZGrnDKzSRDIAhYbMUHX/Ygvd7ZkUret2JKhqOPgA+sH7w7VMTruqiXhJ2+uJ8V
-0/v7B23bq6nmAv3v1f4uLyh7YOQis9BWyzCKiZOY7pJdgRE4522GCgofx8FjwDAM6cvXL5TnmeAB
-s56A+MJMtV29OeRxHPTr9ZWCIFRDBDjg4sTHl3h9fZOk1Fxvma7r9RRPZMM8BiU4RVuifaTVjj+C
-KBo2Mc80DL1SMQE8FmVO5/NFFYC+c5FT4IUhU3WzDJmGkRp8MMtq1AMHBwhKNCua6rqBKiECoSVA
-BXIc7FNvxRoA9MZJTC9PJ7pcLuq79xjOmogRxjx3npoOXnFt29LlcvHsp5kSmlJVltRJfDgOkTAM
-qWlbYQCGgmG4DMh1XTQDwKYmb1vvJf5Yq+1xcJvfG3mJm667JSMdxYHIggWLtYl3A54A/qqqSvGf
-2bQGOMzwrgA+jtMsAHEsz3VRth8OaMV2draQt5gTnhUqMvAiQLCxawBGJgBMyyLXKQ0qA6xxPGdU
-vVmWeWG3CBMdhl7Hm0gl9rUlm+4zGwuG548DMt73XdlfUZTQtt00rRQvGKVmmqZKmOGRREzrmggS
-mSqohmRdAA77tip9E4w7ZNLB2PIxFcdyyW2K774vv3HM7WGg8+QopjVJKY5nz2gCNymHLDqXWGd0
-QvT8/Ex1VVIQRDQOHdWnkyrK4jhWXzccFhAMZWnKvahQQoG2OpZbRGlSUdcPdD6dRHU2a2mapqmG
-cIxCX07ihKrqhY5jou4Nt0QmLsK70JVD7VPRCwKQGganlbDPF0Bdoc7Om1Y4cNjBrW5BTlilJXFE
-b+8fSpu1QhMLjMExynrtIXVp2zaD7PPIUHMnZheznSQxRWFE09SqToDjy2c1kMUF8ei4M4ycCAz1
-XFUWmrwzjKMe5FEU0e12U3csSyleloXWh5GvDVyxQp7HDEUVI4mwat83HRVy67poS5gmKW3R5mlT
-+BKGocimDk1Jknp5g6pHMBHsblK16J9xsWF8WMfcw3Be2aNDadM0NE2zoLspWfswmGAi4y+MYrq+
-vzunmNipCT+vVzqfznTvOkkLcg8NFMpH73L7gK1zrn3Qj2myTnTSC6U3+y0O3IomfG8D598Odl4Q
-DDQLZmAz6LEQkB+Pg22R8YxllzkwkgHIQ1qkMIoV9MH3QDUx6UtNaJo6Wpe7OM3wYQtlG9RmeZ7R
-7XYTzkTuRWjZeG8sTotgYxSIhQljFZT2i6Qrw7sBBwBwF7xvkFpsdegyFObfbMtsJeMqIMeCRKIN
-8KIwWKRS5IkHfr8TE+00iM14ksSerZfFOIIwZLMMQ1IDSQp/g86L99Y0N61EoaWAyhOHnwWn7azf
-AtlN2+h48DcG7rLoJcgYD8lId5e15Axxrb3XGm5egjGP8Fm+Po4j9eJQhAtcSWbIWuQxXKakGw0B
-kd6BU2gcyy/Pc93w7+//iOX0pLfdtm207Qct40jjOEpUU0VpOomRwayBFDiFoOizmxi0XBf66eiR
-PK2IdIPbzWytxJIkYWab4cGP0gNDQ7+oNn3WcSfKNxxgNgIrNESj1LjfwoYZAhIAjuM40eVCHtDH
-VNre24w4LDCPtmM/yF3RBycJb7jX1zeqqsJ4GMaatoNnWFWlptgCFIM4ZTMAIdB3KP76vpf+daTL
-5aKlN54L9+aFWlAfx+IRXbDZVzMGw/uGMo2RdTY6wVQGRi2w39YQTYTBhiEROUdirDvngRjLtGDR
-NsNiRiA04bPa9hDlcpYXRvLOJh8go7H3AZuClobJiXVqI7vt2NDlMkZqeMttNa99+xmxYXtxXLbt
-G+T68DqwbTqeR1mWdD6dNLELFQ00I7gUyrKkkG/WneYH/7FRMvieLhcqS+YOY7w2zTO1baObua5r
-BXuqqhRE1821QdYpxbffzolh713KQ3BEGNKe2lIvnSGj89W3KDj+7yzL1BHlkXBhbblA+LBmFBDy
-pEmqYy/9TMame5xmuned/v329qalNzYa+/AlSm758fOnRIJvnmgKwJiN7LKkKjybdd20pShLphl3
-Hcdd11VJiQA8YRjSx8cn3W4NzctKt6ZR5B+3jD0Um6bRCPF5npSeDWYfgDT+m3vusiwpjBhsslbX
-EKV0Xady3kdTCjz/QZKi7EjLXir7vqkFO+zW/Ci21XvH87JqWxmGoSL39nc/Ol7j+cNSbltXyjLH
-OeFJQakHBFSNZVlSWZ689kixjQeG377vwlfIlZugbEsjifbt2zdlkjofwFRp5KnoSiwvA8rIdV3o
-fDqpjV1iplFoFe/3lnMBxnFUauZirKynaaT7vaeyKr2SBh+0rkt6eXmhPD9RnjlXnXmZxdEkliSa
-TBxYXW9WFM59lo0qd40Lt0QX6/6DTYh+moUxTqtgnVt5PDjQMA6UZqmhJKfqcrNvu5bA1oxyWVZq
-hWwBJPfR2PMxf4+pwKUSpiDA4JIylZAKlrdipIkcQ/ToOtcPA0ozDh3BgrdTGJvwU+Q5hV++MMAW
-J/T+/v5bv2+/OyK00Kei7dDKYuJ5++V8oqKsaVs3ipNYgGEXd87Pg2hZJq+qAE9CDV5ltLl4QBb3
-7GVZ6cFjW4RlWagsCzqdamrbuyf4sfbctr2xUnW0cEVRGAntpvN4IPgWNINRa9+ztyHwK7zbeZlp
-7hbvUEjThLZ1ol+/XqmqCsUnAjMxAhHLXkKoWC1ZKhGbL0w2fv78pYdMILd3lmV0v7dU1yfFN/DM
-hmH0pij7cQiYuysZCOsAI+yyLCn417/+15Ek7BCDU69tG0nKCYWbnWrmuu3PX1/f6evXF7pcLnS7
-3Uw806ia8eMg8a/nLHXOd2NjgqZphGKZiNhlorZtqKpqtbsiCrS0wkz+cXEHAWff4UDRYE6jpsLN
-1zQ3Ksta/PxWQeo75eq7oIhZDCAzqXBSvdFA6EEmve/LHghANWoJj1IbpV9VVpSkCTUNG2py+Emq
-oaaYEwNxxjODdh757vaw4/FPTU3zqRr+deXnUFU1NQ0TYNIkoRmegPJ7cEilWU77tlF7b6nIcwl5
-uaumH4SsRIhEvrEHa/YXcWcCVlAUBc3TSF3fayISPCbyPJOJQqTto7thU9UD3JrWodmHSdK9XSlN
-cy2h4S+wCKclw+zbBNlaXwQ4RrvJT6imouw+RZqpaKPD4f2AdYNqDCW9k65v+iwcOBd5uAc4+phw
-MKmOE5Q5s7Ck9t6KYW/heR9iogReCE9ddiXrgcrs2mheEywVF2zn8/P7gRIJuWNdP2jKz48fP+k/
-/uM/NFrZlXo8f0UsN+yQbeABEdHb2xsbVsYs5BmGgZ1yhEuNOXuepdLr7mqc2TQ36ntW8zHldPRK
-MDv2A9KJHh4n7sfHB10uF42tmqZRxoC58sOBjMJCjBVlk3rZ/fXnH3pyW8qtFYqAATYb26l5nqhp
-eAyH/xbuNhy1PmvcM1tntapmBIjVNA09PT1pZWJRZ8ufh5/gXbzy8S5ut4b++vMPmTYsKnXGiAit
-B4g/ViQ0zzO1bUtfvnzxVJCWc28Ze9aunAFe5pg8PT0p2ImLoet6VRAOQ69aCw2Jjfnz/f39Hzqf
-z55IB2sQm6quKlrWVTUJSBbO0pT+/fffVNeV9t7o1+GrYFWrNhUpzRgX++fHLzqfT78Fg1i8pq5K
-imTk+ePHP1QUpZOE3zv649sXJePY32ezFp2IyJHTTnVFTesCUKE2ZE5/rp4GzpfAjbJxob2+vqmf
-gyOEOVfhGKDDtm3iRNqzt5wxO5jnSUt4II1gE+VZSqtBP7XHDgPVJH9+fmjceJLE5kEsiiK7Pp8d
-V9/eXtX5BP0Reqwsi7zejcMeJ0XpwYDbBDzkci5TeWhpAEeUkTi1Me4rCgbPgiD6zc4coKELkti9
-eKvjIKXtwixUrZxl/AjGm4vmmtmL0JCMLLMSI7txmoQWmygzEtyD/uH9oEpg2u9ivPVJKx+n/yBv
-kdhxlhMcpeoUZPv2x7+4QuKQ0Ka5sW+CMDzBOrXPEm2eNRuZ5oX6YdQpkfWMHMdR3nNBeZZRmhU0
-zTe9TNBeMfGHAUJu59xoGxx9zPOtFn+cZrXB27ZVy2goLnGQvb6+0bdvX6VVaVVDY4NPEK2G9ovb
-7FUt0raNS3Ec2EWeS/IUsLY7PT1dZD1t4ma16uewADUuB7gRpVlGkdjIW+k0fCvWdaGYxRS5IrZK
-4BDTS5TDdryBnhlc6I/3DyHYnHS+30pc1TTNdLmcdU7e97364eG2BEkkFals0zR0HJwvMM+Lx9G2
-OXF6cOEWE0okZJIs2ZzUGAN8b/TjCHkMQy5pkZSst91x0DyNNE2jotZWZrptm0ZeYTHhVoLs1UWr
-zXqADkOvpaNjDvIGgGssDlOmj6Z0HKmWlFFU6gFrWyELbOG2tMAn6/idKevpdBIKdqKzZ2vLZkdV
-mHIAL3I5DoHSU53VO0tp6zoiokC56VB46uUh2BC0/mlWqBORH0Weqi4jSVJFtaFpgBgNhwm48Tjc
-mVCT6yGGQJD7/a6HE2c7zFTXleIN+77T9XpVroPTMvBGf3l5Fk2EH93FRrWzZhOg1ZpnoihiIPbX
-r1dKU/YnZKl7LI4/LseBD7xdyVbWkGdZFnp/e6eqrkT2PnkYwxiGdO86iQPLdbRvI+yDIKQ4z1Iv
-IsnO8ZmVF/w2RwfqiNOnrEpB+nMta/p+01OaUfuEEjGo2I+Djn3VPtrO0tMkpXvXyedIdT6KUmdd
-V1oE9MFLh/Amz1IKVEu/6yQCaKol/Gh+fBjqGApjtjRJJXpsUStw0FanaVZGGyih+76YYNNUk3z3
-faddyBu2XOeflXuGGnjh29Z7ElN4FeLQ6aWXtgeVA4L4YMHz4MpnNWm3iW5wtFMuU3FURR4qhyzL
-qOs6SuJIS1iLIjtptRv1ITUHLLYiL5Q6vK0rdX3vjT4P0y7O0+BVPCBmuUM6UFEViDMcStLpGPQx
-Is2G027bpoYdcKPidRLpGLGuKmXWRVEkk61Kq595nsWVueZItyikMMyJqDEOVNb9OvRuYBzYdc3K
-SvbIJJrGQWXCMESB8aodo1oOTFGygS0o9NYZyI2TI2370HJhUpFlKcUs1Fm8mK5RblfL8LJkh0dZ
-LysCU6V8Wgrv/d5JuRsryLWuG8XRrlRRxgImRZaxAcZpoo+PD3p+ftYHCPEDFg1CK5OEI84XOQkR
-OFLkuUSUiY7fjpyW2SOj4AXdmkZNFqMw0N8JNSRuwONIaJwm+v79u9hhEX18XOmPP75x3yiA0uPt
-zOUwp/ygekDqjHU6enSASWJmN1pCE8pAjMPYhShXXMP6KIL8YQkyy7oqAcWCV0CxEc2N6gcHTxxH
-FEeR59IL5B1KQbgKv76+6RqxvTZm4zbfAd/NBliyUO3wLOqDIFDKMucCxppuZCvVR3n6OK66NmEY
-EwSk+QBpVtC6zDTPg4yTU91UCCvZ953WZaaDDrreGoqiTg9o6zcB3MNpN3iKhTDeQhylYWNncQZM
-SpgIxZWP88JcJWviJNoRomluFKhkqjRPupZ50e9grflB3Irt6cSoZqxEFKi2ONEmMydMpP2W08Bv
-enBkqQMymJQReSAZTDjSNPPUc2CfoZSE/TUWSRAEFAqwBztrTBSQ/ooTU4lMyyoz5UxPSvTnuIUt
-pRNtSZKACbfR+XwWgDTUchKfdV2Z5lzXtTxo0pIMOXNPT096wFpLbYij8NmtmxECSGwGAqYhRMR+
-DCYmzfrEp1lG8zRpm+EmIpFx3s31fWh0m4nItmIe4AbsYZBoFWQJP4+RcVVVUd93NI4DhWHpaeYt
-M9HejPguavstt7pyBoZBo7tCY6sFzCkMIxr1e84acWc3DVpI8P3RdlZVSW17p667/3ZjL8tC7X1X
-kByA5CjOzS4H0SUWofLcNheuyhLfSMM8EHdu9xVufvBHoMewB5qVFg9D702leHKV6++Ik0jbAxYH
-pT5lGSw5cI6rqqKnp2edq1pyilM4uX7EppyCxpmawwKuuXle0iH9C8c8hR4wUZWFzvZRaXCZnmgS
-LYgiEFDg38ei08ZcFKdgmibU9R1rzfteuOOrAnqQBicmGNJy6sMHggqyBfd9E1xho2XhkpBLuovm
-xF0uz3oT2ufECzDREnieZ+qHUaKkNr0peAOk+hz6vhdmGN+4uHnZ93DQA3IRDGRe/HIbh8ayLHS/
-t8L5X9QYNZW2D7fYJHwATkYelRAFsOu/0m1gEa/rStfrVSOsy7Lk9xuZSYjhqD+yIYeh98gxOLQQ
-7ILRIAhIifhTAOxkGbojYqkhi3j8TUKIAqDIepVdKw/3mfz8SgbO+EJ5e/9Qhqm9RCzBJwzZoj7P
-Uh1Xw94e7wAg9qOxzDTNGvtupxNgZGIq13U93e93r2UBw3IYRnp7+xCrsEPp6RhFSpUcm4z2TBYn
-eaix5sXJKQwars1qs9Fc9oOjOljXXoI6NpdXHwYUpImJP549WaU7sRO1ZkKflWWZhH8ShVFM69oa
-B5ud4jjVXLYkYQusQ4JG8cDxHRe5PVG1gMbJ/7wLn91l8l2vDVVVocSLYRjo169X73lgXux6N1I3
-HeAr+C4wMsEpfsifR99urcOtRgKHHWK6kXZk+2huWWYjMOK+sCxy7wazYirc/FmW0SBEKbxvfB47
-jnx07LE0bphyMmOw8Zx4QYLC4YHPUhSlphp9fn7K2DihfXeUbfT7XdfpM8Dti7WYiogGDj/47BZj
-yfNcM/jc4RTpmBAHHDvz9vrf4L/DLYznjnXUNDdhs85KwsH6jcX4dp5nqqrKk3hzS7wRUexNWqwZ
-L9oMawYTx0wgi9KEp290mPcZelmNDISOTNxD2cimi/ylwdUuipzyLOcbYBh0XssjsszrF1HitG2r
-1cM0TTSOg4pvptkFP5RlSWlW6FgDMmA+/UatPoIg1NOdJwxOPIFRDYNfkcye78pIXCR4g91PYwWV
-0D+jX06k3QFq/PHxqYcElHbor+OYg0Cen57odDpp5XM6nQxhJpCgiEk2ys6eeRJGse2bZzGls2/p
-8+yEgIhfHCTF1hEYYNLlfOIKS54NKgybneduIf6suYw5MRkJ5TC53+/08+cvJ4CKYhPQGooV1eGx
-Am1kvOO9r1qdzcus6wKINhZ/VZVqK4bZOqoVsAWLIqdURqaW7wFpM/wmdjF0OdU1nU8n2YybquhQ
-eSQPZJyqYu8HxVpEigx3pv8qHRttACcrJ14qMkbWvCZcajEOiXXb6HSqmU4tCD0OeTBjXRQ8c2VQ
-mSgNXRizwLjw89HbQxdgE4rBpIUmJMsyHgN2vZ+qYscZhyxAuLKodxv5fGosSkRl3W43ZVVZtR6Y
-TFEU0TwN6tRrx4sQ8uTCfrMIqA1zwIO1M1xNYZX+HV++63pDe3W9JQQ6+P3sU5jTqa5EfrzpiYub
-Ms9zyeILFCzFS0jTlMoiV0IONjQcl+I4oYACPXRYMDTqjb9tm5pqsrxzoLqedKPBv46TgCL1KeSw
-h1SrBoxWkVqoDgAAEPFJREFUXR+feIfs7XbTfjqKQmX2resqHHfWdEzzRFmemeiw3AMg8ZxRNdn8
-gff3d5ombpHs+NQKXtCPL7LxjiNzgjKJ3srzkkE3xXZ4zq523DmHl3IGAIPH2to+AKrLg6MU/ndd
-FzV0gZ4fVZB1XQI+g+/Qdb1n88VTnZAPlbo2TkjO8yCgQOS9s25G9gdwLZ9zH950QmUPIWzsg1w6
-9uP3Qpl/v3N1fD5flHWo6+nz80p1XdH5fFKiBX7gNI2qVoLUFPReOw5Tb7fTibI0pSTN9IF197um
-7yA8JI4LNf94PESs0o7LaZ9+jJkqUHocAPaUQ0rtfozq5Au/OLDAdpnbr+uinwN+fWVZUV6U1Lat
-aPWdkg0HwTj2KrtN4oiOfVX7q3vXa6kKYUaSpGrueJBTsqE8tWM9d1BGakXOz8LlKdpIcfamb70M
-QiQsYz4/yA0CQo0zqiAhnjjM5nSqKc9LJQvB9xE9KEpjZMzZigDeAvf7XUtlTJbwHVEJ7CblFyQX
-JgMluhn2fVOpum0pt23UVoRj6UcFmm2KtA3HdF4JE93vnY6oIewaJeT0x4+flCQxffnyhXYjT8fv
-c+vMHeI4GNDOQZt/v7f0/PyseBIz9RxbFLLnJEn0UgUtGj/LZRDaEWMsPAWOHkO2AbQ9WHvIuzwO
-NjWJwoiOw2UbxKdTLS88p3XtHuSvyW9sLxYJzaqLx0Nl+yUWBNU1c/nzvGTLos0RjLIsknIrpP5h
-TGPjxsbp0I2J8s4l2nArgL6UwTbShwkKJvdOq7LlPj8/6enpSUtN9EZ242ECAjUbOAV2RONIGocS
-mWajwV+WWZxvS9U6YOOkaegh7yokEiEU+liUhGmaeQwygJWg9WICYBWDrn0KKMvm3zIE/JtvfUgf
-3qSEn2iaZp3OsMvS4gFVNm0J1ZAdXfKhkSjzEqYdoxxeltwTBKFa0MHohAG/wHvuoEQ3TaMMQfTH
-eZ5r8GnX9YqEWwoxvifH1NXK/nRis4PqulTl3ufnJ8VJ4jn6qnW93MTANWwoR55l6qVg3YUsp8Za
-6zEnIvJwFtCmY/VLXL1cAjwvjLlBcLJELpT6URhoQAmew77vFBdFIYET4W837TD0ctNE6j2GhT/P
-uz4wVAtcMkU6LrnfW7rfW0rTRFHksmTJqnPT8S2o0ctDXPRYGQAkwuTg1rTUNI06z+KWwBe06DTA
-JA495SRcLFqw1wBgDcMoCcEcojlPE82y8GymnxJMpCTGhKESfjhaFnDAJ3HAARiKiQeYgta7nZHf
-2GTVH+prWFalcsM5jNU/ADTFNvR5+/aZOnmvlRyLJFvGkpymm1JAzvjVahE0YkonB6FWMEmSUJxE
-dGsaAUB32gyRyG4GVAcAqHCQW4k3Dl4o46qyoDDkhY93G8UZte1NCU0Qp8EK3ZmcRlLl7F7MGSLI
-yiKXzAB6CPV0fAmQb+Z5omGQqHWpgtr7XTEwHC7WuMPyHlAhweEaBy1i1zG6DALSypGDcpmEFYWB
-HnqYUqkXpTy/aXJ7Axb9RMQ8gH4YKBBQwXeXTdTT3d6S1tXUUj9RlsAgg2g1RhCbChbYE2BUUMSW
-d+jhcVMjeAN91LpuBgTi0w0lGLjkcMyxvvZW752mmRgkck8GcxJWV4UqqUSwB9tqlbQfPeV5pimz
-KOlAF8WNw5wIF4OG0tACRTachIHPyTsQ0I9P80SlpBzrjF1YZHGSKkbzOErSymzddNph0WTwMECV
-tWKUMAwpNMxJO0nAbeXGmJNeHta7AbHZQz8ohmCrg02rwljf1yhjPOtteBy7JzjCpsGYDeuSk6FD
-WpfJqCNziiLY3Ee0rn5oDRyZgNw74DcQYVrvHXq4reHR50JsWPGH9ClwV9I0oa9fvtDpVMv4dfTE
-RLaNw4gzMJgXEqH2/UVowquCvxZ8v3cdtT9+Up5nHPCS5QoKQpXpyZ5l0hOGIcUowUCxRInBJTYj
-nGmW0bL23swXC8U60uIl30VkYl96HMv0IC+Vsmr19JYxhY1RFgVt26Ea9nFcFWxajFVXXdfCiGI+
-wi6jPHsjop8cx9HzfTv23evFsaj4Vl7087Rto2M/BjtLGkeewYLck+cZ/fz5S01QgoB03Aj7KLyE
-RzUfSjWLqjvDzU0rDp7hFmKgEuipD259QAyCGf6mB6I6wDSiQWK2Us1kdCMmeAH+V/ZWfkmeKJiK
-9ZHEER0Zh2wuy6rOvlVV6o21rg7U3YJAx8tO1bbKZvOpsNaabd831YQQ69oMsYZ06uKMPNff2lY1
-xxSWHrz0Lbcf6x3aj/0hFFXR+zgyGgYGg8d408PBrnOLKTz6KNrvm+eFtk69HMKYkux7oHoWXLoQ
-E4GFaUVdwGgWsb3b952C//k//9uBEdOtaWXkwppxd+I6JRKyxicxreSct9nrkbk/zPTh4/8HF1bW
-yofKOYeSD77mIMJwj76bcSMZn/ZY3F4WJUZYvTjMIhkAnE2oiOOe82J1+fb8gBiZZlvyUOa1wBwS
-z4MAnx0ZCVma0sfnJ0VRSE+Xi2oYNCXpfJHfFXibE/+MKmnbNsrSTMlBFiuII//z+vn2TuttWwH+
-s7HyO+znT1MWfjln2f03r4XjYBsvvtVZX4B/D14DpgEufjw07QBboBUFjyqTJPaqFXgepGmmAbXc
-OsUqeuIqYfa+rwP3QnmWgXoV2EmWNSjFe59FHs0isUInNAj8nOdJKOqL6kAAiFpPBg7smH2qt+wf
-PGOU5D6YuKt/Qp5nXvVh2zLmMyQS6NEJ32FSTAX7hFvjjKIoo6a5Cms08t4LgGHQ8adpoqC5/XMk
-SUL94NRwP378pKLI6Xw+U9M0qidellmRd0wHrCLPykfBF397e9dy3toeWU01Tkz0y9aN5Xq90dPT
-Rf8MXjyCQx5vJmfdzOo/RFq5uSqpOytcgR1t2VFSgcziWYAN+frrlYqSJcu2JyzynC2z7x3leU6n
-04Xa9kafn5/0/PzMscwSh7U8SFAfP7t1kPn8vNKXLy+eE9Mj8QY4BiYH9kbB78dBhAWIYJG65nn0
-uix0vV29Wz0MQ3p//6CyZOpyJeCtrfg0y084IkmSerr519dXtWhjw5VQKyBURnj28PNDBTNNE3Vd
-R9++ffOchLHmbNAIQEFUWZiB//z5k6dTgtuogeviDlc2KdnU8xHxYkREP378pL/++lMdssLQof1Y
-/wCg7YGL6rTrOvUzwJ8DIcziKfYzowrouo6GYaQ//vimzxoEJQSkAnd5fX2jui7Veh4jzKZp6eXl
-yYuCh+tzEEg0GD44wJnL5Syz7VzdZkFNTZNYmU0oOW+3m4JX+FJdd9dNcr1+qr+cLW9sJlySxAak
-iNSJFcaH9nS0c0/w6x+FS6BsWgYVnHlsa2JxDRujbdNh8jyj8+lE67pQVbMXHmb96iA0z0qsYTyh
-lwonEIuwTa3Suq4xVMxEe1BNNVagchNUfvXoprYiABMNt43jtx9Cfd29Del4FaQhsPhzaH+sHwBu
-mDxP1Pbcj20LdNT0GJ/FFvADFXnBpJ+ypDhJaN/ZI8Jy7h2GsT3Yve8ysSEvZ/HRORqakDSJqevd
-eBa4BVqL2+3GlUaRu5aKHEsvDCPatlmnHHmeKZPR6iPQog6yqdVlWXIW0EoAY7AxbtZ3weo/bNQ7
-Ds19PyQF+VCqNwhQ6OW3bddJHlepuwbtWJm/i1xPtPqOl3VTI0aXFMthi0laUBD88l42bi8HRJjZ
-uyH12HDRQE49kBCsKg0fiA0zVol9WoQMlFKSzF4ZhxuAf9ZueuPYsAITpT0uZv5vN75dvFbzjhcH
-80seGfHC7SU3jzMUIiLqdZRmQ0ERZc7g4m6synaa50FP3yjKdPHbkhXP2I72vv/9NxVlyfLPB8PJ
-IGAhV1kWyglHeQivP034kZIa1VaWsYy6MziDM5ZATqOAT+RSbxwY5aq2TJB8N75dWTf/5YWqsqQw
-wucs9Z3gsANJy7dgj9XZGOvKeTE6vwN87txMT+CLB+k0vj+AT8sqBEaRZ6m2rQ6bikSe7gJkwzCk
-qixUQAUZPPYOuzNxCzyFToWJjRcGAXX9aqLfe+f6HEfKUWG9xiQt7qox6gCIrWgO77yqTqpc3dZF
-359/+B8spsoyii0Cb8cSwzjSvMwKEAFAsRvR8qkRLb2uztk0y1Kap4Ri4fNneUHL0picdf5voNNG
-2mnT3AQwzNSJ5fHEn0ygBHp53KjO/40Zi3YsZkdfLn8t8r4HcuitWxL44rxg2t9QXFZTuuDQ6Zip
-73ux1T48U089oEQ9OEWRIeks3ggT3IiiZNLK+XRS11vLTrtcLoq9WK98S2BiDIS8jctBnb0njpnn
-SW2t7GYHpZZ9I1v97wBejtNkvO6g2Uid1Zy4SgNBZ/p5QrPkBDpV4uT1wk3T8u0m5a/FOCxQOYlQ
-yt5w+77R+/u7tGUnja1jiu7mAdr7cSjD0h40MAHBc9j3nd7eP/QQsu2pcwXmsJuu72g/GGCe58PP
-a5D+XJOSkkSqa9KwXLhIAY/Bc7UXGS4enj71orhdPG6HJWBZR+vwcVRmN8e27XRIv29VUlgUls8+
-inoJ831mQXWKyo7TTG9vb3oapUIBdWknO31+fkrZyw8hoECFRTrXNtFS1kl2GEe1y2azzUVptrbc
-hzsQej4LFEE/ADdVTAAGAfOwiSdZ6HYMComtdeFBFQLV32yca1grwFRQeC1CpWUptZ+frEu4XJ7o
-y5evFAstG88OQB5YaaUwxg5DXbYjQmuWYUtX6C9wewBpBsr9CKix8qz0bOB9R6JImW79MNL1dtVA
-VMixp3kRs9BApyWuMkl1wwEUhiLOgZ6ruhy5NjVR6zFL+4V9HcDuz+vVmwQEQaC6B2cMO4nv3uJd
-HDgYIAt3HnurhK2MdGtaGkcmk0Hnkee5KhJx4KBN4RQoNrcZhtHZ7JcMLoM+D/KVnXAp5z+JKZZW
-wkbFAyS0Kc46xbFJsNhU9kUiW9yOriyy/Qh88ElJOtdcl9XjL9ubC8IRhCugVK0qnmUy3z70Nlog
-IyOg/4+MOkhAp2miuq494gbwBsu7hwcf7LVcsOOio0Gks9oZrZNU7jrBQEsD9xiktNZ15bHNbBQX
-fkffd146EhY5CDKMFE90vd40odhVNc70Y9s3KgoetUah8+m33A3779y7SRXQws9j08zYc7DFYke/
-nxclbetCt6ZXNSPGYmzUEWmwCxJ1HxN0sOk4apyJXgjggNEJ+ypGKgBzVGbfaQeH4rq6No+NOyuK
-4oyWe6c9PNYyDphHYxS0DAgnsb6QSZLKBIVTg3n+P5sbl3X/EL4lcUytyHaZyEYauYd9AGyGtQ5M
-Vx8HUro02qN19XkXbetck+GPYBORbHAqHL+gkYj5RfgJwKCZck8/UJ6nnkINQgksKDtmQQ45NhRu
-LCU8CNI7iakmRltw+o0ilqrempbWZdKXZNFtgFwITgT9FiabIBNx6Ejs+bLFMbcjmHyAJgxj0m0j
-Z3qaxNTnBeVZashNZNJgd0MhznTjrNuqYp9Z0oHAzIJwBxsAwFOahtoOjeMklk68+NhsJKe+77SE
-rMqC2nvnTQXiOKZj32mZZ03Rta2O3ZioVLCI+r6jMIwUqG3bVtKaHIiKvl459ctKy9oqgIw1g3KU
-vRldJh0AQsz8eZw2a54kfgaLcjZVf7Ls1/XJdkyZJEzJdaCpu1yYiTfR6XRiMHWZ9MCOTXgH5uez
-gKb2gM6Ez0BEtEWuQuYIOesFYAlYcMrKKZf1Yzn9+GcbR4ZDP8syKotCK8RxGikvck1rOp1qz5vS
-8kcwQXhkfCrOJlqCXTAAIqL/Dyy2Xw3ACWE3AAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.3@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAgIAAABaCAYAAADKBz5/AAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIaFX5RmFoAACAASURB
-VHja7J13mCVVmf8/Vbdu7tu5p8P05MwwTCQnySAgyYTKKogBMK26JtR1Dav+TKuiYkBRxCVKkKDk
-AWaAgck5h8755lTp98c9ZZ+pud3TAzMEt77PU0+HW7fCOe/7nu95wzkKb0L8+GuXqmvXdzRHaiqm
-R2Paglik5ngjYJxjGlZ9X1+uPxzm7lC4+u/5XOHRn/3sfh0PHjx48ODBw6uC8mZ6mP/92QeUPe3F
-2aZlXdrR1Xtqw/j6k3vjicoqNUzSp2PrClplJY2xGqpqK4zaytbP7F277JYbf3xPwXUp2+taDx48
-ePDg4S1CBG79wfVqfyEVSeWLX0l2FS6dMrFmmuLXAts6u5i/cD6nnvQ+fn3LL3noHw9y9vnn8j/f
-/jn+gJ9Eoi+xddtTnzn11A/eXiyYlnRJyyMEHjx48ODBw8GhvdEPcPP/XDV5oJD9oBnihlBcbfC3
-TmBb7yADXR2sWLWB2Uedw4xZMwlGoxRzBqueXcsd9/+VbCpDJr2tSk/k3vnu8459+s8PvtgrCIAt
-CI7tOjx48ODBgwcPbxaPwF9++mnf7kzHBZVKxafymnXOQHs/6ZzCjd/6KZm+Ns6/4lpMw6Shpopx
-4+pYs34rqUwGza+B6kcv6CiKwZknzUw11FW94ze3Pr5GEAFTHJZ0eGTAgwcPHjx4KAPfG3HT39x0
-Xayts+eT2Xzue4Sb5w11divnnXM+a7YMUNRNdu3p4777HkLVVHr6B+lPZDHMImF/jGAkjF0sEoxE
-sYsFGirDwUg0+OSa9Xvbxfuo4lC87vXgwYMHDx5Gx+seGrjzr1+c276h62taqPI9+oCPlvmTec+7
-r2fqlFmY4alcdPEVhCIRqmsqSefSxCoqSScT+ANhjICNBmihIKpPxQxqFE2D2mjFImA1oANFIC9+
-OmTA8wh48ODBgwcPbyQR+P4Pr1TCmfyivm29Px4cHDzFopJ1Gzbxzve/j6lTZgFw8y9+QSwaxrB1
-0tkMiqqRSKb4wFXvJZu1ePhvj5DPpVAUhUI+T6QiSko3MC2rCagFCkBO8grYDIcGoBQy8ODBgwcP
-HjwIqK/XjQJJ8/RQTfVfO7v7T776w59QF550PjlD47Of+ibvee+VLF6yhGUvrMIXCqHaFr/81U00
-1lWj6yb11TF+9YufMW3aRAzbZsHC+Xzx6zeQzKewDZtxNZXzgXFAPVADVAIRIAj4GQ4VeOECDx48
-ePDg4fUmAnfe/NF5mWzmr6l+Ju7bO+SbdvR5TB4/EfCzY/culi9fTnf/AJZqYxl5wMe7L3sP//Zv
-HyIWsln58mpQCtiWgc8yuejCi/jK576Dr2gR8kNNbWwqMB5oFGSgCqgAwoIIaHh5Ax48ePDgwcMB
-OOLJgjd/5/wZmUzwJ35/8KihREZZt2U3xWySO/5yFytWr8MfjKKpGnWNjXz+E59kzcpVWIUUHT19
-PP/C0wwmB+iPp3ny6cfoau9Az+UJ+KA26uOue+5hfGM9c6dPtB5+etU68T42YIjDyRkwGK4k8HIF
-PHjw4MGDh9eDCDz15/NCvYZ6naoFPrhxd6/W06uTzCvc9/en2blnF7bPR9inYKo+Jk6bws9+8iM2
-bXqeLdvb2Ll9E2kjTyKRR/Gp9HT0ktPzKAE/Q719LF+6lIxRZPa0JmZNG289+PjKnQyvH1AUJKAg
-EQGD4YWGPHjw4MGDBw8c4dBApj9dX+juunLSrOn+n9/8KPPmL2LHll0EbBPFH2D+0VOYNXMShUyc
-LavXsGDOXB5/6HkKuTwP3nMvzzz5LIuPn4dt51mweAENLeOwsEnreQYSOaqCQWJakEBAt4A6SgmD
-clggSCks4JQVeqEBDx48ePDg4fUiAsVqKzzt2BNnnXHWtfhUjRlHLcT0+TBtH6qm8qUbv8bPfvEr
-qhrqiFaG6I8PUDBsLBT+dOfddLR18tGPXUNdrJnb/3g7119zNUP9Q3z4Ix/muJNPYzBnE4oEWbOp
-O00pQbACiEokwO8iAV7CoAcPHjx48CDhiJYPBpXGgekz3/6Az998ybe+/H6eWrGbcChEOBxhKNXH
-I488xMypU0nl8/gNBdWv8Y5LLuelVS/wh1v/wD333o8SMFiwcCE1VXVc97HP84tf385Xb/wmd9//
-Bx5+/CGqI2F6hrJQqhKIACFBAgKSN8AjAB48ePDgwcPrTQSWPbcy9dDybS9rhf+65OGlHRR0hcqK
-KlKpFLbi5667H6KYLwAKpqqwaOFCbvr5TbT37uHUk05iyTGN9Lb1oUp7C158wWI0xcfe3b2EolFC
-1RGUbMEnBv6AiwB4ZYMePHjw4MHDKDiiyYLvXzLJfmZ7ccIrawbO9WmBgKHDzJkz+OY3v8kra18m
-lUljFnQCqkqqWCQUVOkb3McjDzzJ4O6tnHr0eKojQXZu38Vzz68g37aB9dt3oIY0HnziYaZObaWl
-2s+OHR3ZLbu6UpQWE0oBCSApjjSlpEGdUsKgt8qgBw8ePHjw8HoQgYdX9jKtuTYTT6VP9PsDE1vG
-N9OXyPPD73+XbD7Liy88S3NrE4/edzOKFWX9+hWsWv48mf5txDSF6dU6x4YKpLNZJugdrF6/lueX
-beZvTzzG2886jWNmNJPr38PSFbvSvQOpDJAVRGAIiEtEIEepesApIfTgwYMHDx48cOSXGFb29Mbb
-FJ+ybfbsWSfd/8Bj6g2f/gSnnX4KPr9JMWuh+VQaxp/C939wHrNmtHDvL3/CR945kw0bephp5mio
-q+P0TJ5qn8L4cdUEYgHaEgaP3n832aLGF649E9te795y2MLbfdCDBw8ePHh4Yz0CgDI0lFXmHd3o
-69nXc2FXZ2dg1erV7NixjWw2RbBCY8/WfUyc0MSiRcex4Jg57FtzFzVmEX0wS7BCQ0kV0HwKxXFB
-lEyWHXGbSTXVRKsiBEIhzjllPvc8sioVT2ZTYvYfBwbEz4TwEOTYPzTgwYMHDx48eBirR+D66y5W
-Kir0aE1ttKG6oS5ayNvJ7nQqPpCyM7/9zp2jbeSjAEpiKLeUoNJ3+1/+t2LcuEpOPvl4+nt7+fPt
-d/Pv13+U55Yt5+xzL2LX6kdZvjZFdE6AuXMaGdjVjw+bign1ZNIJAiEfiqKQzmXoTVk0VofRLdPW
-DdOZ+RtlDtPzDHjw4MGDBw+v0iPw9a9d5AtXN5w9cdLMT0Qj0a9PGD/3a1WxljMjvrqjx1dOnLNk
-yYmx09+2uOuZZ17Qy5AAFVB7ejMcN6+1LpO3Tjl9yRx+d9vfSA7uZuuWLcycM5tf3/Qr/vdPt7Ls
-idU0BgtUa1Dr0wnWVhJTFXr7hvD5FPZEguhFhUA4RntXksYJTeQNU//70+uTumEmhQdgEOhnOE8g
-RWlbYh1viWEPHjx48ODh0DwCCZ9yZrO/+jeXXXr9pKqKEIXUXlZu2T5/z9aO+XYoihahwyxEV3/l
-y+96oDFQvPPT//VAqgzZ8MWivudnTol88bmXNvG5T1zHlt3b2L7iJcxQmIa6OrSwxofOmcTcap0d
-O3tQ4wV2JeOs2JqjI6UTUX3kSdPYEGFKSxV5RaOpuoJk1jYLhuXsK+AcRfbfY8D2vAEePHjw4MHD
-IXgErr/+NN+ZZxx/cW2o9uYvfeUXkyoilfz59t9x5dUf44n7HuPppS+xdsUGtq3dVNnWsXdmwCie
-P3lC+F3vuvz49PVfOKc32RfLbt2+UxX3CFiaZs6YVtewr3tgbsfO7XR1DhAIRZjWFOWso6rxFZIo
-+QFmNoeIpXW6ckV643n8LY1cMg0qagNs687R2uJnXJ1FVzLFCQtmsLUtnntlzY6E8AbEhTdA9ghk
-GC4f9MiABw8ePHjwMBYicPTR0+c1jW/58UeuvmFORayJvz/5GN/98c+w0iaGrmBpAUL+AKlsBttn
-0tM34Hv6le31mXTvRX39AwuOXZJPNDXW7lu9plcBAn19af+s+U3jDNM6LpU0A7FIiPqqCA3+Ai3V
-Ieo1i/Y+k+lRCzUAG7pzTJs+k0/+5C9kuv9Ojd+iZY6fceMC9MUt+jMqjZPq6EkUs6vX7nLKBAfE
-0cdw+WAWr3TQgwcPHjx4KIuyew386EdX+mMx7VvZgr3Yp1g8/exSvv7VG+nc3U4iXSSezGCYJmYw
-iD8YpqKilmIBND3M6o1J7a47Np1z+517f5nMDPz2CzeeP07cR924uW9964TYroKtY1hFLJ9O1oow
-WNBpmBhkYkzhub0ZwgtbScUC3PFKN0mji5a3Xcnsyy5g3oXX074nRWVtHfG+Aq2tDdhK0CkX1MTM
-3znKhQY8ePDgwYMHDwcjAt3dxhmx6LiLE71DXPWpr/CBaz7InvZuApEIKBaTZ07ny1/8PO+6/BIM
-FDK5InlDozdZ4Jijj+E/PvVR0ml/y66N6nueemzrC28/f+71rZPqa9e90jZAuPaV2rDfyOYM0ski
-scYQBrX05TRCLS34/CpPPt1JciAA6SQnzTifX333V3QmZzO5ZRa5VIiCBS2tMdSiqj/39NI0pWTA
-MKUywaz429mK2PEEeETAgwcPHjx4cOGAZMH/+s9LfF2p3Cc/+aH/UCorwnzz//03mzQTFR+2ZeH3
-+TjqqKP4xCc+XfpCIMhtv/4jiuZH9YeYOH4WanACqYSKpqFYvfq4nu7erze2VCyoqFYee+pvrzx7
-2aULLnzmse3jdNNi1544VqVO+95+zrvgZIr+KjZu3cz8Ga3U1vqwIyHuf7yTh5f+O7oNV5xeT188
-QbUFOT1ndvZm88IDEBJEIO/yCFgeEfDgwYMHDx7K44AcgcmLW49OdiWvnzCxqm7Vhs3c89cnKOTy
-5HI6hlkgncmwfecennjyKf7x6FOsePFlBocG0M0itqWwauUaNmzYhG5bBLQAtgm2AgO9AzMSKWOh
-EtSGNEXr0FRlfjyZZ/z4Fr7ww1+T6OkiVtXIZ3/0fdo2rqN9zx4WTa9k7qwGlkyNYvltckWVaa0B
-YsEQuUSSqbNjxTv+tq2PUi6ACmymlCMwSKls0EkU9MIDHjx48ODBw1g8AheddsXZ0WBt6y//8hvW
-LN9MoWASAiojEdauWsPO9p1cdfVVrN+4htX6y2j+IJYKdTUVnHHWOZgFg2eXP4+d1MkXdFQtREAL
-8/Cjv1e37Nja8vOf3vZJxR7a1NxUu2+gPzcxm8uR7l9F04xGVjz9JDdPvo2GqJ/KmB8jG6K6MkZj
-pMAxxzXSOzFFsF5j1ZZBJk5SyeRTReEFyAkikBVHThAAQ/IGeImCHjx48ODBw2hE4Cc3XaVd+LYL
-JoSqJoX/8exj7Khowx8woGCTzxe48etfJpmLM9AziOozGF83jqF8hlR/mspINd/48udobJrM5798
-Lbf87n4aaqoIBjU6u3vp6Ehz+cWf5PKLr1XOeNviuYWCTUNtFe3tg1xz9VcoFC1Mw6K2QmNC2Mec
-JhszkaKqIUBOt0lU2fh1HVQ/Qb9KVLfsZ1btdnYWLAgi4IQGnPwAOTTgwYMHDx48eBjVIxBo1bRI
-S8C0bVYuX0s6kUcNKBTyFioqf779XoJRH1beIBgNc8edd9A4roWhgQH+/Qs3cNHF7+Gb3/gsG9bu
-RdVsMsUshbxFSINvf+sHnHP25dz6x9/Q2TFIMKKj6CbVVRHyBR9TJlSQjCc4urmCOTPriLZ3QNFm
-3/ZB1JxJbaKIokOxYJFOm0ycBq88mEhLHoHiCN4AjwR48ODBgwcPI2C/qoFw0N/Y1ds226eoGEEd
-Q7VIJQoctegovv/drzF33lSMgg8lEKSY1vnvb30fFYtsNkt3T5LdHTv40DUfZ/XqVdRFI1RofgIh
-qKqJ0tPfTWNzjM994WvE/DGUokVIiwIW2byO369yzFETmNTajGUX6asJEmiq4JLvnMlgUxhfzsRq
-CWHZNr6QRWR8hb11ezolBn9naeGMRAScigEvN8CDBw8ePHgYi0cg27+XwcEeamoaSfSmqYpVkSgO
-8Z9f/A9OO+VsVry8hu0b29FzBuObmli+YgUXXXwhHZ0DpJND+KIBogE/QZ9N0bTwqX60YJBCwSCr
-FxhXXUs0HAFdwSiYFC0DFYWKiEbXYJramI/taZPBwTg9PQOcP6+avuUa0XHVmP095NUIhpUiaVvs
-G8gUbOufA39WeABkEiDnB3jw4MGDBw8eymC/qoHKqoqal9avueTvTz0yZeuWvRTSefApbNy4nhdf
-fIXnnn6SVMGgvrGJv91/N9OmzeC2P92OpvmoigQJaBqa5sO2LUIRDVCxC0WKxQKhgEYqmcdPAFXx
-oft8+GwbVTUIh6A/naMuGqS9L8lVH/0wl7znVDauWEZi807uer6PigqFurog+AwCFXn2Zhha9kp6
-n/AEDAhvwD5KFQQZDlxQyIMHDx48ePAwChFQjjt2VsSXKp7bXB2e1REfwLTzhDQ/A939tO3rIJsq
-ENBUMokhCsUh7rz7AfKpDK11tdiajaqAiU3ADyFVQ8cmns0T0lQqA37i6QyqT8MwdVRVxe9XsJUi
-yUKe6roQuztzXHbpVbz9sg8wuC9D/IV/MPuEZk4PqUxqrcWn2eR2ZJi9JMDdzwzu3bFP7xYkIA90
-Ad2UygazklfACw148ODBgwcPI2C/0EC6dzB54plndFaEwHzuBQzbQjFLJYC1jTWk+uKkMjn8gRC3
-3/ZQiSj4A6SyKVpa67FtnURWh2yWnF4ka+hMn9LIdddeR2NdAx+74dP4ikWyKvhNA9MIUFsbQin6
-8CkqoaCPhx65i5eW3cHaFR3MmVbN4ikt+PUh8v1JNMuHv0WndU6YvEleEACnSiDv8gJYHgnw4MGD
-Bw8eRoeTLKgAylPLNhgnnXlF/gMf/iqf//g1ZFMGuWKA1gkTufeee/nF724mFU+RyaZRDIOa6hpa
-JzSTKmTYsn0PnZ1xUukcaRN0S8VPkAvPfTvv/+B1hKpNFNPADBiEwhBQFbKFPPF0CjWoEA5HGN9a
-z7iaGqZOnEBtUwU1NX5U20IL+gjVVxIcV4NeUFm1Tk9s2mkkGa4YMF1eAG81QQ8ePHjw4OEQiACA
-MpgsYuTTXZFwde708z/M5KkzCUY08IOl5zj15JOINVTjC4Vobm1k69ZtLH/hFZYcdzrRiijjmuqY
-Mq6eaDSMYhoU8ln+dNufmD25iUsv+jCKZjB/RgPXXHYsJy6sozqskMlYZNI5hnrSFAZz2GaOzi37
-uODsKSxZVM9QKkC2pZreXI5cPgOTi7y4PRXv6Sk6ewwUAD+lbYe9nAAPHjx48ODhEOCTPAIqoFWY
-2/NBRTnn2eXP1z79/DIKuQLxoRQvLn+C559fwfatOwkHNQrFHDt27mLnzp08ev/91FTGaKxvoKG5
-jvraBqZPbmF8cxPxwSLJfJG6qiATmmOcf/ZMaptrqauw6e0dpD9hoGkqOV3ByhWIBFWKFqAomDZU
-+WpYsaWNtGFCJEl9pWWua9d6Xl6b6hGDf0I8/z7hFShXOugRAw8ePHjw4KEMFMkz4ANC06fX106Z
-WP1Xf+34RV27EwwmMxh2nrAWIpcYQotWYOYNLAVsw6RY1ImEfdiKn0goiM9nEzRN1HAIyzSpidZR
-KKTpSwxQFbSpqNQ49ZQp1FWGeGZZGys2DBALB6mKRqitrSSR7sLIm6iKTSiiMHdGC3ohy8KjGojW
-J8n3dqeu/0H/BrNodaDQVVet9Q8MGQawXBCDOKWqgTxvrjJCZQz/L/eM9hivbf8LyePB4BE7Dx48
-eDiMHgHHG6ACgcHBrO/tpzRNam2ZcPycJcexafsOIoEAuUSSU885gU985NNs3b6DgaEBPvC+d5JK
-xclkdaqiUWJVEQKBIFUN9Vx3w/WcftKJPPDw45iWRUt9FYZdoD9lsmFbN1t39JJNm4R8KroCM1pb
-mT13EsnuPnL5AnPmzCRQUUGoLkIxn6VnMElYNenNmpmly5M9VVHF/u8v1R/zH5+se1tTvd9q6zJ3
-xRNmmgMTBd8MBMAnDk0cfunQXP93fveJPlFGGPzkflNd574VCYDP1Taa6/C9Rd9R7iffW7yf/i9N
-kP6v95nien/VE4t/XWiujlcAZeve+MNfeMdRn6yacQUdW/fwzOrVWKrFtR+6hjNPv4S2rm5u/f3v
-+NRnPsPKV1YTrTYI+YKotkm2YBKJ6OQGE/TaIdJ6kaKqMLW+idaKKpKpFJpRoLOrwGA6hS8QJRSy
-SZgFdnf0EY5V0xwOsPi0hbTvaSeRjpNImQSDNsFYJc1RK3r+WRWTzj9JC4QrlKZ1G7KcuDjyjunT
-IupPbxm8de26tMH+CYPu6gH7dVYmH3AKMEca7BSXYVFcz+dsknSv8HDIng1ZSWcBpwL9wD/EOW+1
-PAnH2LwTqB3F8FrAKmAtw3tJvNkTQp1+mgycDaSBB0T/6Ly5l8BWXHL6fyXM5vTZROAcSt7Ft0qf
-He42WAwsBPYCz79F7YuHQyQC/zTMS1/s7Puvb9srjp2/8Lieyy7gmdVr0FG46abb6O3Nc/ttf6Kj
-t58zzriA6oZqbMtgIJslFo5SXV+Palrccdd97O3upiqkodsWQ6kcqh6jJ5HDZxrsyxSJaSEaakP0
-pfLEU1kaxtex8MwLiPd08vhjLxHvjtPcWEtlTSXHz6vGsIuEw/7gzKnZ1gGfppLx0ZvIkDZs31mL
-w2//xnWN7Zddl76H4fUDTMlD8EYMGqpo4w8CH3oV339FPH/aZYQVcd1TgJvFeS9SCoc4+y68FZTV
-MThB4FvAtIOc/wNgt9Qe+luACGjAEtFPu4ClUj8V3qSDq0NgjwECwDqhP/8X9u9w+mwh8Gtg51uk
-zw633fID7wBuBO4TMuC0gY1XlfUv7REAsItF9L/e9re7p4x/21H+UKpCKSpUKBGee34pfsXmo9de
-w//7+c84422n8dtf/ZYrrrycjWs3EQwGUPQCuVSOnAKVsUoKhTwUdfa2ddHDIJlihmAgiKabZG2V
-TNFPZX0loYhGZyJPavlKtq/dgWIUqa2K0DuUptgxhJlJc9yiyfQVdKxQgzqU8LNjWyfVDZV0RTT6
-k6p/75DeDEoN2M5A6Mwc34h1BRRJofYBK8XvsqtthvjZRym/QfYGWEAlEJM8As7g7hMGOiju5Qca
-KK2qaLve961gdMOS63FAtIfbS2IJQ1QjDUpv5r0k5P53+snn6qc34zLYDgmYBawQ73CW8MQ4a3X8
-qw6Ecp+FJRv5Zu+zI9EGsn0JizZIiHc38TZz+5clAvsZ3bse69v2qa/PWH3eeaeceuYpr/DCi6sp
-2jbf/+EPmTxxCr+77VY6Ozr5+U2/oKOzi6r6Jux8moJexAyESAz2U8wXMAp5bJ9N0YTmCa3UaY3o
-CtQ0RDj3nPOI+qPcde/dJPoGMXw+lGKQgqET80fIZkyKuUHqmipR0j70gsFL27vxR6qZMXchSs86
-ioTQFJv+3qHss892KmDPYHgXQnngVd4gpfIBfwT+DjRScn9XABHg60LJ1guj6+ybkBGGxwRCHBhO
-cBTVMVYBYJz43NmW2XiLGB2feA+ngmUN8KwwNEXpyFBaTjos+vWtELd195MmZEAVfZR/HfpJkdp5
-LLkziqQzDtGKCEIK//prdDh9FpL6bNzr3GdvBp0MSkQgJIiAzXDJtuNt9fAvRgTkmZe5b293/J2X
-X3H7Cy++2PiJT94wc8+W69H1AK+sW87qVWsI+UN0D3Zz25/+SFEtYOVzKCr4CIGRpzISIDq+ldNO
-WUx1NMJgPMX8o6fQ05ti9XMr0XwKm1/ewMZNG2nv76CmLorPX0lBT+PDRzaTxB8KEjJt4okM2UyA
-1Ip2wg11ZPIakUCMc088w9yya6teUx3UN+ztXnf/Y/E1lNzGC4Ct0gDyRg0YtjRDN8TzFCQFQ2Lc
-FZL3wjnPnRvgdt35pX6sFd9JiXc2JMPNIRhud2zY/S72ETI6qtQWMfYvBXXITdE1IyuXQEkZb4L7
-cw6hTRTXYY+xPf5ZkuvyCNQIYxpnOFmXEd6j3LMeyjs4+RdVwGeA70kzOjlkVq5PeoELRF/0A1Gp
-H5TXSYYUV5+WuxaHUSZH6rM6IXvJV6lbh7s9lCOslw4ZcuxLUNiXvLAvOendD5UUjvYOh8NOjVU3
-D4d+Qfl8r3KT6zc1cdbKkQBhfIsrXl7VdfzipluvueFzV9bXF8fnbX/Nd278f4qBYfpCPiOZydqa
-qioLpk9WjIqIr7WlSZ1SW62Eq+uZPL6evniCdWvbGDSzbNi6k+62NqZMnkBP/y4sxUI1bPqSQ9RF
-QlTYEQYHMyghBUvxU9TzVFWomNEgKd1HwIIKK0CNoVLXZLBhxWO5l9Z2de3c1NUO9ACdQkELQJsw
-XDNEx7S9gURAF4oTlxh1hv3j25Y4Z0gY4CFhdBKC2Mgxf9kroEnGKiaUNCquBfuHFA4W25WzhH2u
-QUoePA63O1513UsRz50SA5C8gmRa/O3MymzXdeTqCdtFGORMcHlmO5IhUw+hPUa6hlwx4vwdEYZ1
-JBKgSt9zv4fcT/Jn1ghkUQPqKSWdAvxW0pHRymude/SKc91VG8pBiN1raTO3LKqu+youWzUW2T5U
-uPssJmSvQtKt4hh1S5YjTXoX5zvGIbaH5pINc4zXeDUeJKcN/JTClI7+FSU91cd474PZl9dqp9xy
-NlLo0G0nLEmeFJd+jWYj3O2kliEnR9JuHnYiILMnuRELQP6VNYPtKz9y4z1TWqtmaeGKCabuq8rk
-c8FsJhdIpzM+y7a13Zt2aSeevCR86VknRkLBCt/GTbtI9g1iVqi09/QRCAYIh2y6BjsJhkwmNtfy
-8totjKutpToYJGcUSRRzWLZJLp+lsT5GTyFJPJVB80OxaKIE/BgGWLaFrRd56omt8e6+TMrVgc7g
-a1BK8tGFAM8BNrzOLj2nPXUx8JvCiCTEMxUloSgIotALtDO8m6IzABbYP/nPPaipwARKCYnzxN8v
-AN8QnpG8azZdTrmcWP3HgauA6eKeK4H/AZZJbsHDHSdVXe2Wk9pjSGoDwiiI+AAAIABJREFUJ3SS
-d7WHYxh+AhxPqYLix5KhsgVBelC4Ob8m3qdc9YE8K5wAfFrMjCeIZ9gK/BX4iyArBYmoWaMYLrmd
-3eEqx6g77/ER4GrgGeC/pQEb4LPAZWJwv9kh7a4ZqvP8TeJZF4t2e0QaPD4ObBFtqrue3RaycLu4
-zueF3I42u3Hu2SDa7GJgqrj2DuBvwK2iX/OjtJljXN8mPBj7gO8AX6CUxR+kFEb7ptBpt0werlCK
-3GdNwPuEp9FPKTn3mwznTRRG8dxpwAnAV8TPqJi03Af8rEx72CPoZj2lhNoLxe89lJIYf8twIt/h
-ShJ2t0EUeI+wLXWCoD8K/FDoqBwusEYh+5XAJ8W1pgrZexn4EaWKoIPZF6c9xwv9OEHIm3sWfhml
-MKLjUUTSL03c70ShP/dI+qWI9pwDfBd4gv3zzOwyz/K8+P064HIhJ41i/PmZ6Oe89CxvyrCaNooL
-Oy8YYNiG3l3tCQUScaC+qqqiNp3Jhi3bDsdqQlVf/vJ7J2jhyf5YTYVSyNkoWpHBoRx2Joxh6vS2
-dZQClKZGciBDVjexfQGskEIxbZNIFzC0IgEzgG3l8BuQ01XMYo7ZE2sI+jUi0QDRsEJDJaBbnHv6
-+Ni9f98Zz6RNdRR3U4rSroRB0fGbKCWiFV+n9rWkgd4QbZoV9/e7iEBKGIUBoWhy9r/MuMu5oarF
-AGEJwzmVUrnaPOASQS5S0izQLmNoYsCd4nuI5wgBp1GqTviEGEiS0rMdLoMjow6YTSku2yp5RHTg
-OfEeZpnB2y+MyQ1Ckf8q+jorzv034GRKO1TukWY47jCDE3Y5A/hf4VZHXCdKqQJgiVD4j1AqrcpI
-XoqDDUbqCC5vOUlrirhHlwgl5MT1bUHQlgjjXyPu7ciQ3B71lMreFoj/RYCjpOdoEQOSXaYN5KoB
-xDON5g1w2myRaPcm8f+80L354vgA8GFBptLivdxt5lxrnCAwk4X8BShVXUwXJGGBkO1dkrv6cJEB
-XIPgvwsd2UuprPBUMYBcKgx+ssz9nTacBzzp8r5OFGRpDvApoffpEQi/kxj8Z+BM8dkg0CxksFJc
-K+my4xxG3ZwjDscWNYmB+AzxDPsk++LuA0UKiT0EHCv+3y9k8mzgdHE9R7+zZeyUIxcnAvdLeinb
-+z5x70bxHEnJ2yC35WwhW1OE7cxKXo65lCpGJorPMuKQ29UhNmGhiwiSO0OMMT7RXr8S9/ubINLZ
-w2Q3j2hoQHZV6ZILOyDFcC2fTzHy+VzOsqzogoUTpl72nrOaTznp9MC6je3s29tB92Ce3r49FHMG
-GcvEyPuIVUSJBgN09w6Ss03GVVegtzbR35+kMlZFfeNEOvq7GewcIBIOkrTyzJvRjOLTsXSDwe4U
-0aBGJBxhdkOYvA3HTAtVvH2xPeGnt+0rvrCpMCTNtHwutyJC0ZYLAZgAbJZmOK8HGbBd7i8fw2U4
-MJwX4BCFnGRY7FHczjIReAV4WBiJIPBVoRBXAb9j/3JKs0w88N+FUvYLpt8t/n+WYPDODEh1eTvs
-w2x0ZomjHN4p3s/t0naMxFIxeDYL78gfGc50/ri4xt9EvFORZtOm9AyaMBAOCVgpZsZOouJCYfyO
-Bn4OfEzMiuwRYpPKIQ4+QdHuCCI2TsivKg3KzgDVIGTJcLWH49L9AnClMLIdghhkRB9nJVd3wRV6
-Ul22IcKBSZqKa5Y1TngpmoR+/VHMWoOCgHxADOq/Fu3XI3l/3OEbOcGyTnhG/iyes1J4uhoEqfgf
-DqyUOZwENSo8D/czXM3yFfG+1wrPU7n7O+3SLN7xj5SSgh2SeQVwriA060YImTiDV5MgAQivQJto
-nwXi+WqkCdzh9NY5bWAI3XpF6NM0qT+/Kg6FA9dtkQffbwgS0CFm5IPi/xeL41tCVtVRrhMUg2sV
-8JSQ5yrxvTliovKEkOuYy0uCNHg7sl0p5MhZjVaVdKdakGmljL1x7ETEpSNfErZAAT4qJh43CA8W
-b+YQgeryCFjSoJQTjZMQndYLdFuW3VEomG0zp9emv/XFd804bsH8yKZN29i7Z4j1G3aQ7eqlkChi
-KAqBokkxD6lsnJ6+OG17d9Ld3UNjfQP9Q3mKpsbMRUdzwXnncsxR86htaaB1/ASax9UQqY4SiPip
-jgV51+WnMG/uRGa0tBAOmdRW+QiGkkxtKVR87MLg5KooMYazXB1D6iS7OATBFgYqLQbHE9+AMIE1
-wmDsjnkeasyvW7BpR1mKwuWGmKU1CKF3x6ZVSaCvFf/7X6FA48SAuUrMhOqFMaoTxsfPkVltLCsM
-bpcweHvErG+HGBhjrvdQXKGS+8R13i1ciOMEmZkl2uUlYTgjDFdjlCNFVeLev5VCTH4xKPxa9MuS
-EdpEeZVG110W6mRrV0mDcUAyPPVSe7g9Y0XRhjmXjOUlElzuWeXBGMlgVoj/+UbwYnxUDHr9wE1C
-zyrFZzuBX4p2nC5ct3XSNVVGrojpEwa+ShhnhdKaGQgvwzjxWVAy4ocTCeBxcV+nkkC+v6NboRFk
-MkVpHZG/iz7xCXKZF9c4WmoLt07JoSQnNHScaOeI0PF7xL0PdyWNfJ3tIozkE/fZLvoEQWYmjaBT
-jkxXCY8cwG1CFp0KqmVCZqaId3Ou4yadTkhgthi4b2c45+p+ce1LhU7I/eGO5wcZToKMSToUlp4f
-8czlZFQZgQjcLf5fI77zrPj/dOF9G8nmvOk8AnJygy4JqjOA5YCMbZMAort2D8Zvuum+EMHoArTq
-xlhFTTAYqwlZ4aBqBmIECjr4w+j2IPHuDCctaiaZ6megb4gn126kp6+HgmXw+IMDPMk/0Px+IrU1
-DA4OEK3wEw7ZoMRY++IWErkUQcvHoklRIpPG0aAZGH6wdGiZMaHqD9/WFl/71eWZwYzuxJAdN5s7
-flsAtonZyKVCEB+T4khvVeiSR8FJRIxLRrxa/J2QPA24ZsBNkmE6Who4ZDmZJ4ygkz1dPAIxr22U
-SgiTIj8gLe6VEuGKcBmDKTPsf4iZYqMgAEsZXszpJWmgUUZwh4fE9xDkKsxwfkdRfH+HOGaI0Mkq
-KXdBf5XuaXkmrkmz/5jUBrb0WVB8Fmc4CY2DxPGdxNW05JovF7f0ScYSYdjCZQZtJON6rvh7mTjP
-krwNDjFZJ1yyp4gZXdb1DLLB9kv2J8z+24zHJUPulu3Dve+G20NaFHJZ7v5Zly1RhJw0CHksiPeZ
-JfVXlRgkBoXMF6R3cGTCEAPNlcD5YnB5QNzT5MjU9duuccEJFSfEO74sCJ2z+NKgK0RjSyG7+YIo
-26L/NZd9ce51DLDRFR6wXCTZOb/Kpce4bIO7EkGVPIc+iWhXSKEdWY+cSq5QGf1yP49jI/0MVzsN
-SMS2SbSP47kuvtkGkHLrCFjSQCHPVJ1krUzQT+3Mqa2R1tkL+9OZ/Cpd97ceNW/q5HA02jw0mFcD
-4Xrad++lvy9JeiBJRs+zdNVmEv1xIuEIA/t6wVaIRmJMbx3PULyP/v40RjpHTUWIQCTMjMnTCFdX
-sW3rLvwBjektk8jGh4iNG0+sejKq9hKmWkVH90zqihuqfvRvcxZ//i/rCgOJ/Wp9DZd73ZYU+U8i
-TPCvAFsYqSHBrnUhkI4gyrNJn8vQOAleDk4awRjkheFzst61I+QRsCXj65CbkcoH5UHPcY0OClfy
-ecDbhSfrBGkmp43gRnXaIiRmAjBcepoW7eq4D6uFF2aGOLdK3DfBcCLjq4Uc0pJnMD6X29/9mXsp
-YJP9kwwtYfCcBZscw10uLq24ZteBMt4AN3mqF/9LSzPhfvFTFW3UJc6pEW045BrA4cBEWMelmpHC
-QhlJtsMc2bUlbKFLcfE+Ben+iku3VBfBdGxpQUw63ivCApbUvmExSIbKzBZl/btFnHOJIAKfopTT
-cxeHt2qgHBkwhez0S/bFIadRoQMxye0ue0ScfA+nvU4bxb5Uu+yL4pLHjPBMzKa06uHz4tkuFNfY
-xXCCsF6GICkuGfZLOqS52t/vsnMjec7kd8lLYQb53ULsXy2k8iZLGhxpHQE3G3TiwcaPvnr2cUtO
-PePDXXuTlZZWMW5dW0bbt71d27StK6SoATq7eglHwrTt2kVQUxhIDGFYFhWaSkV1CAubUDRKnRak
-qqaSxdOaWbOjSG4oQ1ApYBs+zLzCylXriDbUUNNchV6wMRWdoxZNJd25i6MWRkgOhUm0F5g6fQZW
-KkdTvGPc9Wc3z//eA91F3bCLLje7XYaBmsJl+VZeGEUmb1lhVAcYTkx0s1V3qY2jGDnp3D+Kazmz
-fkuSk1SZGOqR8G44RqdXKFZWeqZySVWW9M7O2vDnCoN5lVC8XdJA4lxPzrKWZwxpMXDVivMTYvBM
-SEQiKu5dEEoeOgzhknIJhHIJXbkyqJHq003JIDrGPCXeIS7NgnRGT0Qtdy+ljLFPS4O8k6jVx3B+
-Q1Fy9+ddbeZzzezc7+TUrw9JYUvnPeVNqg4XEXDPJjOSbhUlku3WLbXMQG6KsMmnKSXV/YpS8u53
-xOCpCRKhcWD+hSPbzj3vER6zy4CZlOL0GvBTjuwCW47sOCFiR2ZCkg6EJLKoumbyWek6v2P/NRlk
-L1fC1f/lBt8fAt+nlDD6NldI8VGG86tGypdQRtAv98A+loXoFJfdSgsZTbnGVs0lo2O5nn0I9uI1
-n68dhAXKxMA8dv7kSPPEJR9du7Jv4fq1m1m9rY1Uqki0pgbDgGhlhFR/gh7DpKmpjnwmxfSJk7Hs
-HP2pFJXBavr6+2hoquXUJbPZ3dnLI39/jtraCJe/fTaZlMIr6/aQSiTRjTy7+nuY3NyEVh+lI56n
-89l1bNywk/e+sJd/+0wr1aECe++9lZaTVWqOrdbmqqHpnwsGtO/9Za/J/vW2spI5BsvJEjXeomTA
-dv1eYHhVQkNyP8mDnLtkzTmGhNFuEGGBFey/sp9znRzly80Op+GVZx/dwvg47ja56sIq872C6N8d
-lBIbFzCceLhWvGtWcj0WR5gxrBfxyIUi1leU3t0nPpsrvrOb/ZNUOQzuaV3ST58rXOBzzUiUEZRc
-Tk5FknnHszJa/bdyEIJSbma0Xrh2F4rwjNNmWfF5jXALQyn3wt1mlPFqIHnxcpJrvljm/od7ILRH
-0K1iGd3yjTJrPJnSYk69wJfFYFntIlm+gxAJXSJCO4DfU8q0v4BSLsydEklWD1N4pFwf5CX9P048
-sy5CrWoZT45jX/aJ9otQSupby/5LwDuJhhlXSMA9ITUEoX9AEHyTUuXLbhGq6JE8FfkRbLst6VeA
-/Xc91Tgwr2Cskx6D/VeGzZaxK+ooBEcmIzblq3lGknn30vSM4Xw5iX1EduJOHjQBs6m+3pdNFRcu
-XbaBp1ZvYsbR8/mPGz+HP6yiGwW+8Z+f4qc3fZ9MNo0flVAoTCYTJ5vOMmlCK1e86x1MmTuB9t5u
-nnxpFVs2bqU6pnLKMeNYMG0ypy2ayfHzWgmE/ERiYeqrq7A0H4mhPOmMQayqlauv/ywts1rYs0ph
-3Z1DbFq5j+7nOgkMhGkK1yonTmue9N4T6uZRSqhpEsc44b6qllxYAQ5c2OKNGshHi+uO9RqGyy1W
-rj57pJXNdErJTAg3+mxJsDNidvxuMfiVcycfTviFwXAyf50Yaq342xyh7eSZU5JSqRKSJ6NNfJ4S
-xiI/QpjBopRwaAnX/8WSvAQolTR+X7j5eoSr0hpFCe1XYXx3ib+nM5zkGRYk7bQys/TR9NcxSA2S
-6zZIab0F7RBn0vYo93pQtG+zkBUnySpIKT7+XaF/SUo5IOUWarFHMbJul+9oxOVw66fpegbzILMt
-OaFMLpcLCU9SwGV7RyMTTsnod4UsxIUM75S+O47hBLkjkYzml54xRKl88tPis5Xsn4dllZGNPKVs
-fsR3p7F/vkoNpWTCycLeyPbFHWY5HrhGDP6/EF6SZQznE8VHsVHOtXaLv+cK+QwJ3TiPUuk1jG3r
-Zbf9dcup+7yRSIBP2JVfAZ8TuhMcoS+d86dTSmT+6EHCtc758wWBfH+ZMEVZj4D88DJDx19VoTRM
-nYzx0k6SOYtTzzyND3/o44yfNJkPXfVB/nDrX6mpqEYxTfp7eyjmdKK1EWx/gIrKaqbObmbK7skM
-7O3Glytg5guMn9jA+OoQvnCSUKSK9vYEhVyBQMBCqYphqyqpbBpdU/neD77NwqMXs+eZn7Lijz9n
-+tsnsFgpkOiqIbPDRKsPMn5uk/qubOGoXQOGtWJ7wpJcVDajL/n4eu7WZ48SkrEPcdCQZw7lVsIa
-6dpyLLlIKRnpJKGk54tY5qAwXJXiOy8x8mp0r3XW4cCp0y+HRyiV67mrMOQZQ04YgpeFC7aVUqZ/
-TnKNlwsvyCWRmyhlN39QGIcTxEwsKEiSJgbY2xnOnRnrQksjbYst98cyQTIaKZWqrRHG+ARpNqoy
-8nKmMut/UTxbhbiW0yZrhRF3zjUYeZlXawTZUaQ2a6NUTXGDmAUvEG5sp6baL867neFExbEssjJW
-2T6S+jnaLqYj6a2T+LlX/H0UpRyBXjGbdkJLsyjlV/ygTHhAHjwuohQL3y5kb7b43Ll+hPLJnIfj
-/ecJ8uuQGSenqFt4fxxvXZEDyygd+3Kb0OsWSvH9c8SgHROyiUQmzRH62RTPYAnScJrQy50ML9aW
-4MBEZtv1PA8JsjqZ0u6Km8Q7HSO+F+LAvJuDwXoVMiLLyVcYrtzaIOxXhgNLkp1Q3HcolaB+UNiH
-7WXOl0N3PxKhlPcLve9mOMHZ1sYoGCrgq62fqS1YdBHFmx+kqibCL396E5n+3Tz+1CqKhSJLH3uC
-pilNhEIaOb3I1NlTiad6KORsVr+wgq0bNlMZCePzQc9QnFg0yOrtHazfvoNIUCFp+IlEapgybRpD
-Q0MkU1lMFcZHK1CLWW7+9FVMmuBnMNHDcaEo+qBKW3c12S0DTDpHwdZ8pDf5aRrXHPjSxxcv/O5v
-/sbLW3tUVwxPTkLxlelM63UgAO5FP4wRlOhgA6jbdadzYBaxNUq8zJYGz0FKK7ldLVh3UMzuELHR
-Rykl5xyJZKyxtnlIzB5sDkyQsl3hgUFBHD4oBsNB8R5ydrddZsBxvn+fIA6XiVDAYmlQWCEMoDML
-kaso3EtByzIl95M1woBriGt+h1JdcotQ4DSl0s4pYqB1G5+RBtA+SrXunxDelSrxjtsZ3snRdJEq
-u0xIoVzylbvNHhOG5Z3iORdKz7lWyFAfw5tqpcfYZrpLtk3XZ4ezdr5cPpG8nLDpIp+jxaJVISuP
-i4HvXPG8TmXFZEEKHna5puUYuypI4Z/FADpTukcbpQWcRssXeS3vv04MslPFjNlJrs6L93pS6EiK
-AxcCkol1VrzDtylV9CxkOMkT8dlDUviOEbyZPuFV6hRk9lhxOCvJ3i/CEKN5DXURmvqxIK3jxdFL
-aSXAyyktJsRB7PFIOmJIHiQ51KePIiN+QWgc72VRTL5MSbZM1/nbxPnO2hYxDlxa2Rm7A5QW8Xqb
-kJmQdL4OWGMhAv/shGw6rTXUBqmtUynuM8llkuzaleLyd76LhoYWVq1cxeXvuIhHHnyG7q5utu7Z
-Sm0ojKr4OXnxQsLhED2JFFs291NfXcsPv/efhGJNbN++ll/cfCvptm58/hiB+kn4DYtowSZkmKT6
-OpnVWM1ZZ53K9KNNtOIghb0p0m1tBMIBqhcpGGmDrBWjf3cHr7S1ceJFReV9Z7fO6erp19vjpjxD
-UlwdYrkGZF4HMuAI5CXC0Ackd/VYPBPOQHi/YI5VUhzVMUy3C0WNSbE9owxDdojAkBCS3wulHC/u
-NSgUNTVKHPe1wGmLDwlXfDPDayE4jNWZdceFgjjJfsoIA2lWvM9DDC/ZnBDKnhzFbWgyXGffT6l8
-cCPDteq6uIbz3aw4b1Aa1Kwys4QnKFUwVEsuUZ0Dy6ec2VNGzFJuFIY/SGkhlqJg/w9JcevCKCEO
-pw2XCgM5Q3y+UxjTqBTPVFzfjVMqo3R2tXTnZrjbzKlIeElcv16EcwxhrJwBIifabEDyzIzUZhcI
-sqJLsq2LmeNLEqnJcXiWb5UJ5dOu+2el+z9EaXGdcvcvF676sdBFZ50FJ7lugpCdnWW8PHJ8OiNm
-dHcKd3aTRBizjF4K+mrbwSEsXYIITJDsVK80iDj5PEPiWdybgsn6uIfSsr6Nwu45qwH2CfuiUL6s
-1wmzfEEQWsdrV5BCT7OAL4r++h+pPWTyKpPWZ8XzTBeft4tzfi7ulZH0q5ytcOzWGQzvKCpvlDYg
-yJ9TTeNOTna77u8V3h2nyiTMcM4HHJjg+AfhOXAqm8IMVzW5k3k1SsuvLxf9EMJVFukbAwlwanr9
-c+fOrX7v+67+WHu8g7XrNuIrKHzq3z/Nle9+L1OnT+ahxx5jx+YddPV0o2katmGiKgbTp7dSV19J
-Z18/8fgQvb0JDJ9FfW0dPttkyUknEYxUsXnTBuqbJ2BhEu/vIxIJ01xZQ9Yq0lBXQ0QzWfZCH7kd
-eyh2DqD1FzHT4G+uw2xoIZQpcOfLXdy3ehBfKMTsea3+iRX5yu6+QmEgbbg3+SnnbjzUnfpeDZw2
-lRc6cga5IVd8a1QPjTR7cDJWE+L7ukuhndhZuQ17ygm4IT1PWhp0ZNf6WJfUPVhbOAw3IIWqHGWQ
-Z2Kj1cCPFKt1XIkpyeDEXaRoLF6XnNR+TsKdYwB7GN4caaQlYh2FM1x94X4OdwkdDGciyzsxZsQ1
-+oTBGYncyJuiOEtuO3s3OG3pJFbprlmoI5+WdL94mVlfufaSS6kSUps5a0H0Sm2WP0ib6dL9ndmS
-Lc20RpPtVyOPo/VZiv0TFd3PlnN5N+REtKLUfo4+Of0XZ7j8NOfyVsnbIjsEOSn13aDUnvFDmEyM
-1e47Nf8Z6RllGewVOjAwAhkuJx+6ZF8yUnskXaE7Z2KmCRL9J/H7/1DKzekQM93l4ruzBHG+j+Hy
-43JLHstJeU4VjVyu7Oic0z+pMp4rec0PuWrLKSGWJ50Z9l9rwijj6g9JfeesW1JuXxWfdH5OOj/r
-Ii6W6/pB8bm8Ed4/yYk2BoH45+DT3rbXBDadc9JZR93557/SmRri05//Erf8/ves37ydbHwA/AFm
-zp7JrbfcQsu4Rs458xR27m5jx869aD4/waBGJOLHKir88re/x+8PUhGoJJVLoNh+ahpM0okh6moj
-7OvqMhNpTQ0oAWX15h6eXbWLXO8AlfVhJk+fQmNNgHcvCJDPGKRWtvH7R/bS74uyO7mXx/70Gza/
-8iSzZs2uvGygOO+36T57IG04jSIrvHtXM/0I5wzILNkpZ3NK+JJjIAGySzIluZNMicXKm0clJWNW
-jgS4r2WI6zgJK7LBS4wwgL0Wb4DTFgOiD1KC3fo4cI2ADPsvilTO4Diz6rTExH3STGC0Z7fZfw0G
-R8HkRCykmXZCGgQO1rZOxYrcT0aZ2bDT1v3i3LTUHpbUHg4ZGcn4yySwT7pWUPq9XAmh7M4dFNdW
-GDmj2+1VcoxYJfuv1KZLxl4mQqaLgI/UZk42tkziU9K7HI4BsJw+jPX+OZcr2ZLk0OnLBAfWxzvy
-MET5ZcVNiUT5GS7l0yS9HhJ9dTj1siA9rzNwBxmutMpLBEkmSeU8RnJ7OhUQMYYX5ClKg6Wb0Dl2
-2rFHlniukBSO00WoCymHIceB1QNyn/RJ9jHoyqsxpJyDVBly47bhBclrJj8TDJe6yhVdliuXx5Ds
-vy7JhDtpUnHZTE06Z6QF3mR91qT22C+UqY1BMf6JbbvWG08svWXXth1DR+WSKcY3NtPX28Oqlaux
-TINIOEIym6MiEKKncw9de3czadIE2l/qYsb0KRiWQvuedlRFoaq2Cl0PUCiYFIw8gWgYtQBBzSaq
-QTybpbOjy5wyfQrhqOorWhGu/tCHUI0C9f5ervrct1i/9D7W3/I9zEgF9z3fht0S4TPvv5KBpM74
-BYvp2beRRDHBpEVTKs9V1Vn/+2hHTmp4gwPXCHcnlxypRCSn453V1xTXLPhgyVOWNDMxpEFTFkBn
-9uhj/1LA0VzitqS0YYk0mRJrzx2GmZf73vLWrkPsvziMmwxkJTexNULszpAMc06a2Y20k1i5tnW7
-NeUlbHUp3JJzxf0ZQQkN8V6H0heO0Qyw/x4PptS/uRG8AZb0/rY0k/RLf2dHGNxl+cy45MkYwYsk
-t5kTXnG3WYH9d9Q0xtBmmitPwJJmb7LcH65KFpmMGaL9X839ZflxPCRDHFilZLF/qaW7Lxx5QHoe
-Rx6cz+TZ4OEIj8hk2pEBtz3Qpb7MMfLuprJMyCQrJF3PYOTdRR3vp7Oa4bGUkupWCE9EQbjmnc3S
-NkgkVF4Ey3L1iUx2/Oy/V4K8um5+BIIj60i2TK5XUSLiI+mPm3g7pNIpWR0podkhTqakH4UyZNgu
-I8+a9O7/XPxMOwThsHu70vovbrplu1+pwO/zk8gnyeVyvOOiCznvoou44/bbefTRx1izfgPXfvQG
-0pkChXSKCZMmkstBR1cHmAYWPqxsDl0v0FBVRTJToJhLEonWceVVH+D9V1zBipUrrDPOPCdfURsJ
-G1l8lVVwyfkLyaTTPHrHbbz0wlLW3PoTxleGiLXWULdmL9d9/kssuvSTbF7+QXpfzrD6pa3kMDhh
-YSsnzq6tzw5acx54qQtXwo/hSpZyu8yPxGpdlqTwBUkIx7q3uryroe4aJOTdz3QO3L/dHuF6stsu
-z/41tTJ5OtyrmLnbYrSFVSzXM9gHIVuWK0xijWGwsKVzDMkN6nO1s9weo5UOGlK7uvvJGsVLIhst
-H+XrheXktZG8I25joLruo48yKzfYf292cxTyZbmMYJr9y5lMycCO9swHazOk51YOoV8Plajb0vuX
-u3+xDDmzR5AjSyLl6gj95NatcraiKMmi/Kz6QeTw1ZKBvDTgaS5ybrrkZ7T2l99Bvt5I9mWkScZ3
-KG1etIDhhD4Zm0T+yGiltZaL0GU4sL7erV/WCPkfst3CFWZWJPmJaZ0yAAAQjElEQVRhFP2xysg7
-Lt22D6IfsgxZYzjfdp+vjVEo/tmAg4lMx4JjJ+vx5IC/d3cfFfUxzn77BVx8/oVMaqlh7bptJNMJ
-0ok0s2bPZM/OHbT3thPW/GQSGfyRABYmRrqI6lPo7BskqCpUVtbh92ucftJ8/MEIW7ft1vWCkZtU
-VxXcNrAbVQ9x3Yc+xdGzKjjhhAkkH/suQc1HXs/TEFF4x8njKPT/ifWPp9n04iaeerqf9r0pFi2p
-Z7BziPrx1crRU5XWngy8uKFLjrXLA+dINc0mhxeyJ8JdomIfwgDqXKfcNZQyn9ljfCbDpUhH0kvi
-vu9omc8j7fA32nnmSB6uMT6TKQ067oQ6+xDa1XTJmD3Gvi0y8j4CY7m/fK1yfTrSwF5OPg+lzYsc
-uLjN4WqzQ5XtVyuTr/X+Y5Htcm0zmiwWy3gU7CPQBu5Q0Wu1B/J7HMr1ZOLdQ2k9hXmUSlIrJPf+
-bimXJsPIOURuOS23CNjBSs3HqiPKGGV0JFs+kjzYh3i+WwYPOH8su3WpkntGe8+7Lox95obPHBcO
-azWPP/0iqq2yeeMW+gcGueeBR2nftwe/ohKrquTm3/0Kw9R5bukLHD19Cr5ghP6BARRMFs6bgeYP
-MNSfxBfyEwyFiFTE0CIROnv6uPbqa5KGruemT2+IWpmcVqlAZbBIfdBPtZqhSgVrTz+Gz0dVax2K
-qdG5qo+dS19g1/Y49dWVXDQpwPyjGqit87N1bwqNWizbF22Pp9RcXs+4WJzlYuTlapaPBA6HAtsH
-mR2/mkVtrDLHkV5nYbR7W7wx23faI8wQXusCUK+lPexX2a+vpj/tw/Tc5hFoM/t1ksnDcf/R5PpQ
-+uL11gn34nLWa/QIjiQbI11PTu5zEl8zlDLst1BKFtzLcM6JnOSXPEjIyD6InXk1a7q8Vhk5lHsf
-tvPHUjWwXxmCbgbNz332a8c0VVkzfn/HfSiqxmB/gvWr17Bv1y7yus7gQD+FfJ5N6zexactWpk2a
-xIMPPsTV11zL1j3bMHMmTz61lNPOOIs///F2IlWVKNhYus2mzbv5+z8e1Tv3tcWB3NvOOrair6c/
-4DMVmqpqqQwrmP09TDt+EvrOAaoaYoRDAdL5BGHdplJVmXF0hAXTTeyCSc0MG82qZtm6PsxAmC3d
-Q+pR02dGw9VVRldXrzGCobc5sAzmrbwngQcPHjy8leHeTMvJy3ByJJyKmH6Gq4OyHP7l0P8loR1q
-B6x48cWh1atWLY9o+VMnTp9Q0bmti5b6eizFx1nnnMvRs2dz5113s237Dl5ZuRLLhi/c+FlyVp4V
-y15k98atRGoq2L59J7t278EG0vE09TU1GLZOhaLbu9vbnMzwTCgQMi3VxPZFSBYtgsUCe/p9aM/s
-4oGNORZlLGoTFslckoaojxOXTCazfi8JVKqnQ9sqFV80z9QZLazZmKK7L8WlV10fOFNTpm/Z9CUr
-myu460zl38vlC3hC5cGDBw+vHwGQKw+cBNgw+yejygnNToVLkdd3xdi3LMYSGpA9Airge3HFc0OR
-Kt+Fho+qnq5uUmmDytpKvvaVr3Dm284ibxRZtvwFmsa3Usxn6Oho5+GHHuDWP9zJnvYuUvEh/nrv
-Pdxx931MnNTExRecxfbdu/FHfVAs5HbvboublpUC0osWTavv6yuGE9kiuzuSbNk7QE+2SKS2BcvM
-0Z30MWnhBSw4+Qq27exBCRcJxFMoWKT2KITqKljfb/PEqn5SSoiFJ5zEJz71OQb6uv3r1q2L9vYO
-ZCRhkRM03GECzyvgwYMHD28cIZArNpzywIwgCEmG9xGRFxPybPZhIgIOGcAhAz3d/fqxixcl/usr
-3zi7JhRUVm3aQrw7zspVa3jkiad5+OF/YOl55i1ahF7Q2bGrjYHuAQp2kdrGGvLpHEVbR/MHaJ40
-jllzZ7Fl525aWhuNbes2Dwwm0knRsclZs2a09GQKEX8gyu9v+QMfu+EGJs+cwee++j22tXdx3FlX
-8JkvfJU58xezp7+X1cvWsXhSiFRbmqCiMGQGeOCVHhZdcQU3//YvzJo3j4pojMWLjmPz9i3BXbu2
-h7OZfIYD42CG63ePDHjw4MHDG08GDPZfAMg5nCqqw7nk9P8JjHXvdMvVAbm//+OFp2uqJz235JQz
-qGusxUJh4+bNLF+2jEx8iONPP5bf/OInfPHznyEaCtLUOp7bbrmVe+/6E/XNEwn7Y/gUP+tWbOc3
-N/2ZqU1NpLtTibau/jjDq+QNtYybpGdSGcK+ANlcjq079/Dcc8/y0GNP8Ktb7kXXhxf62rGzk0fX
-7OObTyT54x6DPXWNrPfVUtSqeNel78OnBRhX38TFF13Ecy88RzgYo662uq65tW62ojCO0kIUzk95
-t0L37k6KJzoePHjw8IYSgYLr8EjAEfYIHOAV6Orq+v/tnXtsU+cZxp9zsY/t2LETyI1rGi7hEli4
-3zsuAqH1grZK7daOMaAqaOPSThvStmpbWammru2mQaFF29oBE1QCSjtooTSUGCgtNEBJAiEJiUMS
-27HjS+zj67F99kdymhPj0LJOLYj3J33K8cnxybEU5Xvyfu/3PEmdTteycOGSMn2WIb+65jIiYgJG
-gw5dogi3O4i6a/U4/t67cLm9ePyxR7By5WoUDByMv7+5CwzLQyMI0BsETCgdgoKiwsjBtw/bZVlW
-bCa9AHxTxw4vag+IeaLfh5qGBhz+zwFUVJzC6dPHoGElBMIhjB4xCOc+O4sdO17HhMnfwebnX8T0
-mbOw6/0atHQEcN3hRO2Vy3jsh49AJ5iwY/sO7N69G1drr0LLC0wgENSBQVKSEhH03TKmjpbsL1mK
-IAiC+PbEAf09/gaFgCIGvvBDr6ioCESCvprVK9dMqW+8khuTojBodZAZFojHcK2xEU6nCwmGwfWm
-dhz+4AO8feQIaqtroON5mHRajC8dhJKhQ+JHjla2ezzeTqUSgJ4wF8GSK3GpxIS83Hy89NLLKCos
-QNn4SXht+07U1V/FZ5cv4djRkzh+4kOEwmEUFA/FL9ZvQkfYiz1vHUJjayd++/vnMG/BQjz/h9+h
-4YYN1sozSDIsIKcw+f5y3D9nOtvRYjf7u4JhudchTZ0klW7YQb94BEEQxD0pBG7i3PkLgdOnK6oe
-evC7Yxcsmjdgzdr1nOjzo6G5FRazCZyGRyImIRIN4UbrDXTYHWAYGTISKCrKQknJgMhx64Wmq7X1
-DvR6ZnvQvQWkc/jQbGgY/Vy70wshy4BzZ6xgNUYsXTIP7xx9H87WToRDQYjBCAAOtvpmHHrnEPbt
-OQh3hxMbnl6PDes2wGQ2Y83ap1FXew2JZAo8xyEFGUvnL8YLW15GU6uNvd7cYEzGEmIilUqPk4zj
-Zie524nPJQiCIIi7Xggozkvp1q9oa3OGvG7/5XmzF4WHFRePFYMOTbaRR1FBLlpdPhg0enAA4vEU
-si0ChhQOxIyZEzGkiI8fO1pVU1vd2KaqBHh6xEB3RYBnvWOGFX/f1eWH1foxWmxONNpaYD1Zidoa
-G+JSDCNGl2LL5s2IxmKwd7iQiEbRJYYgSUmEwyF0BQJ4Y9cutNrsyDYZsGHdo5g4aQ4qz5yF0+VG
-ltGIqk/Po8Xepsk1GbhQKCymUrLiFa2sRcXR10uaKgMEQRDEXQ/zP1yvjmDUoruJTgfAKOgEy+y5
-s0dOnDhyyc/Wrps7etT4nE6vTydoBeG9w3txvdWOKdOmg5Eckarzte5/vrm3trHB6cLNMZRKj0AA
-QOSpVfOPNTVJRkP2AHT6PHC5umA2ZcHlDoLRJPHAkgXY+uqr+Msrf8W2nTshxeJYt24NZs2cieUr
-ngTLsMjPNcNgysbFS5dxYP8eLJ6/BBt++Svs378fLCMjEgqAE7SwGLWpiBhuaGvz1KA7i9uB7ix3
-J3odq9TRrbRFhSAIgrgnKgKZBEQfj+hkIinZmmy+T89eqN629bUTtpaWWrMp22k2ZwezLfnto0aM
-axeDYce2bXtO7djxr0+8XtGBbgcoT8/o7BEAXpUQEIsHmZJ5w/JmP/H4A1j10xXYuPEpmPMKUGk9
-A44HXHYH9h04iI8+OglJSmCgxYJhQweD5VhcvFgNKRbDvrf2YO2qn+DkyROwnr2E8kllsFZY0WRr
-gsViRiKVBAMWWk5mhg8qMsejklcMRwIqkZK+ReXrWM0SBEEQxF1ZEVC/T51BoOmpDmjR7fikR/eW
-OwOALNU5oedaJZNb2Qqi7AcV0esKpRhDxMvLC0ZZ8kzbps6aNHbZ936OkvtKEQx24bk/bkGnuxOd
-dheanHbwHAdB0HbPy3IKPMcjGo4iCRbLli3BxPETsOffe+H2dMFsyYbH5UUyJUFv1EOKxcHJKcTj
-EVgMHPJMOQ5rVW0FgHYAbQDsAFw9owt94zKpV4AgCIK4pyoCyFQRQF8DHrUftJIzHeqZ4BUnKH+G
-0YW+DlExny/i0glyu73TM7Kh5fPCG61NiPrcqLM5oGV4TB07CM9sfBLDBw9BW5sdiXgU5dOnYsq0
-6RhXNg55hRZ8ePwYrNZzCPi7wCSTiEsxyHIKMgPIiRQ4gYVOlrBo/nRsffE3GFxSrK+6dDHs94dv
-KJUJ9LpZKbnSJAIIgiCIuxr+a7w3PT5THdqjdn3S9lQBlKFkcqfnWivZ70qTnjLZpmKxFGqrvYfL
-pgiXCkz6Z+ubG8pu1DeM5WMJXo7IGDd5Bh58eAXmzHfA7nfA1erErzdtwtTyaV887JpnVuPKlXpk
-sTyu1jVBjoWhN1kwY9o0BEUfrtka8MKmZ/GDR1cAAOpb/saPLCkcFg5EtC6PGEf/mdsMaGmAIAiC
-uEcrAsDN2dFq9ye1MFAmd2WtPdLPULtEqSdf2eUQxfqr9kqTJqvKoGcv5+rMosyxuSGf1+hsuYaa
-i6fQ3NGKYNAHzsDC7XKg/kodImE3Ovz1mFc+Ew8tnQNnswusTosf/fgJvPKnP2P0qJH45MwpDBie
-g1iXC/94fTvqqs+heNgAQyIWr2lu9VzvqQqEVBUBdaMgCQGCIAjiroT5P98rPbaYVVUAWFUlgM0g
-HNRLC6m0/77V91N2KuiNBr1ZI2gt+XnGonxzdsl9owaPGTpyyLSwK5Yl68F5EyG20+MRomKUc7vD
-zJjSEjy8eDH27T5o8oaCbGnp+Mjy5SukiuPv4mjlx8jR8SmO4aMTp5TJ5hxT4MAb+45eaXR8HpeS
-bnRvbVSWM5RdA3FQIiFBEARBQuCWgqC/oUa9vKAWB+n35HqGeuuigO5GRF3PEAAYdFmCMZFICgWF
-5sIskz6L4WU2EpQ4PsWymqQ8Jid/oODz+tu9ouiPJSQmx2SR9XpWsjU7HNFYUmlcVGddB9Hb4xBB
-7xIGGQsRBEEQJARucW8m7Tj9++rSevpx+v3UVQYevX0Hyo4Fjeorr7pG8T1gM1QnmDRBos4aUPoc
-lGULZadAerMgLQ0QBEEQJARu8+dkEgJftdqgFgScatJPP/4yAZAuBOQMYqC/JkYSAQRBEAQJgW/p
-mdWCgEHfXgQuw8TPpl3f3xJFpp4F9a4G5TgF6g0gCIIgSAjcMYIgkzDIdD59maI/IYC0yT6Z9poq
-AQRBEAQJgTvwMzBfMuEzX+Ezy7cQBennCYIgCIKEwB38eZjbPJ+pUVHO8JogCIIgSAjcAc9OSwME
-QRAE8TX4Lybv2o9oSY6CAAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0
-Content-Type: image/png
-Content-ID: <26389.957885364.4@twelve-monkeys.helixcode.com>
-Content-Transfer-Encoding: base64
-
-iVBORw0KGgoAAAANSUhEUgAAAFcAAABVCAYAAAA8AHhnAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIKIGIgTigAACAASURB
-VHja5b13lGTned75u/neylXdXZ27p2emJw9mgJlBIEAkggkkQXIZlHkoWV6ttVrJKx3t2pZ2Ja7P
-UtJ65bUtyaa8FkVZgZJMUzTFAFAgQBJxBmEiJvZ093QOlcPNYf/oauxFoQeBHJAKdc53qupUd917
-n/u+zxu/twT+4T2Ezoo/wrfqQP8QgRW3APaGAyz+AwNWBKSPv/fmD44WE0lA6qy3RNDEH6D0CN9H
-zXlZYm/emfxfbav9hf2Tg+/uALsJ+t9pcF+WHEDuLOmturCtrnWkQLbVdH5ZkuTTi2vm051j/73Q
-XhFQAB1IdVay815+iy9SBJSizr+9ZTL/BJAHckAaMN6q48s/AKlVAa3zPgLc2HorDIsACH1Jbb+m
-RT+T682/nyvVzc+iznrL7uj3W3rVw5NDRztSk45JjxqjiRvOtZHofWZ8Z+9fPPbM9PNdwL5l4Eo/
-CMkVHfOz+ZR6qG4Hz3W0R+hcZNhZ0Q28mcIt+3v/aTKp3LNWDT9Wb1hx1yu+uNFAS99Hqd0EWN45
-2js+Mtz/j3sKyebSWuNKjCJCILhBFykAwp1Htk2KQvQnyXTmo2fOLy1vcSP/3oArAEI2k5kRIu+H
-7rv/3rvDMHhhYWm9FJOmG6WuIiCMDKS+HIbhf376hfn/FvNK4jcyfKvo4fsJ7uYFCOV6yzQ05Ykw
-9D501523v+vkmZe+5riB3bn4sEuyvusbedfR8X/mum7vc2dXfzHm8kVbUNBbwrvfT3BfAXKlaZer
-1fITVrv1Yx9+6H3Hnj5x8uHolcBG34MUiw/eu+eWRrP1a00z/HC5avpdvnR0g7Xkbw24L1+c6YQl
-WQgvCEg//c773p448eLZZ7ti/rhxe6MAiPsm87oiRX/VaJj//YXpynxXoBLy6pvI3ydwXwa40rBm
-hcg5p+vy/3HHrUevnDx7YbpLfaM3YXAEQEjn+TeiIH/x9MXKN7dw76IucLuTWMKNCtF/kOC+TBGl
-Wnsmk1ZqiiL/GkTfLFXq1S6efiMSLABCcYf8kB+EO69cbv32dcLrrdy96DWAja/o7xK4L3sIi8vV
-k7LombcdO/LP5xaWv2TZjreFBMddOjEGngiImVHGBMJfsWv8rGtHdH2+FZC8DqjX+7u/M+C+LJ1r
-5ebJSml970c++L6Hnnvx7Ne2kJiXfeWtVqqPz4aW8PP1UmR2JYbELdT+FRFc7GbFpV3sWtdzL/9W
-gHs9HntZQust69HK2tJ7//FPfXLHU88+/1wXMJsZNa2T8NE7obNeGBd+KXT5Um2Zuc7nShf4cZCl
-LjDjWTqp879K1/+Jb0CyX3VR3wtI35W6vI7jL2VSemqkv+fPP/DQhz77W//P7z3ZxbubF/8ygNke
-blEMaby0EHxxMzAYG0ru7uspTIgCo57nRK7nlBCks+evVJ6/jo+7lWTHDZ/fFXjEX7OVTRC+C4mL
-q1L3a15Dfa5HCWxxkVImnUzumRj7kwfe8+Cvffr/+u15QJgY7r+nv9jz6YH+gYHZ2ZnLl2cXfj0I
-AyWblz++tup+rtBrHMjlEnf157O3G5KSzOeLeJ6H69p4votpNgjCYNnzo98/eX7lT7sMm7AFN0dd
-QPqA13ntXSfKi94oLcTVKK4u6haqmYg9x1dyi9dGbG1+hxZ7Vh3XE+qN5pOOZf2aphvPVKpVxkcG
-/8D3g+G777kH3/d7dFUOfM+6X1IMc2yi/2d27dr5YFJPbh/o6VdDV0AQdcJgQ/tFUUYUFDLpfDqT
-Tt/bk1XvaFut47YTBZ1jajGNUDvnEqeHbj4WtqC1NyRRAq+uHGweRO06aPfBX+sEXuUlbJFAiTrS
-ABBJMLlrYviTdTv4DUMW/ri/f3RClgxSqSzDw7n2E099J7n/0AH80MfQVcrldYQgQBZErKZNEILv
-efh+QCQI9PX2MTQ8jOfZXLry3MzzZxZ/yg8iNyZsQlcOwo9JrBN7jueh/c45B3Gpl18D2LikajEp
-M7IZY3tCU7fJUpTpyecGdC2RSiRSoq4lBUmSxX37DgpRFAmjoyPMzc0Js7OzeJ7L6Ogonh9U10sl
-q91uoypSJEmSOzUzs6rreuh5XrheKrUXV9dKm+oWQLtUqT5W7Ov5V6qW+urFi5d/7uMf/Un27TtE
-uTGTvMV2WVpeYOfOCRYWZnEsCyOh4vs+ohAiiuCHPpbpEAkS5XKLVNJldHQMb9yaqNfMT12YqfzG
-Fp5BELv5m4CqgMUri5rhFgGPsBW4m8DKMVATyaTWf2DPjk9oonxXykgdzKQzSsJIIqsGAwODyLJG
-b08R07QprVfpzfYRRiHNapPIj0jqSUQjjWf7mG2TlJZACSUK2RyyJHHz7ptIJlNYlokgiEiSjGm2
-Lcv3n3rkW48eP3PxpWt+KJ4ZKEof+PjHP4rjtllenWXm6lnm52a5447buXDhHGarDkKIFGjYtotv
-u0iCSOgEBLaDJCn4tKmurLBzfJSx0THqjbW7G6Z1fHHVOhnT1HhaclMyNzVW6gAMYG7BueH1VFWM
-SawOpI4cO/yz/T29//P+XXvUYrYXvACr2abdtFiut1BUHc/zERAIggjbdogiyOay1BtLGIa+UU+S
-ZVKpFM1mk3Q6TWl9jchyMdttJicnCaOIVCpFFEW4jkMYRezYu5+HPvQQ80vXnJ/7p/9TfdeeyeKl
-qasEIfze7/57PvzgO3nvu97Nr3/q1/nZf/IzSJKI5zmomky72SKwA1zbwzYtPC9AEkQSegJdTzAy
-OszA5ACW2+TE808vPXdm6V9u4c8GMePldMBsd5YJtDrPTowyXvYmpC6pjfuRyWN33Pmr99/7zl/Y
-t/uAtDC9yNzVWVbmlikvr9OoNTADC9tu44cOrtvGD0yiyEVVIyyngaooCIKAqqqk02nCMMQPAkzT
-JJVKIIsufcUsghTQaFaQ5YhafR3Pt1hYnmdprcqpM+fYtWeffM999yeXV9c5dMstnDl7iumZKVKq
-Sn+xn/n5BZrNNn4QYRhpFFnHtnxCL8RxXDzPJ/R8Qj9AEQXEKKLVbCAYEggiuqama7VKrWl69Zhh
-VWOlJykWvARbeBBxV+1lD0Tqklpx01LefPOh+z724R/59J6dezn+5DPMz84hI3ZEWyAioOnX8EML
-P2gThiae38KPWoiKC9iE4QYl+YFDq9XAcS1EMUI3VGRZwA9MvMBBVkRsz6bRbqAYKn39vYxv34Yd
-RFydmeXFU6ept0yCSGRgcIjZa7OIsoIiaRT7B1leXWdhaZ2x8UnyPQOsrdUJULBdC8fzkGQJRZaB
-aOP8xQhZElhYX0U3EoyNb8NsN7Pzy+XLMWCVLaK8sPPsd62t3DJB3qoMA2jjY2O/sGNwnAtnznPt
-8lVSCR1VlRGiAM9z8UKXKIoIgxCCgDDa+F5RijBNB1GUMHQVP9gwxJIkEYRgNmokEgmCMCST66PV
-auM7Er0DO9ANnXK5zErVoXx1iUJPlm07h1lcrDA3t4wgytQaJoqaxrID9u+5iVqtQd/gds5PLTO0
-bS+rqyWM7Ahes0ZoN0nrBrIYYdZqyLqC4LogQCSG+H6AJCmMju6gUW+Pv3hueshyvFrMUG1SgtJF
-E3qHd5WYZHdHbpHUBawCaHfddefeH//Rn/gX5mqdxx/5G3RVRtcU/NDBx8OLXNzQxw80BBREQUWU
-VAI/QpZUfC9EECSCwMVxTaIoQFElwshDkgRUVSKTzeJFvezacytDI7vIFkYp9IwxPLqbsYn9DAyO
-02jNM3ttlkQyh+9L+KFIOpMn39MLosTySolDt9zG7PwymVyRw7fcgZbIUambDI1O0NOfwnJt2mab
-SAjxPRfbMnEcEz/wQVPxg4jdu/YxOraNmZlpc7VcqXRJLF0GLtjCJfM6y9+KFsQYuPonP/mTn/zQ
-hz7ytvmLV7hw7iyI4IUefhjghQFeGOKFIWHQMZCCgCAIRBGI0sZ5SaKMKHqoiowkyng+OE6IJKeQ
-pCSKmmVoaIJSqczs3CKimmRhpULFDEnmRxnduZe2WeWmg7fSrIWUSxbpVB/DY9u4trSIqKpUWz67
-9hxkdWWNZMJgbW2VEyeOoyeSuJ6LbddJpwwUUcB1WkhiROQHRKGAJKoYqoJlmh1qGEdWkJ8/dXY6
-VpGOS+Km1G56D3YHXLsL3E0X7hWSuxkgGJM7d/yK2XIGHn/4YdbWV9ANnZAIUZYJI4EgEogQEAQP
-UQpBjBCECFHaOA9FUdAMHc9uoSgKkqDh+RKCmGR4ZA/JVD+ilCTy6zQaZZZWl1mt1DByPbR8ETmV
-x5cNVM2g1RYpZMfYM3kztXqTQl8vs4uzSAkNxzNYWS1z9ObD7N01ydrSAhcvXUSUJEzbxmu3kSJw
-7CaRbxP6DkIoEIUSBCJy6COLIl4Qsn33DoyUlnj08ScvdIX0USyw8WISa3WAtWLBxCvcMrk7Gtu9
-a3vxnrvuPNyXH+SJICCbTiMS4fkeiBBGIWEQEoYBoti5L9HGs+97G2ogSoiI5HK9BGFEGCkkVINE
-skAun6daM4lCWKmW8Yko9BRJF4aomzb9w8OUKlValsu1+ctkEmn0QKa6eoXJ7aOMjo/zX/768+zK
-7SFCZP7aKs1dLr65zvDIDm4+HKEm0rx4+iyRbdLSgMjHbnt4poMUBkRCRBD5BMHG6Z8/fx4xoXL4
-yMFNbyleHN30BMQtos2teiCI04IYN2THbjnw0PjQyLtPPPk05eUVhDDED3xURSYIA8IwIAx8otBH
-lCQEYeO+CIKArhskkykMI4koSQRBiKwYJFM50pkevEDAdgKaLZMgDIkIcL2QIFJwApGm5bG4UiGR
-ypMtFEkWR7k6s4SeSHPfvfeyd+8ujj//DK5vMzs3RyozhusEhJ7HttExPvbRD/HEky+gJdIMj24n
-l81hGEnS6QypdIowCAhDD8cxcT2byPVAFIgkmXxfD7Im8/zJcxe2yCNvqrsVo4JNn9ftvPe7aOHl
-u/Fysri3p++Ogd5ecB3sdhNJDFHEjbuvSgKaLKLKApIoIEnyhkETZSRRxfcjPC8kCCJEFHKFAUQp
-geOJLK1WcLwQ03bxw5AgjChXmwSRhKqnQFCY2LGHm246yk2HjtJsu7xw7iq7Dx5Dz+R58dxZnLBB
-qVLB9UPCUMZ2I1KpPNlcH6Zt8e9+9w/J5ArISopGyyaTLYKcRNYLaHofg6O7KfSPIicShLKAIIl4
-no8kSWQyWYIgYIvEObGmle7gItziOdqqV0wExPe///0333HsGG6jhqEpaLKEqojoiowqi4iECFGA
-LIKuJpBlDbFjXGVJw9BTKIqB4wTMza1TaziUKy0Gh8YYG9tBIpkmmc6CrLB330G279hNNtfDxI7d
-SJJBrWUxt7jC5alZDu7dT+j7tJs1FhZmmFtYJxIE8j0DVKttjGQSRde4OjtDo2Xz9PFn+aM/+hxI
-IkEUUmpUGRwbx/FFikM78QIdpAyZwiCKnkIUJXRdR1VVYCMyVFVZv04KNYpRQNCVrAnihmwTULm7
-lysIgp0XT59hZe4aLdOGTJYgCtETBoqk4roBhAGqomLbLhEgCiKyKOK6HpZVRdM00pksucIoqWyG
-nr5+5hcWuTa/wMDQCOlsDj8IWF1eQRB9JC1F23SotEzQ0ly+MsP+AzeRSxqceuEUoVnh9AtPc/LZ
-b3L09lspFAfJFYcZGRth9uoljKQGckgyqXHsztt46eJZRsbHMc0W56+cZ7h/iKXVKgNDk6yvyjQa
-DTK5QcRodYO+FA1BENENg4SuJlzXd7fIF4Rdvm8Y42N/qzL9K0oXud58enb2Gj25HDu3bSOh6yQM
-HVEAURAgClFkCUWWIApRVQVRlDaOEAToRoLR0VG2b99OX1+RVDpLEIicOXseP4goDgyhJ5KsrK5y
-4dJlBKQN7yMUmJqeJZFM027b3PG2u1BkhTPHn0B2G1SWZxnpz7Fz+zYM3WDH5BiCYuBHLj29eWy/
-zej4MHfffzerpWUGh3s5efp5EmmNZNpgenaGXL6P9UqLRKqX4ZFJwCAKIQxDyuUyvu8zNjbGyHB/
-pstYRVtIqx9zyfyuisTWLaT5ntzQ+lqJ3t4BevNF8qkUCVVGikJ820ZGQEZCQUYMJdqWhSCJpDMZ
-Cj295PMFZFkhDMAybZbW1/GBsW3b6OkromoaKytLRFGIAoS2hy4bOJaPYWTxvYA7jtzMYEbn2unj
-rM1doVWr4viQKoxgBgb1RkBvYZDJ7btot5r0Dw5SHBrl8adOYIUiiUyB5bUyt9xyhCunXkL2A1Kq
-wOL8ZQYHe/AC0FMDaKkhhGQKJaViGNCfyzFSGGGodygbC3OFLYIINwauF5Pi7j6IV4I7c2nmcqVc
-xnMjMtkijt1GCHz68jkG+nrRZAVJEBEjEUmQ0FNJAgFsd8NIGYkUmWyBldUSzZZJtlBAVFVsz6Nt
-mSwtLeLYNo5lUuzrRRYE5mfnaTZMBCR2ToyjhBZf/NzvUJo5RUqTcByP3QeOUncU1mo+1VbEyrKJ
-02gyuW2CSrnM2nqV4fFJ1GQCPV2gWmuxurJGwciwNDVFSoWkETI9fZZsLoEXCKiJApGewMMnmVLR
-EHBqHpFFbotkf9AVJLgxnvWv15n5qnq+KAluKAgoCaPzaYSiyARBQBB4CAKIokAUBeB7aKpCJp0i
-k0lTqVS5Oj1N/8AgvcUBgiAimUwhywr1eoNsNkcmk8V1fZaWl1iulJnYtZ1MPsHuXaOsLF7h63/9
-59jtNeTIpFKtMTw6xvmLl1FVne07dnL01iNcm76KRMjpF0/QV8igyiJ7d42ytrJGJpmkkM9tREWK
-gCCFrK0t4HsmouAxN3uJTEom8s0NF1KU0DSN+flriKLAof0HCoosq10+bhCrSsTpwLkeJcRdjJej
-kInt26eSPQWWqzXCaCOjFRFg2W0azQaua20AS4AQBUS+S7NZZ2VpmSiKyGTzVOpNHC9EUTRKpQqV
-SvVlUE3TJp8vkMrkGNm+jYZZo6+YZmXxEpfPHSd0SoRuFT9oMbl7D+vlKv0Dg7RMC9NscfbkSW49
-ehO3HTtCWhdZvjbF4b27OPH0Cf67Dz5Au9Wg2WwQhgFIAcmUynppmbn5K7Qaa0hYLF67QH8xRcJI
-ISCjaRql8joXL51n9+494r7JnYWuyCwuofFyz3UpodvNiIDw2uLCybptc9+DD9Jb7EOUwLZNqrUy
-YeghySKCGCGKApIYEbg2oe+iqgqeH7BertJbHEDVE7RaFkQiimzQbFikklkSRpowECCSsOw2hUIG
-s7HO8vwlGpV5KusL6LpMtpAl29NDKCoIkoJhGOSyWVRVxjZtJkaHSMqQlGBssMCB3ROsLS2T0BUG
-+4vIkkgmmyaby9DblycKHFQZQq+NJvk0Sqtk0z3IcgIQUFWZ8+fPkUwmeOd994zFcOnOkG0C676W
-MesGNwSCheXlZ64uziEmk2SyKSyrjSQJJBIa2VyadDqJrqsYuooQeCgSiFGIaZlYlsXQyCjVRoty
-vUUqnUeSVEAklysgCBKCIFEuV8nn8rhmk2tT57l6/hRuvUTkWQwODpAq9JLtG8YNJfoHh/HDiCAI
-MC0TVZaw2y3WluYoL85QXbnG8Sce5+KZUxw9fDP5bAZNlUklk4ShQBBAf98AKSPJ4twcTruFKoAS
-RZgtByKRMIyQJBHd0FleXkURpEFZEpWu0DaIGTG/q+pw3Y6bePZHajQa5dGJnZ84dPiomhPazExd
-Qjd0enp6yefzCKIIkoAkSfj+Rk3M8wNUPUEyncN0fBQ9RU9fP62mhW05KLIKCKytrROGEQMDg6yu
-LJOUQ5Znp8joCookoqo6WroHIz+MQ4KGBaqepGXaqKqK2awzOtjL+GAfa/OzjAxkUEU4dvQIiWSS
-VttmeWUV1/Op1erokopjOfTks1itJilDI7B8EooOASTTBYgsBByEMCCKZDQtjZpQhcXla3al3lyN
-Zb9anVUHmp21mbCJrgduFAfXbFtB7/D4vn17D+wpKg4nXzhBuVxBVjWqtRqlSpkgDBFEEc/1cFwP
-UVZIpXMIooakJcgVilRrLTzHJ5fLE4YR9XqDTDpNb0+Rq1evIokCVmUBQ4KUruGYNj3FIfTsIIFe
-QEwUECQD03aoNVokDR1NFhnsySNHLoFrsjhzjnazzlNPP83ly1e4+977sV0X03FQZA3P9NE0jVaz
-iqEpKIKI2zIRQoF8poe2E+A4NUTBQhbBtkI0Pc3eg3txvJZx7uLUhQ64m8A2gUZnmTFq4PVo4eUa
-/ckXnvn3337i6zR8ifHJw4QkwFdJGwXaTZ9G06fR9onCiJSRIJdOIYtA5JJQRarlRVIJgVRGBhxK
-a0sErkW9tMzK3Euk9TZ++xq2tU42n6TpmLiSgq+k8CSDlh2iqEkC18I1WwiBTyqRxG6b2FaLRn2d
-2269iRdePMHcwgzJlEFxoMju3ROISIQeNOptbMdCkiRCZFQjixNKhFqCtu+zWFmjZyBBOp8gCCPc
-IEIzZBpmhUJvL+9690PZbWODg1sUKoMuro1erxHvFX1SlfX1+vi2vr3vuO/9k7fefg8ri+sszi4R
-edBs2Wh6imQmjyxGGy6PrBCEAa7nIxBu5HaFEC/waTUbDA30Y7daeGadvoKG3VqmUZsDEZqOjYOM
-mMhRGNyOg8rg0DaWlpZJqjKtRpN8poDvBOgyFNIqIwMp/vpLf0YmreH7AYVikR/5kR9DNwpMz8wj
-KwaNehMhcrAdE4Bmq0kkiggiKIaGLwS0rBVuu/VmGvU6rXoTQRLp6SvSUxwile2hXFkTLl6+cqWT
-DYvTQqsj0e7rce5Wzb+i57mXewr9Pzo2Mi7VqzVeOneWZrNJPpchndYRIg9dU4kiCCKwLBcECT8C
-SZKRJIVatY6hG5RWVunrKVDIp2i1qqyuLpFOJ/EjiTCS2L5zH7YLbSdk28QeTNMjmUhit5qk0lks
-y0XXdJIJhXxSIanB7slt9PflmNy1m92799FsOyiqxuy1BTTdYHFxkaSh0W43MdtNrHYLVZHRNAlN
-VVA1Fdts4dkOtx09RiFboFJpUKtZZHJFLNun1ljLvnThwskoijZpYJNv2x3A/TcC7qt6GNbXKs0Q
-0bg6M3PbwYMHufmmQ1y5dBERj75CmkImgSirOI5LGEQb5R1BwXV9JEmGUEAIwXdddu3YgSrD1NWL
-mGYTSRJotduISgJVT1HoHcILRIZHd9A2fRTVYH11DVURaTRa9BcHqFYqGJpEQg0ZHczRm0vw7cce
-pa+3yP4DB3jm2efoHxhhdX2NdCZDrVZFQsD17I0ctL+h0bomE4UBRBFEYDbbVEplDu2/idtvvwtV
-TbJt+14OHDqCIPni2bOnrzWareWOtLaBWgfoTXCjNwJu1A300tLimbbVuvvIkaMDtxw5QuC6VNZX
-8Kw6uioSomDbDoIgIckKCBKOF4AgIgoiKT3BkcOHaTUqTE1doN2qEYQeju2Sy/ci6UkSyRyuL5Ap
-FEmm8hh6mlqtidXhV1VVMbQkltlGEUL68gkCt8HMlfMUsllUWcV2PARBZs++vSwuL5FMGSwtLiKw
-QQNRsIFBFPposkQYbtgg17GRBYFWo8n87CyqmuCBd76Hvv4R8j1FkimdE889W11cWroSM2ib9OC9
-lqfwel2Ogu/7YRC432nWax9VFd146IMPkcukuXLpJaqVUqfo6CHJKkEIYSRS6OmlUq1x8MBBDu3b
-T6te5eyZ5wkjB0naKAHJioZpe+SKQxjJHEEk4gUSkqzTatq4jocoimRSOvVqHT2RJPADdFkgnZQZ
-G8zTm09QWlklQsD1XA4cPEjbNAnY8GRKpTVaLQvHsVEUGU2VCXyXjYTeRjQbBi4EHroq4tkWpXKJ
-5dV1ltdLrJcr9PX18MyzT1kz12ZOdiR10wUzYz7vmwL3Ffu1TNO2SqW1p4IgfF8QCMadd72NWqXM
-mdOnUEQNTdURRIkgjDBtj77iAHfd9XZ27phk6vx5nj/+FI7bRpFDgshDkVUkWSed7SVfHGJ1vUIy
-lSOb78MyPdptC8/xkQSJRELBc31kRdswBr6LoYaUV6bJJjUuX7xM4IfYjotlWViODUJErV5FFCVc
-NyIMQ1RFpl6rQhSgKiKiAIoio6ohlllDlSFpqKQzKZaXV7g0NcXi8hKTu/Zy4eL5mUtXzl/sANqM
-tTJZrxdEiNfbwhSLSOxyrXHm2089+aOPP/X0fCDpfOQTP8U973wvzWYT27bxfY97776HT//mb/KB
-970fWZI49eKLzExd2QhDUwaObaKpCpqhIYoKqVSWcqVOMpWl0Fuk3baxTAtZlJEEEbPVoidfQJZF
-FEnEd2xkReKHP/YRCvk8mUyaXCaLgEC1XAYiBgeLtJo1MukEq6uLGx6M69I2TRKJxEa4FYUEwUZj
-i6IIqJpI26ojiAG208QLTMLIwbQatFsWpmnWu6oSwnVaZN8ULbyi69u0zFLbbD0yNrpt56Fjt0+M
-jGxn4qZD7Dl8lKGJ3Xz0Jz+JIOv81z/7POvLS8xNXUQMWqSTCpbZQJJk2raPbuQZHt9NIGik0lk0
-WaPdsJFFFdsOAAlDT+K6HmrGoFytkUlnUSQRMXQwGxXGR/qZnr5MhIWqSzieyTvecS/5Qpql+Xny
-6RSryyvYgU6j0cSslOhNJ5CjgBCBdhCxVquT11wE38Iya0gKuJ7LWrlKIplBkg3uvfedfPmrf/nc
-ytryakdiNxvvzFiO4bvi3FcBXK1X21/66n/7+vy15WttN5jce/ut+bn1GrfcejsD/UX+47/5DPNX
-LyMFbUTfxPUbRPi4jo+iJDGSBUIpiaRmMJI5FEQKmTy25XF1aobBgRFEFBRZJQgj7MjD9TwIA3RJ
-wGyU6C0k0dQQy2pQayxh2U0kWcB1bXZO7GB5YYFWrQGhSMURMNsmmgAZQ0MkwidEz6QxrRZKfR4V
-GyMhIUgRLcvCC0SSyV727zvM3v373d/87U893lXtjXc2vmYgIb7eDsdYRrZsCwAADsZJREFURLLZ
-CNH847/4wy/8/C//k/f94s//jz/2hb/80z9JpzQWp69x+rln2L1jhIQcktQEVCNDywZBzyDqaQJB
-ZXBgCE0WsVt12o0mYRBimW0md+6E0EdVRKIwwNBVDEVHE2XSRgLHbqMqYCQgwsZxGtz5trdTq7UZ
-HZmgXKoBIg8++H5arTae69CT1YlCl0DRKJkBDgqB3Uaz1uijgtheY7wvw9F9e+lJZ9BklZ7eIoqe
-YGhsnIuXz61fZ9dOd6sTbxbcOMivAhioPf6tR5/xrNbE8twsn//Pn6U3ZzA/9RJeq0xWBy8ICUQV
-HxVf1Mn3DnWaki16UgYiAp7jktQNErqOoalY7TqBbyJEHm6ziRoJRI5FYLWQcGnU11hdvUrbLHHT
-wZtJpfKYpoMkyczPzbNtYoL77ruXSmUV2W+gyj6e71EzLSIiBKeBOXeWYUqMF3QSuIRmi4XpWSRk
-2qZH03KRNI1HHv3qUtc2qXhztMjrjM16o+CGXYU5G2hnc9nBu+6+684D+/dz+tTzHD64m9LKHKMD
-eQwlRPRdCpk06VSG7Tt2IUoqYRAhBAGC55FJpqlVqiiiSOC5pFMGZruBGHmoUkDkNNEiF6dVoTeb
-wDVryILH6to8hd4MFy9eJJ/LMTU1ha6piBJcOH+GIHScYjGL114lMNfQBBPVr9NamSLpVeiJarx9
-/xg37dtBFHhMX5mmXGpgGHmaLYd0tsDEzh088+wT89eLYN/I3uA3M0/mVTQxtmPygUNHjyGqGplC
-ASOZQJQERCGgXl5j32AO3W2SM2Rc08RstZBEiVw6QzaVplVrICORNAwMVWZhfhZdFdF1EUKbpOKS
-0j10wSbymihiyP69k4Sez9rqKtMzU4RiUNk2MYIgBayXF3jq2cfXf/lXf/Hc0aP7qJdmaCyfR6xc
-pNebZ0KtcsdkL2lMArOBqCdxBY1K20fWCjTbIc2WS09vH1dnrlRXVldaXbZJejPewpudzhRvjKA4
-tu1Yy4uo2xZ2EDGxazeFvuJG/1c+w1AyolVqIUg+lVYdAhHfcdELeURBoFKusn3nTkRBxHYd6tUS
-o+NjCGKIIAVUy/Ok+orYQQsCjUppBV3RWV5eI5dLsO2uET71r37r0tuPHT4yOjqsprMC//GP/vzi
-5alrc1/+yp8f3DM5qib9CsO6QMKuoUcht47vpF89zNx6hTPTZeq2RK64A7mgY/oKd997C/fc/w7+
-4r/80bXrbAAUuwTzupuuv5vRV5v530jUjB25gWFqloPpBVyZmaN3YIh0TiXdk2Z3UkAT4exqlSgI
-2TZ+EMsJMPQk6ysr9BZ6yaZzhFGA53tk0imiKMS1bXRdQgib+LaIpsgookyxt4f+4gCFbB+TuydA
-8HE913v0yWefHO7PbPvqN4LqwmpjGnBOnnlhblt/dufhnUPsT4dkTbj60jQ56iwKAr6SYqZUIRBT
-jO/byey5aXKFAvfc+y76+4vh3zzy5Zmua5auA/INoYVXRXITE7u4+dBe6rUmkR/yjUceRlUV1tZX
-ccOA4kAfvTnokVfJWFdoXHgCa+ES1YVpZqdOkWSG5txllHqA3KiSDqeJGk9DbRa1KZKIFLzGCrI1
-g9ieQg/WqazN0bCbVJwWp849j+N6lusHzZnF6vGF1caZTZepWm9dadcWSSVV1GQ/1aCPNb/AtWaK
-P3vkBdpKDtnIIatpREWnVKmy58AeRsaKfPnLn581zbZ3HVqka0vUDaOFV6jI1MXLfPuxE+wZGcJu
-tRkdyBKFPtPTV5m51GJX+gHWV68xmmtz+4EJZubaXJhbxGspFBNraJZLY3WUsV0fwG5dRNWeI5Lq
-VBujZKUikdBk+zaV0Ckz0DfEuYtVxFaDIwcP07djhOX5c2HMizFjqUC7aXFmvb7y3iuKxsmzK5gV
-nz277+E7ixbnyj6jcpr+4hiakeHCSy+Ry6Qo5AzOX3gx/NznPnO5S9WjLaRVeL0BG9/LRDxhfXm+
-NDdzBXN1CVnTqLUs9u8ao/GczUhPnnLZRlWT3P/eO1Bos3e3w95rLU5PneKudx0k9FXWF/v5+lf+
-mOKwwtseGKLQP8nidJavfulbDI7Y/MRP/BDXzr3ASHEPw4UQVU4RrfvsumMXV86daHeiJDuWb20B
-dtsM/TnTWXbM5uDIyDjZPo2db7uVb33nSbRCEV80cD2L2bmNNqoH3nU/B27azTe++bXZer1ubVEy
-32oszGsOuPhuaUEAkCLnxLNPPMbg4ADvePd7KDXbXF1Y5oH3vZ9scZBqpONoOf7669/gyvw0ckHG
-al7jvtt76UsuMjzcYrRvgaMHLN59T4E92wR6jDoT/Q57xgMGB1NIakRPXy/T8wssr5XxbJ+luUW2
-DY2gKIl6xzXcLCDWgApQBWpr7fAE6Sy1KGR4726uldaYXVzmnre/k+q6yZWpJTxf5IMf/giFnhRf
-/OKftv/DZz5zrmunTve22a3Gw9wwyX35TlVX57504MH3/NKxYzcRuD43r93J/OXThH6TXDrDuXKL
-cmkeMahxbrnCkXmfpDDMoJDBcSwCrwGCimFEjOwY48rF59i+bwcyOqlUhnW28Sd/cY5iX5LvfOc0
-ojiOvvoUY4cn8HWLk2fPrccoYbN4uJnMDlbnWg/fvF/5oK7qzMxcpV22MCSFpx75NqlMnluO3kEi
-ZVAc6OXC5RfDL3zpS896nudtsVvd6wI63KJZ74YNsxAAsV5rlraNDLyv2fb6jVSebD5P6LucOnmc
-kICe8UmWGnUagYCU3IbLOKY3xMOPnuexx+ZJZbKEYj96ejsXLy/zB398houXljl89AN85ZtXyOz6
-GH/16ElaJLnzPR/jxKV5Ts1O8wu/+nM89uxX+cM/+MvjjuNtAlqOSW0dsBzTL+2ZGBrLJo3t46Oj
-/MtP/waH9x0ioyX5wHs/yJH77+OmWw7iR63gt/7v33p2ba1U6soIbkak7a5kudVZHq8xwe97AhcQ
-7WZtdmFp7Uci0eDQzUdJJjXOnX6BZr3Ezh376evvwwkEVGOAnoGDVBsyc8tVlFSa+YpAxcriacM8
-/NRL1IOIpbpCqv8QFxY8Pv7T/4zJg0fIDRX59L/+HZxI5Zf+xf/Czbfu5//8zU8tnjs1fb5z4ZUu
-YDcLiEGt2jw3ur3n3vnSQqZcLXPo1tsYHZ1gYHSc2dIKU7MXmr/zu//6WxcuXlqP9YZ5sfb8dhe4
-ccMZvFYd7XsBF0As1RrLupFMOZF8649/4ifQNYWB3hTZhMal46fpzaSwLZN602T37gMEvs1qeQrT
-r2H0HyI9uB8lP8rzl+aoehq21IOUHmOhYmE5Hk898whf/8Z/5R/99D/iQx/8GOPDowiByz//5V89
-4dh+qQNmGSh1AG7EdtqErbZtVertJws7C6NT64tDJ86elsZ27eWRbz+++LWHv3Ly9373t59aWFhs
-bzGwonvvQ7urOOl09YrdsDEsxDepAMl3vffBf3v02O0f37PrIBMjEyQVlSf/6vM89/wTzC1fo394
-iJtuOsyttxykUb1Gs1XiqZNLZHI9vO3Ou5idm6O/fwRdz/Cnf/YF1lYrSHKSj/7Q+/ixT/wojz3+
-GKlUFs9zOPfS87O/8r/979/qALsCLAHLHZBrsQ0gmxvEc0AWKHRWhv9/OLLGK4cTb4Jsxri8Aqx3
-nusdDWl3AXxDBwi94sZcnbrybSFqppqmf6R/9BByapRDRw+TKQ7RckCUda5eneKl8+dYXF5naaXO
-xWtXKNcrVGtV1lYrvHTuMn/zjcepV1scvulmPv7jP8X9DzyA5wv8p8/+vyhaxInnv934/d//T0/Y
-trPJtaXOhdc6F76Za91s3OjOAyi8eqZj3DtwY/vLWrEOm3asAmx31dCiG+3nhl2NwdZ3vvP8b1yd
-XT3p+vzKz/wPvzTcPzrMA4MfZMfeI0hCxNSlC6wszTM7PY1pNikUDSRZBrmPMAwYnxxg3+EMR48c
-ww8Cas0mjdY6mi7xxJOPUCpPt77zxFNP1WvNeqzMXY31E1hd/bNC1wyJ7n1mm4ZLie2aDGPGrBkD
-047tlvS7poJwo2mhe/iF2plfk5Zkqf/DH//hH3773Q99aHRsYlQWZXbt2M7c3DKpRIpsOkvCkJmb
-m+f4c8e58223s7q2wvbt47iuQ6tV42tff5jdu0ZIJFQe+cZXOH78mdWZ6cVnXNevd8BcBxY6dLDW
-AbodA2BTopTOlJMUr5w2neyszanTcXC9rtx1I/b9zS7teEs4t9tz2JxHbnROPgf0jO/cddvR2972
-jg995CMHp67M9OQyvTzwzgcQibh0YZmTL77IsWOHcT2L8W3DPPrNh/E8myuXL2C3lzh96mS93XIu
-Li6sz8bcolIH1CVgtcOF7S7Jjbo2jCdiPJvqGnYUnyG2KdF2F++2YiUet+s4bxm43QBvGpFkx4jk
-Nw2JkUqM79i1a/Ke++4fq1Rq/Yvz1cz2iQlNkhDmFmbYsWNMOHfudNho1Jori8vVVr22ZLadRkyK
-zI4ErXXAXekYsVbMuvtdjr4Qm9VjdE2I0mNTmOLjvePca8ZK6VaMb1+XGm7k7zMIW0wb2VTHTAzo
-bOd9OiY5Wkw1pa52eTcGbKMD5lqHFqodqYobmPgkD6HLs1FjgOpdE0HELbrIvRjXOl0jAAJeZ/bu
-jfwpg6grqRHGJGBTnesdUDddoVTXfDEldk7d4LZiBqzaed3qUtHu5EoYA8zvcrU225HiowaFrr9x
-Y3/nbjVT4Q27U2+RFMfHA2oxMBNd6hmX3nhhNC65ce6Lb8XfasZM9Bpz0iReOetR6RoBQNeGPm+L
-jdOvOzH6rf7ZFoGtJ4eqsaXxykFwUpe7F1fPuGpuNVvmtX4hStjipktbVHTjm6fDrr29b2oa9ff7
-h4deawKoGDMqxNQ5Dp7XtYl5qxHZr6eu3Tv1hS12p0dcf3D8Gx7z/YP4PbQ3MnBzqyz/VkPio+/m
-otl6hm53Nfd63x29mQv9QT+26mh5o/0U0RZtV2/2Jl+3w/M6x+LvErhvBOw30st2I7Tphn7v3/af
-SewGOrpeVeRv4+P/A9Q+PxXM9RiwAAAAAElFTkSuQmCC
-
-------- =_aaaaaaaaaa0--
diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am
deleted file mode 100644
index fa7974678d..0000000000
--- a/default_user/local/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS =					\
-	Calendar				\
-	Contacts				\
-	Drafts					\
-	Executive-Summary			\
-	Inbox					\
-	Outbox					\
-	Sent					\
-	Trash
diff --git a/default_user/local/Outbox/.cvsignore b/default_user/local/Outbox/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Outbox/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am
deleted file mode 100644
index d9ccc4dba4..0000000000
--- a/default_user/local/Outbox/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Outbox
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Outbox/folder-metadata.xml b/default_user/local/Outbox/folder-metadata.xml
deleted file mode 100644
index 4452fb9e0c..0000000000
--- a/default_user/local/Outbox/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Outbox</description>
-</efolder>
diff --git a/default_user/local/Sent/.cvsignore b/default_user/local/Sent/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Sent/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am
deleted file mode 100644
index 024f5c76eb..0000000000
--- a/default_user/local/Sent/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Sent
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Sent/folder-metadata.xml b/default_user/local/Sent/folder-metadata.xml
deleted file mode 100644
index 87188daedb..0000000000
--- a/default_user/local/Sent/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Sent</description>
-</efolder>
diff --git a/default_user/local/Trash/.cvsignore b/default_user/local/Trash/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/default_user/local/Trash/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am
deleted file mode 100644
index 25def5bfe9..0000000000
--- a/default_user/local/Trash/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Trash
-defaultcalendar_DATA = folder-metadata.xml
-
-EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Trash/folder-metadata.xml b/default_user/local/Trash/folder-metadata.xml
deleted file mode 100644
index 6f1acf7a4a..0000000000
--- a/default_user/local/Trash/folder-metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<efolder>
-	<type>mail</type>
-	<description>Trash</description>
-</efolder>
diff --git a/default_user/shortcuts.xml b/default_user/shortcuts.xml
deleted file mode 100644
index 1107fa043e..0000000000
--- a/default_user/shortcuts.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<shortcuts>
-	<group title="Evolution shortcuts">
-		<item>evolution:/local/Executive-Summary</item> 
-		<item>evolution:/local/Inbox</item>
-<!--		<item>evolution:/local/Outbox</item>
-		<item>evolution:/local/Trash</item>
-		<item>evolution:/local/Drafts</item> -->
-		<item>evolution:/local/Calendar</item>
-		<item>evolution:/local/Contacts</item>
-	</group>
-
-
-<!--	<group title="Personal shortcuts">
-	</group>
--->
-</shortcuts>
-
diff --git a/devel-docs/.cvsignore b/devel-docs/.cvsignore
deleted file mode 100644
index d436efd0f7..0000000000
--- a/devel-docs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-
diff --git a/devel-docs/Makefile.am b/devel-docs/Makefile.am
deleted file mode 100644
index 74a5ff5b60..0000000000
--- a/devel-docs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS=camel
diff --git a/devel-docs/camel/.cvsignore b/devel-docs/camel/.cvsignore
deleted file mode 100644
index 56d9506207..0000000000
--- a/devel-docs/camel/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-sgml
-html
-Makefile.in
-Makefile
-camel.signals
-camel.hierarchy
-camel.args
-camel-decl.txt
-camel-unused.txt
-camel.html
-camel-decl-list.txt
-
diff --git a/devel-docs/camel/Makefile.am b/devel-docs/camel/Makefile.am
deleted file mode 100644
index 276059cf88..0000000000
--- a/devel-docs/camel/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=camel
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=camel-docs.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(top_srcdir)/camel
-
-CFLAGS=`gtk-config --cflags gtk`
-LDFLAGS="-lcamel `gtk-config --libs gtk` "
-
-
-HTML_DIR=$(datadir)/gnome/html
-
-
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/camel-data-wrapper.sgml		\
-	tmpl/camel-folder.sgml			\
-	tmpl/camel-mime-message.sgml		\
-	tmpl/camel-mime-part.sgml		\
-	tmpl/camel-recipient.sgml		\
-	tmpl/camel-service.sgml			\
-	tmpl/camel-store.sgml			\
-	tmpl/camel-stream.sgml		
-
-
-camel_docdir = $(HTML_DIR)
-camel_doc_DATA =				\
-	camel.html				\
-	camel.hierarchy			\
-	camel.types				\
-	camel-scan.c				\
-	camel-decl.txt			\
-	camel-sections.txt
-
-EXTRA_DIST = $(camel_doc_DATA)
-
-camel.html: html/book1.html
-	-cd $(srcdir) && cp html/book1.html camel.html
-
-html/book1.html: sgml/camel-doc.bottom
-	$(MAKE) html
-
-sgml/camel-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-camel-scan.c:
-
-scan: camel-scan.c				
-	CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) gtkdoc-scanobj --module=$(DOC_MODULE)
-	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-templates: scan
-	gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml: 
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-html: 
-	if ! test -d html ; then mkdir html ; fi
-	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-
-clean-local:
-	rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt camel.html
-
-maintainer-clean-local: clean
-	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt Makefile.in 
-
-install-data-local: 
-	$(mkinstalldirs) $(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-
-dist-hook:
-	mkdir $(distdir)/html
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-
-.PHONY : html sgml templates scan
diff --git a/devel-docs/camel/README_AND_TODO.txt b/devel-docs/camel/README_AND_TODO.txt
deleted file mode 100644
index 5feeb1e4e9..0000000000
--- a/devel-docs/camel/README_AND_TODO.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Camel is currently (conceptualy) separated in four parts:
-
-* the session handling 
-* the storage mechanism.
-* the (mime) message handling.
-* some general utilities class/functions.
-
-
-
-* Session handling 
-------------------
-
-(This is not gnome session managing related)
-CamelSession is an object used to store some parameters on a user
-basis. This can be a permanent (fs based) or volatile 
-(ram only) storage depending on user preferences. 
-The session object is, for example, responsible for 
-remembering authentication datas during application lifetime.
-It is also responsible for selecting and loading providers 
-corresponding to protocols. In the case where only one 
-provider exists for a given protocol, the task is trivial, 
-but when multiple providers exist for a given protocol, the
-user can choose their prefered one. Given its relationship
-with providers, the session object is also used to instanciate
-a store given an URL.
-
-Associated Classes:
-  CamelSession 
-    implementation: 5%
-
-Associated Files:
-  camel-provider.[ch]
-    implementation: 2.5% (a struct in camel-provider.h)
-
-
-* the storage mechanism.
-------------------------
-
-The storage mechanism is  mainly represented by 
-the Store class and the Folder class. 
-* the (mime) message handling.
-* some general utilities class/functions.
-
diff --git a/devel-docs/camel/camel-docs.sgml b/devel-docs/camel/camel-docs.sgml
deleted file mode 100644
index 33c6623731..0000000000
--- a/devel-docs/camel/camel-docs.sgml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity CamelDataWrapper SYSTEM "sgml/camel-data-wrapper.sgml">
-<!entity CamelFolder SYSTEM "sgml/camel-folder.sgml">
-<!entity CamelMimeMessage SYSTEM "sgml/camel-mime-message.sgml">
-<!entity CamelMimePart SYSTEM "sgml/camel-mime-part.sgml">
-<!entity CamelRecipient SYSTEM "sgml/camel-recipient.sgml">
-<!entity CamelService SYSTEM "sgml/camel-service.sgml">
-<!entity CamelStore SYSTEM "sgml/camel-store.sgml">
-<!entity CamelStream SYSTEM "sgml/camel-stream.sgml">
-]>
-
-<book>
-  <bookinfo>
-    <title>Camel Messaging Library Reference Manual</title>
-  </bookinfo>
-
-  <chapter id="camel-objects">
-    <title>Camel Objects</title>
-    &CamelMimeMessage;
-    &CamelService;
-    &CamelStore;
-    &CamelFolder;
-    &CamelMimePart;
-    &CamelDataWrapper;
-    &CamelRecipient;
-
-  </chapter>
-</book>
diff --git a/devel-docs/camel/camel-sections.txt b/devel-docs/camel/camel-sections.txt
deleted file mode 100644
index 1f6d45c03c..0000000000
--- a/devel-docs/camel/camel-sections.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<INCLUDE>gnome.h</INCLUDE>
-<INCLUDE>camel-data-wrapper.h</INCLUDE>
-
-
-<SECTION>
-<FILE>camel-data-wrapper</FILE>
-CamelDataWrapper
-<TITLE>CamelDataWrapper</TITLE>
-camel_data_wrapper_write_to_stream
-<SUBSECTION Standard>
-CAMEL_DATA_WRAPPER
-camel_data_wrapper_get_type
-CAMEL_DATA_WRAPPER_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-recipient</FILE>
-CamelRecipientTable
-<TITLE>CamelRecipientTable</TITLE>
-camel_recipient_table_new
-camel_recipient_table_get
-camel_recipient_table_add
-camel_recipient_table_add_list
-camel_recipient_table_remove
-camel_recipient_table_ref
-camel_recipient_table_unref
-</SECTION>
-
-<SECTION>
-<FILE>camel-mime-part</FILE>
-CamelMimePart
-<TITLE>CamelMimePart</TITLE>
-camel_mime_part_add_header
-camel_mime_part_set_content_object
-camel_mime_part_set_filename
-camel_mime_part_get_disposition
-camel_mime_part_get_content_MD5
-camel_mime_part_get_encoding
-camel_mime_part_set_header_lines
-camel_mime_part_get_content_object
-camel_mime_part_get_content_id
-camel_mime_part_set_description
-camel_mime_part_set_text
-camel_mime_part_set_encoding
-camel_mime_part_set_disposition
-camel_mime_part_remove_header
-camel_mime_part_get_filename
-camel_mime_part_get_content_languages
-camel_mime_part_set_content_languages
-camel_mime_part_get_header_lines
-camel_mime_part_get_description
-camel_mime_part_get_header
-<SUBSECTION Standard>
-CAMEL_MIME_PART
-camel_mime_part_get_type
-CAMEL_MIME_PART_CLASS
-</SECTION>
-
-
-
-<SECTION>
-<FILE>camel-mime-message</FILE>
-CamelMimeMessage
-<TITLE>CamelMimeMessage</TITLE>
-camel_mime_message_remove_recipient
-camel_mime_message_get_recipients
-camel_mime_message_set_flag
-camel_mime_message_set_subject
-camel_mime_message_get_reply_to
-camel_mime_message_get_from
-camel_mime_message_set_reply_to
-camel_mime_message_get_sent_date
-camel_mime_message_new_with_session
-camel_mime_message_add_recipient
-camel_mime_message_get_subject
-camel_mime_message_set_from
-camel_mime_message_get_flag
-camel_mime_message_get_message_number
-camel_mime_message_get_received_date
-camel_mime_message_set_received_date
-<SUBSECTION Standard>
-CAMEL_MIME_MESSAGE
-camel_mime_message_get_type
-CAMEL_MIME_MESSAGE_CLASS
-</SECTION>
-
-
-<SECTION>
-<FILE>camel-folder</FILE>
-CamelFolder
-<TITLE>CamelFolder</TITLE>
-camel_folder_get_folder
-camel_folder_create
-camel_folder_delete
-camel_folder_delete_messages
-camel_folder_get_parent_folder
-camel_folder_get_parent_store
-camel_folder_get_mode
-camel_folder_list_subfolders
-<SUBSECTION Standard>
-CAMEL_FOLDER
-camel_folder_get_type
-CAMEL_FOLDER_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-service</FILE>
-CamelService
-<TITLE>CamelService</TITLE>
-camel_service_connect
-camel_service_is_connected
-camel_service_connect_to_with_login_passwd
-camel_service_connect_to_with_login_passwd_port
-camel_service_get_url
-<SUBSECTION Standard>
-CAMEL_SERVICE
-camel_service_get_type
-CAMEL_SERVICE_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>camel-store</FILE>
-CamelStore
-<TITLE>CamelStore</TITLE>
-camel_store_get_separator
-camel_store_get_folder
-<SUBSECTION Standard>
-CAMEL_STORE
-camel_store_get_type
-CAMEL_STORE_CLASS
-</SECTION>
-
-
-<SECTION>
-<FILE>camel-stream</FILE>
-CamelStream
-<TITLE>CamelStream</TITLE>
-camel_stream_seek
-camel_stream_write
-camel_stream_flush
-camel_stream_eos
-camel_stream_write_string
-camel_stream_close
-camel_stream_write_strings
-camel_stream_read
-camel_stream_available
-<SUBSECTION Standard>
-CAMEL_STREAM
-camel_stream_get_type
-CAMEL_STREAM_CLASS
-</SECTION>
-
-
diff --git a/devel-docs/camel/camel.types b/devel-docs/camel/camel.types
deleted file mode 100644
index 93142d8692..0000000000
--- a/devel-docs/camel/camel.types
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <gtk/gtk.h>
-#include <camel/camel-data-wrapper.h>
-camel_data_wrapper_get_type
-camel_folder_get_type
-camel_mime_message_get_type
-camel_mime_part_get_type
-camel_service_get_type
-camel_store_get_type
-camel_stream_get_type
diff --git a/devel-docs/camel/tmpl/.cvsignore b/devel-docs/camel/tmpl/.cvsignore
deleted file mode 100644
index 29db8d052d..0000000000
--- a/devel-docs/camel/tmpl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-camel-unused.sgml
-
diff --git a/devel-docs/camel/tmpl/camel-data-wrapper.sgml b/devel-docs/camel/tmpl/camel-data-wrapper.sgml
deleted file mode 100644
index 6fce9eb128..0000000000
--- a/devel-docs/camel/tmpl/camel-data-wrapper.sgml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelDataWrapper
-
-<!-- ##### SECTION Short_Description ##### -->
-data container with streaming methods
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A CamelDataWrapper is wrapper around data which can save them to a stream
-and restore them from a stream. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_data_wrapper_write_to_stream ##### -->
-<para>
-
-</para>
-
-@data_wrapper: 
-@stream: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-folder.sgml b/devel-docs/camel/tmpl/camel-folder.sgml
deleted file mode 100644
index 882d63499c..0000000000
--- a/devel-docs/camel/tmpl/camel-folder.sgml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelFolder
-
-<!-- ##### SECTION Short_Description ##### -->
-Represents a folder of messages on a store.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-CamelFolder represents a folder in a message store. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelFolder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_folder_get_folder ##### -->
-<para>
-
-</para>
-
-@folder: 
-@folder_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_create ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_delete ##### -->
-<para>
-
-</para>
-
-@folder: 
-@recurse: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_delete_messages ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_parent_folder ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_parent_store ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_get_mode ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_folder_list_subfolders ##### -->
-<para>
-
-</para>
-
-@folder: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-mime-message.sgml b/devel-docs/camel/tmpl/camel-mime-message.sgml
deleted file mode 100644
index 704f3d3572..0000000000
--- a/devel-docs/camel/tmpl/camel-mime-message.sgml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelMimeMessage
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelMimeMessage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_mime_message_remove_recipient ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_recipients ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_flag ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@flag: 
-@value: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_subject ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@subject: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_reply_to ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_from ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_reply_to ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@reply_to: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_sent_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_new_with_session ##### -->
-<para>
-
-</para>
-
-@session: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_add_recipient ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_subject ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_from ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@from: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_flag ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@flag: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_message_number ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_get_received_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_message_set_received_date ##### -->
-<para>
-
-</para>
-
-@mime_message: 
-@received_date: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-mime-part.sgml b/devel-docs/camel/tmpl/camel-mime-part.sgml
deleted file mode 100644
index 2db158b25f..0000000000
--- a/devel-docs/camel/tmpl/camel-mime-part.sgml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelMimePart
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_mime_part_set_filename ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@filename: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_disposition ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_MD5 ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_encoding ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_header_lines ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@header_lines: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_id ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_description ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@description: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_text ##### -->
-<para>
-
-</para>
-
-@camel_mime_part: 
-@text: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_encoding ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@encoding: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_disposition ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@disposition: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_filename ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_content_languages ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_set_content_languages ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@content_languages: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_header_lines ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_mime_part_get_description ##### -->
-<para>
-
-</para>
-
-@mime_part: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-recipient.sgml b/devel-docs/camel/tmpl/camel-recipient.sgml
deleted file mode 100644
index 4af84cf58e..0000000000
--- a/devel-docs/camel/tmpl/camel-recipient.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelRecipientTable
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelRecipientTable ##### -->
-<para>
-
-</para>
-
-@recipient_hash_table: 
-@ref_count: 
-
-<!-- ##### FUNCTION camel_recipient_table_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_unref ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_get ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_add ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_remove ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_add_list ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-@recipient_type: 
-@recipient_list: 
-
-
-<!-- ##### FUNCTION camel_recipient_table_ref ##### -->
-<para>
-
-</para>
-
-@recipient_table: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-service.sgml b/devel-docs/camel/tmpl/camel-service.sgml
deleted file mode 100644
index 5b51ea902e..0000000000
--- a/devel-docs/camel/tmpl/camel-service.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelService
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelService ##### -->
-<para>
-
-</para>
-
-@e: 
-
-<!-- ##### FUNCTION camel_service_connect ##### -->
-<para>
-
-</para>
-
-@service: 
-
-
-<!-- ##### FUNCTION camel_service_is_connected ##### -->
-<para>
-
-</para>
-
-@service: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_service_connect_to_with_login_passwd ##### -->
-<para>
-
-</para>
-
-@service: 
-@host: 
-@login: 
-@passwd: 
-
-
-<!-- ##### FUNCTION camel_service_connect_to_with_login_passwd_port ##### -->
-<para>
-
-</para>
-
-@service: 
-@host: 
-@login: 
-@passwd: 
-@port: 
-
-
-<!-- ##### FUNCTION camel_service_get_url ##### -->
-<para>
-
-</para>
-
-@service: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-store.sgml b/devel-docs/camel/tmpl/camel-store.sgml
deleted file mode 100644
index 2882c09986..0000000000
--- a/devel-docs/camel/tmpl/camel-store.sgml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelStore
-
-<!-- ##### SECTION Short_Description ##### -->
-
-A class representing a message (local or distant) repository
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The store class models a place where messages can be stored and retreived. It can be a local 
-store (for example an mbox-style store) or a distant server (for example an POP3 server). Messages are
-not retreived or stored directly with a CamelStore object. Instead, a CamelFolder object must be
-obtained from the store first. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT CamelStore ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_store_get_separator ##### -->
-<para>
-
-</para>
-
-@store: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_store_get_folder ##### -->
-<para>
-
-</para>
-
-@store: 
-@folder_name: 
-@Returns: 
-
-
diff --git a/devel-docs/camel/tmpl/camel-stream.sgml b/devel-docs/camel/tmpl/camel-stream.sgml
deleted file mode 100644
index e965db2e45..0000000000
--- a/devel-docs/camel/tmpl/camel-stream.sgml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CamelStream
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION camel_stream_seek ##### -->
-<para>
-
-</para>
-
-@stream: 
-@offset: 
-@policy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_write ##### -->
-<para>
-
-</para>
-
-@stream: 
-@buffer: 
-@n: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_flush ##### -->
-<para>
-
-</para>
-
-@stream: 
-
-
-<!-- ##### FUNCTION camel_stream_eos ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Returns: 
-
-
-<!-- ##### MACRO camel_stream_write_string ##### -->
-<para>
-
-</para>
-
-@stream: 
-@string: 
-
-
-<!-- ##### FUNCTION camel_stream_close ##### -->
-<para>
-
-</para>
-
-@stream: 
-
-
-<!-- ##### FUNCTION camel_stream_write_strings ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION camel_stream_read ##### -->
-<para>
-
-</para>
-
-@stream: 
-@buffer: 
-@n: 
-@Returns: 
-
-
-<!-- ##### FUNCTION camel_stream_available ##### -->
-<para>
-
-</para>
-
-@stream: 
-@Returns: 
-
-
diff --git a/devel-docs/misc/ref_and_id_proposition.txt b/devel-docs/misc/ref_and_id_proposition.txt
deleted file mode 100644
index 2127b45a57..0000000000
--- a/devel-docs/misc/ref_and_id_proposition.txt
+++ /dev/null
@@ -1,237 +0,0 @@
-Author: Bertrand Guiheneuf <Bertrand.Guiheneuf@aful.org>
-Date: August 9th 1999
-Last revision date : September 3rd 1999
-Version: 0.2
-
-The last version of this document is always available in gnome CVS in
-the gnome-mailer module: devel-docs/misc/ref_and_id_proposition.txt
-
-
-
-A) Identifying messages within folders
---------------------------------------
-
-Currently, in Camel there is only one way to retrieve a message from a
-mail store:
-     CamelMimeMessage * 
-     get_message (CamelFolder *folder, gint number)
-
-where number is an integer representing the message rank within its
-parent folder.
-
-This is a traditional method (JavaMail, MAPI) and it is very useful
-because this is often the only way to get a message in from a
-classical store (pop3 for example).
-
-Moreover, various documents ([1], [2]) proposed to generalize the URL
-scheme used in Camel ([3]) to access mail stores in order to identify
-messages. Such an URL would be, for instance:
-
-pop3://po.myisp.com:1
-
-Meaning: "Access message 1 on Pop3 server po.myisp.com"
-
- 
-However, referencing a message with its number within a folder is a
-very unreliable method:
-
-1) Message order in a folder can change during a session: 
-   
-   The user can move or remove messages from the folder, thus
-   completely changing message numbers.  We could however imagine to
-   follow message operations in order to keep camel in a coherent
-   state at each time instant. This could be quite complex but may
-   be feasible using gtk signal system.
-
-2) Message order can change between sessions:
-
-   Gnome-mailer was designed from the begining to allow messages to be
-   stored in classical mailboxes (mbox, maildir, MH, IMAP ...), in
-   order to allow users to run other MUA on their mailboxes if
-   necessary.  These other MUA can change message order within folders
-   without any chance for Camel to trace the operations.
-   
-These two scenarii show that it is quite impossible to use reliable
-folder caching or message referencing if messages are referenced only
-by their position within their parent folder.
-   
-
-We thus have to find a general way to identify and retreive a message
-within its folder. One thing is sure, however: all folders
-implementation won't allow this method. Pop3 stores will always access
-messages using their rank on the server. MUA using Camel will thus
-have to be prepared to access some stores providing only the old
-fashionned message number access method.
-
-Basically, we have two choices:
-
-1) Accessing messages using (mailbox) Unique ID (UID)
-
-   A UID is a string identifier associated to a message, which is
-   guaranteed to be unique within its parent folder and which will not
-   change between sessions.
-
-2) Accessing messages using Message ID
-
-   A Message ID is a string identifier associated to a messages which
-   is guaranteed to be unique in the world, that is, no other message
-   can have the same Message ID. The message ID is defined in RFC 822,
-   and is stored as the message header "Message-id"
-   
-Method (1) already exists in IMAP.  
-It is quite simple to define on local stores (MH, mbox, ....) but it
-may not resist to message modification by other MUA.
-Methods based on Message-id matching or message content checksum seem
-to be the best one. Using an "X-" header is another possibility for
-non read-only folders. A combination of these three methods may be the
-most reliable solution.
-The UID is impossible to implement in a POP3 store provider.
-
-(2) Can be used with IMAP, but would be very ineficient. 
-The main issue with this method is its dependancy upon other MUAs and
-MTAs. Message-id is set before or during message transport. Moreover,
-some rfc822 compliant messages may not even have any Message-id
-header.
-These are major issues when accessing read-only stores.  
-The M-ID is also impossible to implement in a POP3 store provider.
-   
-
-We may not rely on external MUA and MTA to guarentee the uniqueness of
-the identifier . We may loose messages by never being able to read them
-if two had the same uid. It would be possible to find workarounds, but
-it could make Camel use a bit tricky.
-
-Given that most users will use IMAP or a database based store as their
-main mail store, and given that this stores allow UID very
-easily, I suggest that we use method (1). Discussion is still open,
-though.
-
-Here are the public methods I propose to add to CamelFolder:
-
-gboolean camel_folder_supports_uid (CamelFolder *folder)
-    returns true if the folder can get messages 
-    by their uid.
-
-gchar * camel_folder_get_uid_by_number (CamelFolder *folder, gint message_number)
-    return the uid of message which number in the folder
-    is %message_number.
-
-gchar * camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message)
-    return the uid of the message within the folder.
-
-CamelMimeMessage *camel_folder_get_message_by_uid  (CamelFolder *folder, gchar *uid)
-    return the message which uid is %uid
-
-In addition, the CamelMessage Class will have a new public method
-
-gchar * camel_mime_message_get_uid (CamelMimeMessage *message) 
-    return the uid associated to the message in its physical parent
-    folder.
-
-
-
-B) Handling message references in (v)folders.
----------------------------------------------
- 
-
-We want the future Gnome mailer to be able to build (virtual) folders
-holding references to messages physically located in other
-folders. More generally, we would like folders to be able to hold:
-
-1) messages
-2) subfolders
-3) references to messages
-
-(1) and (2) are already implemented in Camel because most mail stores
-can hold messages and/or subfolders.
-
-(3) is a different issue, because no existing mail store can currently
-hold, within folders, references to messages in other folders.
-It will thus be a specific gnome-mailer extension. 
-
-
-One of the main issue is to determine what kind of behaviour we expect
-from folders holding references. Here is a possible API.
-
-( the world (v)folder is used to distinguish between the physical
-parent folder and the folder holding a reference to the message, when
-a confusion may arise)
-
-Addition to CamelFolder:
-
-gboolean camel_folder_can_hold_references (CamelFolder *folder)
-    return true if the folder can contain references
-
-void camel_folder_add_reference_by_uid (CamelFolder *folder, gchar *folder_url, gchar *message_uid)
-    add a reference into a folder. %folder_url is the url of 
-    the folder, %message_uid is the uid of the message within 
-    its physical parent folder.
- 
-void camel_folder_add_reference_by_message (CamelFolder *folder, CamelMessage *message)
-    add a reference. The place where the reference points 
-    to is found using CamelMessage methods
-
-void camel_folder_remove_reference_by_uid (CamelFolder *folder, gchar *uid)
-    remove a message reference form a folder. Reference 
-    is identified using its uid within the folder.
-
-gboolean camel_folder_uid_is_reference (CamelFolder *folder, gchar *uid)
-    return true if the message corresponding to the uid is a reference.
-
-Then all usual operations on the folder act if the message was
-actually physically stored in this folder. For example, when the mailer
-uses camel_folder_get_message_by_uid onto the (v)folder, the actual
-message is retreived from its physical store.
-
-As you can see, the uid of the message within its physical parent
-folder is different than its uid within the (v)folder. This is because
-there is no way to guarantee that the uids of two messages in two
-different folders would be different. Using references on this two
-message in the same vfolder would break uniqueness of the uid in the
-(v)folder.
-
-A couple of other methods could be defined but all the basics are
-described here.  
-
-This draft API is far from complete nor perfect, and is described here
-only to stimulate discussions before the actual implementation.
-
-
-The question now is to know how we store references. There are basically 
-two ways:
-
-1) references are stored using the URL of the physical folder
-   and the uid of the message within the folder
-
-2) a list of reference is kept, and in this list, reference are stored
-as in (1). Folders would refer to the actual message using index in
-the list
-
-
-   
-The main problem with (1) is that references get lost as soon
-as the actual message is moved. There is no way to find in which
-folders references to the message exist. 
-
-(2) is a way to solve this issue. When messages are used, Camel looks
-in the list to see if the message is refered somewhere, and actualize 
-the URL and the uid with their new values. 
-
-The problem with (2) is that we need to keep this information in a file
-and libraries writing automatically to files are generally a bad idea.
-
-As in additional remark, it is clear that Camel will only be able to
-hold references to messages on stores supporting UIDs.
-
-
-Thanks in advance for your comments and ideas,
-
-
-       Bertrand <Bertrand.Guiheneuf@aful.org>
-
-
---
-
-[1] : http://www.selequa.com/%7epurp/gnomail/mail2db.html 
-[2] : http://www.selequa.com/%7epurp/gnomail/dbRecFmt.html 
-[3] : http://www.gnome.org/mailing-lists/archives/gnome-mailer-list/1999-April/0248.shtml
diff --git a/devel-docs/query/virtual-folder-in-depth.sgml b/devel-docs/query/virtual-folder-in-depth.sgml
deleted file mode 100644
index d3e3e0504b..0000000000
--- a/devel-docs/query/virtual-folder-in-depth.sgml
+++ /dev/null
@@ -1,407 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []>
-
-<!-- SGMLized by Bertrand <Bertrand.Guiheneuf@aful.org> -->
-
-<article id="index">
-  <artheader>
-    <authorgroup>
-      <author>
-	<firstname>Giao</firstname>
-	<surname>Nguyen</surname>
-      </author>
-    </authorgroup>
-
-    <title>An in-depth look at the virtual folder mechanism</title>
-    <abstract>
-      <para>
-	This document describes a different way of approaching mail
-	organization and how all things are possible in this brave new
-	world. This document does not describe physical storage issues
-	nor interface issues.
-      </para>
-      <para>
-	Historically mail has been organized into folders. These
-	folders usually mapped to a single storage medium. The
-	relationship between mail organization and storage medium was
-	one to one. There was one mail organization for every storage
-	medium. This scheme had its limitations.
-      </para>
-      <para>  
-	Efforts at categorizations are only meaningful at the instance that
-	one categorized. To find any piece of data, regardless of how well
-	it was categorized, required some amount of searching. Therefore, any
-	attempts to nullify searching is doomed to fail. It's time to embrace
-	searching as a way of life.
-      </para>
-      <para>  
-	These are the terms and their definitions. The example rules used are
-	based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle
-	Jones whose ideas form the basis for this. I'm only adding the
-	existence of summary files to aid in scaling. I currently use VM and
-	it's virtual-folder rules for my daily mail purposes. To date, my only 
-	complaints are speed (it has no caches) and for the unitiated, it's
-	not very user-friendly.
-      </para>
-      <para>  
-	Comments, questions, rants, etc. should be directed at Giao Nguyen
-	(grail@cafebabe.org) who will try to address issues in a timely
-	manner.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Definitions -->
-  <sect1 id="definitions">
-    <title>Definitions</title>
-    <sect2>
-      <title>Store</title> 
-      <para>
-	A location where mail can be found. This may be a file (Berkeley
-	mbox), directory (MH), IMAP server, POP3 server, Exchange server,
-	Lotus Notes server, a stack of Post-Its by your monitor fed through
-	some OCR system.
-      </para>
-    </sect2>
-
-    <sect2>
-      <title>Message</title> 
-      <para>  
-	An individual mail message.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Vfolder</title> 
-      <para>  
-	A group of messages sharing some commonality. This is the result of a
-	query. The vfolder maybe contained in a store, but it is not necessary
-	that a store holds only one vfolder. There is always an implicit
-	vfolder rule which matches all messages. A store contains the vfolder
-	which is the result of the query (any). It's short for virtual folder
-	or maybe view folder. I dunno.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Default-vfolder</title> 
-      <para>  
-	The vfolder defined by (any) applied to the store. This is not the
-	inbox. The inbox could easily be defined by a query. A default rule
-	for the inbox could be (new) but it doesn't have to be. Mine happens
-	to be (or (unread) (new)).
-      </para>
-    </sect2>
-    <sect2>
-      <title>Folder</title> 
-      <para>  
-	The classical mail folder approach: one message organization per
-	store.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Query</title> 
-      <para>  
-	A search for messages. The result of this is a vfolder. There are two
-	kinds of queries: named queries and lambda queries. More on this
-	later.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Summary file </title> 
-      <para>  
-	An external file that contains pointers to messages which are matches
-	for a named query. In addition to pointers, the summary file should
-	also contain signatures of the store for sanity checks. When the term
-	"index" is used as a verb, it means to build a summary file for a
-	given name-value pair.
-      </para>
-    </sect2>
-  </sect1>
-
-  <!-- Queries -->
-  <sect1>
-    <title>Queries</title> 
-    <para>  
-      Named queries are analogous to classical mail folders. Because named
-      queries maybe reused, summary files are kept as caches to reduce
-      the overall cost of viewing a vfolder. Summary files are superior to
-      folders in that they allow for the same messages to appear in multiple
-      vfolders without message duplications. Duplications of messages
-      defeats attempts at tagging a message with additional user information
-      like annotations. Named queries will define folders.
-    </para>
-    <para>
-      Lambda queries are similar to named queries except that they have no
-      name. These are created on the fly by the user to filter out or
-      include certain messages.
-    </para>
-    <para>
-      All queries can be layered on top of each other. A lambda query can be 
-      layered on a named query and a named query can be layered on a lambda
-      query. The possibilities are endless.
-    </para>
-    <para>
-      The layerings can be done as boolean operations (and, or, not). Short
-      circuiting should be used. 
-    </para>
-    <para>
-      Examples:
-      <programlisting>
-(and (author "Giao")
-  (unread))
-      </programlisting>
-      The (unread) query should only be evaluated on the results of (author
-      "Giao").
-      <programlisting>
-(or (author "Giao")
-  (unread))
-      </programlisting>
-      Both of these queries should be evaluated. Any matches are added to the
-      resulting vfolder.
-    </para>
-  </sect1>
-
-  <!-- Summary files -->
-  <sect1>
-    <title>Summary files</title> 
-    <para>    
-      Summary files are only meaningful when applied to the context of the
-      default-vfolder of a store.
-    </para>
-    <para>
-      Summary files should be generated for queries of the form:
-      <programlisting>
-(function "constant value")
-      </programlisting>
-      Summary files should never be generated for queries of the form:
-      <programlisting>
-	(function (function1))
-	
-	(and (function "value")
-	(another-function "another value"))
-      </programlisting>
-      Given a query of the form:
-      <programlisting>
-	(and (function "value")
-	(another-function "another value"))
-      </programlisting>
-      The system should use one summary file for (function "value") and
-      another summary file for (another-function "another value"). I will
-      call the prior form the "plain form".
-    </para>
-    <para>
-      It should be noted that the signature of the store should be based on
-      the assumption that new data may have been added to the store since
-      the application generated the summary file. Signatures generated on
-      the entirety of the store will most likely be meaningless for things
-      like POP/IMAP servers. 
-    </para>
-  </sect1>
-
-  <!-- Incremental Indexing -->
-  <sect1>
-    <title>Incremental indexing</title> 
-    <para>
-      When new messages are detected, all known queries should be evaluated
-      on the new messages. vfolders should be notified of new messages that
-      are positive matches for their queries. The indexes generated by this
-      process should be merged into the current indexes for the vfolder.
-    </para>
-  </sect1>
-
-  <!-- Can I have multiple stores -->
-  <sect1>
-    <title>Can I have multiple stores?</title> 
-    <para> 
-      I don't see why not. Again, the inbox is a vfolder so you can get a
-      unified inbox consisting of all new mail sent to all your stores or
-      your can get inboxes for each store or any combination your heart
-      desire. You get your cake, eat it, and someone else cleans the dishes!
-    </para>
-  </sect1>
-
-  <!-- Why all this? -->
-  <sect1>
-    <title>Why all this?</title> 
-    <para> 
-      Consider the dynamic nature of the following query:
-      <programlisting>
-(and (author "Giao")
-  (sent-after (today-midnight)))
-      </programlisting>
-      today-midnight would be a function that is evaluated at run-time to
-      calculate the appropriate object.
-    </para>
-  </sect1>
-
-  <!-- Scenarios of usage and their solutions -->
-  <sect1>
-    <title>Scenarios of usage and their solutions</title> 
-    <sect2>
-      <title>Mesage alterations</title>
-      <para>
-	This is a fuzzy area that should be left to the UI to handle. Messages 
-	are altered. Read status are altered when a new message is read for
-	example. How do we handle this if our query is for unread messages?
-	Upon viewing the state would change.
-      </para>
-      <para>
-	One idea is to not evaluate the queries unless we're changing between
-	vfolder views. This assumes that one can only view a particular
-	vfolder at a time. For multi-vfolder viewing, a message change should
-	propagate through the vfolder system. Certain effects (as in our
-	example) would not be intuitive.
-      </para>
-      <para> 
-	It would not be a clean solution to make special cases but they may be 
-	necessary where certain defined fields are ignored when they are
-	changed. Some combination of the above rules can be used. I don't
-	think it's an easy solution.
-      </para>
-    </sect2>
-    <sect2>
-      <title>Message inclusion and exclusion</title>
-      <para>
-	Messages are included and excluded also with queries. The final query
-	will have the form of:
-	<programlisting>
-	  (and (author "Giao")
-	  (criteria value)
-	  (not (criteria other-value)))
-	</programlisting>
-	Userland criterias may be a label of some sort. These may be userland
-	labels or Message-IDs. What are the performance issues involved in
-	this? With short circuiting, it's not a major problem.
-      </para>
-      <para>    
-	The criterias and values are determined by the UI. The vfolder
-	mechanism isn't concerned with such issues.
-      </para>
-      <para>   
-	Messages can be included and excluded at will. The idea is often
-	called "arbitrary inclusion/exclusion". This can be done by
-	Message-IDs or other fields. It's been noted that Message-IDs are not
-	unique. 
-      </para>
-      <para>  
-	I propose that any given vfolder is allocated an inclusion label and an 
-	exclusion label. These should be randomly generated. This should be
-	part of the vfolder description. It should be noted that the vfolder
-	description has not been drafted yet.
-      </para>
-      <para>   
-	The result is such that the rules for a given named query is:
-	<programlisting>
-	  (and (user-query)
-	  (label inclusion-label)
-	  (not exclusion-label))
-	</programlisting>
-      </para>
-    </sect2>
-    <sect2>
-      <title>Query scheduling</title>
-      <para>
-	Consider the following extremely dynamic queries:
-	<programlisting>
-	  A:
-	  (and (author "Giao")
-	  (sent-after (today-midnight)))
-	  
-	  B:
-	  (and (sent-after (today-midnight))
-	  (author "Giao"))
-	  
-	  C:
-	  (or (author "Giao")
-	  (sent-after (today-midnight)))
-	</programlisting>
-	Query A would be significantly faster because (author "Giao") is not
-	dynamic. A summary file could be generated for this query. Query B is
-	slow and can be optimized if there was a query compiler of some
-	sort. Query C demonstrates a query in which there is no good
-	optimization which can be applied. These come with a certain amount of
-	baggage.
-      </para>
-      <para>
-	It seems then that for boolean 'and' operations, plain forms should be 
-	moved forward and other queries should be moved such that they are
-	evaluated later. I would expect that the majority of queries would be
-	of the plain form.
-      </para>
-      <para>  
-	First is that the summary file is tied to the query and the store
-	where the query originates from. Second, a hashing function for
-	strings needs to be calculated for the query so that the query and the 
-	summary file can be associated. This hashing function could be similar 
-	to the hashing function described in Rob Pike's "The Practice of
-	Programming". (FIXME: Stick page number here)
-      </para>
-    </sect2>
-    <sect2>
-      <title>Archives</title>
-      <para>
-	Many people are concerned that archives won't be preserved, archives
-	aren't supported, and many other archive related issues. This is the
-	short version.
-      </para>
-      <para>    
-	Archives are just that, archives. Archives are stores. Take your
-	vfolder, export it to a store. You are done. If you load up the store
-	again, then the default-vfolder of that store is the view of the
-	vfolder, except the query is different.
-      </para>
-      <para>    
-	The point to vfolder is not to do away with classical folder
-	representation but to move the queries to the front where it would
-	make data management easier for people who don't think in terms of
-	files but in terms of queries because ordinary people don't think in
-	terms of files.
-      </para>    
-    </sect2>
-  </sect1>
-
-  <!-- Miscellany -->
-  <sect1>
-    <title>Miscellany</title>
-    <sect2>
-      <title>Annotations</title>
-      <para>
-	There should be a scheme to add annotations to messages. Common mail
-	user agents have used a tag in the message header to mark messages as
-	read/unread for example. Extending on this we have the ability to add
-	our own data to a message to add meaning to it. If we have a good
-	scheme for doing this, new possibilities are opened.
-      </para>
-      <sect3>
-	<title>Keywords</title>  
-	<para>
-	  When sending a message, a message could have certain keywords attached 
-	  to it. While this can be done with the subject line, the subject line
-	  has a tendency to be munged by other mail applications. One popular
-	  example is the "[rR]e:" prefix. Using the subject line also breaks the 
-	  "contract" with other mail user agents. Using keywords in another
-	  field in the message header allows the sender to assist the recipient
-	  in organizing data automatically. Note that the sender can only
-	  provide hints as the sender is unlikely to know the organization
-	  schemes of the recipient.
-	</para>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>Scope</title>  
-      <para>
-	Let us assume that we have multiple stores. Does a query work on a
-	given store? Or does it work on all stores? Or is it configurable such 
-	that a query can work on a user-selected list of stores?
-      </para>
-    </sect2>
-  </sect1>
-
-  <!-- Alternatives to the above -->
-  <sect1>
-    <title>Alternatives to the above</title>
-    <para>
-      Jim Meyer (purp@selequa.com) is putting some notes on where
-      annotations needs to be located. They'll be located here as well as
-      any contributions I may have to them.
-    </para>
-  </sect1>
-</article>
diff --git a/devel-docs/query/virtual-folder-in-depth.txt b/devel-docs/query/virtual-folder-in-depth.txt
deleted file mode 100644
index 01718a5f05..0000000000
--- a/devel-docs/query/virtual-folder-in-depth.txt
+++ /dev/null
@@ -1,309 +0,0 @@
-TITLE: An in-depth look at the virtual folder mechanism
-AUTHOR: Giao Nguyen <grail@cafebabe.org>
-
-* introduction
-
-This document describes a different way of approaching mail
-organization and how all things are possible in this brave new
-world. This document does not describe physical storage issues nor
-interface issues.
-
-Historically mail has been organized into folders. These folders
-usually mapped to a single storage medium. The relationship between
-mail organization and storage medium was one to one. There was one
-mail organization for every storage medium. This scheme had its
-limitations.
-
-Efforts at categorizations are only meaningful at the instance that
-one categorized. To find any piece of data, regardless of how well
-it was categorized, required some amount of searching. Therefore, any
-attempts to nullify searching is doomed to fail. It's time to embrace
-searching as a way of life.
-
-These are the terms and their definitions. The example rules used are
-based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle
-Jones whose ideas form the basis for this. I'm only adding the
-existence of summary files to aid in scaling. I currently use VM and
-it's virtual-folder rules for my daily mail purposes. To date, my only 
-complaints are speed (it has no caches) and for the unitiated, it's
-not very user-friendly.
-
-Comments, questions, rants, etc. should be directed at Giao Nguyen
-<grail@cafebabe.org> who will try to address issues in a timely
-manner.
-
-* Definitions
-
-** store 
-
-A location where mail can be found. This may be a file (Berkeley
-mbox), directory (MH), IMAP server, POP3 server, Exchange server,
-Lotus Notes server, a stack of Post-Its by your monitor fed through
-some OCR system.
-
-** message 
-
-An individual mail message.
-
-** vfolder 
-
-A group of messages sharing some commonality. This is the result of a
-query. The vfolder maybe contained in a store, but it is not necessary
-that a store holds only one vfolder. There is always an implicit
-vfolder rule which matches all messages. A store contains the vfolder
-which is the result of the query (any). It's short for virtual folder
-or maybe view folder. I dunno.
-
-** default-vfolder 
-
-The vfolder defined by (any) applied to the store. This is not the
-inbox. The inbox could easily be defined by a query. A default rule
-for the inbox could be (new) but it doesn't have to be. Mine happens
-to be (or (unread) (new)).
-
-** folder 
-
-The classical mail folder approach: one message organization per
-store.
-
-** query 
-
-A search for messages. The result of this is a vfolder. There are two
-kinds of queries: named queries and lambda queries. More on this
-later.
-
-** summary file 
-
-An external file that contains pointers to messages which are matches
-for a named query. In addition to pointers, the summary file should
-also contain signatures of the store for sanity checks. When the term
-"index" is used as a verb, it means to build a summary file for a
-given name-value pair.
-
-* Queries
-
-Named queries are analogous to classical mail folders. Because named
-queries maybe reused, summary files are kept as caches to reduce
-the overall cost of viewing a vfolder. Summary files are superior to
-folders in that they allow for the same messages to appear in multiple
-vfolders without message duplications. Duplications of messages
-defeats attempts at tagging a message with additional user information
-like annotations. Named queries will define folders.
-
-Lambda queries are similar to named queries except that they have no
-name. These are created on the fly by the user to filter out or
-include certain messages.
-
-All queries can be layered on top of each other. A lambda query can be 
-layered on a named query and a named query can be layered on a lambda
-query. The possibilities are endless.
-
-The layerings can be done as boolean operations (and, or, not). Short
-circuiting should be used. 
-
-Examples:
-
-(and (author "Giao")
-     (unread))
-
-The (unread) query should only be evaluated on the results of (author
-"Giao").
-
-(or (author "Giao")
-    (unread))
-
-Both of these queries should be evaluated. Any matches are added to the
-resulting vfolder.
-
-* Summary files
-
-Summary files are only meaningful when applied to the context of the
-default-vfolder of a store.
-
-Summary files should be generated for queries of the form:
-
-(function "constant value")
-
-Summary files should never be generated for queries of the form:
-
-(function (function1))
-
-(and (function "value")
-     (another-function "another value"))
-
-Given a query of the form:
-
-(and (function "value")
-     (another-function "another value"))
-
-The system should use one summary file for (function "value") and
-another summary file for (another-function "another value"). I will
-call the prior form the "plain form".
-
-It should be noted that the signature of the store should be based on
-the assumption that new data may have been added to the store since
-the application generated the summary file. Signatures generated on
-the entirety of the store will most likely be meaningless for things
-like POP/IMAP servers. 
-
-* Incremental indexing
-
-When new messages are detected, all known queries should be evaluated
-on the new messages. vfolders should be notified of new messages that
-are positive matches for their queries. The indexes generated by this
-process should be merged into the current indexes for the vfolder.
-
-* Can I have multiple stores?
-
-I don't see why not. Again, the inbox is a vfolder so you can get a
-unified inbox consisting of all new mail sent to all your stores or
-your can get inboxes for each store or any combination your heart
-desire. You get your cake, eat it, and someone else cleans the dishes!
-
-* Why all this?
-
-Consider the dynamic nature of the following query:
-
-(and (author "Giao")
-     (sent-after (today-midnight)))
-
-today-midnight would be a function that is evaluated at run-time to
-calculate the appropriate object.
-
-* Scenarios of usage and their solutions
-
-** Mesage alterations
-
-This is a fuzzy area that should be left to the UI to handle. Messages 
-are altered. Read status are altered when a new message is read for
-example. How do we handle this if our query is for unread messages?
-Upon viewing the state would change.
-
-One idea is to not evaluate the queries unless we're changing between
-vfolder views. This assumes that one can only view a particular
-vfolder at a time. For multi-vfolder viewing, a message change should
-propagate through the vfolder system. Certain effects (as in our
-example) would not be intuitive.
-
-It would not be a clean solution to make special cases but they may be 
-necessary where certain defined fields are ignored when they are
-changed. Some combination of the above rules can be used. I don't
-think it's an easy solution.
-
-** Message inclusion and exclusion
-
-Messages are included and excluded also with queries. The final query
-will have the form of:
-
-(and (author "Giao")
-     (criteria value)
-     (not (criteria other-value)))
-
-Userland criterias may be a label of some sort. These may be userland
-labels or Message-IDs. What are the performance issues involved in
-this? With short circuiting, it's not a major problem.
-
-The criterias and values are determined by the UI. The vfolder
-mechanism isn't concerned with such issues.
-
-Messages can be included and excluded at will. The idea is often
-called "arbitrary inclusion/exclusion". This can be done by
-Message-IDs or other fields. It's been noted that Message-IDs are not
-unique. 
-
-I propose that any given vfolder is allocated an inclusion label and an 
-exclusion label. These should be randomly generated. This should be
-part of the vfolder description. It should be noted that the vfolder
-description has not been drafted yet.
-
-The result is such that the rules for a given named query is:
-
-(and (user-query)
-     (label inclusion-label)
-     (not exclusion-label))
-
-** Query scheduling
-
-Consider the following extremely dynamic queries:
-
-A:
-(and (author "Giao")
-     (sent-after (today-midnight)))
-
-B:
-(and (sent-after (today-midnight))
-     (author "Giao"))
-
-C:
-(or (author "Giao")
-    (sent-after (today-midnight)))
-
-Query A would be significantly faster because (author "Giao") is not
-dynamic. A summary file could be generated for this query. Query B is
-slow and can be optimized if there was a query compiler of some
-sort. Query C demonstrates a query in which there is no good
-optimization which can be applied. These come with a certain amount of
-baggage.
-
-It seems then that for boolean 'and' operations, plain forms should be 
-moved forward and other queries should be moved such that they are
-evaluated later. I would expect that the majority of queries would be
-of the plain form.
-
-First is that the summary file is tied to the query and the store
-where the query originates from. Second, a hashing function for
-strings needs to be calculated for the query so that the query and the 
-summary file can be associated. This hashing function could be similar 
-to the hashing function described in Rob Pike's "The Practice of
-Programming". (FIXME: Stick page number here)
-
-** Archives
-
-Many people are concerned that archives won't be preserved, archives
-aren't supported, and many other archive related issues. This is the
-short version.
-
-Archives are just that, archives. Archives are stores. Take your
-vfolder, export it to a store. You are done. If you load up the store
-again, then the default-vfolder of that store is the view of the
-vfolder, except the query is different.
-
-The point to vfolder is not to do away with classical folder
-representation but to move the queries to the front where it would
-make data management easier for people who don't think in terms of
-files but in terms of queries because ordinary people don't think in
-terms of files.
-
-* Miscellany
-
-** Annotations
-
-There should be a scheme to add annotations to messages. Common mail
-user agents have used a tag in the message header to mark messages as
-read/unread for example. Extending on this we have the ability to add
-our own data to a message to add meaning to it. If we have a good
-scheme for doing this, new possibilities are opened.
-
-*** Keywords
-
-When sending a message, a message could have certain keywords attached 
-to it. While this can be done with the subject line, the subject line
-has a tendency to be munged by other mail applications. One popular
-example is the "[rR]e:" prefix. Using the subject line also breaks the 
-"contract" with other mail user agents. Using keywords in another
-field in the message header allows the sender to assist the recipient
-in organizing data automatically. Note that the sender can only
-provide hints as the sender is unlikely to know the organization
-schemes of the recipient.
-
-** Scope
-
-Let us assume that we have multiple stores. Does a query work on a
-given store? Or does it work on all stores? Or is it configurable such 
-that a query can work on a user-selected list of stores?
-
-* Alternatives to the above
-
-Jim Meyer <purp@selequa.com> is putting some notes on where
-annotations needs to be located. They'll be located here as well as
-any contributions I may have to them.
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/C/.cvsignore b/doc/C/.cvsignore
deleted file mode 100644
index 2f4c48adbf..0000000000
--- a/doc/C/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-evolution-guide
-evolution-guide.junk
-evolution-guide.log
-evolution-guide.ps
-evolution-guide.dvi
-evolution-guide.tex
-fig/*.eps
\ No newline at end of file
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
deleted file mode 100644
index 15f1e047b6..0000000000
--- a/doc/C/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-SGML_FILES =			\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-fdl.sgml		\
-	apx-gloss.sgml		\
-	config-prefs.sgml	\
-	config-setupassist.sgml	\
-	config-sync.sgml	\
-	evolution-guide.sgml	\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-sync.sgml
-
-
-EXTRA_DIST = \
-	$(SGML_FILES)
-
-all: evolution-guide
-
-evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
-
-dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
-	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
-
-install-data-local: evolution-guide
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
deleted file mode 100644
index 89f0dd6bc5..0000000000
--- a/doc/C/apx-authors.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@helixcode.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
-     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@helixcode.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@helixcode.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@helixcode.com</email></member>     
-     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@helixcode.com</email></member>
-     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
-</simplelist>
-and other dedicated GNOME programmers. 
-</para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.helixcode.com/apps/evolution.php3"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugs.gnome.org" type="http">GNOME bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
-      command <command>bug-buddy</command> for submitting bug reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@helixcode.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
-      application programmers and the GNOME Documentation Project.
-      Please send all comments and suggestions regarding the manual to
-      the GNOME Documentation Project at
-      <email>docs@gnome.org</email>. You can also add your comments
-      online by using <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
-    </para>
-    <!-- For translations: uncomment this: <para> Latin translation
-      was done by ME (<email>MYNAME@MYADDRESS</email>). Please send
-      all comments and suggestions regarding this translation to
-      SOMEWHERE.  </para> -->
-    </appendix>
-
-
-
-
-
diff --git a/doc/C/apx-bugs.sgml b/doc/C/apx-bugs.sgml
deleted file mode 100644
index e4a96a8155..0000000000
--- a/doc/C/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Known bugs and limitations</title>
-    <abstract>
-    <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
-    </para>
-  </appendix>
-
diff --git a/doc/C/apx-fdl.sgml b/doc/C/apx-fdl.sgml
deleted file mode 100644
index 17a3bf3070..0000000000
--- a/doc/C/apx-fdl.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-<appendix id="fdl">
-<title>GNU Free Documentation License</title>
-<!-- - GNU Project - Free Software Foundation (FSF) -->
-<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
-
-
-  <sect1 id="fdl-version">
-    <title>GNU Free Documentation License</title>
-
-    <para>Version 1.1, March 2000</para>
-
-    <blockquote>
-      <para>Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</para>
-    </blockquote>
-    </sect1>
-  <sect1 id="fdl-preamble" label="0">
-    <title>PREAMBLE</title>
-
-    <para>The purpose of this License is to make a manual, textbook,
-    or other written document "free" in the sense of freedom: to
-    assure everyone the effective freedom to copy and redistribute it,
-    with or without modifying it, either commercially or
-    noncommercially.  Secondarily, this License preserves for the
-    author and publisher a way to get credit for their work, while not
-    being considered responsible for modifications made by
-    others.</para>
-
-    <para>This License is a kind of "copyleft", which means that
-    derivative works of the document must themselves be free in the
-    same sense.  It complements the GNU General Public License, which
-    is a copyleft license designed for free software.</para>
-
-    <para>We have designed this License in order to use it for manuals
-    for free software, because free software needs free documentation:
-    a free program should come with manuals providing the same
-    freedoms that the software does.  But this License is not limited
-    to software manuals; it can be used for any textual work,
-    regardless of subject matter or whether it is published as a
-    printed book.  We recommend this License principally for works
-    whose purpose is instruction or reference.</para>
-  </sect1>
-
-  <sect1 id="fdl-applicability" label="1">
-    <title>APPLICABILITY AND DEFINITIONS</title>
-
-    <para>This License applies to any manual or other work that
-    contains a notice placed by the copyright holder saying it can be
-    distributed under the terms of this License.  The "Document",
-    below, refers to any such manual or work.  Any member of the
-    public is a licensee, and is addressed as "you".</para>
-
-    <para>A "Modified Version" of the Document means any work
-    containing the Document or a portion of it, either copied
-    verbatim, or with modifications and/or translated into another
-    language.</para>
-
-    <para>A "Secondary Section" is a named appendix or a front-matter
-    section of the Document that deals exclusively with the
-    relationship of the publishers or authors of the Document to the
-    Document's overall subject (or to related matters) and contains
-    nothing that could fall directly within that overall subject.
-    (For example, if the Document is in part a textbook of
-    mathematics, a Secondary Section may not explain any mathematics.)
-    The relationship could be a matter of historical connection with
-    the subject or with related matters, or of legal, commercial,
-    philosophical, ethical or political position regarding
-    them.</para>
-
-    <para>The "Invariant Sections" are certain Secondary Sections
-    whose titles are designated, as being those of Invariant Sections,
-    in the notice that says that the Document is released under this
-    License.</para>
-
-    <para>The "Cover Texts" are certain short passages of text that
-    are listed, as Front-Cover Texts or Back-Cover Texts, in the
-    notice that says that the Document is released under this
-    License.</para>
-
-    <para>A "Transparent" copy of the Document means a
-    machine-readable copy, represented in a format whose specification
-    is available to the general public, whose contents can be viewed
-    and edited directly and straightforwardly with generic text
-    editors or (for images composed of pixels) generic paint programs
-    or (for drawings) some widely available drawing editor, and that
-    is suitable for input to text formatters or for automatic
-    translation to a variety of formats suitable for input to text
-    formatters.  A copy made in an otherwise Transparent file format
-    whose markup has been designed to thwart or discourage subsequent
-    modification by readers is not Transparent.  A copy that is not
-    "Transparent" is called "Opaque".</para>
-
-    <para>Examples of suitable formats for Transparent copies include
-    plain ASCII without markup, Texinfo input format, LaTeX input
-    format, SGML or XML using a publicly available DTD, and
-    standard-conforming simple HTML designed for human modification.
-    Opaque formats include PostScript, PDF, proprietary formats that
-    can be read and edited only by proprietary word processors, SGML
-    or XML for which the DTD and/or processing tools are not generally
-    available, and the machine-generated HTML produced by some word
-    processors for output purposes only.</para>
-
-    <para>The "Title Page" means, for a printed book, the title page
-    itself, plus such following pages as are needed to hold, legibly,
-    the material this License requires to appear in the title page.
-    For works in formats which do not have any title page as such,
-    "Title Page" means the text near the most prominent appearance of
-    the work's title, preceding the beginning of the body of the
-    text.</para>
-  </sect1>
-
-  <sect1 label="2">
-    <title>VERBATIM COPYING</title>
-
-    <para>You may copy and distribute the Document in any medium,
-    either commercially or noncommercially, provided that this
-    License, the copyright notices, and the license notice saying this
-    License applies to the Document are reproduced in all copies, and
-    that you add no other conditions whatsoever to those of this
-    License.  You may not use technical measures to obstruct or
-    control the reading or further copying of the copies you make or
-    distribute.  However, you may accept compensation in exchange for
-    copies.  If you distribute a large enough number of copies you
-    must also follow the conditions in section 3.</para>
-
-    <para>You may also lend copies, under the same conditions stated
-    above, and you may publicly display copies.</para>
-  </sect1>
-
-  <sect1 label="3">
-    <title>COPYING IN QUANTITY</title>
-
-    <para>If you publish printed copies of the Document numbering more
-    than 100, and the Document's license notice requires Cover Texts,
-    you must enclose the copies in covers that carry, clearly and
-    legibly, all these Cover Texts: Front-Cover Texts on the front
-    cover, and Back-Cover Texts on the back cover.  Both covers must
-    also clearly and legibly identify you as the publisher of these
-    copies.  The front cover must present the full title with all
-    words of the title equally prominent and visible.  You may add
-    other material on the covers in addition.  Copying with changes
-    limited to the covers, as long as they preserve the title of the
-    Document and satisfy these conditions, can be treated as verbatim
-    copying in other respects.</para>
-
-    <para>If the required texts for either cover are too voluminous to
-    fit legibly, you should put the first ones listed (as many as fit
-    reasonably) on the actual cover, and continue the rest onto
-    adjacent pages.</para>
-
-    <para>If you publish or distribute Opaque copies of the Document
-    numbering more than 100, you must either include a
-    machine-readable Transparent copy along with each Opaque copy, or
-    state in or with each Opaque copy a publicly-accessible
-    computer-network location containing a complete Transparent copy
-    of the Document, free of added material, which the general
-    network-using public has access to download anonymously at no
-    charge using public-standard network protocols.  If you use the
-    latter option, you must take reasonably prudent steps, when you
-    begin distribution of Opaque copies in quantity, to ensure that
-    this Transparent copy will remain thus accessible at the stated
-    location until at least one year after the last time you
-    distribute an Opaque copy (directly or through your agents or
-    retailers) of that edition to the public.</para>
-
-    <para>It is requested, but not required, that you contact the
-    authors of the Document well before redistributing any large
-    number of copies, to give them a chance to provide you with an
-    updated version of the Document.</para>
-  </sect1>
-
-  <sect1 label="4">
-    <title>MODIFICATIONS</title>
-
-    <para>You may copy and distribute a Modified Version of the
-    Document under the conditions of sections 2 and 3 above, provided
-    that you release the Modified Version under precisely this
-    License, with the Modified Version filling the role of the
-    Document, thus licensing distribution and modification of the
-    Modified Version to whoever possesses a copy of it.  In addition,
-    you must do these things in the Modified Version:</para>
-
-    <orderedlist numeration="upperalpha">
-      <listitem><para>Use in the Title Page
-      (and on the covers, if any) a title distinct from that of the
-      Document, and from those of previous versions (which should, if
-      there were any, be listed in the History section of the
-      Document).  You may use the same title as a previous version if
-      the original publisher of that version gives permission.</para>
-      </listitem>
-
-      <listitem><para>List on the Title Page,
-      as authors, one or more persons or entities responsible for
-      authorship of the modifications in the Modified Version,
-      together with at least five of the principal authors of the
-      Document (all of its principal authors, if it has less than
-      five).</para>
-      </listitem>
-
-      <listitem><para>State on the Title page
-      the name of the publisher of the Modified Version, as the
-      publisher.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      copyright notices of the Document.</para>
-      </listitem>
-
-      <listitem><para>Add an appropriate
-      copyright notice for your modifications adjacent to the other
-      copyright notices.</para>
-      </listitem>
-
-      <listitem><para>Include, immediately
-      after the copyright notices, a license notice giving the public
-      permission to use the Modified Version under the terms of this
-      License, in the form shown in the Addendum below.</para>
-      </listitem>
-
-      <listitem><para>Preserve in that license
-      notice the full lists of Invariant Sections and required Cover
-      Texts given in the Document's license notice.</para>
-      </listitem>
-
-      <listitem><para>Include an unaltered
-      copy of this License.</para>
-      </listitem>
-
-      <listitem><para>Preserve the section
-      entitled "History", and its title, and add to it an item stating
-      at least the title, year, new authors, and publisher of the
-      Modified Version as given on the Title Page.  If there is no
-      section entitled "History" in the Document, create one stating
-      the title, year, authors, and publisher of the Document as given
-      on its Title Page, then add an item describing the Modified
-      Version as stated in the previous sentence.</para>
-      </listitem>
-
-      <listitem><para>Preserve the network
-      location, if any, given in the Document for public access to a
-      Transparent copy of the Document, and likewise the network
-      locations given in the Document for previous versions it was
-      based on.  These may be placed in the "History" section.  You
-      may omit a network location for a work that was published at
-      least four years before the Document itself, or if the original
-      publisher of the version it refers to gives permission.</para>
-      </listitem>
-
-      <listitem><para>In any section entitled
-      "Acknowledgements" or "Dedications", preserve the section's
-      title, and preserve in the section all the substance and tone of
-      each of the contributor acknowledgements and/or dedications
-      given therein.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      Invariant Sections of the Document, unaltered in their text and
-      in their titles.  Section numbers or the equivalent are not
-      considered part of the section titles.</para>
-      </listitem>
-
-      <listitem><para>Delete any section
-      entitled "Endorsements".  Such a section may not be included in
-      the Modified Version.</para>
-      </listitem>
-
-      <listitem><para>Do not retitle any
-      existing section as "Endorsements" or to conflict in title with
-      any Invariant Section.</para>
-      </listitem>
-    </orderedlist>
-    
-    <para>If the Modified Version includes new front-matter sections
-    or appendices that qualify as Secondary Sections and contain no
-    material copied from the Document, you may at your option
-    designate some or all of these sections as invariant.  To do this,
-    add their titles to the list of Invariant Sections in the Modified
-    Version's license notice.  These titles must be distinct from any
-    other section titles.</para>
-
-    <para>You may add a section entitled "Endorsements", provided it
-    contains nothing but endorsements of your Modified Version by
-    various parties--for example, statements of peer review or that
-    the text has been approved by an organization as the authoritative
-    definition of a standard.</para>
-
-    <para>You may add a passage of up to five words as a Front-Cover
-    Text, and a passage of up to 25 words as a Back-Cover Text, to the
-    end of the list of Cover Texts in the Modified Version.  Only one
-    passage of Front-Cover Text and one of Back-Cover Text may be
-    added by (or through arrangements made by) any one entity.  If the
-    Document already includes a cover text for the same cover,
-    previously added by you or by arrangement made by the same entity
-    you are acting on behalf of, you may not add another; but you may
-    replace the old one, on explicit permission from the previous
-    publisher that added the old one.</para>
-
-    <para>The author(s) and publisher(s) of the Document do not by
-    this License give permission to use their names for publicity for
-    or to assert or imply endorsement of any Modified Version.</para>
-  </sect1>
-
-  <sect1 label="5">
-    <title>COMBINING DOCUMENTS</title>
-
-    <para>You may combine the Document with other documents released
-    under this License, under the terms defined in section 4 above for
-    modified versions, provided that you include in the combination
-    all of the Invariant Sections of all of the original documents,
-    unmodified, and list them all as Invariant Sections of your
-    combined work in its license notice.</para>
-
-    <para>The combined work need only contain one copy of this
-    License, and multiple identical Invariant Sections may be replaced
-    with a single copy.  If there are multiple Invariant Sections with
-    the same name but different contents, make the title of each such
-    section unique by adding at the end of it, in parentheses, the
-    name of the original author or publisher of that section if known,
-    or else a unique number.  Make the same adjustment to the section
-    titles in the list of Invariant Sections in the license notice of
-    the combined work.</para>
-
-    <para>In the combination, you must combine any sections entitled
-    "History" in the various original documents, forming one section
-    entitled "History"; likewise combine any sections entitled
-    "Acknowledgements", and any sections entitled "Dedications".  You
-    must delete all sections entitled "Endorsements."</para>
-  </sect1>
-
-  <sect1 label="6">
-    <title>COLLECTIONS OF DOCUMENTS</title>
-
-    <para>You may make a collection consisting of the Document and
-    other documents released under this License, and replace the
-    individual copies of this License in the various documents with a
-    single copy that is included in the collection, provided that you
-    follow the rules of this License for verbatim copying of each of
-    the documents in all other respects.</para>
-
-    <para>You may extract a single document from such a collection,
-    and distribute it individually under this License, provided you
-    insert a copy of this License into the extracted document, and
-    follow this License in all other respects regarding verbatim
-    copying of that document.</para>
-  </sect1>
-
-  <sect1 label="7">
-    <title>AGGREGATION WITH INDEPENDENT WORKS</title>
-    
-    <para>A compilation of the Document or its derivatives with other
-    separate and independent documents or works, in or on a volume of
-    a storage or distribution medium, does not as a whole count as a
-    Modified Version of the Document, provided no compilation
-    copyright is claimed for the compilation.  Such a compilation is
-    called an "aggregate", and this License does not apply to the
-    other self-contained works thus compiled with the Document, on
-    account of their being thus compiled, if they are not themselves
-    derivative works of the Document.</para>
-
-    <para>If the Cover Text requirement of section 3 is applicable to
-    these copies of the Document, then if the Document is less than
-    one quarter of the entire aggregate, the Document's Cover Texts
-    may be placed on covers that surround only the Document within the
-    aggregate.  Otherwise they must appear on covers around the whole
-    aggregate.</para>
-  </sect1>
-
-  <sect1 label="8">
-    <title>TRANSLATION</title>
-
-    <para>Translation is considered a kind of modification, so you may
-    distribute translations of the Document under the terms of section
-    4.  Replacing Invariant Sections with translations requires
-    special permission from their copyright holders, but you may
-    include translations of some or all Invariant Sections in addition
-    to the original versions of these Invariant Sections.  You may
-    include a translation of this License provided that you also
-    include the original English version of this License.  In case of
-    a disagreement between the translation and the original English
-    version of this License, the original English version will
-    prevail.</para>
-  </sect1>
-
-  <sect1 label="9">
-    <title>TERMINATION</title>
-    
-    <para>You may not copy, modify, sublicense, or distribute the
-    Document except as expressly provided for under this License.  Any
-    other attempt to copy, modify, sublicense or distribute the
-    Document is void, and will automatically terminate your rights
-    under this License.  However, parties who have received copies, or
-    rights, from you under this License will not have their licenses
-    terminated so long as such parties remain in full
-    compliance.</para>
-  </sect1>
-
-  <sect1 label="10">
-    <title>FUTURE REVISIONS OF THIS LICENSE</title>
-
-    <para>The Free Software Foundation may publish new, revised
-    versions of the GNU Free Documentation License from time to time.
-    Such new versions will be similar in spirit to the present
-    version, but may differ in detail to address new problems or
-    concerns.  See <ulink
-    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
-
-    <para>Each version of the License is given a distinguishing
-    version number.  If the Document specifies that a particular
-    numbered version of this License "or any later version" applies to
-    it, you have the option of following the terms and conditions
-    either of that specified version or of any later version that has
-    been published (not as a draft) by the Free Software Foundation.
-    If the Document does not specify a version number of this License,
-    you may choose any version ever published (not as a draft) by the
-    Free Software Foundation.</para>
-  </sect1>
-
-  <sect1 label="">
-    <title>How to use this License for your documents</title>
-
-    <para>To use this License in a document you have written, include
-    a copy of the License in the document and put the following
-    copyright and license notices just after the title page:</para>
-
-<blockquote><para>
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-</para></blockquote>
-
-    <para>If you have no Invariant Sections, write "with no Invariant
-    Sections" instead of saying which ones are invariant.  If you have
-    no Front-Cover Texts, write "no Front-Cover Texts" instead of
-    "Front-Cover Texts being LIST"; likewise for Back-Cover
-    Texts.</para>
-
-    <para>If your document contains nontrivial examples of program
-    code, we recommend releasing these examples in parallel under your
-    choice of free software license, such as the GNU General Public
-    License, to permit their use in free software.</para>
-  </sect1>
-
-</appendix>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-parent-document: ("referenz.sgml" "appendix")
-sgml-exposed-tags:nil
-sgml-local-ecat-files:nil
-sgml-local-catalogs: CATALOG
-sgml-validate-command: "nsgmls -s referenz.sgml"
-ispell-skip-sgml: t
-End:
--->
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
deleted file mode 100644
index f04b381d19..0000000000
--- a/doc/C/apx-gloss.sgml
+++ /dev/null
@@ -1,432 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glossary</title>
-
- <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
-  <glossdef>
-   <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="druid">
-  <glossterm>Druid</glossterm>
-  <glossdef>
-   <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
-     account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward</glossterm>
-  <glossdef>
-   <para>
-       the user can send a third party a message
-    which was sent to the user originally.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
-    for describing page layout in electronic documents like web pages,
-    help files, and email messages.  HTML can be used in email and
-    news posts to insert images and apply text treatments.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
-  <glossdef>
-   <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, it allows access to email which is typically (although
-    not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP</glossterm>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Inline</glossterm>
-  <glossdef>
-   <para>
-     Displayed as part of a message or other document, rather than
-     attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly*so[a|u]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
-  <glossdef>
-   <para>
-      As its name implies, <application>sendmail</application> is a
-      program which sends mail.  <application>Evolution</application>
-      can use it instead of <glossterm>SMTP</glossterm>; some people
-      prefer it because it offers more flexibility, but is more
-      difficult to set up.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
-  <glossdef>
-   <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signature</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unwanted e-mail.  Spam normally comes in forms of
-    chain-letters and advertisements for unscrupulous web sites or
-    services.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
-  <glossdef>
-   <para>
-    A file format for the exchange of contact information. When you
-    get an address card attached to an email, it's probably in vCard
-    format.  Not to be confused with <glossterm
-    linkend="vfolder">vFolder</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
-  <glossdef>
-   <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/apx-gpl.sgml b/doc/C/apx-gpl.sgml
deleted file mode 100644
index 7c7e4cd0f7..0000000000
--- a/doc/C/apx-gpl.sgml
+++ /dev/null
@@ -1,414 +0,0 @@
-<appendix id="gpl">
-  <title>GNU GENERAL PUBLIC LICENSE</title>
-  <subtitle>Version 2, June 1991</subtitle>
-
-
-<para>
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</para>
-<sect1>
-<title>Preamble</title>
-<para>
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</para>
-<para>
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</para>
-<para>
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</para>
-<para>
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</para>
-<para>
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</para>
-<para>
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</para>
-<para>
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</para>
-<para>
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</para>
-	   
-</sect1>
-
-<sect1>
-<title> GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-<para>	
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</para>
-<para>	 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</para>
-<para>	 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</para>
-<para>	 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</para>
-<para>	 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</para>
-<para>	 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</para>
-<para>	 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</para>
-<para>	 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</para>
-<para>	 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</para>
-<para>	 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</para>
-<para>	 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</para>
-<para>	 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</para>
-<para>	 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</para>
-<para>	 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</para>
-<para>	 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</para>
-<para>	 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</para>
-<para>	 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</para>
-<para>	 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</para>
-<para>	 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</para>
-<para>	 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</para>
-<para>	 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</para>
-<para>	 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</para>
-<para>	 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</para>
-<para>	 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</para>
-<para>	 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</para>
-<para>	 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</para>
-<para>	 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</para>
-<para>	 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</para>
-</sect1>
-<sect1>
-<title>NO WARRANTY</title>
-<para>
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</para>
-<para>
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</para>
-<para>
-		     END OF TERMS AND CONDITIONS
-</para>
-</sect1>
-  <sect1>
-	 <title>How to Apply These Terms to Your New Programs</title>
-<para>
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</para>
-<para>
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</para>
-<para>
-    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-Copyright (C) &lt; year&gt;  &lt;name of author&gt;
-</para>
-<para>
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-</para>
-<para>
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-</para>
-<para>
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-</para>
-<para>
-
-Also add information on how to contact you by electronic and paper mail.
-</para>
-<para>
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</para>
-<para>
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</para>
-<para>
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</para>
-<para>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</para>
-<para>
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</para>
-<para>
-  &lt;signature of Ty Coon&gt;, 1 April 1989
-  Ty Coon, President of Vice
-</para>
-<para>
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</para>
-</sect1>
-</appendix>
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
deleted file mode 100644
index 27c1ac57db..0000000000
--- a/doc/C/config-prefs.sgml
+++ /dev/null
@@ -1,647 +0,0 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Mail
-        configuration</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	<varlistentry>
-          <term><guilabel>Identities</guilabel></term>
-          <listitem>
-	    <para>
-               This allows you to create and alter one or more
-               identities for your email.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Sources</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> where to get the
-               mail sent to you, and how to get it.
-            </para>
-          </listitem>
-	</varlistentry>
-	<varlistentry>
-
-	  <term><guilabel>Mail Transport</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> how to send mail.
-            </para>
-          </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>News Servers</guilabel></term>
-	  <listitem>
-	    <para>
-              If you would like to use
-              <application>Evolution</application> to read newsgroups,
-              you can specify your news server preferences here.
-           </para>
-	  </listitem>
-	</varlistentry>
-
-
-
-	<varlistentry>
-	  <term><guilabel>Other</guilabel></term>
-	  <listitem>
-	    <para>
-              Miscellaneous mail and news settings, such as HTML
-              handling preferences, and how long
-              <application>Evolution</application> should wait before
-              marking message read.
-           </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
-      <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
-       </para>
-       <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
-      <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from IMAP or POP servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
-                  <glossterm>SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server-- this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.
-          </para>
-      </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
-	<para>
-           The <interface>Mail Transports</interface> tab lets you set
-           how you will send mail.  Evolution currently supports two
-           mail transport options: <guilabel>SMTP</guilabel>, which
-           uses a remote mail server, and
-           <guilabel>sendmail</guilabel>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <systemitem>SMTP</systemitem>.
-        </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-                <term> 
-                   <guilabel>Send messages in HTML format</guilabel>
-                </term>
-                <listitem><para>
-                    If you check this box, you will send
-                    messages as HTML by default.  If you leave it unchecked, your
-                    messages will be sent without HTML formatting unless you select 
-                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-                    </menuchoice> in the message composer.
-                    See <xref linkend="usage-mail-getnsend-send-html">
-                    for more information about HTML mail.
-                </para></listitem>
-              </varlistentry>
-             <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Weeks start on</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day range</term>
-	    <listitem>
-               <para>
-                 When does your work day start, and when does it end?
-                 In the day and week views,
-                 <application>Evolution</application> displays all the
-                 hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, you can
-                 still schedule an appointment outside of these hours,
-                 and if you do, the display will be extended to show
-                 it.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Calendar Colors</title>
-      <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements whose color you can set are:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
-       <variablelist>
-	 <varlistentry>
-	   <term>Show on To Do List</term>
-	    <listitem>
-	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Style Options</term>
-	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</title>
-	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
-	<para>
-          You can set the following options: <!--insert variable list
-          here-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
deleted file mode 100644
index d9649f1adc..0000000000
--- a/doc/C/config-setupassist.sgml
+++ /dev/null
@@ -1,214 +0,0 @@
-    <chapter id="config-setupassist">
-      <title>Easy Setup with the Setup Assistant</title>
-      <para>
-        The first time you try to use email, the mail setup assistant
-        will ask you for some basic information, so
-        <application>Evolution</application> can let you use email. If
-        you prefer more detailed configuration, or if you want to make
-        changes to an existing email setup, see <xref
-        linkend="config-prefs">.
-      </para>
-
-   <sect1 id="config-setupassist-mail">
-      <title>Mail Setup</title>
-      <para>
-        The first time you try to send or receive mail with
-	<application>Evolution</application>, the <interface>mail
-	setup assistant</interface> will pop up to help you with your
-	email preferences.  If you don't plan to use email, or if
-	you'd rather deal with your email preferences later, click
-	<guibutton>Cancel</guibutton>.
-      </para>
-
-<!--  
-
-
-
-Before you get it, though, you should decide where you want to
-	keep it.  Your options will vary a little depending on your
-	network setup, but they come down to storing the mail on your
-	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
-	storing it on the network (using <glossterm
-	linkend="imap">IMAP</glossterm>).  If you store your mail on
-	your local hard disk, you can read it whether you're online or
-	not, but you can only read it from one computer.  If you store
-	it on the network, you can only read it when you're online,
-	but you can access it from almost any computer with a network
-	connection, even if it doesn't have
-	<application>Evolution</application>.
-
-
-        If you choose POP, you'll be putting mail in the
-        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
-        folder.  If you choose IMAP, it's the
-        <guilabel>Inbox</guilabel> of a folder with the same name as
-        your mail server.  That's so you can maintain several distinct
-        IMAP servers if you want.  See <xref
-        linkend="config-prefs-mail"> for more information about mail
-        servers.
--->
-
-      <para>
-         The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
-	 network configuration process.  It will ask you for some
-	 basic information; your system administrator or ISP should
-	 have the answers you'll need.  The mail setup assistant is
-	 pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
-	<figure id="usage-setup-fig">
-	<title>Mail Setup Assistant</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
-	    </graphic>
-	</screenshot>
-	</figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
-  The assistant will ask you for the following information:
-        <variablelist>
-
-          <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term> <listitem>
-	  <para>Your full name. </para></listitem>
-         </varlistentry>
-
-       <varlistentry>
-          <term><guilabel>Email address:</guilabel></term>
-	  <listitem><para>
-                 Your complete email address.
-                 </para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-          <term> <guilabel>Organization:</guilabel></term>
-	  <listitem>
-	    <para>
-              Any organization you represent, or the company where you
-              work.  Leave this blank if you wish, or type "My own bad
-              self" so people know your opinions are yours alone.
-            </para>
-	  </listitem>
-      </varlistentry>
-
-      <varlistentry>
-	 <term><guilabel>Signature File:</guilabel></term>
-          <listitem>
-            <para>
-             A text file appended to any email you send.  A signature
-             file typically consists of your name and email address,
-             or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remember,
-             this is attached to every email you send.
-            </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-           <term> <guilabel>Mail source type:</guilabel></term>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> supports several
-              mail sources: <glossterm>POP</glossterm> and
-              <glossterm>IMAP</glossterm> servers, and UNIX-style
-              <systemitem><filename>mbox</filename></systemitem> and
-              <systemitem><filename>mh</filename></systemitem> files.
-              POP servers retrieve your mail and store it on your
-              local system so you can refer to it even when not
-              connected to a network; <glossterm>IMAP</glossterm>
-              servers store the mail on the server so you can access
-              it from multiple locations;
-              <systemitem><filename>mbox</filename>></systemitem>
-              files are used by your computer for internal mail, and
-              may be useful if you want to switch from another email
-              client such as <application>Spruce</application> or
-              <application>Netscape Communicator</application>.  Ask
-              your system administrator which you should use, or keep
-              guessing until one works.  You may use multiple sources
-              if you wish; see <xref
-              linkend="config-prefs-mail-network"> for more
-              information.
-            </para>
-            <para>
-              If you decide not to have
-              <application>Evolution</application> use any servers,
-              the remaining items are not relevant; you only need to
-              point to the location of the files you wish to access.
-            </para>
-	  </listitem>
-	  </varlistentry>
-          
-       <varlistentry>
-          <term> <guilabel>Server:</guilabel></term>
-	  <listitem>
-	    <para>
-              This should be the name of the server where you check
-              your mail, if you use one.  It may be the same as the
-              server where you send your outgoing mail, if you use
-              one.
-            </para>
-	  </listitem>
-	</varlistentry>
-
-     <varlistentry>
-	  <term><guilabel>Username:</guilabel></term>
-	<listitem>
-             <para>
-              Enter the username for your mail server account, if you
-              have one. Normally, this is the part of your email
-              address before the @ character, and
-              <application>Evolution</application> has selected that
-              value as the default.  If you have a different username,
-              you can enter it here.
-            </para>
-	  </listitem>
-      </varlistentry>
-     
-       <varlistentry>
-            <term><guilabel>Authentication:</guilabel></term> 
-	    <listitem>
-	    <para>
-              Select the type of authentication you will use.  You can
-              click <guibutton>Detect supported types</guibutton> to
-              find out which authentication protocols your network
-              allows.
-            </para>
-	  </listitem>
-       </varlistentry>
-
-      <varlistentry> 
-         <term><guilabel>Mail Transport:</guilabel></term>
-	  <listitem>
-	    <para>
-              This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both SMTP
-              and <application>sendmail</application>.
-            </para>
-	  </listitem>
-      </varlistentry>
-     </variablelist>
-      </para>
-      <para>
-        To learn how to configure <application>Evolution</application>
-        in greater detail, or to change preferences once you have set
-        them, see <xref linkend="config-prefs">.
-      </para>
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml
deleted file mode 100644
index 8fcf94e3af..0000000000
--- a/doc/C/config-sync.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        deal with.  The first one is pretty simple: you'll need to get
-        the data to move among the various devices you're using.  If
-        you've already got <application>Gnome-Pilot</application>
-        working, then all you have to do is tell it to use the
-        <application>Evolution</application>
-        <glossterm>conduit</glossterm>.  If you haven't used
-        <application>Gnome-Pilot</application> before, you'll need to
-        run the GNOME <application>Control Center</application> and go
-        through the hand-held device setup assistant.  Then you can
-        select the Evolution conduit and press the hotsync button.
-      </para>
-      <para>
-        If that doesn't work, jump up and down several times and swear
-        loudly.  Then make sure you've got
-        <application>Gnome-Pilot</application> going to the right
-        device (for my serial port, it's /dev/ttys0, not the default
-        /dev/pilot) and that you have read and write permission on
-        that device.  If you don't, you'll need to be added to whatever
-        group has those permissions (probably tty).
-     </para>
-     <para>
-        Once <application>Evolution</application> knows how to get the
-        mail, address, and calendar data, it needs to know what to do
-        with it.  When you synchronize your local data with the data
-        on a server or handheld device, you may run into conflicts:
-        perhaps you have ended up with two cards with the same name
-        and different addresses, or old mail that has been deleted
-        from one device but not the other.  What if you want to keep
-        only the a few contacts or messages on your hand-held or your
-        laptop, but keep all the data server or your desktop machine?
-        Select the <guibutton>Synchronization</guibutton> tab from the
-        <interface>Preferences</interface> window to set up the
-        conflict resolution preferences.
-     </para>
-      <para> 
-         You can set <application>Evolution</application>'s
-         synchronization behavior in the following ways: 
-         <!-- LIST HERE -->
-      </para>
-      <para> 
-         <warning> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  If you set your
-	    synchronization behaviors wrong, you could end up deleting
-	    the messages and cards you want to keep, and keeping the
-	    ones you want to delete.  Before you change these
-	    preferences, make a backup of your the
-	    <systemitem><filename>evolution</filename></systemitem>
-	    directory.
-          </para>
-	</warning>
-       </para>
-    </chapter>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
deleted file mode 100644
index 064bb0d305..0000000000
--- a/doc/C/evolution-guide.sgml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000</year>
-      <holder> Helix Code, Inc., </holder>
-      <holder> Kevin Breit </holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation
-         License</citetitle></ulink>, Version 1.1 or any later version
-         published by the Free Software Foundation with no Invariant
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-         may obtain a copy of the <citetitle>GNU Free Documentation
-         License</citetitle> from the Free Software Foundation by
-         visiting <ulink type="http" url="http://www.fsf.org">their
-         Web site</ulink> or by writing to: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and those trademarks
-         are made aware to the members of the GNOME Documentation
-         Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-
-    <releaseinfo>
-       This is version 0.6 of the Evolution manual, describing version 
-       0.6 of Evolution.  
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Using Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application>
-        for email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that, as with most of
-        Linux, there's more than one way to do things, and you can
-        pick whichever method you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-MAIL;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system.  But in the case
-        of <application>Evolution</application>, you can expect that
-        it will work perfectly well with minimal setup hassle, and
-        that you can alter its behavior to fit your needs with just a
-        little more work.  This part of the book will describe that
-        process, from the quickest glimpse of the Setup Assistant to
-        an in-depth tour of the preferences dialogs.
-      </para>
-    </partintro>
-
-    &CONFIG-SETUPASSIST;
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
- 
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/fig/calendar.png b/doc/C/fig/calendar.png
deleted file mode 100644
index c9703f4903..0000000000
--- a/doc/C/fig/calendar.png
+++ /dev/null
diff --git a/doc/C/fig/config-cal.png b/doc/C/fig/config-cal.png
deleted file mode 100644
index 25b5b68621..0000000000
--- a/doc/C/fig/config-cal.png
+++ /dev/null
diff --git a/doc/C/fig/config-mail.png b/doc/C/fig/config-mail.png
deleted file mode 100644
index cd8543d94e..0000000000
--- a/doc/C/fig/config-mail.png
+++ /dev/null
diff --git a/doc/C/fig/contact-editor.png b/doc/C/fig/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/doc/C/fig/contact-editor.png
+++ /dev/null
diff --git a/doc/C/fig/contact.png b/doc/C/fig/contact.png
deleted file mode 100644
index a9ed02251a..0000000000
--- a/doc/C/fig/contact.png
+++ /dev/null
diff --git a/doc/C/fig/filter-assist-fig.png b/doc/C/fig/filter-assist-fig.png
deleted file mode 100644
index 5248e0effe..0000000000
--- a/doc/C/fig/filter-assist-fig.png
+++ /dev/null
diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png
deleted file mode 100644
index a8b41ca678..0000000000
--- a/doc/C/fig/filter-new-fig.png
+++ /dev/null
diff --git a/doc/C/fig/mail-composer.png b/doc/C/fig/mail-composer.png
deleted file mode 100644
index 22c16365b5..0000000000
--- a/doc/C/fig/mail-composer.png
+++ /dev/null
diff --git a/doc/C/fig/mail-druid-pic.png b/doc/C/fig/mail-druid-pic.png
deleted file mode 100644
index f29f3e77be..0000000000
--- a/doc/C/fig/mail-druid-pic.png
+++ /dev/null
diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png
deleted file mode 100644
index b4f18640b4..0000000000
--- a/doc/C/fig/mail-inbox.png
+++ /dev/null
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
deleted file mode 100644
index 28bf487bf9..0000000000
--- a/doc/C/fig/mainwindow-pic.png
+++ /dev/null
diff --git a/doc/C/fig/print-dest.png b/doc/C/fig/print-dest.png
deleted file mode 100644
index 464705711e..0000000000
--- a/doc/C/fig/print-dest.png
+++ /dev/null
diff --git a/doc/C/fig/print-preview.png b/doc/C/fig/print-preview.png
deleted file mode 100644
index 7f9a8d661a..0000000000
--- a/doc/C/fig/print-preview.png
+++ /dev/null
diff --git a/doc/C/fig/vfolder-createrule-fig.png b/doc/C/fig/vfolder-createrule-fig.png
deleted file mode 100644
index 162bebf48c..0000000000
--- a/doc/C/fig/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
deleted file mode 100644
index 036b663b23..0000000000
--- a/doc/C/menuref.sgml
+++ /dev/null
@@ -1,1315 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Menu Reference</title>
-  <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-
-
-  <sect1 id="menuref-universal">
-    <title>Menus that are the same everywhere</title>
-    <para>
-      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in
-      the main <application>Evolution</application> window do not
-      change, because they refer to universal items.  Other menus have
-      contents that change depending on context.
-    </para>
-   
- <sect2 id="menuref-universal-file">
-      <title>File Menu</title>
-      <para>
-	<variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>New...</guisubmenu> Submenu</term>
-	    <listitem><para>
-		<itemizedlist>
-		  <listitem><para>
-		      <guimenuitem>Folder</guimenuitem> &mdash;
-		       Create a new folder. See <xref 
-		       linkend="usage-mainwindow-folderbar">
-		       for more information about folders.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Shortcut</guimenuitem> &mdash;
-		       Create a new Shortcut in the Shortcut Bar.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Mail Message</guimenuitem> &mdash;
-		       Compose a new mail message. Covered in
-		       <xref linkend="usage-mail-getnsend-send">.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Appointment</guimenuitem> &mdash;
-		       Enter a new appointment in your calendar. See <xref
-			linkend="usage-calendar-apts-basic"> for more information.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Task</guimenuitem> &mdash;
-		       Enter a new to-do item in your taskpad. Covered in 
-		       <xref linkend="usage-calendar-todo">.
-		    </para></listitem>
-		</itemizedlist>
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Go to Folder</guimenuitem></term>
-	    <listitem><para>
-               View the items in a particular folder.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Create New Folder</guimenuitem></term>
-	    <listitem><para>
-		 This item doesn't belong here any more.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-		 Print the current message.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Exit</guimenuitem></term>
-	    <listitem><para>
-		 Quit using <application>Evolution</application>.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-universal-help">
-      <title>The Help Menu</title>
-      <para>
-      <variablelist>
-	<varlistentry>
-	  <term><guimenuitem>Help Index</guimenuitem></term>
-	  <listitem><para>
-             Displays the table of contents for this document.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Getting Started</guimenuitem></term>
-	  <listitem><para>
-              A quick look around, and a summary of the things
-              <application>Evolution</application> can do for you.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Mailer</guimenuitem></term>
-	  <listitem><para>
-              An in-depth tour of <application>Evolution</application> Mail.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Calendar</guimenuitem></term>
-	  <listitem><para>
-             A step-by-step guide to using the Calendar.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>
-	  <listitem><para>
-            Find your way around the Contact Manager.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Submit Bug Report</guimenuitem></term>
-	  <listitem><para>
-             If you don't report them, they can't fix them.  Select this item to let the 
-             developers know what's wrong.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>About Evolution</guimenuitem></term>
-	  <listitem><para>
-              Displays a window with information about the application and its authors.
-              This has the same information as <xref linkend="authors">.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </para>
-   
-    <sect2 id="menuref-mail-edit">
-      <title>The Edit Menu</title>
-      <para>
-        This menu is currently empty.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-view">
-      <title>The Mail View Menu</title>
-      <para>
-        This menu lets you control the way
-        <application>Evolution</application> displays your information
-        for you.
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the shortcut bar on and off with this item.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Threaded Message List</guimenuitem></term>
-	    <listitem><para>
-               This item controls whether your message list is displayed by thread 
-               or by other criteria.  The default order is by date; see
-               <xref linkend="usage-mail-listorder"> for information about the
-               order of the message list.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-tools">
-      <title>The Mail Settings Menu</title>
-      <para>
-      <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mail Filters</guimenuitem></term>
-	    <listitem><para>
-             Edit your mail filters here.  
-             See <xref linkend="usage-mail-organize-filters">
-             for more information about mail filtering.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               with this tool. 
-              To learn about using vFolders with mail, see 
-              <xref linkend="usage-mail-organize-vfolders">.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Mail Configuration</guimenuitem></term>
-	    <listitem><para> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
-      <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
-      <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
deleted file mode 100644
index 2987dd7988..0000000000
--- a/doc/C/preface.sgml
+++ /dev/null
@@ -1,427 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.
-        <application>Evolution</application>'s goal is to make the
-        tasks of storing, organizing, and retrieving information
-        easier, so you can work and communicate with others.  That is,
-        it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop. On the inside, it's a
-        powerful database; on the outside, it's a tool to help you get
-        your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>Evolution</application> is free software.  The
-        program and its source code are released under the terms of
-        the <ulink type="help" url="gnome-help:gpl"><citetitle>GNU
-        Public License (GPL)</citetitle></ulink>, and the
-        documentation falls under the <ulink type="help"
-        url="gnome-help:fdl"><citetitle>Free Documentation
-        License</citetitle></ulink> (FDL). For more information about
-        the GPL and the FDL, visit the Free Software Foundation's
-        website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>This is a preview release</title>
-           <para>
-             <application>Evolution</application> is not complete, and
-             still has a lot of flaws.  Please help improve it by
-             letting us know about them.  You should do this by
-             submitting bug reports with the GNOME <application>Bug
-             Report Tool</application> (known as
-             <command>bug-buddy</command> at the command line).
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> can help you work in a
-        group, by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-        <application>Evolution</application> can handle almost all
-        your communications and information management tasks with the
-        power and flexibility of the GNOME desktop environment.
-      </para>
-      <para>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. That means a familiar and intuitive
-             interface that users can customize to their liking, and
-             the development of shortcuts for complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Data must be safe: <application>Evolution</application>
-               must not lose mail, corrupt mailbox files or other
-               data, execute arbitrary <glossterm linkend="script">scripts</glossterm>,
-               or delete files from your hard disk.
-            </para>
-          </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        <application>Evolution</application> is designed to make most
-        daily tasks faster.  For example, it takes only one or two
-        clicks to enter an appointment or an address card sent to you
-        by email, or to send email to a contact or appointment.
-        <application>Evolution</application> makes displays faster and
-        more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate advanced
-        features like <link
-        linkend="usage-mail-organize-vFolders">vFolders</link>, which
-        let you save searches as though they were ordinary mail
-        folders.
-      </para>
-
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>About This Book</title>
-    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
-      <para>
-        This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@helixcode.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
-        url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
-      </para>
-    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
-
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this is the section for you. The second section,
-        covering <link linkend="config">configuration</link>, is
-        targeted at more advanced users, but anyone who wants to
-        change the way <application>Evolution</application> looks or
-        acts can benefit from reading it.  In addition, there is a
-        comprehensive <link linkend="menuref">menu
-        reference</link> which describes nearly every capability that
-        <application>Evolution</application> has to offer.
-      </para>
-      <formalpara>
-        <title>Typographical conventions</title>
-	<para>
-          Some kinds of words are marked off with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-        </para>
-      </formalpara>
-  </sect1>
-  <sect1 id="commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-        You might want to get a copy of this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
-    </para>
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use: (Please note that the shortcuts listed are
-         probably wrong at this point).
-         
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:
-         <variablelist>
-	  <varlistentry>
-	    <term>Check Mail</term>
-	    <listitem>
-	      <para>
-                Click <guibutton>Get Mail</guibutton> in the toolbar, or press 
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                Select the message to which you want to reply, and
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message you want to forward, and
-                click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Create Filters and vFolders</term>
-	    <listitem>
-	      <para>
-                You can create filters and vFolders based on specific
-                message attributes by right-clicking on a message or
-                by selecting <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>vFolder Editor</guimenuitem>
-                </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and vFolders
-                in <xref linkend="usage-mail-organize-vfolders">.
-            </para>
-	    </listitem>
-	</varlistentry>
-	</variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-cal">
-        <title>Calendar</title>
-        <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-
-
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
deleted file mode 100644
index 72f278a424..0000000000
--- a/doc/C/usage-calendar.sgml
+++ /dev/null
@@ -1,367 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>The Evolution Calendar</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a grey and white ruled background.  At the upper
-    right, there's a monthly calendar you can use to switch days.
-    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
-    keep a sort of glorified to-do list that's not linked to your
-    calendar.  The calendar's daily view is shown in <xref
-    linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-
-    <para>
-       You can view your calendar by the day, by the week, by the
-       month, or by the year; press the calendar-shaped buttons on the
-       right side of the toolbar to switch between views.
-    </para>
-    <para>
-       To view yesterday's appointments, &mdash;last week's, if you're in
-       the weekly view, and last month's for the monthly view&mdash; click
-       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,
-       or next month, click <guibutton>Next</guibutton>, and of course,
-       click <guibutton>Today</guibutton> for today.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-       The <application>Evolution</application> calendar allows you to
-       schedule events for yourself or a group of people.  It can
-       handle events that repeat, event lengths from ten minutes to
-       multiple days, and events that have a date but no specific
-       time.  Of course, you can also set event reminders and alarms
-       so that you don't forget about everything you've just put into
-       your calendar. From office or family to office
-       <emphasis>and</emphasis> family,
-       <application>Evolution</application> can handle the schedule.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
-      <para>
-	To create a new calendar event, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your event must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <note>
-       <title>Doing Two Things At Once</title>
-         <para>
-           If you create calendar events that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
-         <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your event.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like some additional application
-	        to run as a reminder.  You can enter its name in the
-	        text field, or find it with the
-	        <guibutton>Browse</guibutton> button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> is a little more
-         complicated, and only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and implementations of
-         this feature have yet to be determined. <!-- FIXME -->
-      </para>
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
-        every 100 years.  You can then choose a time when repetition
-        will stop, and, under <guilabel>Exceptions</guilabel>, pick
-        individual days when the event will <emphasis>not</emphasis>
-        recur.
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event in
-	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization with a hand-held device.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
-	  <listitem>
-	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of the
-       calendar window.  To view or edit a detailed description of an
-       item, double-click on it, or select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Keelyn. the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
-      </menuchoice>.
-       You can place the calendar in any calendar folder and access it
-       from the folder view.  Alarms, configuration, and display for
-       each calendar are separate from each other.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
deleted file mode 100644
index 21630cacb3..0000000000
--- a/doc/C/usage-contact.sgml
+++ /dev/null
@@ -1,617 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>The Evolution Contact Manager</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> contact manager can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held and remote devices.
-      Since <application>Evolution</application> supports most major
-      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
-      fit into almost any existing network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  That means that when you look for someone's
-      address, you can also see a history of appointments with that
-      person.  Or, you can get an e-mail with contact information in
-      it and create a new address card on the spot.  In addition,
-      searches and folders and all work in the same way they do in the
-      other components, so you don't have to learn another system for
-      similar tasks.
-    </para>
-    <para>
-      This chapter will cover using the
-      <application>Evolution</application> contact manager to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks.  To
-      learn about configuring the contact manager, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Contact Manager</title>	
-    
-    <para>
-       To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the Contact Manager in all
-       its organizational glory.  By default, the contact manager
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-
-    <figure id="usage-contact-fig">
-      <title>Evolution Contact Manager</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-       The toolbar for the address book is quite simple:
-       <itemizedlist>
-	<listitem><para>
-           Press <guibutton>New</guibutton> for a new contact.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    Press <guibutton>Print</guibutton> to print one or more cards.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> Displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> Stop loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       The rest of the contact manager is taken up by the display of
-       your contact information.  You can view that display as a table
-       or as a list of cards&mdash; switch views in the
-       <guimenu>View</guimenu> menu &mdash; and move through them
-       alphabetically with the buttons and the scrollbar at the right
-       of the window. Of course, if you have more than a few people
-       listed, you'll want some way of finding them more quickly,
-       which is why there's a search feature.
-    </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is <guilabel>Quick Search</guilabel>. To use
-    	   it, just type in one or more words you're looking for and
-    	   hit <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. That means that you can refine searches by doing several in
-    	   succession.
-	</para>
-      <para>
-	   If there are no matches, the card display will be blank. When
-	   you'd like to see all the cards again, press <guilabel>Show
-	   All</guilabel>.
-      </para>
-      <example id="contact-quicksearch-ex">
-	<title>Refining a Quick Search</title>
-	<para>
-	    Tom comes back from lunch and finds a note on his keyboard:
-	    "Curtis in sales called for you, but he didn't leave a number,
-	    and I forgot to write down the name of the company he works
-	    for. He said it was important, though." Tom is not at all
-	    annoyed.
-         </para>
-	 <para>
-	    He opens his contacts folder, and runs a quick search for
-	    "Curtis;" there are eighteen different people with that name
-	    in the file. He then enters "Sales," and
-	    <application>Evolution</application> narrows it down to the
-	    right Curtis. He only becomes annoyed when he discovers that
-	    the call was not actually important.
-          </para>
-      </example>
-    
-      <para>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the in-depth search window, which
-        lets you use multiple search criteria in the same way that
-        email filters and <glossterm linkend="vfolder">vFolders</glossterm> do..
-      </para>    
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a searchs within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select all
-        the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
-  </sect1>
-  <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
-    <para>
-       To delete a card, click on it once to select it, then press the
-       <guibutton>Delete Card</guibutton> button.  If you have
-       multiple cards selected, you'll delete multiple cards.
-    </para>
-    <para>
-       Adding or changing cards is slightly more complicated.  Any
-       time you add information to the contact manager, whether it's
-       an old card you're editing or a new card you're just adding to
-       your address book, you'll use the contact editor.  To change a
-       card that already exists, just double click it to open the
-       contact editor window with all the current information already
-       filled in.  If you want to create a new one, clicking the
-       <guibutton>New Card</guibutton> button will open up that same
-       window, but with empty fields instead of full ones.  Either
-       way, it's the same tool for quite similar tasks, and you'll
-       find that it's pretty flexible and can store quite a lot more
-       than you'd think would fit onto a file card.
-    </para>
-
-      <para>
-	The contact editor window has two tabs,
-    	<guilabel>General</guilabel>, for basic contact information,
-    	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, covered in <xref
-    	linkend="menuref-contact-editor">, and a toolbar with three
-    	items: <guilabel>Save and Close</guilabel>,
-    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-    	After that, however, it gets slightly more complicated, as you
-    	can see in <xref linkend="usage-contact-editor-fig">.
-      </para>
-      
-      <figure id="usage-contact-editor-fig">
-	  <title>Evolution Contact Editor</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
-		</graphic>
-	</screenshot>
-      </figure>
-      
-      <para> The <guilabel>General</guilabel> tab contains no less
-        than seven sections, each with an icon: a face, for name and
-        company; a telephone for phone numbers; an envelope for email
-        address; a globe for web page address; a house for postal
-        address; a file folder for contacts, and a briefcase for
-        categories.  You can guess what sort of information belongs in
-        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
-        page address</guilabel>, but there are several parts of the
-        window that are a little more interesting.
-    </para>
-    <para>
-     <variablelist>
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		             The person's first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  The middle name or initial, if any, goes here.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   The last name (surname) belongs here.
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Suffixes such as "Jr." or "III" can go here. 
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Eva Lucianne Tester</userinput>.
-                    You'll notice that the <guilabel>File
-                    As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Eva</computeroutput>.
-                    You can pick <computeroutput>Eva
-                    Tester</computeroutput> from the drop-down, or
-                    type in your own, such as <userinput>Lucianne
-                    Tester, Eva</userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employee."
-                    </para>
-		  </tip>
-		</listitem>
-	      </itemizedlist>
-             </para>
-           </listitem>
-	</varlistentry>
-	<varlistentry>
-            <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                remember them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool.  That's
-       really its own topic; for information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is, fortunately, much more
-       simple: three sections, all of which are more or less obvious:
-       the briefcase next to the details about the contact's
-       professional life; the face next to the details about their
-       personal life; the globe next to a big blank space you can use
-       for anything and everything else you'd like to note about them.
-       If you ever wanted to have that uncanny knack for remembering
-       obscure details like the date of someone's anniversary (perhaps
-       your own) this is the answer.
-     </para>
-
-
-
-
-<!--- ############# This section isn't implemented yet either:
-    <sect2>
-      <title></title>
-      <para>
-        <tip>
-	  <title>Contact Shortcuts</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-            right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change!  unimplemented!)
-          </para>
-	</tip>
-      </para>
-      <para>
-        You can move cards around just as you would move email
-        messages: dragging and dropping works, as does right-clicking
-        and choosing <guimenuitem>Move</guimenuitem> from the menu
-        that appears.
-      </para>
-    </sect2>
-############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Contact Manager</title>
-    <para>
-       Organizing your contact manager is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the contact manager does not allow vFolders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!--
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your contact manager share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
-         different categories.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
-
-       <!-- FIXME: Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <para>
-       If you keep your cards on a network using an
-       <glossterm linkend="ldap">LDAP</glossterm> server, you can share access to
-       them.  Actually, the server software takes care of that, and
-       also determines who is allowed to see and change them.  This is
-       the sort of feature you'll want to use if your company has a
-       list of vendors and clients that needs constant updating.  If
-       you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their work-group
-       or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X.
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters, or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar, and will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem><para>
-              They are only available when you are connected to the network.  If 
-              you use a laptop or have a modem connection, you may wish to copy or cache
-              the network directory and then synchronize your copy with the networked version
-              periodically.
-          </para></listitem>
-          <listitem><para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para></listitem>
-	  <listitem><para>
-              Your ability to view, change, add or delete
-              contacts depends on the settings of the LDAP server.
-              For example, you may read all the entries in the public
-              Netcenter directory (available by default in the
-              <guilabel>External Directories</guilabel> folder), but
-              you may not change or delete any of them.
-           </para></listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Contact Manager Tools</title>
-    <para>
-       The contact manager works with
-       <application>Evolution</application> mail and the calendar to
-       help you add new address cards quickly.  However, it can also
-       manage mailing lists.  There are more tools planned, and when
-       they arrive, <!-- FIXME --> they will be described in this
-       section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your contact manager's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group.
-      </para>
- <!-- FIXME this feature not yet implemented  -->
-      <para>
-         Future versions of <application>Evolution</application> will
-	 allow you to you export a group of cards to a spreadsheet,
-	 database, or word processor so you can print address labels
-	 or prepare large postal mailings.
-      </para>
-    </sect2>
-<!--
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-  </sect1>
-
-</chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
deleted file mode 100644
index 6aafdaa492..0000000000
--- a/doc/C/usage-mail.sgml
+++ /dev/null
@@ -1,1382 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-mail"> 
-  <title>Evolution Mail</title>
-  <abstract>
-    <title> An Overview of the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   It can sort and organize your mail in a wide variety of ways with
-	   folders, searches, and filters.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	  It can send and receive mail in HTML or as plain text, and
-	  supports file attachments.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   It supports multiple mail sources, including <glossterm
-	   linkend="imap">IMAP</glossterm>, <glossterm
-	   linkend="pop">POP3</glossterm>, local
-	   <systemitem><filename>mbox</filename></systemitem> and
-	   <systemitem><filename>mh</filename></systemitem> files, and
-	   even NNTP messages (newsgroups), which aren't technically
-	   email.
-	 </para>
-       </listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan mail
-      volumes. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail clients.
-      If you get a lot of mail, or if you keep every message you get
-      in case you need to refer to it later, you'll find that feature
-      especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar.  By
-       default, the <interface>Inbox</interface> is open when you
-       start <application>Evolution</application>, and the first
-       time you see your Inbox, there's a message in it from Helix
-       Code welcoming you to the application.
-      </para>
-      <para>
-	The <application>Evolution</application>
-	<guilabel>Inbox</guilabel>, should look like the one in <xref
-	linkend="usage-mail-intro-fig">, which has a message from
-	Helix Code. The message summary appears at the top, in the
-	<interface>message list</interface>.  The message itself is
-	displayed below that, in the <interface>view pane</interface>.
-	If you find the <interface>view pane</interface> too small,
-	you can double-click on the message in the <interface>message
-	list</interface> to have it open in a new window.  Just like
-	with folders, you can right-click on messages in the message
-	list and get a menu of possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="usage-mail-intro-fig">
-	  <title>Evolution Mail</title>
-	  <screenshot>
-	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-      <para>
-         Most of the mail-related actions you'll want to perform are
-         listed in the <guimenu>Message</guimenu> menu in the menu
-         bar.  The most frequently used ones, like
-         <guimenuitem>Reply</guimenuitem> and
-         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-         right-click menu and as keyboard shortcuts, which tend to be
-         faster once you get the hang of them.  You can choose
-         whichever way you like best; the idea is that the software
-         should work the way you want, rather than making you work the
-         way the it does.
-       </para>
-
-      <sect3 id="usage-mail-listorder">
-	<title>Sorting the message list</title>
-	<para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list.  If you click twice, you'll sort them in reverse
-          order.
-        </para>
-	<para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  If the option selected,
-          <application>Evolution</application> will attempt to
-          associate related messages by using message ID numbers and
-          the <systemitem>References</systemitem>,
-          <systemitem>In-Reply-To</systemitem>, and
-          <systemitem>Subject</systemitem> message headers.  Messages
-          which are related are then placed next to each other, so
-          that it's easier to follow the thread of a conversation from
-          message to message.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar.  The message now has a line through it,
-          because you've marked it for deletion.
-        </para>
-        <para>
-          If you really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently. If you want to keep it, click
-          <guibutton>Delete</guibutton> again, and it will no longer
-          be marked as deleted.  At some point in the future, this
-          feature will change to something a little less
-          counter-intuitive.
-        </para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-	Now that you've had a look around the
-	<interface>Inbox</interface>, it's time to check for new mail.
-	Click <guibutton>Get mail</guibutton> in the toolbar to check
-	your mail.  If it's the first time you've done so, the
-	<interface>mail setup assistant</interface> will ask you for
-	the information it needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). 
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        the password until you quit the application or until you
-        select <menuchoice> <guimenu>Settings</guimenu>
-        <guimenuitem>Forget Passwords</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-        Once it's validated the password,
-	<application>Evolution</application> will check your mail.
-	New mail will appear in the local <interface>Inbox</interface>
-	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.
-      </para>
-   
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title> 
-     <para>
-	If you get an error message instead of mail, you probably need
-	to change your network settings.  To learn how to do that,
-	have a look at <xref linkend="config-prefs-mail-network">, or
-	ask your system administrator.
-      </para>
-    </note>
-
-      <sect3 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email there's no reason not to
-         read them side by side.  If you want to do that, add a news
-         source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
-       </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Attachments and HTML Mail</title>
-	<para>
-	  If someone sends you an <glossterm>attachment</glossterm>, a
-	  file attached to an email,
-	  <application>Evolution</application> will display the file
-	  at the bottom of the message to which it's attached.  Text,
-	  HTML, and most images will be displayed within the message
-	  itself.  For other files,
-	  <application>Evolution</application> will provide a link and
-	  icon at the end of the message.  Click on that, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've chosen a location and
-	  saved the file, you can open, move, copy, or execute it just
-	  like any other, using <application>Nautilus</application> or
-	  your favorite shell or file manager.
-        </para>
-        <para>
-          As usual, there's a shortcut here: right-click on the link,
-	  and choose an application for the file: you can send an
-	  image straight to the <application>GIMP</application>, or a
-	  spredsheet straight to <application>Gnumeric</application>.
-	</para>
-
-	<para>
-	   <application>Evolution</application> can also display
-	   HTML-formatted mail, complete with graphics.  HTML
-	   formatting will display automatically, although you can
-	   turn it off if you prefer.
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
-      <para>
-	 You can start writing a new email message by selecting
-	 <menuchoice> <guimenu>File</guimenu>
-	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail</guimenuitem></menuchoice>, or by pressing the
-	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
-	 When you do so, the <interface>New Message</interface> window
-	 will open, as shown in <xref
-	 linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-	<title>New Message Window</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
- <!-- Check the alignment of the following paragraph in the PS and
- HTML output: it's indented for no good reason -->
-      <para>
-	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 subject in the <guilabel>Subject:</guilabel> and a message in
-	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.  That's easy, although it can
-	 get a little more complicated if you want.
-       </para>
-
-      <sect3 id="usage-mail-getnsend-send-delay">
-	<title>Saving Messages for Later</title>
-	<para>
-	   Evolution will send mail immediately unless you tell it to
-	   do otherwise by selecting <menuchoice>
-	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  That will add messages
-	   to the <guilabel>Outbox</guilabel> queue.  Then, when you
-	   press <guibutton>Send</guibutton> in another message, or
-	   <guibutton>Get Mail</guibutton> in the main mail window,
-	   all your unsent messages will go out at once.  I like to
-	   use "Send Later" because it gives me a chance to change my
-	   mind about a message before it goes out.  That way, I don't
-	   send anything I'll regret the next day.
-	</para>
-	<para>
-	   To learn more about how you can specify message queue and
-	   filter behavior, see <xref linkend="config-prefs-mail">.
-	</para>
-
-	<para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
-	  </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-	  You can probably guess the purpose of the buttons labelled
-	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton>, but there's a bit more to
-	  sending mail that's less obvious.  In the next few sections,
-	  you'll see how <application>Evolution</application> handles
-	  additional features, including large recipient lists,
-	  attachments, and forwarding.
-        </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
-	<title>Attachments</title>
-	<para>
-	    If you want to attach a file to your email message, you
-	    can drag it from your desktop into the message window, or
-	    click the button in the toolbar with a paper clip on it,
-	    labelled <guibutton>Attach</guibutton>.  If you click the
-	    <guibutton>Attach</guibutton> button,
-	    <application>Evolution</application> will open a file
-	    selection dialog box, to ask you which file you want to
-	    send.  Select the file and click <guilabel>OK</guilabel>.
-        </para>
-	<para>
-            To see what files you've attached to the message you're
-            composing, select <menuchoice> <guimenu>View</guimenu>
-            <guimenuitem>Show Attachments</guimenuitem> </menuchoice>;
-            to hide them again, choose <guimenuitem>Hide
-            Attachments</guimenuitem>.
-        </para>
-	<para>
-            When you send the message, a copy of the attached file
-	    will go with it.  Be aware that big attachments can take a
-	    long time to download.
-          </para>
-	</sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
-        <para>
-	    <application>Evolution</application>, like all email
-	    programs (at least, all the ones in current use)
-	    recognizes three types of addressee: primary recipients,
-	    secondary recipients, and hidden ("blind") recipients.
-         </para>
-         <para>
-	    The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  However, it's
-            considered bad form to have more than a few email
-            addresses in this section.  If you are sending mail to
-            more than one or two people, consider the
-            <guilabel>Cc:</guilabel> field.
-	  </para>
-	  <para>
-	    Hearkening back to the dark ages when people used
-	    typewriters and there were no copy machines, "Cc" stands
-	    for "Carbon Copy."  Use it whenever you want to share a
-	    message you've written to someone else.
-	    <example id="ex-mail-cc">
-	      <title>Using the Cc: field</title>
-	      <para>
-	         When Susan sends an email to a client, she puts her
-	         co-worker, Tim, in the in the
-	         <guilabel>Cc:</guilabel> field, so that he know
-	         what's going on.  The client can see that Tim also
-	         received the message, and knows that he can talk to
-	         Tim about the message as well.
-	      </para>
-	    </example>
-	  </para>
-	  <para>
-	    If you have a large number of recipients, or if you want
-	    to send mail to several people without sharing the
-	    recipient list, you should use
-	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and means that people you put in the
-	    <guilabel>Bcc:</guilabel> field get the message, but
-	    nobody else sees their email address.  They will still see
-	    the list of addresses from the <guilabel>To:</guilabel>
-	    and <guilabel>Cc:</guilabel> fields, though.
-
-	    <example id="ex-mail-bcc">
-	      <title>Using the Bcc: field</title>
-	      <para>
-	         Tim is sending an email announcement to all of his
-	         company's clients, some of whom are in competition
-	         with each other, and all of whom value their
-	         privacy. He needs to use the
-	         <guilabel>Bcc:</guilabel> field here.  If he puts
-	         every address from his address book's "Clients"
-	         category into the <guilabel>To:</guilabel> or
-	         <guilabel>Cc:</guilabel> fields, he'll make the
-	         company's <emphasis>entire</emphasis> client list
-	         public.  Don't assume it won't happen to you!
-	     </para>
-	    </example>
-	  </para>
-	</sect4>
-
-        <sect4 id="usage-mail-getnsend-send-to">
-	<title>Choosing Recipients Quickly</title>
-	<para>
-	  If you have created address cards in the contact manager,
-	  you can also enter nicknames or other portions of address
-	  data, and <application>Evolution</application> will complete
-	  the address for you. <!-- (INSERT description of UI for this
-	  feature, once it is decided upon). --> If you enter a name
-	  or nickname that can go with more than one card, Evolution
-	  will open a dialog box to ask you which person you meant.
-	  <!-- (NOT YET) Also, <application>Evolution</application>
-	  will add a domain to any unqualified addresses.  By default,
-	  this is your domain, but you can choose which one mail
-	  preferences dialog. -->
-          </para>
-	  <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-	  <para>
-            For more information about using email together with the
-	    contact manager and the calendar, see <xref
-	    linkend="usage-contact-automate"> and <xref
-	    linkend="usage-calendar-apts">.
-	  </para>
-        </sect4>
-      </sect3>
-      
-      <sect3 id="usage-mail-getnsend-send-reply">
-	<title>Replying to Messages</title>
-	<para>
-	   To reply to a message, press the
-	   <guibutton>Reply</guibutton> button while it is selected,
-	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open
-	   <interface>message composer</interface>.  The
-	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
-	   fields will already be filled, although you can alter them
-	   if you wish.  In addition, the full text of the old message
-	   is inserted into the new message, either in italics (for
-	   HTML display) or with the &gt; character (in plain text
-	   mode) before each line, to indicate that it's part of the
-	   previous message.  People often intersperse their message
-	   with the quoted material as shown in <xref
-	   linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note that this figure should have a reply mail ready to send,
-with quoted materials and the relevant replies interspersed-->
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-	 <title>Reply Message Window</title>
-	 <screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-	</para>
-
-	<para>
-	  If you're reading a message with several recipients, you may
-	   wish to use <guibutton>Reply to All</guibutton> instead of
-	   <guibutton>Reply</guibutton>.  If there are large numbers
-	   of people in the <guilabel>Cc:</guilabel> or
-	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  But be careful, and always make sure you
-	   know who is getting a message: one address could be a
-	   mailing list with thousands of subscribers.
-	  <example>
-	    <title>Using the Reply to All feature</title>
-	    <para>
-	      Susan sends an email to a client, and sends copies to
-	      Tim and to an internal company mailing list of
-	      co-workers.  If Tim wants to make a comment to all of
-	      them, he uses <guibutton>Reply to All</guibutton>, but
-	      if he just wants to tell Susan that he agrees with her,
-              he uses <guibutton>Reply</guibutton>.
-	    </para>
-	  </example>
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-	<para>
-           You're probably familiar with search and replace features,
-           and if you come from a Linux or Unix background, you
-           probably know what <guimenuitem>Find Regex</guimenuitem>
-           does.  If you aren't among the lucky who already know,
-           here's a quick rundown of an important section of the
-           <guimenu>Edit</guimenu> menu.
-        </para>
-	<para>
-           <variablelist>
-	    <varlistentry>
-	      <term><guimenuitem>Find</guimenuitem></term>
-	      <listitem><para> Enter a word or phrase, and
-	      <application>Evolution</application> will find it
-              in your message.
-	      </para></listitem>
-	    </varlistentry>
-	    
-	    <varlistentry>
-	      <term><guimenuitem>Find Regex</guimenuitem></term>
-	      <listitem>
-		<para>
-                  Perform a search for a <glossterm
-                  linkend="regular-expression">regular
-                  expression</glossterm>, or "regex."
-               </para>
-             </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenuitem>Find Again</guimenuitem></term>
-	      <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	       <term><guimenuitem>Replace</guimenuitem></term>
-	       <listitem><para> 
-                 Find a word or phrase, and replace it with
-	         something else.  
-               </para></listitem>
-	    </varlistentry>
-
-	  </variablelist>
-        </para>  
-	<para>
-            For all of these items, you have two additional choices.
-            First, you can choose whether to <guilabel>Search
-            Backwards</guilabel>, which will perform the search
-            starting wherever your cursor is, and moving back towards
-            the beginning of the document (normally, it goes the other
-            way).  Then, you can decide whether to have your search be
-            <guilabel>Case Sensitive</guilabel>, meaning should it pay
-            attention to the case of letters when locating a match.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
-	<title>Embellish your email with HTML</title>
-	<para>
-            You can't normally use text treatments or pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis or use <glossterm
-            linkend="emoticon">emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text treatments as well as
-            basic alignment and paragraph formatting. They do this
-            with <glossterm linkend="html">HTML</glossterm>, just like
-            web sites do.
-        </para>
-	<note>
-	  <title>HTML Mail is not a Default Setting</title>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.  <emphasis>Some</emphasis>
-	    people refer to HTML mail as "the root of all evil" and
-	    get very angry if you send them HTML mail, which is why
-	    <application>Evolution</application> sends plain text
-	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <menuchoice>
-	    <guimenu>Format</guimenu> <guimenuitem>
-	    HTML</guimenuitem></menuchoice>.  Alternately, you can set
-	    your default mail format preferences in the mail
-	    configuration dialog.  See <xref
-	    linkend="config-prefs-mail-other"> for more information.
-          </para>
-	</note>
-	<para>
-           HTML formatting tools are located just above the
-	   composition frame, and in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  Your message text will
-	   appear formatted in the composer window, and the message
-	   will be sent as HTML.
-	  </para>
-	  <para>
-            The icons in the toolbar are explained in tool-tips, which
-            appear when you hold your mouse over the buttons.  The
-            buttons fall into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-	      <listitem>
-		<para>
-                  Choose <guilabel>Normal</guilabel> for a default
-                  text style, or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6).  You can also
-                  select <guilabel>pre</guilabel> for preformatted
-                  text blocks, and three types of <guilabel>List
-                  Item</guilabel>.
-                </para>
-	      </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-	      <listitem>
-		<para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">      
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
-                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                 </itemizedlist>
-               </para>               
-	      </listitem>    
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Alignment</term>
-	      <listitem>
-		<para>
-                   Located next to the text style buttons,
-                   these three paragraph icons should be familiar to
-                   users of most word processing software.  The
-                   leftmost button will make your text left-justified,
-                   the center button, centered, and the right hand
-                   button, right-justified.
-                </para>
-	      </listitem>
-	      </varlistentry>
-
-	    <varlistentry>
-	      <term>Indentation rules</term>
-	      <listitem>
-		<para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	    <varlistentry>
-	      <term>Color Selection</term>
-	      <listitem>
-		<para>
-                  At the far right is the color section tool.  You can
-                  choose from several colors by clicking on the arrow,
-                  or create your own custom color by clicking on the
-                  color box itself.  If you have text selected, the
-                  color will apply to the selected text.  If you do
-                  not have text selected, the color will apply to
-                  whatever you type next.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  </variablelist>
-        </para>
-	<para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-	       <listitem>
-	        <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL).
-              </para>
-	    </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-	    <listitem>
-	      <para>
-               <guimenuitem>Insert Image</guimenuitem>: Select this item to
-               embed an image into your email, as was done in the welcome
-               message.  Images will appear at the location of the
-               cursor.
-              </para>
-	    </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-	</varlistentry>
-
-	  </variablelist>
-          </para>
-	  <note>
-	    <title>A Technical note on HTML Tags</title>
-	    <para>
-	      The composer is a WYSIWYG (What You See Is What You Get)
-	      editor for HTML. That means that if you enter HTML
-	      directly into the composer&mdash; say, <markup
-	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	      the composer will assume you meant exactly that string
-	      of characters, and not "make this text bold," as an HTML
-	      composition tool or text editor would.
-	    </para>
-	</note>
-      </sect3>
-   
-
-<!-- Function not implemented, 
-possibly never will be due to security evil. -->
-<!--
-	<sect3 id="usage-mail-getnsend-send-live">
-	  <title>Live Documents</title>
-	  <para>
-	    Later versions of <application>Evolution</application>
-	    will allow you to enliven your email with almost any
-	    sort of document, and even with entire
-	    applications. At this point, however, this feature has not 
-	    yet been implemented.
-	  </para>
-	</sect3>
--->
-
-      <sect3 id="usage-mail-getnsend-fwd">
-	<title>Forwarding Mail</title>      
-	<para>
-	  The post office forwards your mail for you when you change
-	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> button
-	  works in much the same way.  It's particularly useful if you
-	  have received a message and you think someone else would
-	  like to see it.  You can forward a message as an attachment
-	  to a new message (this is the default) or
-	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-	  portion of the message you are sending.  Attachment
-	  forwarding is best if you want to send the full, unaltered
-	  message on to someone else.  Inline forwarding is best if
-	  you want to send portions of a message, or if you have a
-	  large number of comments on different sections of the
-	  message you are forwarding.  Remember to note from whom the
-	  message came, and where, if at all, you have removed or
-	  altered content.
-	</para>
-	<para>
-	  To forward a message you are reading, press
-	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <menuchoice> <guimenu>Message</guimenu>
-	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-	  instead of attached, select <menuchoice>
-	  <guimenu>Message</guimenu> <guimenuitem>Forward
-	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-	  addressee as you would when sending a new message; the
-	  subject will already be entered, but you can alter it.
-	  Enter your comments on the message in the
-	  <interface>composition frame</interface>, and press
-	  <guibutton>Send</guibutton>.
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Usage</title>
-	<para>
-	  I started with ten, but four were "Don't send
-	  <glossterm linkend="spam">spam</glossterm>."
-	  <itemizedlist>
-
-	    <listitem>
-	      <para>
-		 Don't send spam or forward chain mail.  If you must,
-		 watch out for hoaxes and urban legends, and make sure
-		 the message doesn't have multiple layers of
-		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless inline forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Always begin and close with a salutation. Say
-		"please" and "thank you", just like you do in real
-		life. You can keep your pleasantries short, but be pleasant!
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-		message in capital letters.  It hurts people's ears.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Never write anything in email you wouldn't say in
-		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	       Check your spelling and use complete sentences.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Don't send nasty emails (flames).  If you get one,
-		don't write back.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 When you reply or forward, include just enough of
-		 the previous message to provide context: not too
-		 much, not too little.
-	       </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-	<para> Happy mailing! </para>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-organize">
-    <title>Organizing Your Mail</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-
-    <sect2 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the toolbar.
-	If you create a filter with the <interface>filter
-	assistant</interface>, you can have mail moved to your folder
-	automatically.
-      </para>
-    </sect2>    
-
-    <sect2 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster.  You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains:</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains:</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        Then, press <keycap>Enter</keycap>.
-        <application>Evolution</application> will show your search
-        results in the message list.
-
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
-      <para>
-        I once worked in the mail room of a large company, where my
-        job was to bundle, sort, and distribute mail to the various
-        mail boxes and desks throughout the building.  Filters do that
-        same job with email, but they lose much less mail than I did.
-        In addition, you can have multiple filters performing multiple
-        actions that may effect the same message in several ways.  For
-        example, your filters could put copies of one message into
-        multiple folders, or keep a copy and send one to another
-        person as well.  Which is to say, it's quite a bit more
-        flexible than an actual person with a pile of envelopes.
-      </para>
-      <para>
-        Most often, you'll want to have
-        <application>Evolution</application> put mail into different
-        folders, but you can have it do almost anything you like.
-        People who subscribe to multiple mailing lists, or who often
-        need to refer to messages they have sent, find filters
-        especially helpful to separate personal from list-related
-        mail, but they're good for anybody who gets more than a few
-        messages a day.  To create a filter, open the
-        <interface>filter assistant</interface> by selecting
-	<menuchoice>
-	  <guimenu>Tools</guimenu> 
-          <guimenuitem>Mail Filters</guimenuitem>
-        </menuchoice>.
-      </para>
-            
-       <figure id="usage-mail-filters-fig-assist">
-	 <title>The Filter Assistant</title>
-	 <screenshot>
-	  <screeninfo>The Filter Assistant</screeninfo>
-	  <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-
-      <para>
-        The <interface>filter assistant</interface> window contains a
-        list of your current filters, sorted by the order in which
-        they will be performed.  From the drop-down box at the top of
-        the window, choose <guilabel>Incoming</guilabel> to display
-        those filters which are performed on incoming mail, and
-        <guilabel>On Demand</guilabel> for those which are performed
-        only when you want.
-      </para>
-      <para>
-         The <interface>filter assistant</interface> also has a set of
-         buttons:
-        <itemizedlist>
-
-           <listitem><para>
-            <guibutton>Add</guibutton> &mdash; Create a new filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
-           </para></listitem>
-
-           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the
-            selected filter up in the list, so it will be performed
-            sooner.  </para></listitem>
-
-           <listitem><para>
-            <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list, so it will be performed later.
-           </para></listitem>
-        </itemizedlist>
-
-        If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>.  When you
-        do that, (or when you click <guibutton>Edit</guibutton> with a
-        filter selected), the <interface>Add Rule</interface> window
-        appears.
-      </para>
-      <para>
-        That window, shown in <xref
-        linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.  
-
-       <figure id="usage-mail-filters-fig-new">
-	 <title>Creating a new Filter</title>
-	 <screenshot>
-	  <screeninfo>Creating a new Filter</screeninfo>
-	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-      <para>
-        Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing criteria.
-        Choose how many criteria you'd like by pressing <guibutton>Add
-        Criterion</guibutton> and <guibutton>Remove
-        Criterion</guibutton>.  If you have multiple criteria, you
-        should then decide whether to have the filter do its job only
-        <guilabel>if all criteria are met</guilabel>, or <guilabel>if
-        any criteria are met</guilabel>.
-     </para>
-     <para>
-        For each of your filter criteria, you must first select what
-        part of the message you want the filter to look at:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Sender</guilabel></term>
-	    <listitem><para>
-                The author of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Recipients</guilabel></term>
-	    <listitem><para>
-               The recipients of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Subject</guilabel></term>
-	    <listitem><para>
-                The subject line of the message.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Specific Header</guilabel></term>
-	    <listitem><para> The filter can look at any header you
-	    want, even obscure or custom ones like X-Bonus or
-	    X-Archive. Enter the header name, and what you'd like to
-	    match inside it.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Message Body</guilabel></term>
-	    <listitem><para>
-                The actual text of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Expression</guilabel></term>
-	    <listitem><para> Enter a <glossterm
-	    linkend="regular-expression">regular
-	    expression</glossterm>, and
-	    <application>Evolution</application> will search the
-	    entire message, headers and all, to match it for you.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para>
-                You can filter messages by when they were sent: First,
-                choose how you'd like to match the time&mdash;
-                <guilabel>before</guilabel>,
-                <guilabel>after</guilabel> and so forth.  Then, choose
-                the time. The filter compare the message's time-stamp
-                to the system clock when the filter is run, or to a
-                specific time and date you choose from a calendar.
-                You can even have it look for messages within a range
-                of time relative to the filter.  For example, you could have
-                the filter catch all messages sent less
-                than a week before the filter is run.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Recieved</guilabel></term>
-	    <listitem><para>
-                This works the same way as the <guilabel>Date Sent</guilabel> 
-                option, except that it compares the time you got the message 
-                with the dates you specify.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Priority</guilabel></term>
-	    <listitem><para>
-               Emails have a standard priority range from -3 (least
-               important) to 3 (most important). If you can persuade
-               your friends and co-workers to use the priority levels  
-               honestly, you can filter with them as well.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-        <para>
-        Now, tell it what to do with those messages.  If you want multiple
-        actions, click <guibutton>Add Action</guibutton>; if you want fewer,
-        click <guibutton>Remove Action</guibutton>.  And choose again:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Move to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Forward to Address</guilabel></term>
-	    <listitem><para>
-                Select this, enter an address, and the addressee will
-                get a copy of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Delete</guilabel></term>
-	    <listitem><para>
-                Marks the message for deletion.  You can still get the message
-                back, at least until you <guimenuitem>Expunge</guimenuitem> your
-                mail yourself.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para> Select this if you want to tell all other
-	    filters to ignore this message.  If multiple filters copy
-	    the message to a different folders, you'll have multiple
-	    copies of the message.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Color</guilabel></term>
-	    <listitem><para>
-                Select this item, and <application>Evolution</application>
-                will mark the message with whatever color you please.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Score</guilabel></term>
-	    <listitem><para> Priority numbers alone don't work, so you
-	    can score emails on the same scale. Then, you can tell
-	    which ones you want to read, or have scored messages
-	    moved, copied, or colored in a subsequent filter.
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-      <para>
-        You're done.  Click <guibutton>OK</guibutton> to use this
-        filter, or <guibutton>Cancel</guibutton> to close the window
-        without saving any changes.
-      </para>
-
-
-
-   <!-- FIXME: This needs to be in there.  But the feature is temporarily
-         disabled and I don't know how it will be reimplemented.
-
-	  <itemizedlist>
-	    <listitem>
-	       <para>
-		 <guilabel>When mail arrives:</guilabel> Select
-		 this option to have messages filtered as they
-		 arrive.
-	       </para>
-	     </listitem>
-	     <listitem>
-	       <para>
-		 <guilabel>When mail is sent:</guilabel> Select
-		 this option to filter your outgoing mail.  You
-		 can use this feature to keep your
-		 <interface>Outbox</interface> as organized as
-		 your <interface>Inbox</interface>.
-	     </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-
-    -->
-
-      <note>
-	<title>Two Notable Filter Features</title>
-	<para>
-	  <itemizedlist>
-	    <listitem><para>
-              Incoming email that your filters don't move goes into the Inbox; 
-              outgoing mail that they don't move ends up in the Sent folder.
-             </para>
-	    </listitem>
-
-	    <listitem><para>If you move a folder, your filters
-	    will follow it.  </para></listitem>
-	  </itemizedlist>
-	</para>
-      </note>
-    </sect2>
-
-
-
-    <sect2 id="usage-mail-organize-vFolders">
-      <title>Getting Really Organized with Virtual Folders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, vFolders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A vFolder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a vFolder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the vFolder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and and remove them from the
-	vFolder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any vFolders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  vFolders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-      <example id="usage-mail-organize-vFolders-ex">
-	<title>Using Folders, Searches, and vFolders</title>
-	<para>
-	   To organize my mail box, I set up a vFolder for emails from
-	   my friend and co-worker Anna.  I have another one for
-	   messages from anybody at work that have "Evolution" in the
-	   subject line, so I can keep a record of what people from
-	   work send me about <application>Evolution</application>.
-	   If Anna sends a message about a picnic on Saturday, it only
-	   shows up in the "Anna" folder. When Anna sends me mail
-	   about the user interface for
-	   <application>Evolution</application>, I can see that
-	   message both in the "Anna" vFolder and in the "Internal
-	   Evolution Discussion" vFolder.
-	</para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
-
-      <para>
-	 To create a vFolder, select <menuchoice>
-	 <guimenu>Tools</guimenu> <guimenuitem>vFolder
-	 Editor</guimenuitem> </menuchoice>.  This will bring up a
-	 dialog box that looks suspiciously like the filter window
-	 (for more information on filters, see <xref
-	 linkend="usage-mail-organize-filters">), and which
-	 presents you with a list of vFolders you have previously
-	 created. If you have created any vFolders, they are listed
-	 here, and you can select, edit or remove them if you wish.
-	 If you have not created any, there will be only one available
-	 option: click <guibutton>Add</guibutton> to add a new
-	 vFolder.
-      </para>
-      <para>
-	 You can enter a name for your vFolder in the
-	 <guilabel>Name</guilabel>.  Then, tell
-	 <application>Evolution</application> what messages to look
-	 for.  This process is exactly like filter creation: decide
-	 between <guilabel>Match all parts</guilabel> and
-	 <guilabel>Match any part</guilabel>, then choose what part of
-	 the message to look in, what sort of matching to perform, and
-	 specify exactly what it is that you want to find, be it a
-	 line of text, a score, a regular expression, or a particular date or
-	 range of dates.
-       </para>
-       <para>
-         The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>vFolder Sources
-         </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the
-         contents of your vFolder.  Click <guibutton>Add</guibutton>
-         to add a folder, or <guibutton>Remove</guibutton> to remove
-         one.  That way, you can have your vFolder search in
-         newsgroups, or just in one of your mailboxes, or just in a
-         select few folders you've already screened with filters.
-       </para>
-       <para>
-        The vFolder creation window is shown in <xref
-	linkend="usage-mail-vfolder-fig-createrule">
-
-       <figure id="usage-mail-vfolder-fig-createrule">
-	 <title>Selecting a vFolder Rule</title>
-	 <screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-    <sect2 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
-
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
deleted file mode 100644
index c6a252ac78..0000000000
--- a/doc/C/usage-mainwindow.sgml
+++ /dev/null
@@ -1,424 +0,0 @@
-<!--
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>The Main Window: Evolution Basics</title>
-  <para>
-     Start <application>Evolution</application> by selecting
-     <menuchoice><guimenu>Main Panel Menu</guimenu>
-     <guisubmenu>Applications</guisubmenu>
-     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing
-     <command>evolution</command> at the command line.  The first time
-     you run the program, it will create a directory called
-     <filename>evolution</filename> in your home directory, where it
-     will keep all your <application>Evolution</application>-related
-     files.
-   </para>
-   <para>
-     After <application>Evolution</application> starts
-     up, you will see the <interface>main window</interface>, with the
-     <interface>Inbox</interface> open.  It should look a lot like the
-     picture in <xref linkend="usage-mainwindow-fig">. On the left of
-     the <interface>main window</interface> is the <interface>shortcut
-     bar</interface>, with several buttons in it.  Just underneath the
-     title bar is a series of menus in the <interface>menu
-     bar</interface>, and below that, the <interface>tool
-     bar</interface> with buttons for different functions. The largest
-     part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, where messages are listed
-     and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Helix Code.
-
-
-<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
-</para>
-
-   <para>
-    <note>
-      <title>The Way Evolution Looks</title>
-      <para>
-	The appearance of both <application>Evolution</application>
-	and <application>GNOME</application> is very easy to
-	customize, so your screen might not look like this picture.
-	You might decide to have <application>Evolution</application>
-	start with the calendar and a folder bar, or with the contact
-	manager occupying the entire window.
-      </para>
-    </note>
-  </para>
-  
-  <sect1 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       The shortcut group buttons are <guibutton>Evolution
-       Shortcuts</guibutton> and <guibutton>Internet
-       Directories</guibutton>.  When you click on them, they'll slide
-       up and down to give you access to different sorts of shortcuts.
-       When you first start <application>Evolution</application>, you
-       are looking at the <guilabel>Evolution Shortcuts</guilabel>
-       category.  If you click <guilabel>Internet
-       Directories</guilabel>, it will slide up and you'll see buttons
-       for the <guilabel>Bigfoot</guilabel> and
-       <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator might have added. You
-       can add more groups by right-clicking on the background of the
-       shortcut bar and selecting <guimenuitem>Menu
-       Group</guimenuitem>.  Internet directories behave a lot like
-       the local contact manager, which is covered in <xref
-       linkend="usage-contact">.
-       </para>
-    <para>
-       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
-       again.  The shortcut buttons in that category are:
-
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-
-	<varlistentry>
-	  <term> <guibutton>Inbox:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Inbox will show you all of your email.  Your Inbox
-	      is also where you can access Evolution's tools to
-	      filter, sort, organize, and search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-       <varlistentry>
-	<listitem>
-	  <para>
-	     The <guibutton>Tasks:</guibutton> tool combines a "to
-	     do" list with reminders to help you keep track of
-	     daily events.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the menu bar, or
-      keyboard shortcuts, also called <glossterm linkend="hot-key">hot keys</glossterm>.
-      They're shown next to their equivalent menu items in the menu
-      bar. You can also set your own hot keys for functions that don't
-      have any; this is covered in <xref linkend="config">.  If you're
-      using the keyboard shortcuts you may also want to hide the
-      <interface>shortcut bar</interface> by selecting <menuchoice>
-      <guimenu>View</guimenu> <guimenuitem>Show Shortcut
-      Bar</guimenuitem> </menuchoice>.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>. </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three folders at the
-      base.  At the top are your <guilabel>vFolders</guilabel>, or
-      virtual folders, discussed in <xref
-      linkend="usage-mail-organize-vfolders">.  After that come any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you
-      might have available to you over your network.  The next folder
-      is called <guilabel>External Directories</guilabel>, and holds
-      <glossterm linkend="ldap">LDAP</glossterm> contact directories
-      stored on a network.  The most important one is probably
-      <guilabel>Local</guilabel>, which you can use to access all the
-      data that's stored on your computer.  If you click on the plus
-      sign plus sign next to the <guilabel>Local</guilabel> folder,
-      you'll see the contents:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	  <guilabel>Directories</guilabel>, for Internet contact directories.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Outbox</guilabel>, which is for drafts of
-	    messages and mail that's already been sent.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
-         to move about the folder tree.
-       </para>
-     </tip>
-
-    <para>
-       To create a new folder, select <menuchoice>
-       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
-       put it, and what kind of folder it should be.  You can choose
-       from three types: <guilabel>Mail</guilabel>, for storing mail,
-       <guilabel>Calendar</guilabel> for storing calendars, and
-       <guilabel>Contacts</guilabel> for storing contacts.
-    </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-	      You can always place a folder inside other folders,
-	      regardless of folder type.  However, calendars,
-	      contacts, and mail can't go into the same
-	      folder. Calendars have to go in calendar folders, mail
-	      in mail folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-      </itemizedlist>.
-    </para>
-
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 will support context-sensitive help, which means you
-	can almost always get help on an item by right-clicking it.
-	If you're not sure what something is, or don't know what you
-	can do with it, choosing <guimenuitem>Help</guimenuitem> from
-	the right-click menu is a good way to find out.
-      </para>
-    </tip>
-
-    <para>
-      Any time new information arrives in a folder, that folder label
-      is displayed in bold text.
-    </para>
-    <para>
-      To delete a folder, right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
-      To change the order of folders, or put one inside another, use
-      drag-and-drop.  To move individual
-      messages, appointments, and address cards between folders, you
-      can do the same thing: drag them where you want them, and
-      they'll go.
-    </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu> Menu</term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu> Menu </term>
-          <listitem><para>
-              Although it doesn't contain anything at first,
-              the <guimenu>Edit</guimenu> menu fills up with 
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu> Menu </term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Settings</guimenu> Menu </term>
-          <listitem><para> Tools for configuring, changing, and
-          setting up go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>vFolder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration. </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu> Menu</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-   <para>
-     Other menus, like <guilabel>Folder</guilabel>,
-     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
-     appear only occasionally.  <guilabel>Message</guilabel> and
-     <guilabel>Folder</guilabel>, for example, have commands that only
-     relate to email, so they're only available when you're looking at
-     email.
-   </para>
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with your email inbox, since you've got a letter waiting
-      for you already.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/doc/C/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
deleted file mode 100644
index 1af298eb42..0000000000
--- a/doc/C/usage-print.sgml
+++ /dev/null
@@ -1,92 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  This is a very short chapter, because printing with
-  <application>Evolution</application> is not a complex task.  Like
-  most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton>, appears both as a button
-      in the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that displays an image of the current
-      message, calendar, appointment, or address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (<guibutton>Fit</guibutton>) or match the
-      width of the page and the window (<guibutton>Fit
-      Width</guibutton>).  If you're satisfied with the way it looks,
-      click <guibutton>Print</guibutton> to send your document on its way.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; at this time, only <guilabel>Generic
-       Postscript</guilabel> is available&mdash; and whether to print
-       to a file or to an actual printer.  If you choose a printer,
-       you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
deleted file mode 100644
index a6b53e9526..0000000000
--- a/doc/C/usage-sync.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Synchronizing with a Hand-held Device</title>
-      <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device on its cradle and press the
-          HotSync button.
-        </para>
-        <para>
-         No, really.  That's all there is to it.
-        </para>
-       </sect1>
-    </chapter>
\ No newline at end of file
diff --git a/doc/COPYING-DOCS b/doc/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/doc/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/doc/Camel-Classes b/doc/Camel-Classes
deleted file mode 100644
index 93aec087dd..0000000000
--- a/doc/Camel-Classes
+++ /dev/null
@@ -1,35 +0,0 @@
-CamelException
-CamelProvider
-CamelThreadProxy
-CamelURL
-GtkObject
- + CamelObject
-   + CamelAddress
-   |  + CamelInternetAddress
-   |  ` CamelNewsAddress
-   + CamelDataWrapper
-   | + CamelMedium
-   | |  ` CamelMimePart
-   | |     ` CamelMimeMessage
-   | ` CamelMultipart
-   + CamelFolder
-   |  ` CamelFolderPtProxy
-   + CamelFolderSearch
-   + CamelFolderSummary
-   + CamelMimeFilter
-   |  + CamelMimeFilterBasic
-   |  + CamelMimeFilterCharset
-   |  + CamelMimeFilterIndex
-   |  ` CamelMimeFilterSave
-   + CamelService
-   |  + CamelStore
-   |  ` CamelTransport
-   + CamelSession
-   + CamelStream
-   |  + CamelSeekableStream
-   |  |  + CamelSeekableSubstream
-   |  |  + CamelStreamFs
-   |  |  ` CamelStreamMem
-   |  + CamelStreamBuffer
-   |  ` CamelStreamFilter
-   ` CamelThreadProxy
\ No newline at end of file
diff --git a/doc/ChangeLog b/doc/ChangeLog
deleted file mode 100644
index 3b2a5968d3..0000000000
--- a/doc/ChangeLog
+++ /dev/null
@@ -1,587 +0,0 @@
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.	
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml:  Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml:  Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
-	bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-        description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml:  Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.	
-
-	* C/config-prefs.sgml: Revision to reflect current options labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-=======
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
->>>>>>> 1.26
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.	
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
-	but marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release. 
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/doc/Design b/doc/Design
deleted file mode 100644
index 7b7cf6f821..0000000000
--- a/doc/Design
+++ /dev/null
@@ -1,201 +0,0 @@
-
-The Evolution Project specification
-Miguel de Icaza.
-
-
-* Introduction
-
-	Evolution is a project aiming at providing the free software
-	community with a professional, high-quality tool for managing
-	mail, appointments, tasks and other personal information
-	tools.  
-
-	We want to make Evolution a system that addresses our needs
-	(the free software development community) and we believe that
-	by addressing our needs, we will provide a system that will
-	scale in the years to come for other users that are just
-	starting to use computers and the internet.
-
-	The main objectives of Evolution are to provide these powerful
-	features, and to make the user interface as pretty and
-	polished as possible.
-
-	Evolution is a GNOME application and a number of auxiliary
-	CORBA servers that act as the storage backends. 
-
-	Evolution will copy the best user interface bits and the best
-	ideas and features found on contemporary groupware systems.
-
-* Evolution internals.
-
-	Evolution can store its information locally (files for mail,
-	calendar and address book) or on a remote server (imap/pop,
-	cap, ldap).  
-
-	Given the importance of syncing in this modern PDA world,
-	the Evolution GUI acts as a client to the data repository.
-	The data repository is a GUI-less CORBA server called Wombat.
-
-	Wombat provides a unified access system to the calendar and
-	addressbook data (doing mail is a bit hard, so we are leaving
-	this as a TODO item for now).
-
-	Wombat's CORBA interfaces are notifier-based.  This means that
-	CORBA requests sent to Wombat do not return values
-	inmediately, but rather than for Wombat requests the user has
-	to provide a CORBA object that will be notified of what
-	happened.
-
-	Yes, that sounds hairy.  It is actually pretty simple.  It
-	basically means that you submit requests to Wombat, and a
-	callback is invoked in your code when the request has been
-	carried away. 
-
-	This enables a Palm to sync to the repository without having
-	the GUI for Evolution running.  It also means that volunteers
-	will be able to write text-based and web-based versions of
-	Evolution (not me though :-).
-
-* Evolution as a platform
-
-	Evolution is more than a client for managing the above
-	information: Evolution is a platform for building groupware
-	applications that use the above components to get their work done.
-
-	To achieve this Evolution is designed to be scriptable, and it
-	exports its internals trough CORBA/Bonobo.  It is implemented
-	as a collection of Bonobo containers and Bonobo components.
-
-	There is a clean separation between the views (the user
-	interface) and the model (the view).  The views that we are
-	writing are GNOME based, and they talk to the Wombat CORBA
-	server.
-
-	Wombat takes care of notifications to the various clients for
-	the data. 
-
-* The overall organization
-
-	A bar similar to outlook provides shortcuts for accessing the
-	various resources managed by Evolution: mail folders,
-	contacts, tasks, journal entries, notes, messages and other
-	user-defined destinations. 
-
-* User interface widgets
-
-** The ETable package
-
-	This package provides a way of displaying and editing tables.
-
-	Tables are displayed based on a TableColumn definition that
-	defines the layout used for the display.  Table Columns can be
-	nested, and the package does grouping of information displayed
-	according to the criteria defined there.
-
-	This is used in multiple places troughout evolution: it is
-	used for the Mail summary display, for the TODO display and
-	TODO new data entry and for the address book.
-
-	Nesting in the address book can be performed on various
-	fields.  For example, a first level of nesting could be
-	"Company" and a second level would be "Country" the result is
-	a 2-level tree that can be collapsed expanded and contains the
-	information sorted/grouped by those two criteria.
-
-	The user interface for this will be copied from Outlook: the
-	possibility of adding and removing fields with drag and drop
-	as well as grouping using drag and drop.
-
-* The Mail system
-
-** The Mail sources
-
-	The mail system will support 4 sources of mail:
-
-		POP3 (transfer to a local file).
-		IMAP
-		Local mbox format in $MAIL.
-		Local mbox format that have other delivery points.
-
-	On top of that, it will be possible to browse existing mbox
-	archives (and possibly other formats in the future, like
-	Mailbox and Maildir).
-
-** Storing the mail
-
-	Mail that gets incorporated into the system is stored in mbox
-	format, and summary files are provided for quick access to the
-	files.  No modifications to the file on disk is performed (I
-	am not quite sure about this, perhaps we want to add the
-	status flags and some method for adding metadata to the mail).
-
-	Summary files are rebuilt on demand or rebuild if the mbox
-	file and the summary file have got out of sync.
-
-	A Metadata system that will enable us to attach information to
-	a message will have to be designed and implemented (enabling
-	users to add annotations to mails, and special keywords and
-	flags in a per-message fashion).
-
-** Folders
-
-	Michael Zucchi is working on a system that will let users
-	easily define rules for splitting their incoming mail into
-	physical folders.  
-
-	A further refinement to Folders are Virtual Folders.  This
-	basically provides a powerful search and viewing facility for
-	mail.  It works like this: when a mail is "incorporated" into
-	Evolution it is scanned and indexed.
-
-	Then users can enter queries into Evolution that will search
-	the entire database of messages.	
-
-** Virtual folders
-
-	Virtual folders will enable users to read/browse their mail in
-	new ways: by specifying search criterias, these folders will
-	contain messages that match the criteria given.  
-
-	There is more information about this in the libcamel
-	directory. 
-
-	We will index all headers from a message, and possible the
-	contents of messages and keep those on a separate file, to
-	enable users to query their mail database.
-
-** Mail summary display
-
-	The summary will be displayed using the ETable package, to
-	enable users to add a number of sorting criteria and various
-	display methods for the summary view.
-
-	The Outlook methods for displaying will be present on the
-	system.
-
-	Message threading will be supported in Evolution.
-
-** Message display engine
-
-	We are going to be using a combination of
-	libcamel/limime/libjamie to parse messages and render them
-	into an HTML buffer.
-
-* The HTML engine
-
-	The GtkHTML engine will be used to display messages, and will
-	be extended to support a number of features that we require:
-	internal handling of characters will be based on Unicode
-
-* The message composer
-
-	Regular features found in composers will be added: connecting
-	the composer to the address book, support for drag and drop
-	for including attachments, editing the message, archiving
-	drafts and archiving messages sent.
-
-	Ettore has been working on adding editing support to the
-	GtkHTML and he is working currently on a Bonobo component that
-	will provide a ready-to-use Bonobo control for embedding into
-	other applications.
-
diff --git a/doc/Keybindings b/doc/Keybindings
deleted file mode 100644
index f232802110..0000000000
--- a/doc/Keybindings
+++ /dev/null
@@ -1,13 +0,0 @@
-* Keybindings for the mailer
-
-	Delete key: 	Deletes message, moves forward.
-	
-* Keybindings for the composer
-
-	Control-s:		Saves message to file.
-	Control-w:		Closes composer window.
-	Control-Return: 	Sends message now.
-
-	F6:			Opens find dialog.
-	F7:			Opens replace dialog.
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 7b5420fee8..0000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = C devel
diff --git a/doc/devel/.cvsignore b/doc/devel/.cvsignore
deleted file mode 100644
index c24a54fbcc..0000000000
--- a/doc/devel/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-html
-evolution-devel-guide.html
diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
deleted file mode 100644
index 555db7d161..0000000000
--- a/doc/devel/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2000-09-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Made the toplevel <book> id be
-	"index".
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-util/*: Integrated the cal-util library into the
-	documentation framework.
-
-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.
-
-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.
-	Added entity for libical.
-
-	* calendar/reference.sgml: Added the cal-util reference entries.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated
-	for new API.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (maintainer-clean-local): Don't depend
-	on 'clean'; this messes up maintainer-clean.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.
-
-	* evolution-devel-guide.sgml: New <book> toplevel for the
-	Evolution Developer's Guide.
-
-	* calendar/evolution-calendar.sgml: New <part> for the calendar
-	developer's documentation.
-
-	* calendar/architecture.sgml: New <chapter> for the calendar
-	architecture.
-
-	* calendar/reference.sgml: New <reference> for the calendar API
-	reference.
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
deleted file mode 100644
index 0d3cec5a1c..0000000000
--- a/doc/devel/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-SUBDIRS = calendar
-
-# The name of the module.
-DOC_MODULE=evolution-devel-guide
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-evolution_devel_guidedir = $(HTML_DIR)
-evolution_devel_guide_DATA =			\
-	evolution-devel-guide.html
-
-content_files =					\
-	evolution-devel-guide.sgml
-
-EXTRA_DIST = 					\
-	$(evolution_devel_guide_DATA)		\
-	$(content_files)
-
-if ENABLE_GTK_DOC
-evolution-devel-guide.html: html/book1.html
-	-cd $(srcdir) && cp html/book1.html evolution-devel-guide.html
-else
-evolution-devel-guide.html:
-endif
-
-html/book1.html: $(content-files)
-	$(MAKE) html
-
-html:
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
-	-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local:
-	cd $(srcdir) && rm -rf html
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-
-dist-hook:
-	mkdir $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-.PHONY: html
diff --git a/doc/devel/calendar/.cvsignore b/doc/devel/calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/doc/devel/calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/Makefile.am b/doc/devel/calendar/Makefile.am
deleted file mode 100644
index 2220e1d59b..0000000000
--- a/doc/devel/calendar/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = cal-client cal-util
-
-EXTRA_DIST =				\
-	architecture.sgml		\
-	evolution-calendar.sgml		\
-	reference.sgml
diff --git a/doc/devel/calendar/architecture.sgml b/doc/devel/calendar/architecture.sgml
deleted file mode 100644
index 08e4c82b35..0000000000
--- a/doc/devel/calendar/architecture.sgml
+++ /dev/null
@@ -1,94 +0,0 @@
-  <chapter id="calendar-architecture">
-    <title>Architecture of the Calendar</title>
-
-    <para>
-      This chapter gives an overview of the Evolution Calendar
-      architecture.  It describes the model/view split of the calendar
-      into a personal calendar server, or PCS, and the GUI clients
-      that appear inside the Evolution shell.
-    </para>
-
-    <!-- Model/View Separation -->
-
-    <sect1 id="calendar-model-view">
-      <title>Model/View Separation</title>
-
-      <para>
-	Like other base components in Evolution, the calendar
-	separates the data model from the views or clients.  This is
-	done so that multiple clients can access the same calendar
-	data in an orderly fashion and without clashes.  For example,
-	the user may be running a graphical calendar client.  If he
-	then wants to synchronize his calendar with a handheld device,
-	then the corresponding synchronization program (e.g. a conduit
-	for the <application>gnome-pilot</application> package) will
-	also need to access the calendar storage.  It is important
-	that both the GUI client and the synchronization program keep
-	a consistent view of the calendar at all times, otherwise one
-	of them will be left in an inconsistent state if the
-	calendar's data changes unexpectedly.
-      </para>
-
-      <para>
-	Evolution puts the calendar storage in a daemon called the
-	Wombat and completely separates it from clients who wants to
-	access calendar data.  This part of the Wombat is called the
-	personal calendar server, or &PCS;.  Clients must contact the
-	&PCS; and ask it to open an existing calendar or create a new
-	one.  When a calendar component object (e.g. an appointment or
-	to-do item) changes in the &PCS; it will notify all the
-	clients that are using the component's parent calendar.
-      </para>
-    </sect1>
-
-    <!-- Personal Calendar Server -->
-
-    <sect1>
-      <title>Personal Calendar Server</title>
-
-      <para>
-	The personal calendar server, or &PCS;, provides centralized
-	management and storage of a user's personal calendar.
-	Multiple clients can connect to the &PCS; simultaneously to
-	query and modify the user's calendar in a synchronized
-	fashion.  The main features of the &PCS; are as follows:
-      </para>
-
-      <formalpara>
-	<title>Storage</title>
-
-	<para>
-	  The &PCS; is responsible for loading and saving calendars.
-	  Centralizing the loading and saving functionality allows
-	  multiple clients to use the same calendar at the same time
-	  without having to worry about each other.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Basic Queries</title>
-
-	<para>
-	  The &PCS; provides functions to do basic queries on a
-	  calendar, for example, a client can ask the server for a
-	  list of all the appointments in the calendar, or for all the
-	  data for a specific appointment.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Recurrence and Alarm Queries</title>
-
-	<para>
-	  
-	</para>
-      </formalpara>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/calendar/cal-client/.cvsignore b/doc/devel/calendar/cal-client/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/doc/devel/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
deleted file mode 100644
index 44d43639a8..0000000000
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=evolution-cal-client
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-cal-client.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-client
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-client/.libs/libcal-client.a	\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/libical.a			\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/cal-client.sgml			\
-	tmpl/evolution-cal-client-unused.sgml
-
-evolution_cal_client_docdir = $(HTML_DIR)
-evolution_cal_client_doc_DATA =			\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.types		\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt
-
-EXTRA_DIST = 					\
-	$(evolution_cal_client_doc_DATA)
-
-sgml/evolution-cal-client-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-scan:
-	-(cd $(srcdir) \
-	&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
-		 gtkdoc-scanobj --module=$(DOC_MODULE) \
-	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="cal-listener.h evolution-calendar.h" )
-
-templates: scan
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml:
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY : sgml templates scan
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
deleted file mode 100644
index 0574d70678..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-<MACRO>
-<NAME>CAL_CLIENT_TYPE</NAME>
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT</NAME>
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT_CLASS</NAME>
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT</NAME>
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT_CLASS</NAME>
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>CalClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientClass</NAME>
-</STRUCT>
-<ENUM>
-<NAME>CalClientLoadStatus</NAME>
-typedef enum {
-	CAL_CLIENT_LOAD_SUCCESS,
-	CAL_CLIENT_LOAD_ERROR,
-	CAL_CLIENT_LOAD_IN_USE,
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED
-} CalClientLoadStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientGetStatus</NAME>
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-</ENUM>
-<STRUCT>
-<NAME>CalClient</NAME>
-struct CalClient {
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_construct</NAME>
-<RETURNS>CalClient  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_new</NAME>
-<RETURNS>CalClient  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_load_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_create_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_n_objects</NAME>
-<RETURNS>int  </RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_object</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,const char *uid,CalComponent **comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uid_by_pilot_id</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,unsigned long pilot_id,char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, char *uid,unsigned long pilot_id,unsigned long pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_objects_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_generate_instances</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_for_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid,time_t start, time_t end,GList **alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_remove_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid
-</FUNCTION>
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
deleted file mode 100644
index c37b223247..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<INCLUDE>cal-client/cal-client.h</INCLUDE>
-
-<SECTION>
-<FILE>cal-client</FILE>
-CAL_CLIENT
-<TITLE>CalClient</TITLE>
-
-CalClientLoadStatus
-CalClientGetStatus
-cal_client_new
-cal_client_load_calendar
-cal_client_create_calendar
-cal_client_get_n_objects
-cal_client_get_object
-cal_client_get_objects_in_range
-cal_client_generate_instances
-cal_client_get_uid_by_pilot_id
-cal_client_update_pilot_id
-cal_client_get_uids
-cal_client_get_alarms_in_range
-cal_client_get_alarms_for_object
-cal_client_update_object
-cal_client_remove_object
-
-<SUBSECTION Standard>
-
-CAL_CLIENT_TYPE
-IS_CAL_CLIENT
-CAL_CLIENT_CLASS
-IS_CAL_CLIENT_CLASS
-cal_client_get_type
-cal_client_construct
-
-<SUBSECTION Private>
-CalClient
-
-</SECTION>
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.args b/doc/devel/calendar/cal-client/evolution-cal-client.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.args
+++ /dev/null
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy b/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy
deleted file mode 100644
index 88efa3e673..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalClient
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.signals b/doc/devel/calendar/cal-client/evolution-cal-client.signals
deleted file mode 100644
index 97e360b6a2..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.signals
+++ /dev/null
@@ -1,21 +0,0 @@
-<SIGNAL>
-<NAME>CalClient::cal-loaded</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkEnum  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-updated</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkString  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-removed</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkString  arg1
-</SIGNAL>
-
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.types b/doc/devel/calendar/cal-client/evolution-cal-client.types
deleted file mode 100644
index 84d65a6637..0000000000
--- a/doc/devel/calendar/cal-client/evolution-cal-client.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-cal_client_get_type
diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
deleted file mode 100644
index 06469ff3ee..0000000000
--- a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ /dev/null
@@ -1,294 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GTK+ object for communication with personal calendar server.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalClient object provides a nice GTK+ wrapper for the CORBA
-    interfaces that are used to communicate between calendar clients
-    and the personal calendar server in the user's Wombat daemon.  The
-    CORBA interfaces transfer calendar components in RFC 2445 text
-    format; the #CalClient object automatically converts these into
-    #CalComponent structures that are easier to handle.
-  </para>
-
-  <para>
-    After a #CalClient object is created with cal_client_new(), it
-    should be asked to send a request to the personal calendar server
-    to load or create a calendar based on its URI.  The server will
-    asynchronously notify the client about completion of the request,
-    and will return an appropriate result code; this should be noted
-    by the client with the <link
-    linkend="CalClient--cal-loaded">cal_loaded</link> signal.
-  </para>
-
-  <para>
-    When a client asks the server to update or delete a calendar
-    component from the storage, the server will do so and then notify
-    all the clients about the update or removal.  This is the core of
-    the model/view split between calendar clients and the storage in
-    the personal calendar server.  Clients should watch the <link
-    linkend="calclient-obj-updated">obj_updated</link> and <link
-    linkend="calclient-obj-removed">obj_removed</link> signals on the
-    CalClient objects they create so that they can be notified about
-    changes in the storage.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #CalComponent
-  </para>
-
-<!-- ##### MACRO CAL_CLIENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalClient.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
-@CAL_CLIENT_LOAD_SUCCESS: Indicates a successful load or create
-  operation; the corresponding calendar is ready for use.
-@CAL_CLIENT_LOAD_ERROR: Indicates an error while loading or creating
-  the calendar.
-@CAL_CLIENT_LOAD_IN_USE: Indicates that a create request failed
-  because the specified calendar was already being used by another
-  client.
-@CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED: Indicates an error due to
-  trying to load a calendar for which a backend type is not present.
-
-<!-- ##### ENUM CalClientGetStatus ##### -->
-  <para>
-    These values describe the result of the cal_client_get_object()
-    function.
-  </para>
-
-@CAL_CLIENT_GET_SUCCESS: Indicates a successful get operation.
-@CAL_CLIENT_GET_NOT_FOUND: Indicates that the requested object was
-  not found.
-@CAL_CLIENT_GET_SYNTAX_ERROR: Indicates a syntax error when parsing
-  the requested object.  This could indicate a bug in the calendar
-  client libraries or in the Wombat server.
-
-<!-- ##### FUNCTION cal_client_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_create_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_n_objects ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_get_objects_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_generate_instances ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@pilot_id: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_client_get_uids ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_for_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@start: 
-@end: 
-@alarms: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_remove_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
-
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
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
deleted file mode 100644
index 5576dbd57f..0000000000
--- a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
diff --git a/doc/devel/calendar/cal-util/.cvsignore b/doc/devel/calendar/cal-util/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/doc/devel/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
deleted file mode 100644
index 8861aa03cb..0000000000
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=evolution-cal-util
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-cal-util.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-util
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/libical.a			\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/cal-util.sgml			\
-	tmpl/evolution-cal-util-unused.sgml
-
-evolution_cal_util_docdir = $(HTML_DIR)
-evolution_cal_util_doc_DATA =			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.types		\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt
-
-EXTRA_DIST = 					\
-	$(evolution_cal_util_doc_DATA)
-
-sgml/evolution-cal-util-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-scan:
-	-(cd $(srcdir) \
-	&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
-		 gtkdoc-scanobj --module=$(DOC_MODULE) \
-	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="calobj.h icalendar-save.h icalendar.h" )
-
-templates: scan
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml:
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY : sgml templates scan
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
deleted file mode 100644
index eb108b868f..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ /dev/null
@@ -1,852 +0,0 @@
-<MACRO>
-<NAME>CAL_COMPONENT_TYPE</NAME>
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT</NAME>
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT_CLASS</NAME>
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT</NAME>
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT_CLASS</NAME>
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-</MACRO>
-<ENUM>
-<NAME>CalComponentVType</NAME>
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentField</NAME>
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-</ENUM>
-<ENUM>
-<NAME>CalComponentClassification</NAME>
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentDateTime</NAME>
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentPeriodType</NAME>
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentPeriod</NAME>
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentText</NAME>
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentTransparency</NAME>
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-</ENUM>
-<STRUCT>
-<NAME>CalComponentAlarm</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-struct CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_gen_uid</NAME>
-<RETURNS>char  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_new</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_clone</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_new_vtype</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentVType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_icalcomponent</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp, icalcomponent *icalcomp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_icalcomponent</NAME>
-<RETURNS>icalcomponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_vtype</NAME>
-<RETURNS>CalComponentVType  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_as_string</NAME>
-<RETURNS>char  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_commit_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification *classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype **geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency *transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long *pilot_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long pilot_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_pilot_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long *pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_pilot_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_datetime</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_geo</NAME>
-<RETURNS>void  </RETURNS>
-struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_icaltimetype</NAME>
-<RETURNS>void  </RETURNS>
-struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_percent</NAME>
-<RETURNS>void  </RETURNS>
-int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_priority</NAME>
-<RETURNS>void  </RETURNS>
-int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_period_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_recur_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_sequence</NAME>
-<RETURNS>void  </RETURNS>
-int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_text_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *text_list
-</FUNCTION>
-<ENUM>
-<NAME>CalComponentAlarmAction</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_NONE,
-	CAL_COMPONENT_ALARM_AUDIO,
-	CAL_COMPONENT_ALARM_DISPLAY,
-	CAL_COMPONENT_ALARM_EMAIL,
-	CAL_COMPONENT_ALARM_PROCEDURE,
-	CAL_COMPONENT_ALARM_UNKNOWN
-} CalComponentAlarmAction;
-</ENUM>
-<ENUM>
-<NAME>CalComponentAlarmTriggerType</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,
-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE
-} CalComponentAlarmTriggerType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentAlarmTriggerRelated</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END
-} CalComponentAlarmTriggerRelated;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentAlarmTrigger</NAME>
-typedef struct {
-	CalComponentAlarmTriggerType type;
-
-	union {
-		struct {
-			struct icaldurationtype duration;
-			CalComponentAlarmTriggerRelated related;
-		} relative;
-
-		struct icaltimetype absolute;
-	} u;
-} CalComponentAlarmTrigger;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_component_get_first_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_next_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmAction *action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmAction action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarmTrigger *trigger
-</FUNCTION>
-<ENUM>
-<NAME>CalRecurType</NAME>
-typedef enum {
-	CAL_RECUR_YEARLY,
-	CAL_RECUR_MONTHLY,
-	CAL_RECUR_WEEKLY,
-	CAL_RECUR_DAILY,
-	CAL_RECUR_HOURLY,
-	CAL_RECUR_MINUTELY,
-	CAL_RECUR_SECONDLY
-} CalRecurType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalRecurrence</NAME>
-typedef struct {
-	CalRecurType   type;
-
-	int            interval;
-
-	/* Specifies the end of the recurrence. No occurrences are generated
-	   after this date. If it is 0, the event recurs forever. */
-	time_t         enddate;
-
-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
-	gint	       week_start_day;
-
-
-	/* NOTE: I've used GList's here, but it doesn't matter if we use
-	   other data structures like arrays. The code should be easy to
-	   change. So long as it is easy to see if the modifier is set. */
-
-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */
-	GList	      *bymonth;
-
-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */
-	GList	      *byweekno;
-
-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */
-	GList	      *byyearday;
-
-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */
-	GList	      *bymonthday;
-
-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
-	   The second of each pair is the week number [+-]0-53. */
-	GList	      *byday;
-
-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
-	GList	      *byhour;
-
-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */
-	GList	      *byminute;
-
-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */
-	GList	      *bysecond;
-
-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */
-	GList	      *bysetpos;
-} CalRecurrence;
-</TYPEDEF>
-<STRUCT>
-<NAME>CalObjTime</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalObjTime</NAME>
-struct CalObjTime {
-	guint16 year;
-	guint8 month;		/* 0 - 11 */
-	guint8 day;		/* 1 - 31 */
-	guint8 hour;		/* 0 - 23 */
-	guint8 minute;		/* 0 - 59 */
-	guint8 second;		/* 0 - 59 (maybe 60 for leap second) */
-};
-</STRUCT>
-<USER_FUNCTION>
-<NAME>CalRecurInstanceFn</NAME>
-<RETURNS>gboolean </RETURNS>
-CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instace_end,
-					 gpointer      data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_generate_instances</NAME>
-<RETURNS>void 	</RETURNS>
-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_from_icalrecurrencetype</NAME>
-<RETURNS>CalRecurrence  *</RETURNS>
-struct icalrecurrencetype *ir
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_free</NAME>
-<RETURNS>void  </RETURNS>
-CalRecurrence *r
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalObjInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_obj_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalAlarmInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of object */
-#if 0
-	enum AlarmType type;		/* Type of alarm */
-#endif
-	time_t trigger;			/* Alarm trigger time */
-	time_t occur;			/* Occurrence time */
-} CalAlarmInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_alarm_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<ENUM>
-<NAME>CalObjType</NAME>
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_obj_uid_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_icaltimetype</NAME>
-<RETURNS>time_t  </RETURNS>
-struct icaltimetype itt
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_isodate</NAME>
-<RETURNS>time_t  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_start_duration</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t start, char *duration
-</FUNCTION>
-<FUNCTION>
-<NAME>isodate_from_time_t</NAME>
-<RETURNS>char    *</RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>get_time_t_hour</NAME>
-<RETURNS>int  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>isodiff_to_secs</NAME>
-<RETURNS>int  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>isodiff_from_secs</NAME>
-<RETURNS>char    *</RETURNS>
-int secs
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_day</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int days
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_week</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int weeks
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_month</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int months
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int years
-</FUNCTION>
-<FUNCTION>
-<NAME>format_simple_hour</NAME>
-<RETURNS>char  *</RETURNS>
-int hour, int use_am_pm
-</FUNCTION>
-<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int  </RETURNS>
-int year, int month
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t  </RETURNS>
-int year, int month, int day
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_hour</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t, int hour
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>parse_date</NAME>
-<RETURNS>time_t  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void  </RETURNS>
-time_t t
-</FUNCTION>
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt b/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt
deleted file mode 100644
index cd928fc7e3..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-<SECTION>
-<FILE>cal-component</FILE>
-CAL_COMPONENT
-<TITLE>CalComponent</TITLE>
-
-CalComponentVType
-CalComponentField
-CalComponentClassification
-CalComponentDateTime
-CalComponentPeriodType
-CalComponentPeriod
-CalComponentText
-CalComponentTransparency
-CalComponentAlarm
-CalComponentPrivate
-
-cal_component_gen_uid
-cal_component_new
-cal_component_clone
-cal_component_set_new_vtype
-cal_component_set_icalcomponent
-cal_component_get_icalcomponent
-cal_component_get_vtype
-cal_component_get_as_string
-cal_component_commit_sequence
-cal_component_get_uid
-cal_component_set_uid
-cal_component_get_categories_list
-cal_component_set_categories_list
-cal_component_get_classification
-cal_component_set_classification
-cal_component_get_comment_list
-cal_component_set_comment_list
-cal_component_get_completed
-cal_component_set_completed
-cal_component_get_created
-cal_component_set_created
-cal_component_get_description_list
-cal_component_set_description_list
-cal_component_get_dtend
-cal_component_set_dtend
-cal_component_get_dtstamp
-cal_component_set_dtstamp
-cal_component_get_dtstart
-cal_component_set_dtstart
-cal_component_get_due
-cal_component_set_due
-cal_component_get_exdate_list
-cal_component_set_exdate_list
-cal_component_get_exrule_list
-cal_component_set_exrule_list
-cal_component_get_geo
-cal_component_set_geo
-cal_component_get_last_modified
-cal_component_set_last_modified
-cal_component_get_percent
-cal_component_set_percent
-cal_component_get_priority
-cal_component_set_priority
-cal_component_get_rdate_list
-cal_component_set_rdate_list
-cal_component_has_rdates
-cal_component_get_rrule_list
-cal_component_set_rrule_list
-cal_component_has_rrules
-cal_component_get_sequence
-cal_component_set_sequence
-cal_component_get_summary
-cal_component_set_summary
-cal_component_get_transparency
-cal_component_set_transparency
-cal_component_get_url
-cal_component_set_url
-cal_component_get_pilot_id
-cal_component_set_pilot_id
-cal_component_get_pilot_status
-cal_component_set_pilot_status
-
-cal_component_free_categories_list
-cal_component_free_datetime
-cal_component_free_exdate_list
-cal_component_free_geo
-cal_component_free_icaltimetype
-cal_component_free_percent
-cal_component_free_priority
-cal_component_free_period_list
-cal_component_free_recur_list
-cal_component_free_sequence
-cal_component_free_text_list
-
-CalComponentAlarmAction
-CalComponentAlarmTriggerType
-CalComponentAlarmTriggerRelated
-CalComponentAlarmTrigger
-
-cal_component_get_first_alarm
-cal_component_get_next_alarm
-cal_component_alarm_free
-cal_component_alarm_get_action
-cal_component_alarm_set_action
-cal_component_alarm_get_trigger
-cal_component_alarm_set_trigger
-cal_component_alarm_free_trigger
-
-<SUBSECTION Standard>
-CAL_COMPONENT_TYPE
-CAL_COMPONENT_CLASS
-IS_CAL_COMPONENT
-IS_CAL_COMPONENT_CLASS
-cal_component_get_type
-
-<SUBSECTION Private>
-CalComponent
-
-</SECTION>
-
-<SECTION>
-<FILE>cal-recur</FILE>
-CalRecurType
-CalRecurrence
-CalObjTime
-CalRecurInstanceFn
-cal_recur_generate_instances
-cal_recur_from_icalrecurrencetype
-cal_recur_free
-</SECTION>
-
-<SECTION>
-<FILE>cal-util</FILE>
-CalObjInstance
-cal_obj_instance_list_free
-CalAlarmInstance
-cal_alarm_instance_list_free
-CalObjType
-cal_obj_uid_list_free
-</SECTION>
-
-<SECTION>
-<FILE>timeutil</FILE>
-time_from_icaltimetype
-time_from_isodate
-time_from_start_duration
-isodate_from_time_t
-get_time_t_hour
-isodiff_to_secs
-isodiff_from_secs
-time_add_minutes
-time_add_day
-time_add_week
-time_add_month
-time_add_year
-format_simple_hour
-time_days_in_month
-time_from_day
-time_day_hour
-time_year_begin
-time_year_end
-time_month_begin
-time_month_end
-time_week_begin
-time_week_end
-time_day_begin
-time_day_end
-parse_date
-print_time_t
-</SECTION>
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.args b/doc/devel/calendar/cal-util/evolution-cal-util.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.args
+++ /dev/null
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy b/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy
deleted file mode 100644
index cc235653f2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalComponent
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.signals b/doc/devel/calendar/cal-util/evolution-cal-util.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.signals
+++ /dev/null
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.types b/doc/devel/calendar/cal-util/evolution-cal-util.types
deleted file mode 100644
index 52b2d9bf90..0000000000
--- a/doc/devel/calendar/cal-util/evolution-cal-util.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-util/cal-component.h>
-
-cal_component_get_type
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
deleted file mode 100644
index 2f800e583f..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ /dev/null
@@ -1,934 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-RFC 2445 iCalendar component object.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalComponent object provides a wrapper over the &libical;
-    functions for manipulating calendar components.  #CalComponent
-    presents a GTK+-like interface to calendar components according to
-    RFC 2445.
-  </para>
-
-  <para>
-    While &libical; supports almost all of the features of the
-    iCalendar RFCs, applications are normally not interested in all
-    the mindless gunk that is there.  Still, applications should do
-    their best not to drop extension fields from calendar components
-    or any other extra information they do not support (including
-    standard fields they are not interested in).  The #CalComponent
-    object provides a wrapper over
-    <structname>icalcomponent</structname> structures from &libical;
-    so that no information in them will be lost even if the
-    application is not designed to handle it.  Also, #CalComponent
-    provides a higher-level API to many of the &libical; operations so
-    as to make it less painful to deal with iCalendar components.
-  </para>
-
-  <para>
-    A #CalComponent object starts out empty.  It must be initialized
-    from an existing <structname>icalcomponent</structname> structure
-    by using the cal_component_set_icalcomponent() function, or from a
-    completely new data by specifying the desired component type to
-    the cal_component_set_new_vtype() function.
-  </para>
-
-  <para>
-    #CalComponent will create an internal map of the properties in the
-    <structname>icalcomponent</structname> structure and then allow
-    random access to them via the #CalComponent API functions;
-    normally the &libical; API would have to be used by creating many
-    iterators and other unpleasant constructs.  #CalComponent keeps
-    handles to the properties it scanned from the
-    <structname>icalcomponent</structname> and will let the parent
-    application modify them at any time without having to do any
-    iteration.
-  </para>
-
-  <para>
-    Eventually a #CalComponent may be turned into the RFC 2445 string
-    representation of an iCalendar component by using the
-    cal_component_get_as_string() function.  Applications can then
-    transfer this interoperable
-    <footnote>
-      <para>
-	&ldquo;Interoperable.&rdquo;  Heavens, I love that word.
-      </para>
-    </footnote>
-    string to other programs that deal with iCalendar.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-
-  </para>
-
-<!-- ##### MACRO CAL_COMPONENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalComponent.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalComponentVType ##### -->
-  <para>
-    Calendar component types as defined by RFC 2445.  These values can
-    be used to create a new calendar component by passing them to the
-    cal_component_set_new_vtype() function.  They are also the return
-    value of the cal_component_get_vtype() function.  The only time
-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the
-    vtype of an uninitialized #CalComponent.
-  </para>
-
-@CAL_COMPONENT_NO_TYPE: Returned from cal_component_get_vtype() to
-  indicate an uninitialized #CalComponent object.
-
-@CAL_COMPONENT_EVENT: Indicates a VEVENT component.
-@CAL_COMPONENT_TODO: Indicates a VTODO component.
-@CAL_COMPONENT_JOURNAL: Indicates a VJOURNAL component.
-@CAL_COMPONENT_FREEBUSY: Indicates a VFREEBUSY component.
-@CAL_COMPONENT_TIMEZONE: Indicates a VTIMEZOME component.
-
-<!-- ##### ENUM CalComponentField ##### -->
-  <para>
-    These values are used as identifiers for #ETable columns.  These
-    are used by the calendar GUI code in Evolution.
-  </para>
-
-@CAL_COMPONENT_FIELD_CATEGORIES: Component's list of categories.
-@CAL_COMPONENT_FIELD_CLASSIFICATION: Component's classification.
-@CAL_COMPONENT_FIELD_COMPLETED: Component's completion date.
-@CAL_COMPONENT_FIELD_DTEND: Component's ending date.
-@CAL_COMPONENT_FIELD_DTSTART: Component's starting date.
-@CAL_COMPONENT_FIELD_DUE: Component's due date.
-@CAL_COMPONENT_FIELD_GEO: Component's geographical position.
-@CAL_COMPONENT_FIELD_PERCENT: Component's percent completed value.
-@CAL_COMPONENT_FIELD_PRIORITY: Component's priority.
-@CAL_COMPONENT_FIELD_SUMMARY: Component's summary.
-@CAL_COMPONENT_FIELD_TRANSPARENCY: Component's transparency value.
-@CAL_COMPONENT_FIELD_URL: Component's URL.
-@CAL_COMPONENT_FIELD_HAS_ALARMS: Whether the component has any alarms.
-@CAL_COMPONENT_FIELD_ICON: Which icon to use for the component.
-@CAL_COMPONENT_FIELD_COMPLETE: Whether the component has been completed.
-@CAL_COMPONENT_FIELD_RECURRING: Whether the component has any recurrences.
-@CAL_COMPONENT_FIELD_OVERDUE: Whether the component is overdue.
-@CAL_COMPONENT_FIELD_COLOR: Which color to use for the component.
-@CAL_COMPONENT_FIELD_NUM_FIELDS: Total number of enumerated fields.
-
-<!-- ##### ENUM CalComponentClassification ##### -->
-  <para>
-    Values for the access classification property of a calendar
-    component.
-  </para>
-
-@CAL_COMPONENT_CLASS_NONE: Indicates that no access classification has
-    been set for the corresponding component.
-
-@CAL_COMPONENT_CLASS_PUBLIC: Public access.
-@CAL_COMPONENT_CLASS_PRIVATE: Private access.
-@CAL_COMPONENT_CLASS_CONFIDENTIAL: Confidential access.
-
-@CAL_COMPONENT_CLASS_UNKNOWN: Unknown access classification value,
-  used when &libical; returns something #CalComponent does not know
-  about.
-
-<!-- ##### TYPEDEF CalComponentDateTime ##### -->
-  <para>
-    This structure defines a date and time value.
-  </para>
-
-
-<!-- ##### ENUM CalComponentPeriodType ##### -->
-  <para>
-    Defines how a period of time is specified.
-  </para>
-
-@CAL_COMPONENT_PERIOD_DATETIME: Indicates that the period is specified
-  by starting and ending date/time values.
-
-@CAL_COMPONENT_PERIOD_DURATION: Indicates that the period is specified
-  as a starding date/time and a duration value.
-
-<!-- ##### TYPEDEF CalComponentPeriod ##### -->
-  <para>
-    This structure defines a period of time.
-  </para>
-
-
-<!-- ##### TYPEDEF CalComponentText ##### -->
-  <para>
-    This structure defines the value of a text property that may have
-    an alternate representation parameter.
-  </para>
-
-
-<!-- ##### ENUM CalComponentTransparency ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_TRANSP_NONE: 
-@CAL_COMPONENT_TRANSP_TRANSPARENT: 
-@CAL_COMPONENT_TRANSP_OPAQUE: 
-@CAL_COMPONENT_TRANSP_UNKNOWN: 
-
-<!-- ##### STRUCT CalComponentAlarm ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT CalComponentPrivate ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_gen_uid ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_clone ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_set_new_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@type: 
-
-
-<!-- ##### FUNCTION cal_component_set_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@icalcomp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_as_string ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_commit_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-
-
-<!-- ##### FUNCTION cal_component_get_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_set_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_set_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_get_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_set_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_get_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_set_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_get_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_set_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_get_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_set_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_get_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_set_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_get_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_set_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_get_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_set_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-
-<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_component_free_categories_list ##### -->
-<para>
-
-</para>
-
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_datetime ##### -->
-<para>
-
-</para>
-
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_free_exdate_list ##### -->
-<para>
-
-</para>
-
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_geo ##### -->
-<para>
-
-</para>
-
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_free_icaltimetype ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_free_percent ##### -->
-<para>
-
-</para>
-
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_free_priority ##### -->
-<para>
-
-</para>
-
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_free_period_list ##### -->
-<para>
-
-</para>
-
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_recur_list ##### -->
-<para>
-
-</para>
-
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_sequence ##### -->
-<para>
-
-</para>
-
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_free_text_list ##### -->
-<para>
-
-</para>
-
-@text_list: 
-
-
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_NONE: 
-@CAL_COMPONENT_ALARM_AUDIO: 
-@CAL_COMPONENT_ALARM_DISPLAY: 
-@CAL_COMPONENT_ALARM_EMAIL: 
-@CAL_COMPONENT_ALARM_PROCEDURE: 
-@CAL_COMPONENT_ALARM_UNKNOWN: 
-
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
-
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free ##### -->
-<para>
-
-</para>
-
-@alarm: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
-<para>
-
-</para>
-
-@trigger: 
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
deleted file mode 100644
index 703f8b2b85..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-cal-recur
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM CalRecurType ##### -->
-<para>
-
-</para>
-
-@CAL_RECUR_YEARLY: 
-@CAL_RECUR_MONTHLY: 
-@CAL_RECUR_WEEKLY: 
-@CAL_RECUR_DAILY: 
-@CAL_RECUR_HOURLY: 
-@CAL_RECUR_MINUTELY: 
-@CAL_RECUR_SECONDLY: 
-
-<!-- ##### TYPEDEF CalRecurrence ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT CalObjTime ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@hour: 
-@minute: 
-@second: 
-
-<!-- ##### USER_FUNCTION CalRecurInstanceFn ##### -->
-<para>
-
-</para>
-
-@comp: 
-@instance_start: 
-@instace_end: 
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_recur_generate_instances ##### -->
-<para>
-
-</para>
-
-@comp: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
-<para>
-
-</para>
-
-@ir: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
-<para>
-
-</para>
-
-@r: 
-
-
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
deleted file mode 100644
index bc349a377f..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Miscellaneous utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### TYPEDEF CalObjInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### TYPEDEF CalAlarmInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### ENUM CalObjType ##### -->
-<para>
-
-</para>
-
-@CALOBJ_TYPE_EVENT: 
-@CALOBJ_TYPE_TODO: 
-@CALOBJ_TYPE_JOURNAL: 
-@CALOBJ_TYPE_ANY: 
-
-<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ /dev/null
diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
deleted file mode 100644
index 3b62fbba3f..0000000000
--- a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ /dev/null
@@ -1,260 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-timeutil
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
-<para>
-
-</para>
-
-@itt: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_isodate ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_start_duration ##### -->
-<para>
-
-</para>
-
-@start: 
-@duration: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodate_from_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION get_time_t_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
-<para>
-
-</para>
-
-@secs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time: 
-@minutes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_day ##### -->
-<para>
-
-</para>
-
-@time: 
-@days: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_week ##### -->
-<para>
-
-</para>
-
-@time: 
-@weeks: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_month ##### -->
-<para>
-
-</para>
-
-@time: 
-@months: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time: 
-@years: 
-@Returns: 
-
-
-<!-- ##### FUNCTION format_simple_hour ##### -->
-<para>
-
-</para>
-
-@hour: 
-@use_am_pm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_days_in_month ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@hour: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION parse_date ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
diff --git a/doc/devel/calendar/evolution-calendar.sgml b/doc/devel/calendar/evolution-calendar.sgml
deleted file mode 100644
index f3936d9bbc..0000000000
--- a/doc/devel/calendar/evolution-calendar.sgml
+++ /dev/null
@@ -1,51 +0,0 @@
-  <part>
-    <docinfo>
-      <authorgroup>
-	<author>
-	  <firstname>Federico</firstname>
-	  <surname>Mena Quintero</surname>
-	  <affiliation>
-	    <address>
-	      <email>federico@helixcode.com</email>
-	    </address>
-	  </affiliation>
-	</author>
-      </authorgroup>
-    </docinfo>
-
-    <title>Developing Applications for the Evolution Calendar</title>
-
-    <partintro>
-      <para>
-	This part of the Evolution Developer's Guide describes how to
-	write applications for the Evolution Calendar by using its
-	public interfaces.  The Evolution Calendar exports its
-	functionality through a number of interfaces, including CORBA,
-	GTK+ wrappers for Bonobo objects, and other utility libraries.
-      </para>
-
-      <para>
-	You should read this part of the Evolution Developer's guide
-	if you intend to write client applications that use the
-	functionality of the Evolution Calendar.
-      </para>
-
-      <para>
-	This part does not describe the internal interfaces of the
-	Evolution Calendar; for that you should read the Evolution
-	Internals Guide.  You should only need to read that guide if
-	you are interested in the way the calendar works internally or
-	if you want to make changes directly to the Evolution Calendar
-	code.
-      </para>
-    </partintro>
-
-    &calendar-architecture;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/doc/devel/calendar/public-reference.sgml b/doc/devel/calendar/public-reference.sgml
deleted file mode 100644
index f8aa6e848d..0000000000
--- a/doc/devel/calendar/public-reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference>
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/calendar/reference.sgml b/doc/devel/calendar/reference.sgml
deleted file mode 100644
index f8aa6e848d..0000000000
--- a/doc/devel/calendar/reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference>
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml
deleted file mode 100644
index 9db8f1bdf0..0000000000
--- a/doc/devel/evolution-devel-guide.sgml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity evolution-calendar SYSTEM "calendar/evolution-calendar.sgml">
-<!entity calendar-architecture SYSTEM "calendar/architecture.sgml">
-<!entity calendar-reference SYSTEM "calendar/reference.sgml">
-<!entity CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml">
-<!entity CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml">
-<!entity cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
-<!entity cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml">
-<!entity timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity libical "<application>libical</application>">
-]>
-
-<book id="index">
-  <bookinfo>
-    <title>Evolution Developer's Guide</title>
-
-    <authorgroup>
-      <corpauthor>
-	Helix Code, Inc.
-      </corpauthor>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-  </bookinfo>
-
-  <!-- DocBook parts for each individual component -->
-
-  &evolution-calendar;
-
-  <!-- API Reference part -->
-
-  <part>
-    <title>Evolution Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	different libraries and interfaces that Evolution provides.
-	Classes are described together with their methods; individual
-	functions are grouped by functional group.
-      </para>
-    </partintro>
-
-    &calendar-reference;
-  </part>
-</book>
diff --git a/doc/white-papers/calendar/calendar.sgml b/doc/white-papers/calendar/calendar.sgml
deleted file mode 100644
index 2cb3132e2b..0000000000
--- a/doc/white-papers/calendar/calendar.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity CUA "<acronym>CUA</acronym>">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity Bonobo "<application>Bonobo</application>">
-<!entity CORBA "<acronym>CORBA</acronym>">
-<!entity GTK "<acronym>GTK+</acronym>">
-]>
-
-<article class="whitepaper" id="calendar">
-
-  <artheader>
-    <title>&Evolution; Calendaring Framework</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Federico</firstname>
-	<surname>Mena Quintero</surname>
-	<affiliation>
-	  <address>
-	    <email>federico@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <abstract>
-      <para>
-	The &Evolution; groupware suite provides a framework for
-	developing calendaring applications, as well as a graphical
-	calendar client and a personal calendar server.  This white
-	paper describes the architecture of the &Evolution;
-	calendaring framework.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Introduction -->
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      Calendaring is an important part of a groupware suite.  A
-      calendaring framework will allow a user to keep a personal
-      calendar and have several applications use it.  Such
-      applications could be a graphical calendar client that the user
-      employs to schedule appointments and keep track of his time, a
-      <productname>Palm Pilot</productname> synchronization client, or
-      a simple alarm or reminder utility.  A comprehensive calendaring
-      framework will also allow multiple users to schedule
-      appointments between each other; for example, a project director
-      may want to schedule a weekly meeting with the rest of the
-      project members, or a person who owns a large house may want to
-      schedule a big party with his friends.  The attendees will then
-      want to reply with messages such as, &ldquo;I will
-      attend&rdquo;, or &ldquo;I will attend only if the proposed time
-      is changed&rdquo;.
-    </para>
-
-    <para>
-      The &Evolution; groupware suite provides a framework for
-      developing calendaring applications, as well as a graphical
-      calendar client or calendar user agent (&CUA;) and a personal
-      calendar server (&PCS;).
-    </para>
-
-    <para>
-      The following sections explain the basic calendaring framework,
-      the functions of the calendar user agent and the personal
-      calendar server, and the relationship between the two.
-    </para>
-  </sect1>
-
-  <!-- Personal Calendar Server -->
-
-  <sect1 id="pcs">
-    <title>Personal Calendar Server</title>
-
-    <para>
-      The personal calendar server (&PCS;) provides centralized
-      management and storage of a user's personal calendar.  Multiple
-      clients can connect to the &PCS; simultaneously to query and
-      modify the user's calendar in a synchronized fashion.  The main
-      features of the &PCS; are as follows:
-    </para>
-
-    <formalpara>
-      <title>Storage</title>
-
-      <para>
-	The &PCS; is responsible for loading and saving calendars.
-	Centralizing the loading and saving functionality allows
-	multiple clients to use the same calendar at the same time
-	without having to worry about each other.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Basic Queries</title>
-
-      <para>
-	The &PCS; provides functions to do basic queries on a
-	calendar, for example, a client can ask the server for a list
-	of all the appointments in the calendar, or for all the data
-	for a specific appointment.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Recurrence and Alarm Queries</title>
-
-      <para>
-	Clients can ask the &PCS; for a list of the appointments that
-	occur within a specified time range; for example a graphical
-	client that has a per-week view could ask the &PCS; for all
-	the appointments that occur in a particular week.  This
-	includes multiple occurrences of a single recurring event; for
-	example, the object for &ldquo;a 1-hour meeting that occurs on
-	every Tuesday and Thursday&rdquo; is represented inside the
-	&PCS; as a single event with a recurrence rule.  Similarly,
-	clients can ask the &PCS; for a list of events that have
-	alarms that trigger within a specified time range.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Notification of Changes</title>
-
-      <para>
-	This is the most important function of the &PCS;, as it allows
-	multiple calendar clients to maintain a unified view of the
-	calendar between the server and themselves.  When a client
-	asks the &PCS; to modify or remove an event, the &PCS;
-	notifies all the clients that are connected to it about the
-	change.  The policy is that &ldquo;the server is always
-	right&rdquo;; clients can act as dumb views onto the
-	calendar's data and they will be notified by the &PCS; when
-	something changes.
-      </para>
-    </formalpara>
-  </sect1>
-
-  <!-- Calenar User Agent -->
-
-  <sect1 id="cua">
-    <title>Calendar User Agent</title>
-
-    <para>
-      A calendar user agent (&CUA;) is a program that lets a user
-      manipulate a calendar.  &Evolution; provides an attractive,
-      graphical calendar client that communicates with the &Evolution;
-      personal calendar server.
-    </para>
-
-    <para>
-      The &Evolution; calendar client just provides a view onto the
-      data that is stored and managed by the personal calendar server.
-      The calendar client does not perform direct manipulations on a
-      calendar's data; instead it offloads those requests to the
-      calendar server, which takes care of making the appropriate
-      modifications in the calendar and then notifies all the clients
-      about the changes.
-    </para>
-  </sect1>
-
-  <!-- Calendar Client Library -->
-
-  <sect1 id="client-lib">
-    <title>Calendar Client Library</title>
-
-    <para>
-      Communication between the personal calendar server and calendar
-      clients is defined by a set of &Bonobo; &CORBA; interfaces.
-      Clients can be written by implementing the client-side
-      <classname>Listener</classname> interface, which defines the
-      notification callbacks that the PCS uses to inform clients about
-      changes to the calendar.
-    </para>
-
-    <para>
-      As a convenience for &GTK; programmers, &Evolution; also
-      includes a library which provides a
-      <classname>CalClient</classname> class which can be used for
-      communication with the personal calendar server.  Objects of
-      this class automatically contact the PCS when they are created.
-      <classname>CalClient</classname> provides functions to request
-      changes in the calendar, and it also emits signals when it gets
-      notification about changes from the PCS.  This makes it easy and
-      convenient to write calendar clients for &Evolution; using
-      &GTK;.
-    </para>
-
-    <para>
-      The implementation of the <classname>CalClient</classname> class
-      simply wraps the &Evolution; &CORBA; interfaces for calendaring
-      with a familiar-looking &GTK; object.  Calls to the
-      <classname>Listener</classname> interface get translated to
-      signal emissions from the <classname>CalClient</classname>, thus
-      shielding programmers from the details of the &CORBA;
-      interfaces.
-    </para>
-  </sect1>
-</article>
diff --git a/doc/white-papers/mail/camel.sgml b/doc/white-papers/mail/camel.sgml
deleted file mode 100644
index a339909f54..0000000000
--- a/doc/white-papers/mail/camel.sgml
+++ /dev/null
@@ -1,339 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-]>
-
-<article class="whitepaper" id="camel">
-
-  <artheader>
-    <title>The &Camel; Messaging Library</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-
-      <author>
-	<firstname>Bertrand</firstname>
-	<surname>Guiheneuf</surname>
-	<affiliation>
-	  <address>
-	    <email>bertrand@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Camel; is a generic messaging library. It is being used as the
-      back end for the mail component of &Evolution;. The name
-      "&Camel;" is an acronym; it refers to the fact that the
-      library is capable of going several days without food or water.
-      It means : Camel's Acronym Makes Everyone Laugh.
-    </para>
-
-    <para>
-      &Camel;'s initial design is heavily based on Sun's
-      <trademark>JavaMail</trademark> API. It uses the Gtk+ object
-      system, and many of its classes are direct analags of JavaMail
-      classes. Its design has also been influenced by the features of
-      IMAP, and the limitations of the standard UNIX mbox mail store,
-      which set some of the boundaries on its requirements and
-      extensibility.
-    </para>
-
-    <para>
-      &Camel; sees all message repositories as stores containing
-      folders. These folders in turn contain the messages the client
-      actually accesses. The use of such a unified interface allows
-      the client applications to be very extensible. &Camel; includes
-      an external provider mechanism which allows applications to
-      dynamically load and use protocols which were not available when
-      the application was initially written.
-    </para>
-
-    <para>
-      The abstract store/folder mechanism is a powerful and versatile
-      way of accessing messages. No particular asumptions are made on
-      the client side, thus allowing new ways of managing the
-      messages. For example, the messages stored in the folders don't
-      necessarily have to share some common physical location. The
-      folder can be a purely virtual folder, containing only
-      references to the actual messages. This is used by the "vFolder"
-      provider, which allows you select messages meeting particular
-      criteria and deal with them as a group.
-    </para>
-
-    <para>
-      In addition to these possibilities, &Camel; has full MIME
-      support. &Camel; MIME messages are lightweight objects
-      representing the MIME skeleton of the actual message. The data
-      contained in the subparts are never stored in memory except when
-      they are actually needed. The application, when accessing the
-      various MIME objects contained in the message (text parts,
-      attachments, embedded binary objects ...) asks &Camel; for a
-      stream that it can read data from. This scheme is particularly
-      useful with the IMAP provider. IMAP has strong MIME support
-      built-in, which allows &Camel; to download only the parts of
-      messages that it actually needs: attachments need not be
-      downloaded until they are viewed, and unnecessary
-      "multipart/alternative" parts will never be read off the server.
-    </para>
-  </sect1>
-
-  <sect1 id="overview">
-    <title>Overview</title>
-
-    <graphic format="gif" fileref="camel"></graphic>
-
-    <para>
-      To begin using &Camel;, an application first creates a
-      <classname>CamelSession</classname> object. This object is used
-      to store application defaults, and to coordinate communication
-      between providers and the application.
-    </para>
-
-    <para>
-      A <classname>CamelProvider</classname> is a dynamically-loadable
-      module that provides functionality associated with a specific
-      service. Examples of providers are IMAP and SMTP. Providers
-      include subclasses of the various other &Camel; classes for
-      accessing and manipulating messages.
-    </para>
-
-    <para>
-      <classname>CamelService</classname> is an abstract class for
-      describing a connection to a local or remote service. It
-      currently has two subclasses: <classname>CamelStore</classname>,
-      for services that store messages (such as IMAP servers and mbox
-      files), and <classname>CamelTransport</classname>, for services
-      that deliver messages (such as SMTP, or a local MTA). A provider
-      could also be both a store and a transport, as in the case of
-      NNTP.
-    </para>
-
-    <para>
-      A <classname>CamelStore</classname> contains some number of
-      <classname>CamelFolder</classname> objects, which in turn
-      contain messages. A <classname>CamelFolder</classname> provides
-      a <classname>CamelFolderSummary</classname> object, which
-      includes details about the subject, date, and sender of each
-      message in the folder. The folder also includes the messages
-      themselves, as subclasses of <classname>CamelMedium</classname>.
-    </para>
-
-    <para>
-      Email messages are represented by the
-      <classname>CamelMimeMessage</classname> class, a subclass of
-      <classname>CamelMedium</classname>. This class includes
-      operations for accessing RFC822 and MIME headers, accessing
-      subparts of MIME messages, encoding and decoding Base64 and
-      Quoted-Printable, etc.
-    </para>
-
-    <para>
-      <classname>CamelTransport</classname> includes methods for
-      delivering messages. While the abstract
-      <function>CamelTransport::send</function> method takes a
-      <classname>CamelMedium</classname>, its subclasses may only be
-      able to deliver messages of specific
-      <classname>CamelMedium</classname> subclasses. For instance,
-      <classname>CamelSendmailTransport</classname> requires a
-      <classname>CamelMimeMessage</classname>, because it needs a
-      message that includes a "To:" header. A hypothetical
-      <classname>CamelNNTPTransport</classname> would need a
-      <classname>CamelNewsMessage</classname>, which would have a
-      "Newsgroups:" header.
-    </para>
-
-    <para>
-      The content of messages are referred to using
-      <classname>CamelStream</classname> and its subclasses. In the
-      case of an mbox-based store, the
-      <classname>CamelStream</classname> would abstract the operation
-      of reading the correct section of the mbox file. For IMAP,
-      reading off the <classname>CamelStream</classname> might result
-      in commands being issued to the remote IMAP server and data
-      being read off a socket.
-    </para>
-
-    <para>
-      The final major class in &Camel; is
-      <classname>CamelException</classname>, which is used to
-      propagate information about errors. Many methods take a
-      <classname>CamelException</classname> as an argument, which the
-      caller can then check if an error occurs. It includes both a
-      numeric error code which can be interpreted by the program, and
-      a text error message that can be displayed to the user.
-    </para>
-  </sect1>
-
-  <sect1 id="classes">
-    <title>Major Subcomponents</title>
-
-    <sect2 id="store">
-      <title>The Message Store</title>
-
-      <para>
-        A <classname>CamelStore</classname> inherits the ability to
-        connect and authenticate to a service from its parent class,
-        <classname>CamelService</classname>. It then adds the ability
-        to retrieve folders. A store must contain at least one folder,
-        which can be retrieved with
-        <function>CamelStore::get_default_folder</function>. There are
-        also methods to retrieve the "top-level" folder (for
-        hieararchical stores), and to retrieve an arbitrary folder by
-        name.
-      </para>
-
-      <para>
-        All <classname>CamelFolder</classname>s must implement certain
-        core operations, most notably generating a summary and
-        retrieving and deleting messages. A
-        <classname>CamelFolder</classname> must assign a permanently
-        unique identifier to each message it contains. Messages can
-        then be retrieved via
-        <function>CamelFolder::get_message_by_uid</function>. Alternately,
-        within a single mail-reading session, messages can be referred
-        to by their linear position within the store using
-        <function>CamelFolder::get_message_by_number</function>.
-      </para>
-
-      <para>
-        Folders must also implement the
-        <function>get_parent_folder</function> and
-        <function>list_subfolders</function> methods. For stores that
-        don't allow multiple folders, they would return NULL and an
-        empty list, respectively. Stores that do allow multiple
-        folders will also define methods for creating and deleting
-        folders, and for moving messages between them (assuming the
-        folders are writable).
-      </para>
-
-      <para>
-        Folders that support searching can define the
-        <function>search_by_expression</function> method. For mbox
-        folders, this is implemented by indexing the messages with the
-        ibex library and using that to search them later. For IMAP
-        folders, this uses the IMAP SEARCH command. Other folder types
-        might not be able to implement this functionality, in which
-        case users would not be able to do full-content searches on
-        them.
-      </para>
-    </sect2>
-
-    <sect2 id="messages">
-      <title>Messages</title>
-
-      <para>
-        As mentioned before, messages are represented by subclasses of
-        <classname>CamelMedium</classname>.
-        <classname>CamelMedium</classname> itself is a subclass of
-        <classname>CamelDataWrapper</classname>, a generic class for
-        connecting a typed data source to a data sink.
-        <classname>CamelMedium</classname> adds the concept of message
-        headers versus message body.
-        (<classname>CamelDataWrapper</classname> has one other
-        important subclass, <classname>CamelMultipart</classname>,
-        which is used to provide separate access to the multiple
-        independent parts of a multipart MIME type.)
-        <classname>CamelMedium</classname>'s subclasses provide more
-        specialized handling of various headers:
-        <classname>CamelMimePart</classname> adds special handling for
-        the &ldquot;Content-*&rdquot; headers in MIME messages, and
-        its subclass <classname>CamelMimeMessage</classname> adds
-        handling for the RFC822 headers.
-      </para>
-
-      <graphic format="gif" fileref="mimemessage"></graphic>
-
-      <para>
-        Consider a message with two parts: a text part (in both plain
-        text and HTML), and an attached image:
-
-	<programlisting>
-
-	  From: Dan Winship &lt;danw@helixcode.com&gt;
-	  To: Matt Loper &lt;matt@helixcode.com&gt;
-	  Subject: the Camel white paper
-	  MIME-Version: 1.0
-	  Content-Type: multipart/mixed;
-		boundary="jhTYrnsRrdhDFGa"
-
-	  This is a multi-part message in MIME format.
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: multipart/alternative;
-		boundary="sFSenbAFDSgDfg"
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/plain
-
-	  Hey, Matt
-
-	  Check out this graphic...
-
-	  -- Dan
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/html
-
-	  Hey, Matt&lt;br&gt;
-	  &lt;br&gt;
-	  Check out this graphic...&lt;br&gt;
-	  &lt;br&gt;
-	  -- Dan&lt;br&gt;
-	  &lt;br&gt;
-	  --sFSenbAFDSgDfg--
-
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: image/png
-	  Content-Transfer-Encoding: base64
-
-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...
-	  --jhTYrnsRrdhDFGa--
-	</programlisting>
-
-	<para>
-	  In &Camel;, this would be represented as follows:
-	</para>
-
-        <graphic fileref="samplemsg"></graphic>
-      </sect2>
-
-      <sect2 id="streams">
-        <title>Streams</title>
-
-	<para>
-	  Streams are a generic data transport layer. Two basic stream
-	  classes are <classname>CamelStreamFs</classname>, for
-	  reading and writing files, and
-	  <classname>CamelStreamMem</classname>, for reading from and
-	  writing to objects that are already in memory.
-	</para>
-
-	<para>
-	  Streams can also be chained together. So a CamelMimePart
-	  containing base64-encoded data can filter its output through
-	  a CamelStreamB64. Other parts of the application that want
-	  to read its data will never need to even realize that the
-	  original data was encoded.
-	</para>
-      </sect2>
-
-</article>
diff --git a/doc/white-papers/mail/ibex.sgml b/doc/white-papers/mail/ibex.sgml
deleted file mode 100644
index dcb8f5ca4b..0000000000
--- a/doc/white-papers/mail/ibex.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-<!entity Ibex "Ibex">
-]>
-
-<article class="whitepaper" id="ibex">
-
-  <artheader>
-    <title>Ibex: an Indexing System</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Ibex; is a library for text indexing. It is being used by
-      &Camel; to allow it to quickly search locally-stored messages,
-      either because the user is looking for a specific piece of text,
-      or because the application is contructing a vFolder or filtering
-      incoming mail.
-    </para>
-  </sect1>
-
-  <sect1 id="goals">
-    <title>Design Goals and Requirements for Ibex</title>
-
-    <para>
-      The design of &Ibex; is based on a number of requirements.
-
-    <itemizedlist>
-      <listitem>
-        <para>
-	  First, obviously, it must be fast. In particular, searching
-	  the index must be appreciably faster than searching through
-	  the messages themselves, and constructing and maintaining
-	  the index must not take a noticeable amount of time.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexes must not take up too much space. Many users have
-	  limited filesystem quotas on the systems where they read
-	  their mail, and even users who read mail on private machines
-	  have to worry about running out of space on their disks. The
-	  indexes should be able to do their job without taking up so
-	  much space that the user decides he would be better off
-	  without them.
-	</para>
-
-	<para>
-	  Another aspect of this problem is that the system as a whole
-	  must be clever about what it does and does not index:
-	  accidentally indexing a "text" mail message containing
-	  uuencoded, BinHexed, or PGP-encrypted data will drastically
-	  affect the size of the index file. Either the caller or the
-	  indexer itself has to avoid trying to index these sorts of
-	  things.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexing system must allow data to be added to the index
-	  incrementally, so that new messages can be added to the
-	  index (and deleted messages can be removed from it) without
-	  having to re-scan all existing messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must allow the calling application to explain the
-	  structure of the data however it wants to, rather than
-	  requiring that the unit of indexing be individual files.
-	  This way, &Camel; can index a single mbox-format file and
-	  treat it as multiple messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must support non-ASCII text, given that many people send
-	  and receive non-English email, and even people who only
-	  speak English may receive email from people whose names
-	  cannot be written in the US-ASCII character set.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      While there are a number of existing indexing systems, none of
-      them met all (or even most) of our requirements.
-    </para>
-  </sect1>
-
-  <sect1 id="implementation">
-    <title>The Implementation</title>
-
-    <para>
-      &Ibex; is still young, and many of the details of the current
-      implementation are not yet finalized.
-    </para>
-
-    <para>
-      With the current index file format, 13 megabytes of Info files
-      can be indexed into a 371 kilobyte index file&mdash;a bit under
-      3% of the original size. This is reasonable, but making it
-      smaller would be nice. (The file format includes some simple
-      compression, but <application>gzip</application> can compress an
-      index file to about half its size, so we can clearly do better.)
-    </para>
-
-    <para>
-      The implementation has been profiled and optimized for speed to
-      some degree. But, it has so far only been run on a 500MHz
-      Pentium III system with very fast disks, so we have no solid
-      benchmarks.
-    </para>
-
-    <para>
-      Further optimization (of both the file format and the in-memory
-      data structures) awaits seeing how the library is most easily
-      used by &Evolution;: if the indexes are likely to be kept in
-      memory for long periods of time, the in-memory data structures
-      need to be kept small, but the reading and writing operations
-      can be slow. On the other hand, if the indexes will only be
-      opened when they are needed, reading and writing must be fast,
-      and memory usage is less critical.
-    </para>
-
-    <para>
-      Of course, to be useful for other applications that have
-      indexing needs, the library should provide several options, so
-      that each application can use the library in the way that is
-      most suited for its needs.
-    </para>
-  </sect1>
-</article>
diff --git a/doc/white-papers/widgets/e-table.sgml b/doc/white-papers/widgets/e-table.sgml
deleted file mode 100644
index 5ff4faf2ae..0000000000
--- a/doc/white-papers/widgets/e-table.sgml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity ETable "<classname>ETable</classname>">
-<!entity ETableModel "<classname>ETableModel</classname>">
-<!entity ETableSimple "<classname>ETableSimple</classname>">
-<!entity ETableHeader "<classname>ETableHeader</classname>">
-<!entity ETableSpecification "<classname>ETableSpecification</classname>">
-<!entity ETableCol "<classname>ETableCol</classname>">
-]>
-
-<article class="whitepaper" id="e-table">
-
-  <artheader>
-    <title>The ETable Widget</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Chris</firstname>
-	<surname>Lahey</surname>
-	<affiliation>
-	  <address>
-	    <email>clahey@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Miguel</firstname>
-	<surname>de Icaza</surname>
-	<affiliation>
-	  <address>
-	    <email>miguel@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &ETable; is a table widget on steroids. It is intended to provide
-      all the table functionality needed throughout &Evolution;, and
-      hopefully be general purpose enough to be used in other projects.
-    </para>
-
-    <para>
-      &ETable; provides a lot of interactive control over the data in the
-      table.  Without any work from the programmer, &ETable; provides
-      rearrangeable columns and editable data.  When finished, &ETable; will
-      also provide, again with no programmer intervention, easy interactive
-      sorting and grouping.  
-    </para>
-
-    <para>
-      &ETable; gives you a great deal of functionality, flexibility, and
-      power. Most of this power is internal to the widget, but some of
-      the flexibility requires a bit of work by the programmer.
-      However, once you learn it, &ETable; is not very hard at all to
-      use.
-    </para>
-
-    <para>
-      &ETable;'s power comes from the fact that it is fully
-      model/view/controller based.  Various models are involved into
-      the process of rendering the information, and various views are
-      provided.  The programmer has a wide range of options: from the
-      most finely hand-tuned table to a generic all-encompasing widget
-      that takes over most of tasks.  It is up to the programmer: he
-      can use the simple to use &ETable; widget that takes care of
-      everything in a generic way, or he can use the various
-      components to roll his own tabular display.
-    </para>
-
-    <para>
-      &ETable; ships with a standard set of information renderers:
-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line
-      strings.  But the programmer can write and implement his own
-      renderer for his information.  This means that by default
-      &ETable; provides the basic display facilities that programmers
-      required, but they offer the programmer a complete freedom to
-      incorporate new cell renderers.
-    </para>
-    
-  </sect1>
-
-  <sect1 id="model">
-    <title>ETableModel</title>
-
-    <para>
-      The data back end for the &ETable; is an &ETableModel;. The
-      &ETableModel is an abstract interface that acts as the
-      information repository for the various &ETable components.
-    </para>
-    
-    <para>
-      To use &ETable; you have to create a subclass of the abstract
-      &ETableModel; class.  However, to save you the work of defining
-      a new <classname>GtkClass</classname> every time you use
-      &ETable, there is a predefined subclass of &ETableModel; called
-      &ETableSimple; which simply takes a list of function callbacks
-      to perform the various operations.
-    </para>
-
-  </sect1>
-    
-  <sect1 id="columns">
-    <title>Columns</title>
-
-    <para>
-      There are two different meanings to the word "column". The first
-      is the model column (defined by the &ETableCol: object). A model
-      column describes how it maps to the column in the &ETableModel;
-      as well as containing information about its properties (name,
-      resizability, resize dimensions, and a renderer for this
-      specific columns). 
-    </para>
-
-    <para>
-      &ETable; distinguishes between a model column index, and a view
-      column index.  The former reflects the column in which the data
-      is stored in the &ETableModel;  The later represents the actual
-      location at which the column is being displayed in the screen.
-    </para>
-
-    <para>
-      Each view column index corresponds to a specific model column,
-      though a model column may have any number of view columns
-      associated with it (including zero).  For example the same
-      column might be rendered twice, or the data from one column
-      could be used to display different bits of information
-    </para>
-
-    <para>
-      The view column does not necessarily depend on only one model
-      column. In some cases, the view column renderer can be given a
-      reference to another model column to get extra information about
-      its display. For example, a mail program could display deleted
-      messages with a line through them by creating a model column
-      with no corresponding view column that told whether or not the
-      message is deleted, and then having the text column
-      strikethrough the display if the invisible column had a value
-      corresponding to "deleted".
-    </para>
-
-    <para>
-      The view column also specifies a few other pieces of
-      information. One piece of information is the renderer. &ETable;
-      provides a number of renderers to choose from, or you can write
-      your own. Currently, there are renderers for text, image sets,
-      and checkboxes.
-    </para>
-
-    <para>
-      The view column also includes information about the header.
-      There are two types of headers: text, and pixbuf. The first
-      allows you to specify a string which is rendered in the header.
-      The second allows you to specify an image to copy into the
-      header.
-    </para>
-  </sect1>
-
-  <sect1 id="header">
-    <title>Header</title>
-
-    <para>
-      The &ETableHeader; represents the header information for the
-      table. The &ETableHeader; is used in two different ways. The
-      first is the in the <structfield>full_header</structfield>
-      element of an &ETable;. This is the list of possible columns in
-      the view. You add each of your columns to this &ETableHeader;
-      and then pass it into the &ETable;.
-    </para>
-
-    <para>
-      The second use is completely internal. &ETable; uses another
-      &ETableHeader; to store the actual displayed columns. Many of
-      the &ETableHeader; functions are for this purpose. The only
-      functions that users of the library should need to use are
-      <function>e_table_header_new</function> and
-      <function>e_table_header_add_col</function>.
-    </para>
-  </sect1>
-
-  <sect1 id="layout">
-    <title>Layout Specification</title>
-
-    <para>
-      &ETable; uses an &ETableSpecification; to layout the columns of
-      the widget. The &ETableSpecification; is specified as XML data
-      passed into the &ETable; as a string.
-    </para>
-
-    <para>
-      The most powerful part of the &ETableSpecification; is that when
-      finished, &ETable; will allow you to get a copy of an
-      &ETableSpecification; that describes the current view of the
-      tree. This allows the developer to save the current view so that
-      next time the user opens this table, they find it in exactly the
-      state that they left it.
-    </para>
-
-    <para>
-      The XML specification allows for a number of things. First, it
-      allows you to pick a set of default columns to be shown. Thus,
-      even if you had hundreds of pieces of data, you could choose to
-      only display a few that fit on the screen by default.
-    </para>
-
-    <para>
-      The second major thing that the &ETableSpecification; allows you
-      to specify is the column grouping and sorting. &ETable; has a
-      powerful mechanism for allowing the user to choose columns to
-      group by, thus allowing multiple columns of sorting, as well as
-      visual grouping of similar elements and interactive selection of
-      what data to display.
-    </para>
-
-    <para>
-      The grouping in &ETableSpecification; is specified as a
-      hierarchy of columns to group by. Each level of the hierarchy
-      lets you sort by a particular column, either ascending or
-      descending. All levels except the last cause the canvas to group
-      by the given column.
-    </para>
-
-    <para>
-      An example &ETableSpecification; follows.
-    </para>
-
-    <programlisting>
-      &lt;ETableSpecification&gt;
-        &lt;columns-shown frozen_columns="2"&gt;
-	  &lt;column&gt; 0 &lt;/column&gt;
-	  &lt;column&gt; 1 &lt;/column&gt;
-	  &lt;column&gt; 2 &lt;/column&gt;
-	  &lt;column&gt; 3 &lt;/column&gt;
-	  &lt;column&gt; 4 &lt;/column&gt;
-	&lt;/columns-shown&gt;
-	&lt;grouping&gt;
-	  &lt;group column="3" ascending="1"&gt;
-	    &lt;group column="4" ascending="0"&gt;
-	      &lt;leaf column="2" ascending="1"/&gt;
-	    &lt;/group&gt;
-	  &lt;/group&gt;
-	&lt;/grouping&gt;
-      &lt;/ETableSpecification&gt;
-    </programlisting>
-
-    <para>
-      This example has 5 columns which are initially in order. It has
-      2 levels of grouping. The first is grouped by the 4th column
-      (all indexes are 0 based) and sorts those groups in ascending
-      order. Inside those groups, the data is grouped by the fifth
-      column and sorted in descending order of the fifth column.
-      Finally, the data in those groups is sorted by the third column
-      in ascending order. Due to the "frozen_columns" attribute on the
-      columns-shown element, the user will not be
-      able to rearrange the first two columns. They will always be the
-      first two.
-    </para>
-  </sect1>
-
-  <sect1 id="conclusion">
-    <title>Conclusion</title>
-
-    <para>
-      All in all, &ETable; is a very powerful widget. Once you learn
-      to use it, you have access to a vast amount of power requiring a
-      comparatively small amount of work.
-    </para>
-  </sect1>
-</article>
diff --git a/e-util/.cvsignore b/e-util/.cvsignore
deleted file mode 100644
index cb49036068..0000000000
--- a/e-util/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-*.lo
-*.la
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
deleted file mode 100644
index 9cad1815d6..0000000000
--- a/e-util/ChangeLog
+++ /dev/null
@@ -1,749 +0,0 @@
-200-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-dialog-widgets.c: #include <string.h> to quench warning.
-	* e-sexp.c: #include <stdlib.h> for same reason.
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* Makefile.am: build md5-utils
-
-	* md5-utils.c: Make part of util, get rid of camel stream util
-	function include string.h
-
-	* md5-utils.h: ditto
-	
-2000-10-27    <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_uid): Return null if no
-	pnode was found.
-
-2000-10-27  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (map_sax_start_element): Get archive field while
-	parsing
-	(map_write_foreach): Write out archive field
-	(e_pilot_map_pid_is_archived): implement
-	(e_pilot_map_uid_is_archived): ditto
-	(e_pilot_map_insert): Insert new node structures
-	(e_pilot_map_lookup_pid): Take into account the list is now
-	a list of structures
-	(e_pilot_map_lookup_uid): ditto
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_is_postal): 
-	unsigned chars.
-
-	* ename/e-name-western.c (e_name_western_get_one_prefix_at_str):
-	cast to unsigned char.
-
-2000-10-25  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Deal properly with URLs at the
-	end of the buffer. (The old code would append a "&#0;" to the
-	text.)
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c (e_pilot_map_lookup_pid): Lookup a pid by uid.
-	(e_pilot_map_lookup_uid): Lookup a uid by pid.
-	Now this is wrapped, we can store archive info internally
-
-	* e-pilot-map.h: New accessor prototypes
-	
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* ename/Makefile.am (INCLUDES): Remove unused GNOMELOCALEDIR
-	setting.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Operate with EPilotMap structure so things are
-	abstract to the caller
-	(e_pilot_map_pid_is_archived): Infrastructure for marking records
-	as archived
-	(e_pilot_map_uid_is_archived): ditto
-
-	* e-pilot-map.h: Add more to public interface, including EPilotMap
-	structure
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* e-pilot-map.c: Pilot map functions grabbed from existing conduits
-
-	* e-pilot-map.h (e_pilot_map_write): Header
-
-2000-10-18  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,
-	assume it was actually undeclared iso-8859-1 text.
-
-2000-10-17  Jesse Pavel  <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: made the routines use the stardard
-	e_strstrcase instead of the included function that existed
-	earlier.
-
-2000-10-11  Iain Holmes  <iain@helixcode.com>
-
-	* ename/e-address-western.c (e_address_western_parse): g_strconcat
-	needs to be NULL terminated or it goes funny.
-
-Tue Sep 26 16:48:49 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS).
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: add ename as a SUBDIR
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list-iterator.c, e-list.c, e-list.h: Made e_list a bit more
-	reentrant.  If a iterator gets its data pulled out from under it
-	while in a loop, it goes back one so that loops will be able to
-	continue.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed all the files moved to gal.
-
-	* e-dialog-widgets.c: Fixed the #include lines to deal properly
-	with gal.
-
-	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality
-	that was moved to gal.
-
-	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,
-	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,
-	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,
-	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,
-	e-xml-utils.c, e-xml-utils.h: Moved to gal.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-font.c: Fixed an uninitialized variable.
-
-2000-09-12  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c (e_utf8_to_gtk_string_sized): Use underscores
-	for untranslatable characters
-	(e_utf8_from_gtk_string_sized): Ditto
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (e_font_from_gdk_font): Change this a bit so that if
-	you pass it a bold font, it puts that in font->bold and finds a
-	lighter font for font->font (if it can). This is for themes like
-	Metal where the default font is bold.
-	(find_variants): renamed from find_best_bold
-	
-2000-09-11  Dan Winship  <danw@helixcode.com>
-
-	* e-font.c (find_best_bold): Thou shalt leave space for the
-	trailing \0.
-
-	* e-util.c (e_strstrcase): The return value should not be
-	const. (Well, unless the input was, but you can't know that.)
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-unicode.c, e-unicode.h: Added e_utf8_gtk_editable_get_text and
-	e_utf8_gtk_editable_set_text.
-
-2000-09-11  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Try to find real bold variant of X font, fall
-	to double stroke only if not found
-
-2000-09-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gtk-utils.c: New.
-	(e_gtk_signal_connect_full_while_alive): New.
-
-	* e-gtk-utils.h: New.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.c: Use experimental 16-bit font stuff for EFonts
-
-2000-09-08  Dan Winship  <danw@helixcode.com>
-
-	* e-popup-menu.h: remove consts from the EPopupMenu structure: the
-	caller may want to modify its own EPopupMenu before calling
-	e_popup_menu_run.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_get): Use UTF-8
-	(e_dialog_editable_set): Use UTF-8
-
-	* e-font.c (translate_encoding): More encodings
-	(e_gdk_font_encoding): Use experimental stuff
-
-	* e-unicode.* (e_utf8_gtk_editable_insert_text): New wrapper
-	
-2000-09-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-canvas.c (emit_event): Remove incorrect optimization.  Events
-	are read-only!
-
-2000-09-04  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.c: Added new font code, but comment it out now
-	* e-font.h, e-font.c: Test code for font analyzing
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h, e-unicode.c: New functions
-	e_utf8_gtk_clist_append, e_utf8_gtk_clist_set_text
-	e_unicode_init
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Use UTF-8
-
-	* e-unicode.h:
-	* e-unicode.c (g_unichar_to_utf8): glib 1.3 function
-	(gdk_keyval_to_unicode): gdk 1.3 function
-	(e_utf8_from_gdk_event_key): Use keyval, not string
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h: #define gnome_font_get_size and
-	gnome_font_get_width, and gnome_font_lookup_default,
-	if compiling with gnome-print 0.20
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libeutil_la_LIBADD): make e-util depend on
-	libunicode
-
-	* e-popup-menu.c (make_item): Use GtkMenuItem rather than
-	GtkPixmapMenuItem for items with no pixmaps, so that if the whole
-	menu is pixmapless, you don't get a column of blank pixmaps.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_gtk_menu_item_new_with_label): New wrapper
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c (e_utf8_strstrcase): New function
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Constify.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: e_utf8_gtk_editable_get_chars
-	e_utf8_gtk_entry_get_text
-	e_utf8_gtk_entry_set_text
-	e_utf8_to_gtk_string: New convenience functions
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-unicode.h:
-	* e-unicode.c: Some convenience functions to deal with Gtk+ and UTF-8
-
-	* Makefile.am: Added e-unicode.h, e-unicode.c
-
-2000-08-21  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-font.h:
-	* e-font.c: Changed UTF-8 syntax from char-based to byte-based
-	
-2000-08-21  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix a booboo in the tab
-	expansion code (didn't use the new value of 'out').
-
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h: #define e_font_height(f) to save some space
-	
-2000-08-19  Lauris Kaplinski  lauris@helixcode.com
-
-	* e-font.h:
-	* e-font.c: Thin wrapper around GdkFont to deal with UTF-8 directly
-	Also handles bold/italic styling
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* e-sexp.c (scanner_config): Add "-" to be an acceptable
-	first character for an operation -- yaaay subtraction!
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Fix the tab expansion
-	for when the length would exceed the ten characters that
-	we allocated.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* e-setup.[ch]: Remove. The shell tells the components where
-	the evolution homedir is now.
-	
-	* Makefile.am (libeutil_la_SOURCES): Remove e-setup.c
-
-	* e-html-utils.c (e_text_to_html): If converting both spaces and
-	newlines, then convert tabs too. The joys of pseudo-<PRE>.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Fix the bug where it truncates the last item
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c: Ooops.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added uncompiled e_read_uri function.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-popup-menu.c, e-popup-menu.h: Added a hide_mask argument to
-	the two popup menu functions.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.c: Added
-	e_container_change_tab_order.
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* e-canvas.c (e_canvas_destroy): Chain the
-	destroy handler.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>	
-	
-	* e-canvas.c (emit_event): Don't bother with 
-	dereferencing the event pointer.
-	(e_canvas_item_set_cursor): Reference our selection
-	item; print a debug message. Deref when destroying
-	(e_canvas_item_add_selection): Same.
-	(e_canvas_item_remove_selection): Same.
-	
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): Build both libraries
-	(a typo didn't build libeutil.la, only -static.)
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* Makefile.am (libeutil_static_la_LDFLAGS): build static version
-	of library for conduit to use
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added a bunch of e_marshal functions.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strstrcase function.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-vbox.c: Removed some debugging printfs.
-	
-	* e-canvas.c (e_canvas_unrealize): Call parent unrealize method.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-sexp.c (eval_dump_result): `#if 0'ed out.
-
-	* e-popup-menu.h (e_popup_menu_create): New prototype.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c: Fix warnings.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-list.c, e-list.h: Added e_list_duplicate.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strsplit to work around a bug in
-	g_strsplit.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h: Added last and insert functions.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c: Added docstrings.  This file did not have
-	them at all.  EEEEEEK!
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* e-sexp.c (e_sexp_parse): Kill debugging message
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-iterator.c, e-iterator.h, e-list-iterator.c,
-	e-list-iterator.h, e-list.c, e-list.h: New list class with
-	iterators.
-
-	* e-canvas.c: Made it so that you don't get the same selection in
-	the selection list more than once.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-gui-utils.h: #include <libgnomeui/gnome-messagebox.h>.  It's
-	needed to be able to pass an appropriate @type arg to
-	`e_notice()'.
-
-2000-06-29  Jody Goldberg <jgoldberg@home.com>
-
-	* e-canvas.c (e_canvas_init) : Init the InputContext members
-	(e_canvas_class_init) : Add a handler for unrealize.
-	(e_canvas_focus_in) : enable the input context.
-	(e_canvas_focus_out) : enable the input context.
-	(e_canvas_realize) : Create an input context.
-	(e_canvas_unrealize) : New function to release the input context.
-
-2000-06-28  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (url_extract): add ")" to the set of characters
-	to back up over at the end of a potential URL.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-dialog-widgets.c (get_toggle_value): Use `value_var', not
-	`value'.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_srcdir)' to fix compilation
-	with builddir != srcdir.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h.
-
-	* e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like
-	a vbox using the reflow system.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Added a variable to keep track of the
-	cursor.  Set the cursor when selection_add is called.  Properly
-	unset the cursor at the right times.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Grab the focus when setting the cursor.
-
-2000-06-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c, e-canvas.h: Built a system for doing selections
-	and/or a cursor in canvas.
-
-2000-06-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Changed the needed e_marshal functions.
-
-	* e-printable.c, e-printable.h: Added a quantize parameter to
-	e_printable_height.  Also, added a e_printable_will_fit function.
-	
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added e-printable.c and e-printable.h.
-
-	* e-printable.c, e-printable.h: This new class is a printing
-	context.  Other classes return an EPrintable which represents a
-	context for printing that object.
-
-	* e-util.c, e-util.h: Added
-	e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL and
-	e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c: Fixed e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_marshal_INT__INT_INT_POINTER.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* e-util.c (g_int_compare): Duh! -1 != 1. :)
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-sexp.c (e_sexp_term_eval): g_return_val_if_fail to prevent a crash.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_encode_bool): Utility function to build a bool
-	as part of an expression string.
-	(e_sexp_encode_string): Likewise for strings.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas-utils.c, e-canvas-utils.h: Added
-	e_canvas_item_show_area which makes sure that a particular area of
-	a given item is in the scroll area.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (hook_radio): Use the exported function to
-	set the value.
-	(get_radio_value): Likewise.
-	(hook_option_menu): Likewise.
-	(get_option_menu_value): Likewise.
-	(hook_toggle): Likewise.
-	(get_toggle_value): Likewise.
-	(hook_spin_button): Likewise.
-	(get_spin_button_value): Likewise.
-	(hook_editable): Likewise.
-	(get_editable_value): Likewise.
-	(e_dialog_radio_set): Radio buttons are prepended to their parent
-	group's list, so we need to flip the index around when
-	getting/setting the value.
-	(e_dialog_radio_get): Likewise.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (e_dialog_editable_set): Moved over from
-	event-editor-utils.c.
-	(e_dialog_editable_get): Likewise.
-	(e_dialog_toggle_set): Likewise.
-	(e_dialog_toggle_get): Likewise.
-	(e_dialog_spin_set): Likewise.
-	(e_dialog_spin_get_double): Likewise.
-	(e_dialog_spin_get_int): Likewise.
-	(e_dialog_option_menu_set): Likewise, and added a value map.
-	(e_dialog_option_menu_get): Likewise.
-	(e_dialog_dateedit_set): Likewise.
-	(e_dialog_dateedit_get): Likewise.
-	(e_dialog_radio_set): New function.
-	(e_dialog_radio_get): New function.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned.c, e-paned.h: Removed.
-
-2000-05-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.c (get_radio_value): Implemented.  Amazing that
-	one has to go through so much pain to get a stupid value from
-	GTK+.
-	(hook_option_menu): Implemented.  Same complaint.
-	(get_toggle_value): Implemented.
-	(get_spin_button_value): Implemented.
-	(get_entry_value): Implemented.
-	(e_dialog_widget_hook_value): Function to hook a widget to the
-	variable it will modify.
-	(e_dialog_get_values): Function to feed the variables from a
-	dialog's widgets.
-	(e_dialog_xml_widget_hook_value): Function to hook a widget from
-	a Glade file.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_write_file.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dialog-widgets.[ch]: New files with utilities for hooking up
-	widgets in Glade-generated dialogs.
-
-	* Makefile.am (libeutil_la_SOURCES): Added e-dialog-widgets.[ch].
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_container_foreach_leaf.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Add imagesdir support.
-
-	* e-gui-utils.c, e-gui-utils.h: Added e_create_image_widget for
-	glade use.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: xmlGetProp appears to return malloced memory.
-	Thus we must free it.
-
-2000-05-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.c (e_free_string_list): New function.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util.c, e-util.h: Added e_strdup_strip which returns a copy of
-	the string with the leading and trailing spaces removed.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Destroy the g_scanner when cleaning up.
-	(e_sexp_finalise): Free symbol table on finalise.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Remove reflow idle when being destroyed.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-html-utils.c: Got rid of some warnings.
-
-	* e-util.c, e-util.h: Added e_read_file which takes a filename and
-	returns a newly allocated string containing the contents of that
-	file.
-
-2000-05-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-util.h: #include <glib.h> and <gtk/gtktypeutils.h>.
-
-	* e-util.c (e_free_object_list): New utility function.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* e-canvas.c (e_canvas_focus_in): 
-	(e_canvas_focus_out): set and reset the GTK_HAS_FOCUS flag. We now get
-	focus_out events correctly.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* e-sexp.c (e_sexp_finalise): Free the parse tree if we have one.
-	(e_sexp_parse): If we already have a parse tree, free it.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Constified all the functions.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* e-html-utils.c (e_text_to_html): Moved here from the mailer,
-	since it's of general use, and the composer needs it too.
-
-2000-04-24  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-popup-menu.c: New file.  Implements easy to use popup menus. 
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* e-paned.c: New file. Makes a GtkPaned with more than two
-	children.
-	* e-paned.h: same.
-
-	* Makefile.am: added e-paned.[ch].
-
-2000-04-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c, e-xml-utils.h: Added
-	e_xml_get_child_by_name_by_lang.
-
-2000-04-16  Anders Carlsson  <andersca@gnu.org>
-
-      * e-canvas.c (e_canvas_class_init): Add realize.
-      (e_canvas_realize): Set the back pixmap to NULL to reduce flicker.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Fixing a warning.
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-xml-utils.c: Add g_return_if_fails.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-canvas.c: Added proper keyboard focus handling.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory
-	via gnome-config.
-	(mkdir_if_necessary): New function.
-	(e_setup_base_dir): Use mkdir_if_necessary().
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to
-	speed up reflow and to make it fail less often.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for
-	doing hierarchical displays in the canvas.  Adds an extra idle
-	loop to the canvas system.
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c: Fixed e_xml_set_integer_prop_by_name.
-
-2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_set_integer_prop_by_name.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-	
-	* e-util/e-sexp.[ch]: Added.  moved from filter-sexp.[ch]
-
-	* e-util/Makefile.am (libeutil_a_SOURCES): Add e-sexp.
-	(noinst_LTLIBRARIES): Changed to a libtool library.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added
-	e_xml_get_integer_prop_by_name.
-
-	* e-util/Makefile.am: Added e-util.c.
-
-	* e-util/e-util.h: Added e-util.c functions.
-
-	* e-util/e-util.c: New file for compare functions
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/e-canvas-utils.h: Fixed the comment at the top and added
-	#ifndef __E_CANVAS_UTILS__.
-
-	* e-util/Makefile.am: Added e-xml-utils.c and
-	e-xml-utils.h.
-
-	* e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some
-	xml utilities.
-
-	* e-util/e-util.h: Added type EFocus which describes which
-	direction the focus will be coming from.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* e-util/e-setup.c (e_setup_base_dir): Make ~/evolution mode 700
-	rather than mode 600 (and use the symbolic name rather than the
-	number).
-	
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-	
-	* e-util/Makefile.am: Add canvas utilities to libeutil.
-
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
deleted file mode 100644
index a2c25b0501..0000000000
--- a/e-util/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-SUBDIRS = . ename
-
-imagesdir = $(datadir)/images/evolution
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(UNICODE_CFLAGS)			\
-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\
-	-DG_LOG_DOMAIN=\"e-utils\"		\
-	$(UNICODE_CFLAGS)
-
-noinst_LTLIBRARIES = libeutil.la libeutil-static.la \
-	libeconduit.la libeconduit-static.la
-
-libeutil_la_SOURCES =			\
-	e-dialog-widgets.c		\
-	e-dialog-widgets.h		\
-	e-gtk-utils.c			\
-	e-gtk-utils.h			\
-	e-gui-utils.c			\
-	e-gui-utils.h			\
-	e-html-utils.c			\
-	e-html-utils.h			\
-	e-iterator.c			\
-	e-iterator.h			\
-	e-list-iterator.c		\
-	e-list-iterator.h		\
-	e-list.c			\
-	e-list.h			\
-	e-sexp.c			\
-	e-sexp.h			\
-	md5-utils.c			\
-	md5-utils.h
-
-libeutil_la_LIBADD = $(UNICODE_LIBS)
-
-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
-libeutil_static_la_LDFLAGS = --all-static
-
-libeconduit_la_SOURCES =		\
-	e-pilot-map.c			\
-	e-pilot-map.h
-
-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)
-libeconduit_static_la_LDFLAGS = --all-static
-
-
-
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
deleted file mode 100644
index 2a564cbc19..0000000000
--- a/e-util/e-dialog-widgets.c
+++ /dev/null
@@ -1,826 +0,0 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@gimp.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <libgnomeui/gnome-dateedit.h>
-#include "e-dialog-widgets.h"
-#include <gal/widgets/e-unicode.h>
-
-
-
-/* A widget, a pointer to the variable it will modify, and extra information */
-typedef struct {
-	GtkWidget *widget;
-	gpointer value_var;
-	gpointer info;
-} WidgetHook;
-
-/* Hook information for a complete dialog */
-typedef struct {
-	GSList *whooks;
-} DialogHooks;
-
-
-
-/* Destroy handler for the dialog; frees the dialog hooks */
-static void
-dialog_destroy_cb (GtkObject *dialog, gpointer data)
-{
-	DialogHooks *hooks;
-
-	hooks = data;
-
-	g_slist_free (hooks->whooks);
-	hooks->whooks = NULL;
-
-	g_free (hooks);
-	gtk_object_set_data (dialog, "dialog-hooks", NULL);
-}
-
-/* Ensures that the dialog has the necessary attached data to store the widget
- * hook information.
- */
-static DialogHooks *
-get_dialog_hooks (GtkWidget *dialog)
-{
-	DialogHooks *hooks;
-
-	hooks = gtk_object_get_data (GTK_OBJECT (dialog), "dialog-hooks");
-	if (!hooks) {
-		hooks = g_new0 (DialogHooks, 1);
-		gtk_object_set_data (GTK_OBJECT (dialog), "dialog-hooks", hooks);
-		gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-				    GTK_SIGNAL_FUNC (dialog_destroy_cb), hooks);
-	}
-
-	return hooks;
-}
-
-/* Converts an mapped value to the appropriate index in an item group.  The
- * values for the items are provided as a -1-terminated array.
- */
-static int
-value_to_index (const int *value_map, int value)
-{
-	int i;
-
-	for (i = 0; value_map[i] != -1; i++)
-		if (value_map[i] == value)
-			return i;
-
-	return -1;
-}
-
-/* Converts an index in an item group to the appropriate mapped value.  See the
- * function above.
- */
-static int
-index_to_value (const int *value_map, int index)
-{
-	int i;
-
-	/* We do this the hard way, i.e. not as a simple array reference, to
-	 * check for correctness.
-	 */
-
-	for (i = 0; value_map[i] != -1; i++)
-		if (i == index)
-			return value_map[i];
-
-	return -1;
-}
-
-/* Callback for the "toggled" signal of toggle buttons */
-static void
-toggled_cb (GtkToggleButton *toggle, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-
-	/* For radio buttons, we only notify the property box if the button is
-	 * active, because we'll get one call for each of the changed buttons in
-	 * the radio group.
-	 */
-	if (!GTK_IS_RADIO_BUTTON (toggle) || toggle->active)
-		gnome_property_box_changed (pbox);
-}
-
-/* Hooks a radio button group */
-static void
-hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpointer info)
-{
-	GSList *group;
-	GSList *l;
-	int *value;
-	const int *value_map;
-
-	group = gtk_radio_button_group (radio);
-
-	/* Set the value */
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		for (l = group; l; l = l->next)
-			gtk_signal_connect (GTK_OBJECT (l->data), "toggled",
-					    GTK_SIGNAL_FUNC (toggled_cb), dialog);
-}
-
-/* Gets the value of a radio button group */
-static void
-get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	*value = e_dialog_radio_get (GTK_WIDGET (radio), value_map);
-}
-
-/* Callback for the "activate" signal of menu items */
-static void
-activate_cb (GtkMenuItem *item, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks an option menu */
-static void
-hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	/* Set the value */
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog)) {
-		GtkMenu *menu;
-		GList *l;
-
-		menu = GTK_MENU (gtk_option_menu_get_menu (omenu));
-
-		for (l = GTK_MENU_SHELL (menu)->children; l; l = l->next)
-			gtk_signal_connect (GTK_OBJECT (l->data), "activate",
-					    GTK_SIGNAL_FUNC (activate_cb), dialog);
-	}
-}
-
-/* Gets the value of an option menu */
-static void
-get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info)
-{
-	int *value;
-	const int *value_map;
-
-	value = (int *) value_var;
-	value_map = (const int *) info;
-
-	*value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map);
-}
-
-/* Hooks a toggle button */
-static void
-hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info)
-{
-	gboolean *value;
-
-	/* Set the value */
-
-	value = (gboolean *) value_var;
-	e_dialog_toggle_set (GTK_WIDGET (toggle), *value);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
-				    GTK_SIGNAL_FUNC (toggled_cb), dialog);
-}
-
-/* Gets the value of a toggle button */
-static void
-get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info)
-{
-	gboolean *value;
-
-	value = (gboolean *) value_var;
-	*value = e_dialog_toggle_get (GTK_WIDGET (toggle));
-}
-
-/* Callback for the "value_changed" signal of the adjustment of a spin button */
-static void
-value_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks a spin button */
-static void
-hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gpointer info)
-{
-	double *value;
-	GtkAdjustment *adj;
-
-	/* Set the value */
-
-	value = (double *) value_var;
-	e_dialog_spin_set (GTK_WIDGET (spin), *value);
-
-	/* Hook to changed */
-
-	adj = gtk_spin_button_get_adjustment (spin);
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-				    GTK_SIGNAL_FUNC (value_changed_cb), dialog);
-}
-
-/* Gets the value of a spin button */
-static void
-get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info)
-{
-	double *value;
-
-	value = (double *) value_var;
-	*value = e_dialog_spin_get_double (GTK_WIDGET (spin));
-}
-
-/* Callback for the "changed" signal of a GtkEditable widget */
-static void
-changed_cb (GtkEditable *editable, gpointer data)
-{
-	GnomePropertyBox *pbox;
-
-	pbox = GNOME_PROPERTY_BOX (data);
-	gnome_property_box_changed (pbox);
-}
-
-/* Hooks a GtkEditable widget */
-static void
-hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info)
-{
-	char **value;
-
-	/* Set the value */
-
-	value = (char **) value_var;
-
-	e_dialog_editable_set (GTK_WIDGET (editable), *value);
-
-	/* Hook to changed */
-
-	if (GNOME_IS_PROPERTY_BOX (dialog))
-		gtk_signal_connect (GTK_OBJECT (editable), "changed",
-				    GTK_SIGNAL_FUNC (changed_cb), dialog);
-}
-
-/* Gets the value of a GtkEditable widget */
-static void
-get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)
-{
-	char **value;
-
-	value = (char **) value_var;
-	if (*value)
-		g_free (*value);
-
-	*value = e_dialog_editable_get (GTK_WIDGET (editable));
-}
-
-/**
- * e_dialog_editable_set:
- * @widget: A #GtkEditable widget.
- * @value: String value.
- * 
- * Sets the string value inside a #GtkEditable-derived widget.
- **/
-void
-e_dialog_editable_set (GtkWidget *widget, const char *value)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_EDITABLE (widget));
-
-	gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1);
-
-	if (value) {
-		gint pos;
-
-		pos = 0;
-		e_utf8_gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &pos);
-	}
-}
-
-/**
- * e_dialog_editable_get:
- * @widget: A #GtkEditable widget.
- * 
- * Queries the string value inside a #GtkEditable-derived widget.
- * 
- * Return value: String value.
- **/
-char *
-e_dialog_editable_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL);
-
-	return e_utf8_gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
-}
-
-/**
- * e_dialog_radio_set:
- * @widget: A #GtkRadioButton in a radio button group.
- * @value: Enumerated value.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Sets the selected item in a radio group.  The specified @widget can be any of
- * the #GtkRadioButtons in the group.  Each radio button should correspond to an
- * enumeration value; the specified @value will be mapped to an integer from
- * zero to the number of items in the group minus 1 by using a mapping table
- * specified in @value_map.  The last element in this table should be -1.  Thus
- * a table to map three possible interpolation values to integers could be
- * specified as { NEAREST_NEIGHBOR, BILINEAR, HYPERBOLIC, -1 }.
- **/
-void
-e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)
-{
-	GSList *group;
-	int i;
-	GSList *l;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_RADIO_BUTTON (widget));
-	g_return_if_fail (value_map != NULL);
-
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));
-
-	i = value_to_index (value_map, value);
-	if (i != -1) {
-		/* Groups are built by prepending items, so the list ends up in reverse
-		 * order; we need to flip the index around.
-		 */
-		i = g_slist_length (group) - i - 1;
-
-		l = g_slist_nth (group, i);
-		if (!l)
-			g_message ("e_dialog_radio_set(): could not find index %d in radio group!",
-				   i);
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l->data), TRUE);
-	} else
-		g_message ("e_dialog_radio_set(): could not find value %d in value map!",
-			   value);
-}
-
-/**
- * e_dialog_radio_get:
- * @widget: A #GtkRadioButton in a radio button group.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Queries the selected item in a #GtkRadioButton group.  Please read the
- * description of e_dialog_radio_set() to see how @value_map maps enumeration
- * values to button indices.
- * 
- * Return value: Enumeration value which corresponds to the selected item in the
- * radio group.
- **/
-int
-e_dialog_radio_get (GtkWidget *widget, const int *value_map)
-{
-	GSList *group;
-	GSList *l;
-	int i;
-	int v;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1);
-	g_return_val_if_fail (value_map != NULL, -1);
-
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));
-
-	for (i = 0, l = group; l; l = l->next, i++) {
-		widget = GTK_WIDGET (l->data);
-
-		if (GTK_TOGGLE_BUTTON (widget)->active)
-			break;
-	}
-
-	if (!l)
-		g_assert_not_reached ();
-
-	/* Groups are built by prepending items, so the list ends up in reverse
-	 * order; we need to flip the index around.
-	 */
-	i = g_slist_length (group) - i - 1;
-
-	v = index_to_value (value_map, i);
-	if (v == -1) {
-		g_message ("e_dialog_radio_get(): could not find index %d in value map!", i);
-		return -1;
-	}
-
-	return v;
-}
-
-/**
- * e_dialog_toggle_set:
- * @widget: A #GtkToggleButton.
- * @value: Toggle value.
- * 
- * Sets the value of a #GtkToggleButton-derived widget.  This should not be used
- * for radio buttons; it is more convenient to use use e_dialog_radio_set()
- * instead.
- **/
-void
-e_dialog_toggle_set (GtkWidget *widget, gboolean value)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-}
-
-/**
- * e_dialog_toggle_get:
- * @widget: A #GtkToggleButton.
- * 
- * Queries the value of a #GtkToggleButton-derived widget.  This should not be
- * used for radio buttons; it is more convenient to use e_dialog_radio_get()
- * instead.
- * 
- * Return value: Toggle value.
- **/
-gboolean
-e_dialog_toggle_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE);
-
-	return GTK_TOGGLE_BUTTON (widget)->active;
-}
-
-/**
- * e_dialog_spin_set:
- * @widget: A #GtkSpinButton.
- * @value: Numeric value.
- * 
- * Sets the value of a #GtkSpinButton widget.
- **/
-void
-e_dialog_spin_set (GtkWidget *widget, double value)
-{
-	GtkAdjustment *adj;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-
-	adj->value = value;
-	gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
-}
-
-/**
- * e_dialog_spin_get_double:
- * @widget: A #GtkSpinButton.
- * 
- * Queries the floating-point value of a #GtkSpinButton widget.
- * 
- * Return value: Numeric value.
- **/
-double
-e_dialog_spin_get_double (GtkWidget *widget)
-{
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (widget != NULL, 0.0);
-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0);
-
-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-	return adj->value;
-}
-
-/**
- * e_dialog_spin_get_int:
- * @widget: A #GtkSpinButton.
- * 
- * Queries the integer value of a #GtkSpinButton widget.
- * 
- * Return value: Numeric value.
- **/
-int
-e_dialog_spin_get_int (GtkWidget *widget)
-{
-	double value;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);
-
-	value = e_dialog_spin_get_double (widget);
-	return (int) floor (value);
-}
-
-/**
- * e_dialog_option_menu_set:
- * @widget: A #GtkOptionMenu.
- * @value: Enumerated value.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Sets the selected item in a #GtkOptionMenu.  Please read the description of
- * e_dialog_radio_set() to see how @value_map maps enumeration values to item
- * indices.
- **/
-void
-e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)
-{
-	int i;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_OPTION_MENU (widget));
-	g_return_if_fail (value_map != NULL);
-
-	i = value_to_index (value_map, value);
-
-	if (i != -1)
-		gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i);
-	else
-		g_message ("e_dialog_option_menu_set(): could not find value %d in value map!",
-			   value);
-}
-
-/**
- * e_dialog_option_menu_get:
- * @widget: A #GtkOptionMenu.
- * @value_map: Map from enumeration values to array indices.
- * 
- * Queries the selected item in a #GtkOptionMenu.  Please read the description
- * of e_dialog_radio_set() to see how @value_map maps enumeration values to item
- * indices.
- * 
- * Return value: Enumeration value which corresponds to the selected item in the
- * option menu.
- **/
-int
-e_dialog_option_menu_get (GtkWidget *widget, const int *value_map)
-{
-	GtkMenu *menu;
-	GtkWidget *active;
-	GList *children;
-	GList *l;
-	int i;
-	int v;
-
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1);
-	g_return_val_if_fail (value_map != NULL, -1);
-
-	menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)));
-
-	active = gtk_menu_get_active (menu);
-	g_assert (active != NULL);
-
-	children = GTK_MENU_SHELL (menu)->children;
-
-	for (i = 0, l = children; l; l = l->next, i++) {
-		if (GTK_WIDGET (l->data) == active)
-			break;
-	}
-
-	if (!l)
-		g_assert_not_reached ();
-
-	v = index_to_value (value_map, i);
-	if (v == -1) {
-		g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i);
-		return -1;
-	}
-
-	return v;
-}
-
-/**
- * e_dialog_dateedit_set:
- * @widget: A #GnomeDateEdit widget.
- * @t: Date/time value.
- * 
- * Sets the value of a #GnomeDateEdit widget.
- **/
-void
-e_dialog_dateedit_set (GtkWidget *widget, time_t t)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));
-
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);
-}
-
-/**
- * e_dialog_dateedit_get:
- * @widget: A #GnomeDateEdit widget.
- * 
- * Queries the value of a #GnomeDateEdit widget.
- * 
- * Return value: Date/time value.
- **/
-time_t
-e_dialog_dateedit_get (GtkWidget *widget)
-{
-	g_return_val_if_fail (widget != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);
-
-	return gnome_date_edit_get_date (GNOME_DATE_EDIT (widget));
-}
-
-/**
- * e_dialog_widget_hook_value:
- * @dialog: Dialog box in which the @widget lives in.
- * @widget: A widget that will control a variable.
- * @value_var: Pointer to the variable that the @widget will control.
- * @info: NULL for most widgets, or an integer value map array (see
- * e_dialog_radio_set() for details).
- * 
- * Hooks a widget from a dialog box to the variable it will modify.  Supported
- * widgets are:  #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see
- * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean),
- * #GtkSpinButton (double), #GtkOptionMenu (int/value_map pair), and
- * #GnomeDateEdit (time_t).
- *
- * A pointer to the appropriate variable to modify should be passed in @value_var.
- * For values that take a value_map array as well, it should be passed in @info.
- *
- * The widgets within a dialog that are hooked with this function will set their
- * respective variables only when e_dialog_get_values() is called.  The typical
- * use is to call that function in the handler for the "OK" button of a dialog
- * box.
- *
- * In addition, if the specified @dialog is a #GnomePropertyBox, the widgets wil
- * automatically turn on the "Apply" button of the property box when they are
- * modified by the user.
- * 
- * Return value: TRUE if the type of the specified @widget is supported, FALSE
- * otherwise.
- **/
-gboolean
-e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
-			    gpointer value_var, gpointer info)
-{
-	DialogHooks *hooks;
-	WidgetHook *wh;
-
-	g_return_val_if_fail (dialog != NULL, FALSE);
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (value_var != NULL, FALSE);
-
-	hooks = get_dialog_hooks (dialog);
-
-	/* First check if it is a "group" widget, like a radio button or an
-	 * option menu.  Then we check for normal ungrouped widgets.
-	 */
-
-	if (GTK_IS_RADIO_BUTTON (widget))
-		hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info);
-	else if (GTK_IS_OPTION_MENU (widget))
-		hook_option_menu (dialog, GTK_OPTION_MENU (widget), value_var, info);
-	else if (GTK_IS_TOGGLE_BUTTON (widget))
-		hook_toggle (dialog, GTK_TOGGLE_BUTTON (widget), value_var, info);
-	else if (GTK_IS_SPIN_BUTTON (widget))
-		hook_spin_button (dialog, GTK_SPIN_BUTTON (widget), value_var, info);
-	else if (GTK_IS_EDITABLE (widget))
-		hook_editable (dialog, GTK_EDITABLE (widget), value_var, info);
-	else
-		return FALSE;
-
-	wh = g_new (WidgetHook, 1);
-	wh->widget = widget;
-	wh->value_var = value_var;
-	wh->info = info;
-
-	hooks->whooks = g_slist_prepend (hooks->whooks, wh);
-
-	return TRUE;
-}
-
-/**
- * e_dialog_get_values:
- * @dialog: A dialog box whose widgets have been hooked to the appropriate
- * variables with e_dialog_widget_hook_value().
- * 
- * Makes every widget in a @dialog that was hooked with
- * e_dialog_widget_hook_value() apply its value to its corresponding variable.
- * The typical usage is to call this function in the handler for the "OK" button
- * of a dialog box.
- **/
-void
-e_dialog_get_values (GtkWidget *dialog)
-{
-	DialogHooks *hooks;
-	GSList *l;
-
-	g_return_if_fail (dialog != NULL);
-
-	hooks = get_dialog_hooks (dialog);
-
-	for (l = hooks->whooks; l; l = l->next) {
-		WidgetHook *wh;
-
-		wh = l->data;
-
-		if (GTK_IS_RADIO_BUTTON (wh->widget))
-			get_radio_value (GTK_RADIO_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_OPTION_MENU (wh->widget))
-			get_option_menu_value (GTK_OPTION_MENU (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_TOGGLE_BUTTON (wh->widget))
-			get_toggle_value (GTK_TOGGLE_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_SPIN_BUTTON (wh->widget))
-			get_spin_button_value (GTK_SPIN_BUTTON (wh->widget), wh->value_var, wh->info);
-		else if (GTK_IS_EDITABLE (wh->widget))
-			get_editable_value (GTK_EDITABLE (wh->widget), wh->value_var, wh->info);
-		else
-			g_assert_not_reached ();
-	}
-}
-
-/**
- * e_dialog_xml_widget_hook_value:
- * @xml: Glade XML description of a dialog box.
- * @dialog: Dialog box in which the widget lives in.
- * @widget_name: Name of the widget in the Glade XML data.
- * @value_var: Pointer to the variable that the widget will control.
- * @info: NULL for most widgets, or an integer value map array (see
- * e_dialog_radio_set() for details).
- * 
- * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML
- * data structure.
- * 
- * Return value: TRUE if the type of the specified widget is supported, FALSE
- * otherwise.
- **/
-gboolean
-e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,
-				gpointer value_var, gpointer info)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (xml != NULL, FALSE);
-	g_return_val_if_fail (GLADE_IS_XML (xml), FALSE);
-	g_return_val_if_fail (dialog != NULL, FALSE);
-	g_return_val_if_fail (widget_name != NULL, FALSE);
-	g_return_val_if_fail (value_var != NULL, FALSE);
-
-	widget = glade_xml_get_widget (xml, widget_name);
-	if (!widget) {
-		g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in "
-			   "Glade data!", widget_name);
-		return FALSE;
-	}
-
-	return e_dialog_widget_hook_value (dialog, widget, value_var, info);
-}
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
deleted file mode 100644
index 7ace238d1f..0000000000
--- a/e-util/e-dialog-widgets.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Evolution internal utilities - Glade dialog widget utilities
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@gimp.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_DIALOG_WIDGETS_H
-#define E_DIALOG_WIDGETS_H
-
-#include <time.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-propertybox.h>
-
-
-
-void e_dialog_editable_set (GtkWidget *widget, const char *value);
-char *e_dialog_editable_get (GtkWidget *widget);
-
-void e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map);
-int e_dialog_radio_get (GtkWidget *widget, const int *value_map);
-
-void e_dialog_toggle_set (GtkWidget *widget, gboolean value);
-gboolean e_dialog_toggle_get (GtkWidget *widget);
-
-void e_dialog_spin_set (GtkWidget *widget, double value);
-double e_dialog_spin_get_double (GtkWidget *widget);
-int e_dialog_spin_get_int (GtkWidget *widget);
-
-void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map);
-int e_dialog_option_menu_get (GtkWidget *widget, const int *value_map);
-
-void e_dialog_dateedit_set (GtkWidget *widget, time_t t);
-time_t e_dialog_dateedit_get (GtkWidget *widget);
-
-gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
-				     gpointer value_var, gpointer info);
-
-void e_dialog_get_values (GtkWidget *dialog);
-
-gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,
-					 gpointer value_var, gpointer info);
-
-
-
-#endif
diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c
deleted file mode 100644
index 3cca1d0789..0000000000
--- a/e-util/e-gtk-utils.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-gtk-utils.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-gtk-utils.h"
-
-
-/* (Cut and pasted from Gtk.)  */
-
-typedef struct DisconnectInfo {
-	unsigned int signal_handler;
-
-	GtkObject *object1;
-	unsigned int disconnect_handler1;
-
-	GtkObject *object2;
-	unsigned int disconnect_handler2;
-} DisconnectInfo;
-
-static unsigned int
-alive_disconnecter (GtkObject *object,
-		    DisconnectInfo *info)
-{
-	g_assert (info != NULL);
-
-	gtk_signal_disconnect (info->object1, info->disconnect_handler1);
-	gtk_signal_disconnect (info->object1, info->signal_handler);
-	gtk_signal_disconnect (info->object2, info->disconnect_handler2);
-	
-	g_free (info);
-	
-	return 0;
-}
-
-/**
- * e_gtk_signal_connect_full_while_alive:
- * @object: 
- * @name: 
- * @func: 
- * @marshal: 
- * @data: 
- * @destroy_func: 
- * @object_signal: 
- * @after: 
- * @alive_object: 
- * 
- * Connect a signal like `gtk_signal_connect_while_alive()', but with full
- * params like `gtk_signal_connect_full()'.
- **/
-void
-e_gtk_signal_connect_full_while_alive (GtkObject *object,
-				       const char *name,
-				       GtkSignalFunc func,
-				       GtkCallbackMarshal marshal,
-				       void *data,
-				       GtkDestroyNotify destroy_func,
-				       gboolean object_signal,
-				       gboolean after,
-				       GtkObject *alive_object)
-{
-	DisconnectInfo *info;
-	
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (func != NULL);
-	g_return_if_fail (GTK_IS_OBJECT (alive_object));
-	
-	info = g_new (DisconnectInfo, 1);
-
-	info->signal_handler = gtk_signal_connect_full (object, name,
-							func, marshal, data,
-							destroy_func,
-							object_signal, after);
-
-	info->object1 = object;
-	info->disconnect_handler1 = gtk_signal_connect (object, "destroy",
-							GTK_SIGNAL_FUNC (alive_disconnecter), info);
-
-	info->object2 = alive_object;
-	info->disconnect_handler2 = gtk_signal_connect (alive_object, "destroy",
-							GTK_SIGNAL_FUNC (alive_disconnecter), info);
-}
diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h
deleted file mode 100644
index 0dc6b68512..0000000000
--- a/e-util/e-gtk-utils.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-gtk-utils.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef E_GTK_UTILS_H
-#define E_GTK_UTILS_H
-
-#include <gtk/gtk.h>
-
-void  e_gtk_signal_connect_full_while_alive  (GtkObject          *object,
-					      const char         *name,
-					      GtkSignalFunc       func,
-					      GtkCallbackMarshal  marshal,
-					      void               *data,
-					      GtkDestroyNotify    destroy_func,
-					      gboolean            object_signal,
-					      gboolean            after,
-					      GtkObject          *alive_object);
-
-#endif
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
deleted file mode 100644
index 3ce7110fff..0000000000
--- a/e-util/e-gui-utils.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GUI utility functions
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 1999 Miguel de Icaza
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gnome.h>
-#include "e-gui-utils.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-GtkWidget *e_create_image_widget(gchar *name,
-				 gchar *string1, gchar *string2,
-				 gint int1, gint int2)
-{
-	char *filename;
-	GdkPixbuf *pixbuf;
-	double width, height;
-	GtkWidget *canvas, *alignment;
-	if (string1) {
-		if (*string1 == '/')
-			filename = g_strdup(string1);
-		else
-			filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1);
-		pixbuf = gdk_pixbuf_new_from_file(filename);
-		width = gdk_pixbuf_get_width(pixbuf);
-		height = gdk_pixbuf_get_height(pixbuf);
-
-		canvas = gnome_canvas_new_aa();
-		GTK_OBJECT_UNSET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS);
-		gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(canvas)),
-				      gnome_canvas_pixbuf_get_type(),
-				      "pixbuf", pixbuf,
-				      NULL);
-
-		alignment = gtk_widget_new(gtk_alignment_get_type(),
-					   "child", canvas,
-					   "xalign", (double) 0,
-					   "yalign", (double) 0,
-					   "xscale", (double) 0,
-					   "yscale", (double) 0,
-					   NULL);
-	
-		gtk_widget_set_usize(canvas, width, height);
-
-		gdk_pixbuf_unref(pixbuf);
-
-		gtk_widget_show(canvas);
-		gtk_widget_show(alignment);
-		g_free(filename);
-
-		return alignment;
-	} else
-		return NULL;
-}
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
deleted file mode 100644
index 9cbb64fbf6..0000000000
--- a/e-util/e-gui-utils.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef E_GUI_UTILS_H
-#define E_GUI_UTILS_H
-
-#include <gtk/gtkwidget.h>
-
-GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
-
-#endif /* E_GUI_UTILS_H */
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
deleted file mode 100644
index 7395f6144b..0000000000
--- a/e-util/e-html-utils.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Dan Winship <danw@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-html-utils.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-#include <unicode.h>
-
-static char *
-check_size (char **buffer, int *buffer_size, char *out, int len)
-{
-	if (out + len > *buffer + *buffer_size) {
-		int index = out - *buffer;
-
-		*buffer_size *= 2;
-		*buffer = g_realloc (*buffer, *buffer_size);
-		out = *buffer + index;
-	}
-	return out;
-}
-
-static char *
-url_extract (const unsigned char **text, gboolean check)
-{
-	const unsigned char *end = *text, *p;
-	char *out;
-
-	while (*end && !isspace (*end) && (*end != '"') && (*end < 0x80))
-		end++;
-
-	/* Back up if we probably went too far. */
-	while (end > *text && strchr (",.!?;:>)", *(end - 1)))
-		end--;
-
-	if (check) {
-		/* Make sure we weren't fooled. */
-		p = memchr (*text, ':', end - *text);
-		if (!p || end - p < 3)
-			return NULL;
-	}
-
-	out = g_strndup (*text, end - *text);
-	*text = end;
-	return out;
-}
-
-/**
- * e_text_to_html:
- * @input: a NUL-terminated input buffer
- * @flags: some combination of the E_TEXT_TO_HTML_* flags defined
- * in e-html-utils.h
- *
- * This takes a buffer of text as input and produces a buffer of
- * "equivalent" HTML, subject to certain transformation rules.
- *
- * The set of possible flags is:
- *
- *   - E_TEXT_TO_HTML_PRE: wrap the output HTML in <PRE> and </PRE>.
- *     Should only be used if @input is the entire buffer to be
- *     converted. If e_text_to_html is being called with small pieces
- *     of data, you should wrap the entire result in <PRE> yourself.
- *
- *   - E_TEXT_TO_HTML_CONVERT_NL: convert "\n" to "<BR>\n" on output.
- *     (should not be used with E_TEXT_TO_HTML_PRE, since that would
- *     result in double-newlines).
- *
- *   - E_TEXT_TO_HTML_CONVERT_SPACES: convert a block of N spaces
- *     into N-1 non-breaking spaces and one normal space. A space
- *     at the start of the buffer is always converted to a
- *     non-breaking space, regardless of the following character,
- *     which probably means you don't want to use this flag on
- *     pieces of data that aren't delimited by at least line breaks.
- *
- *     If E_TEXT_TO_HTML_CONVERT_NL and E_TEXT_TO_HTML_CONVERT_SPACES
- *     are both defined, then TABs will also be converted to spaces.
- *
- *   - E_TEXT_TO_HTML_CONVERT_URLS: wrap <a href="..."> </a> around
- *     strings that look like URLs.
- **/
-char *
-e_text_to_html (const char *input, unsigned int flags)
-{
-	const unsigned char *cur = input;
-	char *buffer = NULL;
-	char *out = NULL;
-	int buffer_size = 0, col;
-
-	/* Allocate a translation buffer.  */
-	buffer_size = strlen (input) * 2 + 5;
-	buffer = g_malloc (buffer_size);
-
-	out = buffer;
-	if (flags & E_TEXT_TO_HTML_PRE)
-		out += sprintf (out, "<PRE>\n");
-
-	col = 0;
-
-	for (cur = input; cur && *cur; cur = unicode_next_utf8 (cur)) {
-		unicode_char_t u;
-
-		unicode_get_utf8 (cur, &u);
-		if (unicode_isalpha (u) &&
-		    (flags & E_TEXT_TO_HTML_CONVERT_URLS)) {
-			char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;
-
-			if (!strncasecmp (cur, "http://", 7) ||
-			    !strncasecmp (cur, "https://", 8) ||
-			    !strncasecmp (cur, "ftp://", 6) ||
-			    !strncasecmp (cur, "nntp://", 7) ||
-			    !strncasecmp (cur, "mailto:", 7) ||
-			    !strncasecmp (cur, "news:", 5)) {
-				tmpurl = url_extract (&cur, TRUE);
-				if (tmpurl) {
-					refurl = e_text_to_html (tmpurl, 0);
-					dispurl = g_strdup (refurl);
-				}
-			} else if (!strncasecmp (cur, "www.", 4) &&
-				   (*(cur + 4) < 0x80) &&
-				   unicode_isalnum (*(cur + 4))) {
-				tmpurl = url_extract (&cur, FALSE);
-				dispurl = e_text_to_html (tmpurl, 0);
-				refurl = g_strdup_printf ("http://%s",
-							  dispurl);
-			}
-
-			if (tmpurl) {
-				out = check_size (&buffer, &buffer_size, out,
-						  strlen (refurl) +
-						  strlen (dispurl) + 15);
-				out += sprintf (out,
-						"<a href=\"%s\">%s</a>",
-						refurl, dispurl);
-				col += strlen (tmpurl);
-				g_free (tmpurl);
-				g_free (refurl);
-				g_free (dispurl);
-			}
-
-			if (!*cur)
-				break;
-			unicode_get_utf8 (cur, &u);
-		}
-		if (u == (unicode_char_t)-1) {
-			/* Sigh. Someone sent undeclared 8-bit data.
-			 * Assume it's iso-8859-1.
-			 */
-			u = *cur;
-		}
-
-		out = check_size (&buffer, &buffer_size, out, 10);
-
-		switch (u) {
-		case '<':
-			strcpy (out, "&lt;");
-			out += 4;
-			col++;
-			break;
-
-		case '>':
-			strcpy (out, "&gt;");
-			out += 4;
-			col++;
-			break;
-
-		case '&':
-			strcpy (out, "&amp;");
-			out += 5;
-			col++;
-			break;
-
-		case '"':
-			strcpy (out, "&quot;");
-			out += 6;
-			col++;
-			break;
-
-		case '\n':
-			if (flags & E_TEXT_TO_HTML_CONVERT_NL) {
-				strcpy (out, "<br>");
-				out += 4;
-			}
-			*out++ = *cur;
-			col = 0;
-			break;
-
-		case '\t':
-			if (flags & (E_TEXT_TO_HTML_CONVERT_SPACES |
-				     E_TEXT_TO_HTML_CONVERT_NL)) {
-				do {
-					out = check_size (&buffer, &buffer_size,
-						    out, 6);
-					strcpy (out, "&nbsp;");
-					out += 6;
-					col++;
-				} while (col % 8);
-				break;
-			}
-			/* otherwise, FALL THROUGH */
-
-		case ' ':
-			if (flags & E_TEXT_TO_HTML_CONVERT_SPACES) {
-				if (cur == (const unsigned char *)input ||
-				    *(cur + 1) == ' ' || *(cur + 1) == '\t') {
-					strcpy (out, "&nbsp;");
-					out += 6;
-					col++;
-					break;
-				}
-			}
-			/* otherwise, FALL THROUGH */
-
-		default:
-			if ((u >= 0x20 && u < 0x80) ||
-			    (u == '\r' || u == '\t')) {
-				/* Default case, just copy. */
-				*out++ = u;
-			} else {
-				out += g_snprintf(out, 9, "&#%d;", u);
-			}
-			col++;
-			break;
-		}
-	}
-
-	out = check_size (&buffer, &buffer_size, out, 7);
-	if (flags & E_TEXT_TO_HTML_PRE)
-		strcpy (out, "</PRE>");
-	else
-		*out = '\0';
-
-	return buffer;
-}
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
deleted file mode 100644
index a56889f4d9..0000000000
--- a/e-util/e-html-utils.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-html-utils.c */
-/* 
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Dan Winship <danw@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_HTML_UTILS__
-#define __E_HTML_UTILS__
-
-#define E_TEXT_TO_HTML_PRE            (1 << 0)
-#define E_TEXT_TO_HTML_CONVERT_NL     (1 << 1)
-#define E_TEXT_TO_HTML_CONVERT_SPACES (1 << 2)
-#define E_TEXT_TO_HTML_CONVERT_URLS   (1 << 3)
-
-char *e_text_to_html (const char *input, unsigned int flags);
-
-#endif /* __E_HTML_UTILS__ */
diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c
deleted file mode 100644
index 874d05ccea..0000000000
--- a/e-util/e-iterator.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-iterator.h"
-
-#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
-
-static void e_iterator_init (EIterator *card);
-static void e_iterator_class_init (EIteratorClass *klass);
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-enum {
-	INVALIDATE,
-	LAST_SIGNAL
-};
-
-static guint e_iterator_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * e_iterator_get_type:
- * @void: 
- * 
- * Registers the &EIterator class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EIterator class.
- **/
-GtkType
-e_iterator_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EIterator",
-			sizeof (EIterator),
-			sizeof (EIteratorClass),
-			(GtkClassInitFunc) e_iterator_class_init,
-			(GtkObjectInitFunc) e_iterator_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_iterator_class_init (EIteratorClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_iterator_signals [INVALIDATE] =
-		gtk_signal_new ("invalidate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EIteratorClass, invalidate),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_iterator_signals, LAST_SIGNAL);
-
-	klass->invalidate = NULL;
-	klass->get        = NULL;
-	klass->reset      = NULL;
-	klass->last       = NULL;
-	klass->next       = NULL;
-	klass->prev       = NULL;
-	klass->delete     = NULL;
-	klass->insert     = NULL;
-	klass->set        = NULL;
-	klass->is_valid   = NULL;
-}
-
-/**
- * e_iterator_init:
- */
-static void
-e_iterator_init (EIterator *card)
-{
-}
-
-/*
- * Virtual functions: 
- */
-const void *
-e_iterator_get      (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->get)
-		return ECI_CLASS(iterator)->get(iterator);
-	else
-		return NULL;
-}
-
-void
-e_iterator_reset    (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->reset)
-		ECI_CLASS(iterator)->reset(iterator);
-}
-
-void
-e_iterator_last     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->last)
-		ECI_CLASS(iterator)->last(iterator);
-}
-
-gboolean
-e_iterator_next     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->next)
-		return ECI_CLASS(iterator)->next(iterator);
-	else
-		return FALSE;
-}
-
-gboolean
-e_iterator_prev     (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->prev)
-		return ECI_CLASS(iterator)->prev(iterator);
-	else
-		return FALSE;
-}
-
-void
-e_iterator_delete   (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->delete)
-		ECI_CLASS(iterator)->delete(iterator);
-}
-
-void           e_iterator_insert     (EIterator  *iterator,
-				      const void *object,
-				      gboolean    before)
-{
-	if (ECI_CLASS(iterator)->insert)
-		ECI_CLASS(iterator)->insert(iterator, object, before);
-}
-
-void
-e_iterator_set      (EIterator *iterator,
-			  const void    *object)
-{
-	if (ECI_CLASS(iterator)->set)
-		ECI_CLASS(iterator)->set(iterator, object);
-}
-
-gboolean
-e_iterator_is_valid (EIterator *iterator)
-{
-	if (ECI_CLASS(iterator)->is_valid)
-		return ECI_CLASS(iterator)->is_valid(iterator);
-	else
-		return FALSE;
-}
-
-void
-e_iterator_invalidate (EIterator *iterator)
-{
-	g_return_if_fail (iterator != NULL);
-	g_return_if_fail (E_IS_ITERATOR (iterator));
-
-	gtk_signal_emit (GTK_OBJECT (iterator),
-			 e_iterator_signals [INVALIDATE]);
-}
diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h
deleted file mode 100644
index 84a2db142b..0000000000
--- a/e-util/e-iterator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_ITERATOR_H__
-#define __E_ITERATOR_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-#define E_TYPE_ITERATOR            (e_iterator_get_type ())
-#define E_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))
-#define E_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))
-#define E_IS_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ITERATOR))
-#define E_IS_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))
-
-typedef struct _EIterator EIterator;
-typedef struct _EIteratorClass EIteratorClass;
-
-struct _EIterator {
-	GtkObject object;
-};
-
-struct _EIteratorClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void         (*invalidate) (EIterator  *iterator);
-	
-	/* Virtual functions */
-	const void * (*get)        (EIterator  *iterator);
-	void         (*reset)      (EIterator  *iterator);
-	void         (*last)       (EIterator  *iterator);
-	gboolean     (*next)       (EIterator  *iterator);
-	gboolean     (*prev)       (EIterator  *iterator);
-	void         (*delete)     (EIterator  *iterator);
-	void         (*insert)     (EIterator  *iterator,
-				    const void *object,
-				    gboolean   	before);
-	void         (*set)        (EIterator  *iterator,
-				    const void *object);
-	gboolean     (*is_valid)   (EIterator  *iterator);
-};
-
-const void    *e_iterator_get        (EIterator  *iterator);
-void           e_iterator_reset      (EIterator  *iterator);
-void           e_iterator_last       (EIterator  *iterator);
-gboolean       e_iterator_next       (EIterator  *iterator);
-gboolean       e_iterator_prev       (EIterator  *iterator);
-void           e_iterator_delete     (EIterator  *iterator);
-void           e_iterator_insert     (EIterator  *iterator,
-				      const void *object,
-				      gboolean    before);
-void           e_iterator_set        (EIterator  *iterator, 
-				      const void *object);
-gboolean       e_iterator_is_valid   (EIterator  *iterator);
-
-void           e_iterator_invalidate (EIterator  *iterator);
-
-/* Standard Gtk function */
-GtkType        e_iterator_get_type   (void);
-
-#endif /* ! __E_ITERATOR_H__ */
diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c
deleted file mode 100644
index 360e37ca40..0000000000
--- a/e-util/e-list-iterator.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-list-iterator.h"
-#include "e-list.h"
-
-static void        e_list_iterator_init       (EListIterator *list);
-static void        e_list_iterator_class_init (EListIteratorClass *klass);
-		   
-static void        e_list_iterator_invalidate (EIterator *iterator);
-static gboolean    e_list_iterator_is_valid   (EIterator *iterator);
-static void        e_list_iterator_set        (EIterator  *iterator,
-	           			       const void *object);
-static void        e_list_iterator_delete     (EIterator  *iterator);
-static void        e_list_iterator_insert     (EIterator  *iterator,
-		   			       const void *object,
-		   			       gboolean    before);
-static gboolean    e_list_iterator_prev       (EIterator  *iterator);
-static gboolean    e_list_iterator_next       (EIterator  *iterator);
-static void        e_list_iterator_reset      (EIterator *iterator);
-static void        e_list_iterator_last       (EIterator *iterator);
-static const void *e_list_iterator_get        (EIterator *iterator);
-static void        e_list_iterator_destroy    (GtkObject *object);
-
-#define PARENT_TYPE (e_iterator_get_type ())
-
-static GtkObjectClass *parent_class;
-#define PARENT_CLASS (E_LIST_ITERATOR_CLASS(parent_class))
-
-/**
- * e_list_iterator_get_type:
- * @void: 
- * 
- * Registers the &EListIterator class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EListIterator class.
- **/
-GtkType
-e_list_iterator_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EListIterator",
-			sizeof (EListIterator),
-			sizeof (EListIteratorClass),
-			(GtkClassInitFunc) e_list_iterator_class_init,
-			(GtkObjectInitFunc) e_list_iterator_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_list_iterator_class_init (EListIteratorClass *klass)
-{
-	GtkObjectClass *object_class;
-	EIteratorClass *iterator_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	iterator_class = E_ITERATOR_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = e_list_iterator_destroy;
-
-	iterator_class->invalidate = e_list_iterator_invalidate;
-	iterator_class->get        = e_list_iterator_get;
-	iterator_class->reset      = e_list_iterator_reset;
-	iterator_class->last       = e_list_iterator_last;
-	iterator_class->next       = e_list_iterator_next;
-	iterator_class->prev       = e_list_iterator_prev;
-	iterator_class->delete     = e_list_iterator_delete;
-	iterator_class->insert     = e_list_iterator_insert;
-	iterator_class->set        = e_list_iterator_set;
-	iterator_class->is_valid   = e_list_iterator_is_valid;
-}
-
-
-
-/**
- * e_list_iterator_init:
- */
-static void
-e_list_iterator_init (EListIterator *list)
-{
-}
-
-EIterator *
-e_list_iterator_new (EList *list)
-{
-	EListIterator *iterator = gtk_type_new(e_list_iterator_get_type());
-
-	iterator->list = list;
-	gtk_object_ref(GTK_OBJECT(list));
-	iterator->iterator = list->list;
-
-	return E_ITERATOR(iterator);
-}
-
-/*
- * Virtual functions: 
- */
-static void
-e_list_iterator_destroy (GtkObject *object)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(object);
-	e_list_remove_iterator(iterator->list, E_ITERATOR(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator->list));
-}
-
-static const void *
-e_list_iterator_get      (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		return iterator->iterator->data;
-	else
-		return NULL;
-}
-
-static void
-e_list_iterator_reset    (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = iterator->list->list;
-}
-
-static void
-e_list_iterator_last     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = g_list_last(iterator->list->list);
-}
-
-static gboolean
-e_list_iterator_next     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		iterator->iterator = g_list_next(iterator->iterator);
-	return (iterator->iterator != NULL);
-}
-
-static gboolean
-e_list_iterator_prev     (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator)
-		iterator->iterator = g_list_previous(iterator->iterator);
-	return (iterator->iterator != NULL);
-}
-
-static void
-e_list_iterator_insert   (EIterator  *_iterator,
-			  const void *object,
-			  gboolean    before)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	void *data;
-	if (iterator->list->copy)
-		data = iterator->list->copy(object, iterator->list->closure);
-	else
-		data = (void *) object;
-	if (iterator->iterator) {
-		if (before) {
-			iterator->list->list = g_list_first(g_list_prepend(iterator->iterator, data));
-			iterator->iterator = iterator->iterator->prev;
-		} else {
-			if (iterator->iterator->next)
-				g_list_prepend(iterator->iterator->next, data);
-			else
-				g_list_append(iterator->iterator, data);
-			iterator->iterator = iterator->iterator->next;
-		}
-		e_list_invalidate_iterators(iterator->list, E_ITERATOR(iterator));
-	} else {
-		if (before) {
-			iterator->list->list = g_list_append(iterator->list->list, data);
-			iterator->iterator = g_list_last(iterator->list->list);
-		} else {
-			iterator->list->list = g_list_prepend(iterator->list->list, data);
-			iterator->iterator = iterator->list->list;
-		}
-		e_list_invalidate_iterators(iterator->list, E_ITERATOR(iterator));
-	}
-}
-
-static void
-e_list_iterator_delete   (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator) {
-		e_list_remove_link (iterator->list, iterator->iterator);
-	}
-}
-
-static void
-e_list_iterator_set      (EIterator  *_iterator,
-			  const void *object)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	if (iterator->iterator) {
-		if (iterator->list->free)
-			iterator->list->free(iterator->iterator->data, iterator->list->closure);
-		if (iterator->list->copy)
-			iterator->iterator->data = iterator->list->copy(object, iterator->list->closure);
-		else
-			iterator->iterator->data = (void *) object;
-	}
-}
-
-static gboolean
-e_list_iterator_is_valid (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	return iterator->iterator != NULL;
-}
-
-static void
-e_list_iterator_invalidate (EIterator *_iterator)
-{
-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);
-	iterator->iterator = NULL;
-}
diff --git a/e-util/e-list-iterator.h b/e-util/e-list-iterator.h
deleted file mode 100644
index a2b7d82988..0000000000
--- a/e-util/e-list-iterator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_LIST_ITERATOR_H__
-#define __E_LIST_ITERATOR_H__
-
-typedef struct _EListIterator EListIterator;
-typedef struct _EListIteratorClass EListIteratorClass;
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-iterator.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())
-#define E_LIST_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST_ITERATOR, EListIterator))
-#define E_LIST_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST_ITERATOR, EListIteratorClass))
-#define E_IS_LIST_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST_ITERATOR))
-#define E_IS_LIST_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST_ITERATOR))
-
-struct _EListIterator {
-	EIterator      parent;
-
-	EList         *list;
-	GList         *iterator;
-};
-
-struct _EListIteratorClass {
-	EIteratorClass parent_class;
-};
-
-EIterator *e_list_iterator_new      (EList *list);
-
-/* Standard Gtk function */
-GtkType    e_list_iterator_get_type (void);
-
-#endif /* ! __E_LIST_ITERATOR_H__ */
diff --git a/e-util/e-list.c b/e-util/e-list.c
deleted file mode 100644
index 6fd0e559d5..0000000000
--- a/e-util/e-list.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@umich.edu>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-
-#include "e-list.h"
-#include "e-list-iterator.h"
-
-#define ECL_CLASS(object) (E_LIST_CLASS(GTK_OBJECT((object))->klass))
-
-static void e_list_init (EList *list);
-static void e_list_class_init (EListClass *klass);
-static void e_list_destroy (GtkObject *object);
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-/**
- * e_list_get_type:
- * @void: 
- * 
- * Registers the &EList class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EList class.
- **/
-GtkType
-e_list_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		GtkTypeInfo info = {
-			"EList",
-			sizeof (EList),
-			sizeof (EListClass),
-			(GtkClassInitFunc) e_list_class_init,
-			(GtkObjectInitFunc) e_list_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_list_class_init (EListClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = e_list_destroy;
-}
-
-/**
- * e_list_init:
- */
-static void
-e_list_init (EList *list)
-{
-	list->list = NULL;
-	list->iterators = NULL;
-}
-
-EList *
-e_list_new          (EListCopyFunc copy, EListFreeFunc free, void *closure)
-{
-	EList *list = gtk_type_new(e_list_get_type());
-	list->copy    = copy;
-	list->free    = free;
-	list->closure = closure;
-	return list;
-}
-
-EList *
-e_list_duplicate    (EList *old)
-{
-	EList *list = gtk_type_new(e_list_get_type());
-
-	list->copy    = old->copy;
-	list->free    = old->free;
-	list->closure = old->closure;
-	list->list    = g_list_copy(old->list);
-	if (list->copy) {
-		GList *listlist;
-		for (listlist = list->list; listlist; listlist = listlist->next) {
-			listlist->data = list->copy (listlist->data, list->closure);
-		}
-	}
-	return list;
-}
-
-EIterator *
-e_list_get_iterator (EList *list)
-{
-	EIterator *iterator = e_list_iterator_new(list);
-	list->iterators = g_list_append(list->iterators, iterator);
-	return iterator;
-}
-
-int
-e_list_length (EList *list)
-{
-	return g_list_length(list->list);
-}
-
-void
-e_list_append       (EList *list, const void *data)
-{
-	e_list_invalidate_iterators(list, NULL);
-	if (list->copy)
-		list->list = g_list_append(list->list, list->copy(data, list->closure));
-	else
-		list->list = g_list_append(list->list, (void *) data);
-}
-
-void
-e_list_invalidate_iterators (EList *list, EIterator *skip)
-{
-	GList *iterators = list->iterators;
-	for (; iterators; iterators = iterators->next) {
-		if (iterators->data != skip) {
-			e_iterator_invalidate(E_ITERATOR(iterators->data));
-		}
-	}
-}
-
-/* FIXME: This doesn't work properly if the iterator is the first
-   iterator in the list.  Well, the iterator doesn't continue on after
-   the next time next is called, at least. */
-void
-e_list_remove_link (EList *list, GList *link)
-{
-	GList *iterators = list->iterators;
-	for (; iterators; iterators = iterators->next) {
-		if (((EListIterator *)iterators->data)->iterator == link) {
-			e_iterator_prev(iterators->data);
-		}
-	}
-	if (list->free)
-		list->free(link->data, list->closure);
-	list->list = g_list_remove_link(list->list, link);
-	g_list_free_1(link);
-}
-
-void
-e_list_remove_iterator (EList *list, EIterator *iterator)
-{
-	list->iterators = g_list_remove(list->iterators, iterator);
-}
-
-/* 
- * Virtual functions 
- */
-static void
-e_list_destroy (GtkObject *object)
-{
-	EList *list = E_LIST(object);
-	g_list_foreach(list->list, (GFunc) list->free, list->closure);
-	g_list_free(list->list);
-}
-
diff --git a/e-util/e-list.h b/e-util/e-list.h
deleted file mode 100644
index 017f48d813..0000000000
--- a/e-util/e-list.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_LIST_H__
-#define __E_LIST_H__
-
-typedef struct _EList EList;
-typedef struct _EListClass EListClass;
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list-iterator.h>
-
-#define E_TYPE_LIST            (e_list_get_type ())
-#define E_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST, EList))
-#define E_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass))
-#define E_IS_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST))
-#define E_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST))
-
-typedef void *(*EListCopyFunc) (const void *data, void *closure);
-typedef void (*EListFreeFunc) (void *data, void *closure);
-
-struct _EList {
-	GtkObject      object;
-	GList         *list;
-	GList         *iterators;
-	EListCopyFunc  copy;
-	EListFreeFunc  free;
-	void          *closure;
-};
-
-struct _EListClass {
-	GtkObjectClass parent_class;
-};
-
-EList     *e_list_new                  (EListCopyFunc  copy, 
-					EListFreeFunc  free,
-					void          *closure);
-EList     *e_list_duplicate            (EList *list);
-EIterator *e_list_get_iterator         (EList         *list);
-void       e_list_append               (EList         *list,
-					const void    *data);
-int        e_list_length               (EList         *list);
-
-/* For iterators to call. */
-void       e_list_remove_link          (EList         *list, 
-					GList         *link);
-void       e_list_remove_iterator      (EList         *list,
-					EIterator     *iterator);
-void       e_list_invalidate_iterators (EList         *list,
-					EIterator     *skip);
-
-/* Standard Gtk function */
-GtkType    e_list_get_type             (void);
-
-#endif /* ! __E_LIST_H__ */
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
deleted file mode 100644
index 4f985ccace..0000000000
--- a/e-util/e-pilot-map.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include <gnome.h>
-#include <gnome-xml/parser.h>
-#include <e-pilot-map.h>
-
-typedef struct 
-{
-	char *uid;
-	gboolean archived;
-} EPilotMapPidNode;
-
-typedef struct
-{
-	guint32 pid;
-	gboolean archived;
-} EPilotMapUidNode;
-
-
-static void
-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-map_sax_start_element (void *data, const xmlChar *name, 
-		       const xmlChar **attrs)
-{
-	EPilotMap *map = (EPilotMap *)data;
-
-	if (!strcmp (name, "PilotMap")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "timestamp")) 
-				map->since = (time_t)strtoul (*val, NULL, 0);
-
-			attrs = ++val;
-		}
-	}
-	 
-	if (!strcmp (name, "map")) {
-		const char *uid = NULL;
-		guint32 pid = 0;
-		gboolean archived = FALSE;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				uid = *val;
-			
-			if (!strcmp (*attrs, "pilot_id"))
-				pid = strtoul (*val, NULL, 0);
-
-			if (!strcmp (*attrs, "archived"))
-				archived = strtoul (*val, NULL, 0)== 1 ? TRUE : FALSE;
-				
-			attrs = ++val;
-		}
-			
-		if (uid && pid != 0)
-			e_pilot_map_insert (map, pid, uid, archived);
-	}
-}
-
-static void
-map_write_foreach (gpointer key, gpointer value, gpointer data)
-{
-	xmlNodePtr root = data;
-	xmlNodePtr mnode;
-	unsigned long *pid = key;
-	EPilotMapPidNode *pnode = value;
-	char *pidstr;
-
-	mnode = xmlNewChild (root, NULL, "map", NULL);
-	
-	pidstr = g_strdup_printf ("%lu", *pid);
-	xmlSetProp (mnode, "pilot_id", pidstr);
-	g_free (pidstr);
-
-	xmlSetProp (mnode, "uid", pnode->uid);
-
-	if (pnode->archived)
-		xmlSetProp (mnode, "archived", "1");
-	else
-		xmlSetProp (mnode, "archived", "0");
-}
-
-gboolean 
-e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)
-{
-	EPilotMapPidNode *pnode;
-	
-	pnode = g_hash_table_lookup (map->pid_map, &pid);
-
-	if (pnode == NULL)
-		return FALSE;
-	
-	return pnode->archived;
-}
-
-gboolean 
-e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid)
-{
-	EPilotMapUidNode *unode;
-	
-	unode = g_hash_table_lookup (map->uid_map, uid);
-
-	if (unode == NULL)
-		return FALSE;
-	
-	return unode->archived;
-}
-
-void 
-e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived)
-{
-	char *new_uid;
-	guint32 *new_pid = g_new (guint32, 1);
-	EPilotMapPidNode *pnode = g_new0 (EPilotMapPidNode, 1);
-	EPilotMapUidNode *unode = g_new0 (EPilotMapUidNode, 1);
-	
-	*new_pid = pid;
-	new_uid = g_strdup (uid);
-
-	pnode->uid = new_uid;
-	pnode->archived = archived;
-	
-	unode->pid = pid;
-	unode->archived = archived;
-	
-	g_hash_table_insert (map->pid_map, new_pid, pnode);
-	g_hash_table_insert (map->uid_map, new_uid, unode);
-}
-
-guint32 
-e_pilot_map_lookup_pid (EPilotMap *map, const char *uid) 
-{
-	EPilotMapUidNode *unode = NULL;
-	
-	unode = g_hash_table_lookup (map->uid_map, uid);
-
-	if (unode == NULL)
-		return 0;
-	
-	return unode->pid;
-}
-
-const char *
-e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid)
-{
-	EPilotMapPidNode *pnode = NULL;
-	
-	pnode = g_hash_table_lookup (map->pid_map, &pid);
-
-	if (pnode == NULL)
-		return NULL;
-	
-	return pnode->uid;
-}
-
-int 
-e_pilot_map_read (const char *filename, EPilotMap **map)
-{
-	xmlSAXHandler handler;
-	EPilotMap *new_map = g_new0 (EPilotMap, 1);
-
-	*map = NULL;
-	
-	memset (&handler, 0, sizeof (xmlSAXHandler));
-	handler.startElement = map_sax_start_element;
-
-	new_map->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
-	new_map->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (g_file_exists (filename)) {
-		if (xmlSAXUserParseFile (&handler, new_map, filename) < 0) {
-			g_free (new_map);
-			return -1;
-		}
-	}
-	
-	*map = new_map;
-	
-	return 0;
-}
-		
-int
-e_pilot_map_write (const char *filename, EPilotMap *map)
-{
-	xmlDocPtr doc;
-	int ret;
-	
-	g_return_val_if_fail (map != NULL, -1);
-	
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL) {
-		g_warning ("Pilot map file could not be created\n");
-		return -1;
-	}
-	doc->root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);
-	map->since = time (NULL);
-	map_set_node_timet (doc->root, "timestamp", map->since);
-
-	g_hash_table_foreach (map->pid_map, map_write_foreach, doc->root);
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Pilot map file '%s' could not be saved\n", filename);
-		return -1;
-	}
-	
-	xmlFreeDoc (doc);
-
-	return 0;
-}
-
-void 
-e_pilot_map_destroy (EPilotMap *map)
-{
-	g_hash_table_destroy (map->pid_map);
-	g_hash_table_destroy (map->uid_map);
-	g_free (map);
-}
-
-
-
-
-
-
-
-
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
deleted file mode 100644
index 8e3d2b71f6..0000000000
--- a/e-util/e-pilot-map.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution Conduits - Pilot Map routines
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_PILOT_MAP_H
-#define E_PILOT_MAP_H
-
-#include <glib.h>
-#include <time.h>
-
-typedef struct _EPilotMap EPilotMap;
-
-struct _EPilotMap
-{
-	GHashTable *pid_map;
-	GHashTable *uid_map;
-
-	time_t since;
-};
-
-gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid);
-gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid);
-
-void e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived);
-guint32 e_pilot_map_lookup_pid (EPilotMap *map, const char *uid);
-const char * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid);
-
-int e_pilot_map_read (const char *filename, EPilotMap **map);
-int e_pilot_map_write (const char *filename, EPilotMap *map);
-
-void e_pilot_map_destroy (EPilotMap *map);
-
-#endif /* E_PILOT_MAP_H */
diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c
deleted file mode 100644
index 2757ea2043..0000000000
--- a/e-util/e-sexp.c
+++ /dev/null
@@ -1,1164 +0,0 @@
-/* 
- * Copyright 2000 HelixCode (http://www.helixcode.com).
- *
- * A simple, extensible s-exp evaluation engine.
- *
- * Author : 
- *  Michael Zucchi <notzed@helixcode.com>
-
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
-  The following built-in s-exp's are supported:
-
-  list = (and list*)
-	perform an intersection of a number of lists, and return that.
-
-  bool = (and bool*)
-	perform a boolean AND of boolean values.
-
-  list = (or list*)
-	perform a union of a number of lists, returning the new list.
-
-  bool = (or bool*)
-	perform a boolean OR of boolean values.
-
-  int = (+ int*)
-	Add integers.
-
-  string = (+ string*)
-	Concat strings.
-
-  int = (- int int*)
-	Subtract integers from the first.
-
-  Comparison operators:
-
-  bool = (< int int)
-  bool = (> int int)
-  bool = (= int int)
-
-  bool = (< string string)
-  bool = (> string string)
-  bool = (= string string)
-	Perform a comparision of 2 integers, or 2 string values.
-
-  Function flow:
-
-  type = (if bool function)
-  type = (if bool function function)
-  	Choose a flow path based on a boolean value
-
-  type = (begin  func func func)
-        Execute a sequence.  The last function return is the return type.
-*/
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-#include "e-sexp.h"
-
-#define p(x)			/* parse debug */
-#define r(x)			/* run debug */
-#define d(x)			/* general debug */
-
-
-static struct _ESExpTerm * parse_list(ESExp *f, int gotbrace);
-static struct _ESExpTerm * parse_value(ESExp *f);
-
-static void parse_dump_term(struct _ESExpTerm *t, int depth);
-
-static GtkObjectClass *parent_class;
-
-
-
-static GScannerConfig scanner_config =
-{
-	( " \t\r\n")		/* cset_skip_characters */,
-	( G_CSET_a_2_z
-	  "_+-<=>"
-	  G_CSET_A_2_Z)		/* cset_identifier_first */,
-	( G_CSET_a_2_z
-	  "_0123456789-<>"
-	  G_CSET_A_2_Z
-	  G_CSET_LATINS
-	  G_CSET_LATINC	)	/* cset_identifier_nth */,
-	( ";\n" )		/* cpair_comment_single */,
-  
-	FALSE			/* case_sensitive */,
-  
-	TRUE			/* skip_comment_multi */,
-	TRUE			/* skip_comment_single */,
-	TRUE			/* scan_comment_multi */,
-	TRUE			/* scan_identifier */,
-	TRUE			/* scan_identifier_1char */,
-	FALSE			/* scan_identifier_NULL */,
-	TRUE			/* scan_symbols */,
-	FALSE			/* scan_binary */,
-	TRUE			/* scan_octal */,
-	TRUE			/* scan_float */,
-	TRUE			/* scan_hex */,
-	FALSE			/* scan_hex_dollar */,
-	TRUE			/* scan_string_sq */,
-	TRUE			/* scan_string_dq */,
-	TRUE			/* numbers_2_int */,
-	FALSE			/* int_2_float */,
-	FALSE			/* identifier_2_string */,
-	TRUE			/* char_2_token */,
-	FALSE			/* symbol_2_token */,
-	FALSE			/* scope_0_fallback */,
-};
-
-struct _ESExpResult *
-e_sexp_result_new(int type)
-{
-	struct _ESExpResult *r = g_malloc0(sizeof(*r));
-	r->type = type;
-	return r;
-}
-
-void
-e_sexp_result_free(struct _ESExpResult *t)
-{
-	if (t == NULL)
-		return;
-
-	switch(t->type) {
-	case ESEXP_RES_ARRAY_PTR:
-		g_ptr_array_free(t->value.ptrarray, TRUE);
-		break;
-	case ESEXP_RES_BOOL:
-	case ESEXP_RES_INT:
-		break;
-	case ESEXP_RES_STRING:
-		g_free(t->value.string);
-		break;
-	case ESEXP_RES_UNDEFINED:
-		break;
-	}
-	g_free(t);
-}
-
-/* implementations for the builtin functions */
-
-/* can you tell, i dont like glib? */
-/* we can only itereate a hashtable from a called function */
-struct _glib_sux_donkeys {
-	int count;
-	GPtrArray *uids;
-};
-
-/* ok, store any values that are in all sets */
-static void
-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	if (value == fuckup->count) {
-		g_ptr_array_add(fuckup->uids, key);
-	}
-}
-
-/* or, store all unique values */
-static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
-{
-	g_ptr_array_add(fuckup->uids, key);
-}
-
-static ESExpResult *
-term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1;
-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
-	int type=-1;
-	int bool = TRUE;
-	int i;
-	
-	r(printf("( and\n"));
-
-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);
-	
-	for (i=0;bool && i<argc;i++) {
-		r1 = e_sexp_term_eval(f, argv[i]);
-		if (type == -1)
-			type = r1->type;
-		if (type != r1->type) {
-			printf("invalid types in and operation, all types must be the same\n");
-		} else if ( r1->type == ESEXP_RES_ARRAY_PTR ) {
-			char **a1;
-			int l1, j;
-			
-			a1 = (char **)r1->value.ptrarray->pdata;
-			l1 = r1->value.ptrarray->len;
-			for (j=0;j<l1;j++) {
-				int n;
-				n = (int)g_hash_table_lookup(ht, a1[j]);
-				g_hash_table_insert(ht, a1[j], (void *)n+1);
-			}
-		} else if ( r1->type == ESEXP_RES_BOOL ) {
-			bool &= r1->value.bool;
-		}
-		e_sexp_result_free(r1);
-	}
-	
-	if (type == ESEXP_RES_ARRAY_PTR) {
-		lambdafoo.count = argc;
-		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &lambdafoo);
-		r->type = ESEXP_RES_ARRAY_PTR;
-		r->value.ptrarray = lambdafoo.uids;
-	} else if (type == ESEXP_RES_BOOL) {
-		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
-	}
-	
-	g_hash_table_destroy(ht);
-	
-	return r;
-}
-
-static ESExpResult *
-term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1;
-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
-	int type = -1;
-	int bool = FALSE;
-	int i;
-	
-	r(printf("(or \n"));
-
-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);
-	
-	for (i=0;!bool && i<argc;i++) {
-		r1 = e_sexp_term_eval(f, argv[i]);
-		if (type == -1)
-			type = r1->type;
-		if (r1->type != type) {
-			printf("wrong types in or operation\n");
-		} else if (r1->type == ESEXP_RES_ARRAY_PTR) {
-			char **a1;
-			int l1, j;
-			
-			a1 = (char **)r1->value.ptrarray->pdata;
-			l1 = r1->value.ptrarray->len;
-			for (j=0;j<l1;j++) {
-				g_hash_table_insert(ht, a1[j], (void *)1);
-			}
-		} else if (r1->type == ESEXP_RES_BOOL) {
-			bool |= r1->value.bool;				
-		}
-		e_sexp_result_free(r1);
-	}
-	
-	if (type == ESEXP_RES_ARRAY_PTR) {
-		lambdafoo.count = argc;
-		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
-		r->type = ESEXP_RES_ARRAY_PTR;
-		r->value.ptrarray = lambdafoo.uids;
-	} else if (type == ESEXP_RES_BOOL) {
-		r->type = ESEXP_RES_BOOL;
-		r->value.bool = bool;
-	}
-	g_hash_table_destroy(ht);
-	
-	return r;
-}
-
-static ESExpResult *
-term_eval_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	int res = TRUE;
-	ESExpResult *r;
-
-	if (argc>0) {
-		if (argv[0]->type == ESEXP_RES_BOOL
-		    && argv[0]->value.bool)
-			res = FALSE;
-	}
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = res;
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_lt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			printf("error, invalid types in compare\n");
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number < r2->value.number;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) < 0;
-		}
-	}
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_gt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			printf("error, invalid types in compare\n");
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = r1->value.number > r2->value.number;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->type = ESEXP_RES_BOOL;
-			r->value.bool = strcmp(r1->value.string, r2->value.string) > 0;
-		}
-	}
-	return r;
-}
-
-/* this should support all arguments ...? */
-static ESExpResult *
-term_eval_eq(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r, *r1, *r2;
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	
-	if (argc == 2) {
-		r1 = e_sexp_term_eval(f, argv[0]);
-		r2 = e_sexp_term_eval(f, argv[1]);
-		if (r1->type != r2->type) {
-			r->value.bool = FALSE;
-		} else if (r1->type == ESEXP_RES_INT) {
-			r->value.bool = r1->value.number == r2->value.number;
-		} else if (r1->type == ESEXP_RES_BOOL) {
-			r->value.bool = r1->value.bool == r2->value.bool;
-		} else if (r1->type == ESEXP_RES_STRING) {
-			r->value.bool = strcmp(r1->value.string, r2->value.string) == 0;
-		}
-	}
-	return r;
-}
-
-static ESExpResult *
-term_eval_plus(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int type;
-	int i;
-
-	if (argc>0) {
-		type = argv[0]->type;
-		switch(type) {
-		case ESEXP_RES_INT: {
-			int total = argv[0]->value.number;
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
-				total += argv[i]->value.number;
-			}
-			if (i<argc) {
-				g_warning("Wrong type trying to add integers: ignored");
-			}
-			r = e_sexp_result_new(ESEXP_RES_INT);
-			r->value.number = total;
-			break; }
-		case ESEXP_RES_STRING: {
-			GString *s = g_string_new(argv[0]->value.string);
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_STRING;i++) {
-				g_string_append(s, argv[i]->value.string);
-			}
-			if (i<argc) {
-				g_warning("Wrong type trying to concat strings: ignored");
-			}
-			r = e_sexp_result_new(ESEXP_RES_STRING);
-			r->value.string = s->str;
-			g_string_free(s, FALSE);
-			break; }
-			
-		}
-	}
-
-	if (!r) {
-		r = e_sexp_result_new(ESEXP_RES_INT);
-		r->value.number = 0;
-	}
-	return r;
-}
-
-static ESExpResult *
-term_eval_sub(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int type;
-	int i;
-
-	if (argc>0) {
-		type = argv[0]->type;
-		switch(type) {
-		case ESEXP_RES_INT: {
-			int total = argv[0]->value.number;
-			for (i=1;i<argc && argv[i]->type == ESEXP_RES_INT;i++) {
-				total -= argv[i]->value.number;
-			}
-			if (i<argc) {
-				g_warning("Wrong type trying to subtract numbers: ignored");
-			}
-			r = e_sexp_result_new(ESEXP_RES_INT);
-			r->value.number = total;
-			break; }
-		}
-	}
-
-	if (!r) {
-		r = e_sexp_result_new(ESEXP_RES_INT);
-		r->value.number = 0;
-	}
-	return r;
-}
-
-/* implements 'if' function */
-static ESExpResult *
-term_eval_if(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r;
-	int doit;
-
-	if (argc >=2 && argc<=3) {
-		r = e_sexp_term_eval(f, argv[0]);
-		doit = (r->type == ESEXP_RES_BOOL && r->value.bool);
-		e_sexp_result_free(r);
-		if (doit) {
-			return e_sexp_term_eval(f, argv[1]);
-		} else if (argc>2) {
-			return e_sexp_term_eval(f, argv[2]);
-		}
-	}
-	return e_sexp_result_new(ESEXP_RES_UNDEFINED);
-}
-
-/* implements 'begin' statement */
-static ESExpResult *
-term_eval_begin(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
-{
-	struct _ESExpResult *r=NULL;
-	int i;
-
-	for (i=0;i<argc;i++) {
-		if (r)
-			e_sexp_result_free(r);
-		r = e_sexp_term_eval(f, argv[i]);
-	}
-	if (r)
-		return r;
-	else
-		return e_sexp_result_new(ESEXP_RES_UNDEFINED);
-}
-
-
-struct _ESExpResult *
-e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)
-{
-	struct _ESExpResult *r, *r1;
-	int i;
-
-	g_return_val_if_fail(t != NULL, NULL);
-
-	r(printf("eval term :\n"));
-	r(parse_dump_term(t, 0));
-
-	r = g_malloc0(sizeof(*r));
-	r->type = ESEXP_RES_UNDEFINED;
-
-	switch (t->type) {
-	case ESEXP_TERM_STRING:
-		r(printf(" (string \"%s\")\n", t->value.string));
-		r->type = ESEXP_RES_STRING;
-		/* erk, this shoul;dn't need to strdup this ... */
-		r->value.string = g_strdup(t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		r(printf(" (int %d)\n", t->value.number));
-		r->type = ESEXP_RES_INT;
-		r->value.number = t->value.number;
-		break;
-	case ESEXP_TERM_BOOL:
-		r(printf(" (int %d)\n", t->value.number));
-		r->type = ESEXP_RES_BOOL;
-		r->value.bool = t->value.bool;
-		break;
-	case ESEXP_TERM_IFUNC: {
-		if (t->value.func.sym->f.ifunc) {
-			r1 = t->value.func.sym->f.ifunc(f, t->value.func.termcount, t->value.func.terms, t->value.func.sym->data);
-			if (r1) {
-				e_sexp_result_free(r);
-				r = r1;
-			}
-		}
-		break; }
-	case ESEXP_TERM_FUNC: {
-		struct _ESExpResult **argv;
-
-		/* first evaluate all arguments to result types */
-		argv = alloca(sizeof(argv[0]) * t->value.func.termcount);
-		for (i=0;i<t->value.func.termcount;i++) {
-			argv[i] = e_sexp_term_eval(f, t->value.func.terms[i]);
-		}
-		/* call the function */
-		if (t->value.func.sym->f.func) {
-			r1 = t->value.func.sym->f.func(f, t->value.func.termcount, argv, t->value.func.sym->data);
-			if (r1) {
-				e_sexp_result_free(r);
-				r = r1;
-			}
-		}
-		for (i=0;i<t->value.func.termcount;i++) {
-			e_sexp_result_free(argv[i]);
-		}
-		break; }
-	default:
-		printf("Warning: Unknown type encountered in parse tree: %d\n", t->type);
-		r->type = ESEXP_RES_UNDEFINED;
-	}
-
-	return r;
-}
-
-#if 0
-static void
-eval_dump_result(ESExpResult *r, int depth)
-{
-	int i;
-	
-	if (r==NULL) {
-		printf("null result???\n");
-		return;
-	}
-
-	for (i=0;i<depth;i++)
-		printf("   ");
-
-	switch (r->type) {
-	case ESEXP_RES_ARRAY_PTR:
-		printf("array pointers\n");
-		break;
-	case ESEXP_RES_INT:
-		printf("int: %d\n", r->value.number);
-		break;
-	case ESEXP_RES_STRING:
-		printf("string: '%s'\n", r->value.string);
-		break;
-	case ESEXP_RES_BOOL:
-		printf("bool: %c\n", r->value.bool?'t':'f');
-		break;
-	case ESEXP_RES_UNDEFINED:
-		printf(" <undefined>\n");
-		break;
-	}
-	printf("\n");
-}
-#endif
-
-static void
-parse_dump_term(struct _ESExpTerm *t, int depth)
-{
-	int i;
-
-	if (t==NULL) {
-		printf("null term??\n");
-		return;
-	}
-
-	for (i=0;i<depth;i++)
-		printf("   ");
-	
-	switch (t->type) {
-	case ESEXP_TERM_STRING:
-		printf(" \"%s\"", t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		printf(" %d", t->value.number);
-		break;
-	case ESEXP_TERM_BOOL:
-		printf(" #%c", t->value.bool?'t':'f');
-		break;
-	case ESEXP_TERM_IFUNC:
-	case ESEXP_TERM_FUNC:
-		printf(" (function %s\n", t->value.func.sym->name);
-		/*printf(" [%d] ", t->value.func.termcount);*/
-		for (i=0;i<t->value.func.termcount;i++) {
-			parse_dump_term(t->value.func.terms[i], depth+1);
-		}
-		for (i=0;i<depth;i++)
-			printf("   ");
-		printf(" )");
-		break;
-	case ESEXP_TERM_VAR:
-		printf(" (variable %s )\n", t->value.var->name);
-		break;
-	default:
-		printf("unknown type: %d\n", t->type);
-	}
-
-	printf("\n");
-}
-
-/*
-  PARSER
-*/
-
-static struct _ESExpTerm *
-parse_new_term(int type)
-{
-	struct _ESExpTerm *s = g_malloc0(sizeof(*s));
-	s->type = type;
-	return s;
-}
-
-static void
-parse_term_free(struct _ESExpTerm *t)
-{
-	int i;
-
-	if (t==NULL) {
-		return;
-	}
-	
-	switch (t->type) {
-	case ESEXP_TERM_FUNC:
-	case ESEXP_TERM_IFUNC:
-		for (i=0;i<t->value.func.termcount;i++) {
-			parse_term_free(t->value.func.terms[i]);
-		}
-		g_free(t->value.func.terms);
-		break;
-	case ESEXP_TERM_VAR:
-		break;
-	case ESEXP_TERM_STRING:
-		g_free(t->value.string);
-		break;
-	case ESEXP_TERM_INT:
-		break;
-	default:
-		printf("parse_term_free: unknown type: %d\n", t->type);
-	}
-	g_free(t);
-}
-
-static struct _ESExpTerm **
-parse_values(ESExp *f, int *len)
-{
-	int token;
-	struct _ESExpTerm **terms;
-	int i=0;
-	GScanner *gs = f->scanner;
-
-	p(printf("parsing values\n"));
-
-	/* FIXME: This hardcoded nonsense!!! :) */
-	terms = g_malloc0(20*sizeof(*terms));
-
-	while ( (token = g_scanner_peek_next_token(gs)) != G_TOKEN_EOF
-		&& token != ')') {
-		terms[i]=parse_value(f);
-		i++;
-	}
-
-	p(printf("found %d subterms\n", i));
-	*len = i;
-	
-	p(printf("dont parsing values\n"));
-	return terms;
-}
-
-static struct _ESExpTerm *
-parse_value(ESExp *f)
-{
-	int token;
-	struct _ESExpTerm *t = NULL;
-	GScanner *gs = f->scanner;
-	struct _ESExpSymbol *s;
-
-	p(printf("parsing value\n"));
-
-	token = g_scanner_get_next_token(gs);
-	switch(token) {
-	case G_TOKEN_LEFT_PAREN:
-		p(printf("got brace, its a list!\n"));
-		return parse_list(f, TRUE);
-	case G_TOKEN_STRING:
-		p(printf("got string\n"));
-		t = parse_new_term(ESEXP_TERM_STRING);
-		t->value.string = g_strdup(g_scanner_cur_value(gs).v_string);
-		break;
-	case G_TOKEN_INT:
-		t = parse_new_term(ESEXP_TERM_INT);
-		t->value.number = g_scanner_cur_value(gs).v_int;
-		p(printf("got int\n"));
-		break;
-	case '#':
-		printf("got bool?\n");
-		token = g_scanner_get_next_token(gs);
-		t = parse_new_term(ESEXP_TERM_BOOL);
-		t->value.bool = token=='t';
-		break;
-	case G_TOKEN_SYMBOL:
-		s = g_scanner_cur_value(gs).v_symbol;
-		switch (s->type) {
-		case ESEXP_TERM_FUNC:
-		case ESEXP_TERM_IFUNC:
-				/* this is basically invalid, since we can't use function
-				   pointers, but let the runtime catch it ... */
-			t = parse_new_term(s->type);
-			t->value.func.sym = s;
-			t->value.func.terms = parse_values(f, &t->value.func.termcount);
-			break;
-		case ESEXP_TERM_VAR:
-			t = parse_new_term(s->type);
-			t->value.var = s;
-			break;
-		default:
-			printf("Invalid symbol type: %d\n", s->type);
-		}
-		break;
-	case G_TOKEN_IDENTIFIER:
-		printf("Unknown identifier encountered: %s\n", g_scanner_cur_value(gs).v_identifier);
-		break;
-	default:
-		printf("Innvalid token trying to parse a list of values\n");
-	}
-	p(printf("done parsing value\n"));
-	return t;
-}
-
-/* FIXME: this needs some robustification */
-static struct _ESExpTerm *
-parse_list(ESExp *f, int gotbrace)
-{
-	int token;
-	struct _ESExpTerm *t = NULL;
-	GScanner *gs = f->scanner;
-
-	p(printf("parsing list\n"));
-	if (gotbrace)
-		token = '(';
-	else
-		token = g_scanner_get_next_token(gs);
-	if (token =='(') {
-		token = g_scanner_get_next_token(gs);
-		switch(token) {
-		case G_TOKEN_SYMBOL: {
-			struct _ESExpSymbol *s;
-
-			s = g_scanner_cur_value(gs).v_symbol;
-			p(printf("got funciton: %s\n", s->name));
-			t = parse_new_term(s->type);
-			p(printf("created new list %p\n", t));
-			/* if we have a variable, find out its base type */
-			while (s->type == ESEXP_TERM_VAR) {
-				s = ((ESExpTerm *)(s->data))->value.var;
-			}
-			if (s->type == ESEXP_TERM_FUNC
-			    || s->type == ESEXP_TERM_IFUNC) {
-				t->value.func.sym = s;
-				t->value.func.terms = parse_values(f, &t->value.func.termcount);
-			} else {
-				printf("Error, trying to call variable as function\n");
-			}
-			break; }
-		case G_TOKEN_IDENTIFIER:
-			printf("Unknown identifier: %s\n", g_scanner_cur_value(gs).v_identifier);
-			break;
-		default:
-			printf("unknown sequence encountered, type = %d\n", token);
-		}
-		token = g_scanner_get_next_token(gs);
-		if (token != ')') {
-			printf("Error, expected ')' not found\n");
-		}
-	} else {
-		printf("Error, list term without opening (\n");
-	}
-
-	p(printf("returning list %p\n", t));
-	return t;
-}
-
-#if 0
-GList *
-camel_mbox_folder_search_by_expression(CamelFolder *folder, char *expression, CamelException *ex)
-{
-	GScanner *gs;
-	int i;
-	struct _ESExpTerm *t;
-	struct _searchcontext *ctx;
-	struct _ESExpResult *r;
-	GList *matches = NULL;
-
-	gs = g_scanner_new(&scanner_config);
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++)
-		g_scanner_scope_add_symbol(gs, 0, symbols[i].name, &symbols[i]);
-
-	g_scanner_input_text(gs, expression, strlen(expression));
-	t = parse_list(gs, 0);
-
-	if (t) {
-		ctx = g_malloc0(sizeof(*ctx));
-		ctx->folder = folder;
-		ctx->summary = camel_folder_get_summary(folder, ex);
-		ctx->message_info = camel_folder_summary_get_message_info_list(ctx->summary);
-#ifdef HAVE_IBEX
-		ctx->index = ibex_open(CAMEL_MBOX_FOLDER(folder)->index_file_path, FALSE);
-		if (!ctx->index) {
-			perror("Cannot open index file, body searches will be ignored\n");
-		}
-#endif
-		r = term_eval(ctx, t);
-
-		/* now create a folder summary to return?? */
-		if (r
-		    && r->type == ESEXP_RES_ARRAY_PTR) {
-			d(printf("got result ...\n"));
-			for (i=0;i<r->value.ptrarray->len;i++) {
-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-				matches = g_list_prepend(matches, g_strdup(g_ptr_array_index(r->value.ptrarray, i)));
-			}
-			e_sexp_result_free(r);
-		}
-
-		if (ctx->index)
-			ibex_close(ctx->index);
-
-		gtk_object_unref((GtkObject *)ctx->summary);
-		g_free(ctx);
-		parse_term_free(t);
-	} else {
-		printf("Warning, Could not parse expression!\n %s\n", expression);
-	}
-
-	g_scanner_destroy(gs);
-
-	return matches;
-}
-#endif
-
-
-static void e_sexp_finalise(GtkObject *);
-
-static void
-e_sexp_class_init (ESExpClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-
-	object_class->finalize = e_sexp_finalise;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and", (ESExpFunc *)term_eval_and, 1 },
-	{ "or", (ESExpFunc *)term_eval_or, 1 },
-	{ "not", (ESExpFunc *)term_eval_not, 0 },
-	{ "<", (ESExpFunc *)term_eval_lt, 1 },
-	{ ">", (ESExpFunc *)term_eval_gt, 1 },
-	{ "=", (ESExpFunc *)term_eval_eq, 1 },
-	{ "+", (ESExpFunc *)term_eval_plus, 0 },
-	{ "-", (ESExpFunc *)term_eval_sub, 0 },
-	{ "if", (ESExpFunc *)term_eval_if, 1 },
-	{ "begin", (ESExpFunc *)term_eval_begin, 1 },
-};
-
-static void
-free_symbol(void *key, void *value, void *data)
-{
-	struct _ESExpSymbol *s = value;
-
-	g_free(s->name);
-	g_free(s);
-}
-
-static void
-e_sexp_finalise(GtkObject *o)
-{
-	ESExp *s = (ESExp *)o;
-
-	if (s->tree) {
-		parse_term_free(s->tree);
-		s->tree = NULL;
-	}
-
-	g_scanner_scope_foreach_symbol(s->scanner, 0, free_symbol, 0);
-	g_scanner_destroy(s->scanner);
-
-	((GtkObjectClass *)(parent_class))->finalize((GtkObject *)o);
-}
-
-static void
-e_sexp_init (ESExp *s)
-{
-	int i;
-
-	s->scanner = g_scanner_new(&scanner_config);
-
-	/* load in builtin symbols? */
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(s, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &symbols[i]);
-		} else {
-			e_sexp_add_function(s, 0, symbols[i].name, symbols[i].func, &symbols[i]);
-		}
-	}
-}
-
-guint
-e_sexp_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ESExp",
-			sizeof (ESExp),
-			sizeof (ESExpClass),
-			(GtkClassInitFunc) e_sexp_class_init,
-			(GtkObjectInitFunc) e_sexp_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-ESExp *
-e_sexp_new (void)
-{
-	ESExp *f = E_SEXP ( gtk_type_new (e_sexp_get_type ()));
-
-	return f;
-}
-
-void
-e_sexp_add_function(ESExp *f, int scope, char *name, ESExpFunc *func, void *data)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->f.func = func;
-	s->type = ESEXP_TERM_FUNC;
-	s->data = data;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_add_ifunction(ESExp *f, int scope, char *name, ESExpIFunc *ifunc, void *data)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->f.ifunc = ifunc;
-	s->type = ESEXP_TERM_IFUNC;
-	s->data = data;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_add_variable(ESExp *f, int scope, char *name, ESExpTerm *value)
-{
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	s = g_malloc0(sizeof(*s));
-	s->name = g_strdup(name);
-	s->type = ESEXP_TERM_VAR;
-	s->data = value;
-	g_scanner_scope_add_symbol(f->scanner, scope, s->name, s);
-}
-
-void
-e_sexp_remove_symbol(ESExp *f, int scope, char *name)
-{
-	int oldscope;
-	struct _ESExpSymbol *s;
-
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(name != NULL);
-
-	oldscope = g_scanner_set_scope(f->scanner, scope);
-	s = g_scanner_lookup_symbol(f->scanner, name);
-	g_scanner_scope_remove_symbol(f->scanner, scope, name);
-	g_scanner_set_scope(f->scanner, oldscope);
-	if (s) {
-		g_free(s->name);
-		g_free(s);
-	}
-}
-
-int
-e_sexp_set_scope(ESExp *f, int scope)
-{
-	g_return_val_if_fail(FILTER_IS_SEXP(f), 0);
-
-	return g_scanner_set_scope(f->scanner, scope);
-}
-
-void
-e_sexp_input_text(ESExp *f, const char *text, int len)
-{
-	g_return_if_fail(FILTER_IS_SEXP(f));
-	g_return_if_fail(text != NULL);
-
-	g_scanner_input_text(f->scanner, text, len);
-}
-
-void
-e_sexp_input_file (ESExp *f, int fd)
-{
-	g_return_if_fail(FILTER_IS_SEXP(f));
-
-	g_scanner_input_file(f->scanner, fd);
-}
-
-/* needs some error return? */
-void
-e_sexp_parse(ESExp *f)
-{
-	g_return_if_fail(FILTER_IS_SEXP(f));
-
-	if (f->tree)
-		parse_term_free(f->tree);
-
-	f->tree = parse_list(f, FALSE);
-}
-
-struct _ESExpResult *
-e_sexp_eval(ESExp *f)
-{
-	g_return_val_if_fail(FILTER_IS_SEXP(f), NULL);
-	g_return_val_if_fail(f->tree != NULL, NULL);
-
-	return e_sexp_term_eval(f, f->tree);
-}
-
-/**
- * e_sexp_encode_bool:
- * @s: 
- * @state: 
- * 
- * Encode a bool into an s-expression @s.  Bools are
- * encoded using #t #f syntax.
- **/
-void
-e_sexp_encode_bool(GString *s, gboolean state)
-{
-	if (state)
-		g_string_append(s, " #t");
-	else
-		g_string_append(s, " #f");
-}
-
-/**
- * e_sexp_encode_string:
- * @s: Destination string.
- * @string: String expression.
- * 
- * Add a c string @string to the s-expression stored in
- * the gstring @s.  Quotes are added, and special characters
- * are escaped appropriately.
- **/
-void
-e_sexp_encode_string(GString *s, const char *string)
-{
-	char c;
-	const char *p;
-
-	p = string;
-	g_string_append(s, " \"");
-	while ( (c = *p++) ) {
-		if (c=='\\' || c=='\"' || c=='\'')
-			g_string_append_c(s, '\\');
-		g_string_append_c(s, c);
-	}
-	g_string_append(s, "\"");
-}
-
-#ifdef TESTER
-int main(int argc, char **argv)
-{
-	ESExp *f;
-	char *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";
-	ESExpResult *r;
-
-	gtk_init(&argc, &argv);
-
-	f = e_sexp_new();
-
-	e_sexp_add_variable(f, 0, "test", NULL);
-
-	e_sexp_input_text(f, t, strlen(t));
-	e_sexp_parse(f);
-
-	if (f->tree) {
-		parse_dump_term(f->tree, 0);
-	}
-
-	r = e_sexp_eval(f);
-	if (r) {
-		eval_dump_result(r, 0);
-	} else {
-		printf("no result?|\n");
-	}
-
-	return 0;
-}
-#endif
diff --git a/e-util/e-sexp.h b/e-util/e-sexp.h
deleted file mode 100644
index 1030531133..0000000000
--- a/e-util/e-sexp.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-  generic s-exp evaluator class
-*/
-#ifndef _E_SEXP_H
-#define _E_SEXP_H
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#define E_SEXP(obj)         GTK_CHECK_CAST (obj, e_sexp_get_type (), ESExp)
-#define E_SEXP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_sexp_get_type (), ESExpClass)
-#define FILTER_IS_SEXP(obj)      GTK_CHECK_TYPE (obj, e_sexp_get_type ())
-
-typedef struct _ESExp      ESExp;
-typedef struct _ESExpClass ESExpClass;
-
-typedef struct _ESExpSymbol ESExpSymbol;
-typedef struct _ESExpResult ESExpResult;
-typedef struct _ESExpTerm ESExpTerm;
-
-typedef struct _ESExpResult *(ESExpFunc)(struct _ESExp *sexp,
-						   int argc,
-						   struct _ESExpResult **argv,
-						   void *data);
-
-typedef struct _ESExpResult *(ESExpIFunc)(struct _ESExp *sexp,
-						    int argc,
-						    struct _ESExpTerm **argv,
-						    void *data);
-enum _ESExpResultType {
-	ESEXP_RES_ARRAY_PTR=0,	/* type is a ptrarray, what it points to is implementation dependant */
-	ESEXP_RES_INT,		/* type is a number */
-	ESEXP_RES_STRING,	/* type is a pointer to a single string */
-	ESEXP_RES_BOOL,		/* boolean type */
-	ESEXP_RES_UNDEFINED	/* unknown type */
-};
-
-struct _ESExpResult {
-	enum _ESExpResultType type;
-	union {
-		GPtrArray *ptrarray;
-		int number;
-		char *string;
-		int bool;
-	} value;
-};
-
-enum _ESExpTermType {
-	ESEXP_TERM_INT	= 0,	/* integer literal */
-	ESEXP_TERM_BOOL,	/* boolean literal */
-	ESEXP_TERM_STRING,	/* string literal */
-	ESEXP_TERM_FUNC,	/* normal function, arguments are evaluated before calling */
-	ESEXP_TERM_IFUNC,	/* immediate function, raw terms are arguments */
-	ESEXP_TERM_VAR,		/* variable reference */
-};
-
-struct _ESExpSymbol {
-	int type;		/* ESEXP_TERM_FUNC or ESEXP_TERM_VAR */
-	char *name;
-	void *data;
-	union {
-		ESExpFunc *func;
-		ESExpIFunc *ifunc;
-	} f;
-};
-
-struct _ESExpTerm {
-	enum _ESExpTermType type;
-	union {
-		char *string;
-		int number;
-		int bool;
-		struct {
-			struct _ESExpSymbol *sym;
-			struct _ESExpTerm **terms;
-			int termcount;
-		} func;
-		struct _ESExpSymbol *var;
-	} value;
-};
-
-
-
-struct _ESExp {
-	GtkObject object;
-
-	GScanner *scanner;	/* for parsing text version */
-	ESExpTerm *tree;	/* root of expression tree */
-};
-
-struct _ESExpClass {
-	GtkObjectClass parent_class;
-
-};
-
-guint		e_sexp_get_type		(void);
-ESExp 	       *e_sexp_new		(void);
-void		e_sexp_add_function  	(ESExp *f, int scope, char *name, ESExpFunc *func, void *data);
-void		e_sexp_add_ifunction  	(ESExp *f, int scope, char *name, ESExpIFunc *func, void *data);
-void		e_sexp_add_variable  	(ESExp *f, int scope, char *name, ESExpTerm *value);
-void		e_sexp_remove_symbol	(ESExp *f, int scope, char *name);
-int		e_sexp_set_scope		(ESExp *f, int scope);
-
-void		e_sexp_input_text		(ESExp *f, const char *text, int len);
-void		e_sexp_input_file		(ESExp *f, int fd);
-
-
-void		e_sexp_parse		(ESExp *f);
-ESExpResult    *e_sexp_eval		(ESExp *f);
-
-ESExpResult    *e_sexp_term_eval		(struct _ESExp *f, struct _ESExpTerm *t);
-ESExpResult    *e_sexp_result_new	(int type);
-void		e_sexp_result_free		(struct _ESExpResult *t);
-
-/* utility functions for creating s-exp strings. */
-void		e_sexp_encode_bool(GString *s, gboolean state);
-void		e_sexp_encode_string(GString *s, const char *string);
-
-#endif /* _E_SEXP_H */
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
deleted file mode 100644
index bfba76885b..0000000000
--- a/e-util/e-text-event-processor-emacs-like.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-text-event-processor-emacs-like.h"
-
-static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
-static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);
-static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-
-static ETextEventProcessorClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0
-};
-
-static const ETextEventProcessorCommand control_keys[26] =
-{
-	{ E_TEP_START_OF_LINE,      E_TEP_MOVE, 0, "" }, /* a */
-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_MOVE, 0, "" }, /* b */
-	{ E_TEP_SELECTION,          E_TEP_COPY, 0, "" }, /* c */
-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_DELETE, 0, "" }, /* d */
-	{ E_TEP_END_OF_LINE,        E_TEP_MOVE, 0, "" }, /* e */
-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_MOVE, 0, "" }, /* f */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */
-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_DELETE, 0, "" }, /* h */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */
-	{ E_TEP_END_OF_LINE,        E_TEP_DELETE, 0, "" }, /* k */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */
-	{ E_TEP_FORWARD_LINE,       E_TEP_MOVE, 0, "" }, /* n */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */
-	{ E_TEP_BACKWARD_LINE,      E_TEP_MOVE, 0, "" }, /* p */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */
-	{ E_TEP_START_OF_LINE,      E_TEP_DELETE, 0, "" }, /* u */
-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* v */
-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* w */
-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* x */
-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* y */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */
-};
-
-static const ETextEventProcessorCommand alt_keys[26] =
-{
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* a */
-	{ E_TEP_BACKWARD_WORD,      E_TEP_MOVE, 0, "" }, /* b */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* c */
-	{ E_TEP_FORWARD_WORD,       E_TEP_DELETE, 0, "" }, /* d */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* e */
-	{ E_TEP_FORWARD_WORD,       E_TEP_MOVE, 0, "" }, /* f */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* h */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* k */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* n */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* p */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* u */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* v */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* w */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* x */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* y */
-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */
-
-};
-
-GtkType
-e_text_event_processor_emacs_like_get_type (void)
-{
-  static GtkType text_event_processor_emacs_like_type = 0;
-
-  if (!text_event_processor_emacs_like_type)
-    {
-      static const GtkTypeInfo text_event_processor_emacs_like_info =
-      {
-        "ETextEventProcessorEmacsLike",
-        sizeof (ETextEventProcessorEmacsLike),
-        sizeof (ETextEventProcessorEmacsLikeClass),
-        (GtkClassInitFunc) e_text_event_processor_emacs_like_class_init,
-        (GtkObjectInitFunc) e_text_event_processor_emacs_like_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      text_event_processor_emacs_like_type = gtk_type_unique (e_text_event_processor_get_type (), &text_event_processor_emacs_like_info);
-    }
-
-  return text_event_processor_emacs_like_type;
-}
-
-static void
-e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass)
-{
-  GtkObjectClass *object_class;
-  ETextEventProcessorClass *processor_class;
-
-  object_class = (GtkObjectClass*) klass;
-  processor_class = (ETextEventProcessorClass*) klass;
-
-  parent_class = gtk_type_class (e_text_event_processor_get_type ());
-
-  processor_class->event = e_text_event_processor_emacs_like_event;
-}
-
-static void
-e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *tep)
-{
-}
-
-static gint
-e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
-{
-	ETextEventProcessorCommand command;
-	ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep);
-	command.action = E_TEP_NOP;
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_GRAB;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-			if (event->button.state & GDK_SHIFT_MASK)
-				command.action = E_TEP_SELECT;
-			else
-				command.action = E_TEP_MOVE;
-			command.position = E_TEP_VALUE;
-			command.value = event->button.position;
-			command.time = event->button.time;
-			tep_el->mouse_down = TRUE;
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_SELECT_WORD;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_3BUTTON_PRESS:
-		if (event->button.button == 1) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_SELECT_ALL;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button == 1) {
-			command.action = E_TEP_UNGRAB;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-			command.time = event->button.time;
-			tep_el->mouse_down = FALSE;
-			command.action = E_TEP_NOP;
-		} else if (event->button.button == 2) {
-			command.action = E_TEP_MOVE;
-			command.position = E_TEP_VALUE;
-			command.value = event->button.position;
-			command.time = event->button.time;
-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);			
-
-			command.action = E_TEP_GET_SELECTION;
-			command.position = E_TEP_SELECTION;
-			command.value = 0;
-			command.time = event->button.time;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (tep_el->mouse_down) {
-			command.action = E_TEP_SELECT;
-			command.position = E_TEP_VALUE;
-			command.time = event->motion.time;
-			command.value = event->motion.position;
-		}
-		break;
-	case GDK_KEY_PRESS: 
-		{
-			ETextEventProcessorEventKey key = event->key;
-			command.time = event->key.time;
-			if (key.state & GDK_SHIFT_MASK)
-				command.action = E_TEP_SELECT;
-			else
-				command.action = E_TEP_MOVE;
-			switch(key.keyval) {
-			case GDK_Home:
-			case GDK_KP_Home:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_START_OF_BUFFER;
-				else
-					command.position = E_TEP_START_OF_LINE;
-				break;
-			case GDK_End:
-			case GDK_KP_End:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_END_OF_BUFFER;
-				else
-					command.position = E_TEP_END_OF_LINE;
-				break;
-			case GDK_Page_Up:
-			case GDK_KP_Page_Up: command.position = E_TEP_BACKWARD_PAGE; break;
-
-			case GDK_Page_Down:
-			case GDK_KP_Page_Down: command.position = E_TEP_FORWARD_PAGE; break;
-				/* CUA has Ctrl-Up/Ctrl-Down as paragraph up down */
-			case GDK_Up:
-			case GDK_KP_Up:        command.position = E_TEP_BACKWARD_LINE; break;
-
-			case GDK_Down:
-			case GDK_KP_Down:      command.position = E_TEP_FORWARD_LINE; break;
-
-			case GDK_Left:
-			case GDK_KP_Left:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_BACKWARD_WORD;
-				else
-					command.position = E_TEP_BACKWARD_CHARACTER;
-				break;
-			case GDK_Right:
-			case GDK_KP_Right:
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_FORWARD_WORD;
-				else
-					command.position = E_TEP_FORWARD_CHARACTER;
-				break;
-	  
-			case GDK_BackSpace:
-				command.action = E_TEP_DELETE;
-				if (key.state & GDK_CONTROL_MASK)
-					command.position = E_TEP_BACKWARD_WORD;
-				else
-					command.position = E_TEP_BACKWARD_CHARACTER;
-				break;
-			case GDK_Clear:
-				command.action = E_TEP_DELETE;
-				command.position = E_TEP_END_OF_LINE;
-				break;
-			case GDK_Insert:
-			case GDK_KP_Insert:
-				if (key.state & GDK_SHIFT_MASK) {
-					command.action = E_TEP_PASTE;
-					command.position = E_TEP_SELECTION;
-				} else if (key.state & GDK_CONTROL_MASK) {
-					command.action = E_TEP_COPY;
-					command.position = E_TEP_SELECTION;
-				} else {
-				/* gtk_toggle_insert(text) -- IMPLEMENT -- FIXME */
-				}
-				break;
-			case GDK_Delete:
-			case GDK_KP_Delete:
-				if (key.state & GDK_CONTROL_MASK){
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_FORWARD_WORD;
-				} else if (key.state & GDK_SHIFT_MASK) {
-					command.action = E_TEP_COPY;
-					command.position = E_TEP_SELECTION;
-					gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-				
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_SELECTION;
-				} else {
-					command.action = E_TEP_DELETE;
-					command.position = E_TEP_FORWARD_CHARACTER;
-				}
-				break;
-			case GDK_Tab:
-			case GDK_KP_Tab:
-			case GDK_ISO_Left_Tab:
-			case GDK_3270_BackTab:
-				/* Don't insert literally */
-				command.action = E_TEP_NOP;
-				command.position = E_TEP_SELECTION;
-				break;
-			case GDK_Return:
-			case GDK_KP_Enter:
-				if ((key.state & GDK_CONTROL_MASK) || (!tep->allow_newlines)) {
-					command.action = E_TEP_ACTIVATE;
-					command.position = E_TEP_SELECTION;
-				} else {
-					command.action = E_TEP_INSERT;
-					command.position = E_TEP_SELECTION;
-					command.value = 1;
-					command.string = "\n";
-				}
-				break;
-			case GDK_Escape:
-				/* Don't insert literally */
-				command.action = E_TEP_NOP;
-				command.position = E_TEP_SELECTION;
-				break;
-
-			case GDK_KP_Space:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = " ";
-				break;
-			case GDK_KP_Equal:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "=";
-				break;
-			case GDK_KP_Multiply:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "*";
-				break;
-			case GDK_KP_Add:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "+";
-				break;
-			case GDK_KP_Subtract:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "-";
-				break;
-			case GDK_KP_Decimal:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = ".";
-				break;
-			case GDK_KP_Divide:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "/";
-				break;
-			case GDK_KP_0:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "0";
-				break;
-			case GDK_KP_1:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "1";
-				break;
-			case GDK_KP_2:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "2";
-				break;
-			case GDK_KP_3:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "3";
-				break;
-			case GDK_KP_4:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "4";
-				break;
-			case GDK_KP_5:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "5";
-				break;
-			case GDK_KP_6:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "6";
-				break;
-			case GDK_KP_7:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "7";
-				break;
-			case GDK_KP_8:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "8";
-				break;
-			case GDK_KP_9:
-				command.action = E_TEP_INSERT;
-				command.position = E_TEP_SELECTION;
-				command.value = 1;
-				command.string = "9";
-				break;
-
-			default:
-				if (key.state & GDK_CONTROL_MASK) {
-					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
-						key.keyval -= 'A' - 'a';
-					
-					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = control_keys[(int) (key.keyval - 'a')].position;
-						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = control_keys[(int) (key.keyval - 'a')].action;
-						command.value = control_keys[(int) (key.keyval - 'a')].value;
-						command.string = control_keys[(int) (key.keyval - 'a')].string;
-					}
-
-					if (key.keyval == 'x' || key.keyval == 'w') {
-						command.action = E_TEP_COPY;
-						command.position = E_TEP_SELECTION;
-						gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-						
-						command.action = E_TEP_DELETE;
-						command.position = E_TEP_SELECTION;
-					}
-					
-					break;
-				} else if (key.state & GDK_MOD1_MASK) {
-					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
-						key.keyval -= 'A' - 'a';
-					
-					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
-						command.position = alt_keys[(int) (key.keyval - 'a')].position;
-						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
-							command.action = alt_keys[(int) (key.keyval - 'a')].action;
-						command.value = alt_keys[(int) (key.keyval - 'a')].value;
-						command.string = alt_keys[(int) (key.keyval - 'a')].string;
-					}
-				} else if (key.length > 0) {
-					if (key.keyval >= GDK_KP_0 && key.keyval <= GDK_KP_9) {
-						key.keyval = '0';
-						key.string = "0";
-					}
-					command.action = E_TEP_INSERT;
-					command.position = E_TEP_SELECTION;
-					command.value = strlen(key.string);
-					command.string = key.string;
-					
-				} else {
-					command.action = E_TEP_NOP;
-				}
-			}
-			break;
-		case GDK_KEY_RELEASE:
-			command.time = event->key.time;
-			command.action = E_TEP_NOP;
-			break;
-		default:
-			command.action = E_TEP_NOP;
-			break;
-		}
-	}
-	if (command.action != E_TEP_NOP) {
-		gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
-		return 1;
-	}
-	else
-		return 0;
-}
-
-ETextEventProcessor *
-e_text_event_processor_emacs_like_new (void)
-{
-	ETextEventProcessorEmacsLike *retval = gtk_type_new (e_text_event_processor_emacs_like_get_type ());
-	return E_TEXT_EVENT_PROCESSOR (retval);
-}
-
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
deleted file mode 100644
index 708ddfcbeb..0000000000
--- a/e-util/e-text-event-processor-emacs-like.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor-emacs-like.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
-#define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
-
-#include <gnome.h>
-#include <gal/e-text/e-text-event-processor.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands.  Uses an emacs-ish interface.
- *
- */
-
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE			(e_text_event_processor_emacs_like_get_type ())
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))
-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-
-
-typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;
-typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeClass;
-
-struct _ETextEventProcessorEmacsLike
-{
-	ETextEventProcessor parent;
-	
-	/* object specific fields */
-	guint mouse_down : 1;
-};
-
-struct _ETextEventProcessorEmacsLikeClass
-{
-	ETextEventProcessorClass parent_class;
-};
-
-
-GtkType    e_text_event_processor_emacs_like_get_type (void);
-ETextEventProcessor *e_text_event_processor_emacs_like_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
deleted file mode 100644
index 8f2ffbaf39..0000000000
--- a/e-util/e-text-event-processor-types.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gdk/gdktypes.h>
-
-typedef enum _ETextEventProcessorCommandPosition ETextEventProcessorCommandPosition;
-typedef enum _ETextEventProcessorCommandAction ETextEventProcessorCommandAction;
-typedef struct _ETextEventProcessorCommand ETextEventProcessorCommand;
-
-typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;
-typedef struct _ETextEventProcessorEventButton ETextEventProcessorEventButton;
-typedef struct _ETextEventProcessorEventKey ETextEventProcessorEventKey;
-typedef struct _ETextEventProcessorEventMotion ETextEventProcessorEventMotion;
-
-enum _ETextEventProcessorCommandPosition {
-	E_TEP_VALUE,
-	E_TEP_SELECTION,
-
-	E_TEP_START_OF_BUFFER,
-	E_TEP_END_OF_BUFFER,
-
-	E_TEP_START_OF_LINE,
-	E_TEP_END_OF_LINE,
-
-	E_TEP_FORWARD_CHARACTER,
-	E_TEP_BACKWARD_CHARACTER,
-
-	E_TEP_FORWARD_WORD,
-	E_TEP_BACKWARD_WORD,
-
-	E_TEP_FORWARD_LINE,
-	E_TEP_BACKWARD_LINE,
-
-	E_TEP_FORWARD_PARAGRAPH,
-	E_TEP_BACKWARD_PARAGRAPH,
-
-	E_TEP_FORWARD_PAGE,
-	E_TEP_BACKWARD_PAGE,
-
-	E_TEP_SELECT_WORD,
-	E_TEP_SELECT_ALL
-
-};
-
-enum _ETextEventProcessorCommandAction {
-	E_TEP_MOVE,
-	E_TEP_SELECT,
-	E_TEP_DELETE,
-	E_TEP_INSERT,
-
-	E_TEP_COPY,
-	E_TEP_PASTE,
-	E_TEP_GET_SELECTION,
-	E_TEP_SET_SELECT_BY_WORD,
-	E_TEP_ACTIVATE,
-	
-	E_TEP_GRAB,
-	E_TEP_UNGRAB,
-
-	E_TEP_NOP
-};
-
-struct _ETextEventProcessorCommand {
-	ETextEventProcessorCommandPosition position;
-	ETextEventProcessorCommandAction action;
-	int value;
-	char *string;
-	guint32 time;
-};
-
-struct _ETextEventProcessorEventButton {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	guint button;
-	gint position;
-};
-
-struct _ETextEventProcessorEventKey {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	guint keyval;
-	gint length;
-	gchar *string;
-};
-
-struct _ETextEventProcessorEventMotion {
-	GdkEventType type;
-	guint32 time;
-	guint state;
-	gint position;
-};
-
-union _ETextEventProcessorEvent {
-	GdkEventType type;
-	ETextEventProcessorEventButton button;
-	ETextEventProcessorEventKey key;
-	ETextEventProcessorEventMotion motion;
-};
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_TYPES_H__ */
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
deleted file mode 100644
index 772ae5c12b..0000000000
--- a/e-util/e-text-event-processor.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#include "e-text-event-processor.h"
-
-static void e_text_event_processor_init		(ETextEventProcessor		 *card);
-static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
-
-static void e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static GtkObjectClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ALLOW_NEWLINES,
-};
-
-enum {
-	E_TEP_EVENT,
-	E_TEP_LAST_SIGNAL
-};
-
-static guint e_tep_signals[E_TEP_LAST_SIGNAL] = { 0 };
-
-GtkType
-e_text_event_processor_get_type (void)
-{
-  static GtkType text_event_processor_type = 0;
-
-  if (!text_event_processor_type)
-    {
-      static const GtkTypeInfo text_event_processor_info =
-      {
-        "ETextEventProcessor",
-        sizeof (ETextEventProcessor),
-        sizeof (ETextEventProcessorClass),
-        (GtkClassInitFunc) e_text_event_processor_class_init,
-        (GtkObjectInitFunc) e_text_event_processor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      text_event_processor_type = gtk_type_unique (gtk_object_get_type (), &text_event_processor_info);
-    }
-
-  return text_event_processor_type;
-}
-
-static void
-e_text_event_processor_class_init (ETextEventProcessorClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_tep_signals[E_TEP_EVENT] =
-		gtk_signal_new ("command",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-
-	klass->event = NULL;
-	klass->command = NULL;
-
-	object_class->set_arg = e_text_event_processor_set_arg;
-	object_class->get_arg = e_text_event_processor_get_arg;
-}
-
-static void
-e_text_event_processor_init (ETextEventProcessor *tep)
-{
-	tep->allow_newlines = TRUE;
-}
-
-gint
-e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)
-{
-	if (E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)->klass)->event) {
-		return E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)->klass)->event(tep, event);
-	} else {
-		return 0;
-	}
-}
-
-/* Set_arg handler for the text item */
-static void
-e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
-
-	switch (arg_id) {
-	case ARG_ALLOW_NEWLINES:
-		tep->allow_newlines = GTK_VALUE_BOOL (*arg);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the text item */
-static void
-e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
-
-	switch (arg_id) {
-	case ARG_ALLOW_NEWLINES:
-		GTK_VALUE_BOOL (*arg) = tep->allow_newlines;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
deleted file mode 100644
index 9f9fbc9c24..0000000000
--- a/e-util/e-text-event-processor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-text-event-processor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TEXT_EVENT_PROCESSOR_H__
-#define __E_TEXT_EVENT_PROCESSOR_H__
-
-#include <gnome.h>
-#include <gal/e-text/e-text-event-processor-types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETextEventProcessor - Turns events on a text widget into commands.
- *
- */
-
-#define E_TEXT_EVENT_PROCESSOR_TYPE			(e_text_event_processor_get_type ())
-#define E_TEXT_EVENT_PROCESSOR(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))
-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))
-#define E_IS_TEXT_EVENT_PROCESSOR(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))
-
-
-typedef struct _ETextEventProcessor       ETextEventProcessor;
-typedef struct _ETextEventProcessorClass  ETextEventProcessorClass;
-
-struct _ETextEventProcessor
-{
-	GtkObject parent;
-
-	/* object specific fields */
-	guint allow_newlines : 1;
-};
-
-struct _ETextEventProcessorClass
-{
-	GtkObjectClass parent_class;
-
-	/* signals */
-	void (* command) (ETextEventProcessor *tep, ETextEventProcessorCommand *command);
-
-	/* virtual functions */
-	gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-};
-
-
-GtkType    e_text_event_processor_get_type (void);
-gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TEXT_EVENT_PROCESSOR_H__ */
diff --git a/e-util/e-util.c b/e-util/e-util.c
deleted file mode 100644
index 9a0929c865..0000000000
--- a/e-util/e-util.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#include "e-util.h"
-#if 0
-#include <libgnomevfs/gnome-vfs.h>
-#endif
-
-int
-g_str_compare(const void *x, const void *y)
-{
-  return strcmp(x, y);
-}
-
-int
-g_int_compare(const void *x, const void *y)
-{
-  if ( GPOINTER_TO_INT(x) < GPOINTER_TO_INT(y) )
-    return -1;
-  else if ( GPOINTER_TO_INT(x) == GPOINTER_TO_INT(y) )
-    return 0;
-  else
-    return 1;
-}
-
-char *
-e_strdup_strip(char *string)
-{
-	int i;
-	int length = 0;
-	int initial = 0;
-	for ( i = 0; string[i]; i++ ) {
-		if (initial == i && isspace(string[i])) {
-			initial ++;
-		}
-		if (!isspace(string[i])) {
-			length = i - initial + 1;
-		}
-	}
-	return g_strndup(string + initial, length);
-}
-
-void
-e_free_object_list (GList *list)
-{
-	GList *p;
-
-	for (p = list; p != NULL; p = p->next)
-		gtk_object_unref (GTK_OBJECT (p->data));
-
-	g_list_free (list);
-}
-
-void
-e_free_string_list (GList *list)
-{
-	GList *p;
-
-	for (p = list; p != NULL; p = p->next)
-		g_free (p->data);
-
-	g_list_free (list);
-}
-
-#define BUFF_SIZE 1024
-
-char *
-e_read_file(const char *filename)
-{
-	int fd;
-	char buffer[BUFF_SIZE];
-	GList *list = NULL, *list_iterator;
-	GList *lengths = NULL, *lengths_iterator;
-	int length = 0;
-	int bytes;
-	char *ret_val;
-
-	fd = open(filename, O_RDONLY);
-	if (fd == -1)
-		return NULL;
-	bytes = read(fd, buffer, BUFF_SIZE);
-	while (bytes) {
-		if (bytes > 0) {
-			char *temp = g_malloc(bytes);
-			memcpy (temp, buffer, bytes);
-			list = g_list_prepend(list, temp);
-			lengths = g_list_prepend(lengths, GINT_TO_POINTER(bytes));
-			length += bytes;
-		} else {
-			if (errno != EINTR) {
-				close(fd);
-				g_list_foreach(list, (GFunc) g_free, NULL);
-				g_list_free(list);
-				g_list_free(lengths);
-				return NULL;
-			}
-		}
-		bytes = read(fd, buffer, BUFF_SIZE);
-	}
-	ret_val = g_new(char, length + 1);
-	ret_val[length] = 0;
-	lengths_iterator = lengths;
-	list_iterator = list;
-	for ( ; list_iterator; list_iterator = list_iterator->next, lengths_iterator = lengths_iterator->next) {
-		int this_length = GPOINTER_TO_INT(lengths_iterator->data);
-		length -= this_length;
-		memcpy(ret_val + length, list_iterator->data, this_length);
-	}
-	close(fd);
-	g_list_foreach(list, (GFunc) g_free, NULL);
-	g_list_free(list);
-	g_list_free(lengths);
-	return ret_val;
-}
-
-gint
-e_write_file(const char *filename, const char *data, int flags)
-{
-	int fd;
-	int length = strlen(data);
-	int bytes;
-	fd = open(filename, flags, 0666);
-	if (fd == -1)
-		return errno;
-	while (length > 0) {
-		bytes = write(fd, data, length);
-		if (bytes > 0) {
-			length -= bytes;
-			data += bytes;
-		} else {
-			if (errno != EINTR && errno != EAGAIN) {
-				int save_errno = errno;
-				close(fd);
-				return save_errno;
-			}
-		}
-	}
-	close(fd);
-	return 0;
-}
-
-/**
- * e_mkdir_hier:
- * @path: a directory path
- * @mode: a mode, as for mkdir(2)
- *
- * This creates the named directory with the given @mode, creating
- * any necessary intermediate directories (with the same @mode).
- *
- * Return value: 0 on success, -1 on error, in which case errno will
- * be set as for mkdir(2).
- **/
-int
-e_mkdir_hier(const char *path, mode_t mode)
-{
-	char *copy, *p;
-
-	p = copy = g_strdup (path);
-	do {
-		p = strchr (p + 1, '/');
-		if (p)
-			*p = '\0';
-		if (access (copy, F_OK) == -1) {
-			if (mkdir (copy, mode) == -1) {
-				g_free (copy);
-				return -1;
-			}
-		}
-		if (p)
-			*p = '/';
-	} while (p);
-
-	g_free (copy);
-	return 0;
-}
-
-#if 0
-char *
-e_read_uri(const char *uri)
-{
-	GnomeVFSHandle *handle;
-	GList *list = NULL, *list_iterator;
-	GList *lengths = NULL, *lengths_iterator;
-	gchar buffer[1025];
-	gchar *ret_val;
-	int length = 0;
-	GnomeVFSFileSize bytes;
-
-	gnome_vfs_open(&handle, uri, GNOME_VFS_OPEN_READ);
-	
-	gnome_vfs_read(handle, buffer, 1024, &bytes);
-	while (bytes) {
-		if (bytes) {
-			char *temp = g_malloc(bytes);
-			memcpy (temp, buffer, bytes);
-			list = g_list_prepend(list, temp);
-			lengths = g_list_prepend(lengths, GINT_TO_POINTER((gint) bytes));
-			length += bytes;
-		}
-		gnome_vfs_read(handle, buffer, 1024, &bytes);
-	}
-
-	ret_val = g_new(char, length + 1);
-	ret_val[length] = 0;
-	lengths_iterator = lengths;
-	list_iterator = list;
-	for ( ; list_iterator; list_iterator = list_iterator->next, lengths_iterator = lengths_iterator->next) {
-		int this_length = GPOINTER_TO_INT(lengths_iterator->data);
-		length -= this_length;
-		memcpy(ret_val + length, list_iterator->data, this_length);
-	}
-	gnome_vfs_close(handle);
-	g_list_foreach(list, (GFunc) g_free, NULL);
-	g_list_free(list);
-	g_list_free(lengths);
-	return ret_val;
-}
-#endif
-
-typedef gint (*GtkSignal_INT__INT_INT_POINTER) (GtkObject * object,
-						gint arg1,
-						gint arg2,
-						gpointer arg3,
-						gpointer user_data);
-
-void
-e_marshal_INT__INT_INT_POINTER (GtkObject * object,
-				GtkSignalFunc func,
-				gpointer func_data, GtkArg * args)
-{
-	GtkSignal_INT__INT_INT_POINTER rfunc;
-	gint *return_val;
-	return_val = GTK_RETLOC_INT (args[3]);
-	rfunc = (GtkSignal_INT__INT_INT_POINTER) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_INT     (args[0]),
-				GTK_VALUE_INT     (args[1]),
-				GTK_VALUE_POINTER (args[2]),
-				func_data);
-}
-
-typedef void (*GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-							      GtkObject *arg1,
-							      gdouble arg2,
-							      gdouble arg3,
-							      gboolean arg4,
-							      gpointer user_data);
-
-void
-e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					   GtkSignalFunc func,
-					   gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	rfunc = (GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	(*rfunc) (object,
-		  GTK_VALUE_OBJECT (args[0]),
-		  GTK_VALUE_DOUBLE (args[1]),
-		  GTK_VALUE_DOUBLE (args[2]),
-		  GTK_VALUE_BOOL   (args[3]),
-		  func_data);
-}
-
-typedef gdouble (*GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-								GtkObject *arg1,
-								gdouble arg2,
-								gdouble arg3,
-								gboolean arg4,
-								gpointer user_data);
-
-void
-e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					GtkSignalFunc func,
-					gpointer func_data, GtkArg * args)
-{
-	GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	gdouble *return_val;
-	return_val = GTK_RETLOC_DOUBLE (args[4]);
-	rfunc = (GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_OBJECT (args[0]),
-				GTK_VALUE_DOUBLE (args[1]),
-				GTK_VALUE_DOUBLE (args[2]),
-				GTK_VALUE_BOOL   (args[3]),
-				func_data);
-}
-
-typedef gdouble (*GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,
-							      GtkObject *arg1,
-							      gdouble arg2,
-							      gdouble arg3,
-							      gboolean arg4,
-							      gpointer user_data);
-
-void
-e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-					GtkSignalFunc func,
-					gpointer func_data, GtkArg * args)
-{
-	GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;
-	gboolean *return_val;
-	return_val = GTK_RETLOC_BOOL (args[4]);
-	rfunc = (GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) func;
-	*return_val = (*rfunc) (object,
-				GTK_VALUE_OBJECT (args[0]),
-				GTK_VALUE_DOUBLE (args[1]),
-				GTK_VALUE_DOUBLE (args[2]),
-				GTK_VALUE_BOOL   (args[3]),
-				func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) (GtkObject * object,
-								 gint arg1, 
-								 gint arg2,
-								 gpointer arg3,
-								 gpointer arg4,
-								 gint arg5,
-								 gint arg6,
-								 gpointer user_data);
-void
-e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,
-					   GtkSignalFunc func,
-					   gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]),
-	    GTK_VALUE_POINTER (args[3]),
-	    GTK_VALUE_INT (args[4]), GTK_VALUE_INT (args[5]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT) (GtkObject * object,
-						     gint arg1, 
-						     gint arg2,
-						     gpointer arg3,
-						     gint arg4, gpointer user_data);
-void
-e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,
-			       GtkSignalFunc func,
-			       gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]), GTK_VALUE_INT (args[3]), func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) (GtkObject * object,
-								 gint arg1, 
-								 gint arg2,
-								 gpointer arg3,
-								 gint arg4,
-								 gint arg5,
-								 gint arg6,
-								 gpointer user_data);
-void
-e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,
-				       GtkSignalFunc func,
-				       gpointer func_data, GtkArg * args)
-{
-  GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT rfunc;
-  gboolean *return_val;
-  return_val = GTK_RETLOC_BOOL (args[6]);
-  rfunc = (GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) func;
-  *return_val = (*rfunc) (object,
-			  GTK_VALUE_INT (args[0]),
-			  GTK_VALUE_INT (args[1]), 
-			  GTK_VALUE_POINTER (args[2]),
-			  GTK_VALUE_INT (args[3]),
-			  GTK_VALUE_INT (args[4]),
-			  GTK_VALUE_INT (args[5]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) (GtkObject *
-									 object,
-									 gint arg1, 
-									 gint arg2,
-									 gpointer
-									 arg3,
-									 gint arg4,
-									 gint arg5,
-									 gpointer
-									 arg6,
-									 gint arg7,
-									 gint arg8,
-									 gpointer
-									 user_data);
-
-void
-e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,
-						   GtkSignalFunc func,
-						   gpointer func_data,
-						   GtkArg * args)
-{
-  GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT rfunc;
-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) func;
-  (*rfunc) (object,
-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), 
-	    GTK_VALUE_POINTER (args[2]),
-	    GTK_VALUE_INT (args[3]),
-	    GTK_VALUE_INT (args[4]),
-	    GTK_VALUE_POINTER (args[5]),
-	    GTK_VALUE_INT (args[6]), GTK_VALUE_INT (args[7]), func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER_POINTER_INT) (GtkObject *, gpointer,
-						     gpointer, gint, gpointer);
-
-void
-e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object, GtkSignalFunc func,
-				     gpointer func_data, GtkArg * args)
-{
-  GtkSignal_NONE__POINTER_POINTER_INT rfunc;
-  rfunc = (GtkSignal_NONE__POINTER_POINTER_INT) func;
-  (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),
-	    GTK_VALUE_INT (args[2]), func_data);
-}	
-
-gchar**
-e_strsplit (const gchar *string,
-	    const gchar *delimiter,
-	    gint         max_tokens)
-{
-  GSList *string_list = NULL, *slist;
-  gchar **str_array, *s;
-  guint i, n = 1;
-
-  g_return_val_if_fail (string != NULL, NULL);
-  g_return_val_if_fail (delimiter != NULL, NULL);
-
-  if (max_tokens < 1)
-    max_tokens = G_MAXINT;
-
-  s = strstr (string, delimiter);
-  if (s)
-    {
-      guint delimiter_len = strlen (delimiter);
-
-      do
-	{
-	  guint len;
-	  gchar *new_string;
-
-	  len = s - string;
-	  new_string = g_new (gchar, len + 1);
-	  strncpy (new_string, string, len);
-	  new_string[len] = 0;
-	  string_list = g_slist_prepend (string_list, new_string);
-	  n++;
-	  string = s + delimiter_len;
-	  s = strstr (string, delimiter);
-	}
-      while (--max_tokens && s);
-    }
-
-  n++;
-  string_list = g_slist_prepend (string_list, g_strdup (string));
-
-  str_array = g_new (gchar*, n);
-
-  i = n - 1;
-
-  str_array[i--] = NULL;
-  for (slist = string_list; slist; slist = slist->next)
-    str_array[i--] = slist->data;
-
-  g_slist_free (string_list);
-
-  return str_array;
-}
-
-gchar *
-e_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	/* find the needle in the haystack neglecting case */
-	gchar *ptr;
-	guint len;
-
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-
-	len = strlen(needle);
-	if (len > strlen(haystack))
-		return NULL;
-
-	if (len == 0)
-		return (char *)haystack;
-
-	for (ptr = (char *)haystack; *(ptr + len - 1) != '\0'; ptr++)
-		if (!g_strncasecmp(ptr, needle, len))
-			return ptr;
-
-	return NULL;
-}
diff --git a/e-util/e-util.h b/e-util/e-util.h
deleted file mode 100644
index 7f61295d9a..0000000000
--- a/e-util/e-util.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _E_UTIL_H_
-#define _E_UTIL_H_
-
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
-#include <sys/types.h>
-
-#define E_MAKE_TYPE(l,str,t,ci,i,parent) \
-GtkType l##_get_type(void)\
-{\
-	static GtkType type = 0;\
-	if (!type){\
-		GtkTypeInfo info = {\
-			str,\
-			sizeof (t),\
-			sizeof (t##Class),\
-			(GtkClassInitFunc) ci,\
-			(GtkObjectInitFunc) i,\
-			NULL, /* reserved 1 */\
-			NULL, /* reserved 2 */\
-			(GtkClassInitFunc) NULL\
-		};\
-                type = gtk_type_unique (parent, &info);\
-	}\
-	return type;\
-}
-
-typedef enum {
-	E_FOCUS_NONE,
-	E_FOCUS_CURRENT,
-	E_FOCUS_START,
-	E_FOCUS_END
-} EFocus;
-
-int  g_str_compare  (const void *x, const void *y);
-int  g_int_compare  (const void *x, const void *y);
-
-char *e_strdup_strip  (char *string);
-
-void  e_free_object_list  (GList *list);
-void  e_free_string_list  (GList *list);
-
-char *e_read_file  (const char *filename);
-int   e_write_file (const char *filename, const char *data, int flags);
-int   e_mkdir_hier (const char *path, mode_t mode);
-
-gchar **e_strsplit (const gchar *string,
-		    const gchar *delimiter,
-		    gint         max_tokens);
-
-gchar *e_strstrcase (const gchar *haystack,
-		     const gchar *needle);
-
-void e_marshal_INT__INT_INT_POINTER (GtkObject * object,
-				     GtkSignalFunc func,
-				     gpointer func_data, GtkArg * args);
-
-void e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-						GtkSignalFunc func,
-						gpointer func_data, GtkArg * args);
-
-void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-						  GtkSignalFunc func,
-						  gpointer func_data, GtkArg * args);
-
-void e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
-						GtkSignalFunc func,
-						gpointer func_data, GtkArg * args);
-
-#define e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT
-void e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,
-						      GtkSignalFunc func,
-						      gpointer func_data,
-						      GtkArg * args);
-
-#define e_marshal_NONE__INT_INT_POINTER_UINT e_marshal_NONE__INT_INT_POINTER_INT
-void e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,
-					  GtkSignalFunc func,
-					  gpointer func_data, GtkArg * args);
-
-#define e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT
-void e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,
-						  GtkSignalFunc func,
-						  gpointer func_data,
-						  GtkArg * args);
-
-#define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT
-void e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,
-							      GtkSignalFunc func,
-							      gpointer func_data,
-							      GtkArg * args);
-
-void e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object,
-					  GtkSignalFunc func,
-					  gpointer func_data,
-					  GtkArg * args);
-
-#endif /* _E_UTIL_H_ */
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
deleted file mode 100644
index 7802d5daf8..0000000000
--- a/e-util/e-xml-utils.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <locale.h>
-#include <math.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "e-xml-utils.h"
-
-xmlNode *e_xml_get_child_by_name(const xmlNode *parent, const xmlChar *child_name)
-{
-	xmlNode *child;
-
-	g_return_val_if_fail(parent != NULL, NULL);
-	g_return_val_if_fail(child_name != NULL, NULL);
-	
-	for (child = parent->childs; child; child = child->next) {
-		if ( !xmlStrcmp( child->name, child_name ) ) {
-			return child;
-		}
-	}
-	return NULL;
-}
-
-/* Returns the first child with the name child_name and the "lang"
- * attribute that matches the current LC_MESSAGES, or else, the first
- * child with the name child_name and no "lang" attribute.
- */
-xmlNode *
-e_xml_get_child_by_name_by_lang(const xmlNode *parent, const xmlChar *child_name, const char *lang)
-{
-	xmlNode *child;
-	/* This is the default version of the string. */
-	xmlNode *C = NULL;
-
-	g_return_val_if_fail(parent != NULL, NULL);
-	g_return_val_if_fail(child_name != NULL, NULL);
-
-	if (lang == NULL)
-		lang = setlocale(LC_MESSAGES, NULL);
-
-	for (child = parent->childs; child; child = child->next) {
-		if ( !xmlStrcmp( child->name, child_name ) ) {
-			char *this_lang = xmlGetProp(child, "lang");
-			if ( this_lang == NULL ) {
-				C = child;
-			}
-			else if (!strcmp(this_lang, "lang"))
-				return child;
-		}
-	}
-	return C;
-}
-
-int
-e_xml_get_integer_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	int ret_val = 0;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *)parent, prop_name);
-	if (prop) {
-		ret_val = atoi (prop);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_integer_prop_by_name(xmlNode *parent, const xmlChar *prop_name, int value)
-{
-	xmlChar *valuestr;
-
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	valuestr = g_strdup_printf ("%d", value);
-	xmlSetProp (parent, prop_name, valuestr);
-	g_free (valuestr);
-}
-
-gboolean
-e_xml_get_bool_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	gboolean ret_val = FALSE;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *)parent, prop_name);
-	if (prop) {
-		if(!strcasecmp(prop, "true"))
-			ret_val = TRUE;
-		xmlFree(prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_bool_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gboolean value)
-{
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (value)
-		xmlSetProp (parent, prop_name, "true");
-	else
-		xmlSetProp (parent, prop_name, "false");
-}
-
-double
-e_xml_get_double_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	double ret_val = 0;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *)parent, prop_name);
-	if (prop) {
-		sscanf (prop, "%lf", &ret_val);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, double value)
-{
-	xmlChar *valuestr;
-
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (fabs (value) < 1e9 && fabs (value) > 1e-5)
-		valuestr = g_strdup_printf ("%f", value);
-	else
-		valuestr = g_strdup_printf ("%.*g", DBL_DIG, value);
-	xmlSetProp (parent, prop_name, valuestr);
-	g_free (valuestr);
-}
-
-char *
-e_xml_get_string_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	char *ret_val = NULL;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *)parent, prop_name);
-	if (prop) {
-		ret_val = g_strdup (prop);
-		xmlFree (prop);
-	}
-	return ret_val;
-}
-
-void
-e_xml_set_string_prop_by_name(xmlNode *parent, const xmlChar *prop_name, char *value)
-{
-	g_return_if_fail (parent != NULL);
-	g_return_if_fail (prop_name != NULL);
-
-	if (value)
-		xmlSetProp (parent, prop_name, value);
-}
-
-
-char *
-e_xml_get_translated_string_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	char *ret_val = NULL;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *)parent, prop_name);
-	if (prop) {
-		ret_val = g_strdup (_(prop));
-		xmlFree (prop);
-	}
-	return ret_val;
-}
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
deleted file mode 100644
index 6d857e4e1d..0000000000
--- a/e-util/e-xml-utils.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-xml-utils.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_XML_UTILS__
-#define __E_XML_UTILS__
-
-#include <gnome.h>
-#include <gnome-xml/tree.h>
-
-xmlNode  *e_xml_get_child_by_name                   (const xmlNode *parent,
-						     const xmlChar *child_name);
-/* lang set to NULL means use the current locale. */
-xmlNode  *e_xml_get_child_by_name_by_lang           (const xmlNode *parent,
-						     const xmlChar *child_name,
-						     const char    *lang);
-
-int       e_xml_get_integer_prop_by_name            (const xmlNode *parent,
-						     const xmlChar *prop_name);
-void      e_xml_set_integer_prop_by_name            (xmlNode       *parent,
-						     const xmlChar *prop_name,
-						     int            value);
-
-gboolean  e_xml_get_bool_prop_by_name               (const xmlNode *parent,
-						     const xmlChar *prop_name);
-void      e_xml_set_bool_prop_by_name               (xmlNode       *parent,
-						     const xmlChar *prop_name,
-						     gboolean       value);
-
-double    e_xml_get_double_prop_by_name             (const xmlNode *parent,
-						     const xmlChar *prop_name);
-void      e_xml_set_double_prop_by_name             (xmlNode       *parent,
-						     const xmlChar *prop_name,
-						     double         value);
-
-char     *e_xml_get_string_prop_by_name             (const xmlNode *parent,
-						     const xmlChar *prop_name);
-void      e_xml_set_string_prop_by_name             (xmlNode       *parent,
-						     const xmlChar *prop_name,
-						     char          *value);
-
-char     *e_xml_get_translated_string_prop_by_name  (const xmlNode *parent,
-						     const xmlChar *prop_name);
-
-#endif /* __E_XML_UTILS__ */
diff --git a/e-util/ename/.cvsignore b/e-util/ename/.cvsignore
deleted file mode 100644
index 4f8c173841..0000000000
--- a/e-util/ename/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-test-ename-western
-test-ename-western-gtk
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
deleted file mode 100644
index b3abe633df..0000000000
--- a/e-util/ename/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"EName\"			\
-	-I$(srcdir)					\
-	-I$(srcdir)/..					\
-	-I$(top_srcdir) 				\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-        -I$(includedir)                                 \
-        $(GNOME_INCLUDEDIR)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-gnome_libs =						\
-	$(BONOBO_GNOME_LIBS)				\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)
-
-ename_libs = 						\
-	libename.la 					\
-	$(gnome_libs)
-
-lib_LTLIBRARIES = libename.la
-
-libename_la_SOURCES =					\
-	e-address-western.c				\
-	e-name-western.c
-
-libenameincludedir = $(includedir)/ename
-
-libenameinclude_HEADERS =				\
-	e-address-western.h				\
-	e-name-western-tables.h				\
-	e-name-western.h
-
-
-noinst_LTLIBRARIES = libename-static.la
-libename_static_la_SOURCES = $(libename_la_SOURCES)
-libename_static_la_LDFLAGS = --all-static
-
-
-noinst_PROGRAMS =					\
-	test-ename-western				\
-	test-ename-western-gtk
-
-test_ename_western_SOURCES =				\
-	test-ename-western.c
-
-test_ename_western_LDADD = $(ename_libs)		\
-	$(EXTRA_GNOME_LIBS)
-
-test_ename_western_gtk_SOURCES =				\
-	test-ename-western-gtk.c
-
-test_ename_western_gtk_LDADD = 			\
-	$(ename_libs) 				\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(gnome_libs)
diff --git a/e-util/ename/TODO b/e-util/ename/TODO
deleted file mode 100644
index 669661eea7..0000000000
--- a/e-util/ename/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Support other naming systems.
-* Handle misspelled suffixes better.
diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c
deleted file mode 100644
index 12e977b973..0000000000
--- a/e-util/ename/e-address-western.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* --------------------------------------------------
-
- An address parser, yielding fields as per RFC 2426.
-
- Author:
-   Jesse Pavel (jpavel@helixcode.com)
-
- Copyright 2000, Helix Code, Inc.
-   -------------------------------------------------- 
-*/
-
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
-
-#ifdef E_ADDRESS_WESTERN_TEST 
-
-#include "e-address-western.h"
-
-#else
-
-#include <ename/e-address-western.h>
-#include <gal/util/e-util.h>
-
-#endif
-
-/* These are the keywords that will distinguish the start of an extended
-   address. */
-
-static char *extended_keywords[] = {
-	"apt", "apartment", "suite", NULL
-};
-
-
-
-static gboolean
-e_address_western_is_line_blank (gchar *line)
-{
-	gboolean blank = TRUE;
-	gint cntr;
-
-	/* A blank line consists of whitespace only, or a NULL line. */
-	for (cntr = 0; line[cntr] != '\0'; cntr++ ) {
-		if (!isspace(line[cntr])) {
-			blank = FALSE;
-			break;
-		}
-	}
-
-	return blank;
-}
-
-
-
-/* In the array of lines, `lines', we will erase the line at line_num, and
- shift the remaining lines, up to line number num_lines, up one position. */
-
-static void
-e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines)
-{
-	gint cntr;
-
-	if (line_num >= (num_lines - 1)) {
-		/* It is the last line, so simply shift in a NULL. */
-		lines[line_num] = NULL;
-	}
-	else {
-		for (cntr = line_num; cntr < num_lines; cntr++)
-			lines[cntr] = lines[cntr + 1];
-	}
-}
-
-
-static void 
-e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)
-{
-	gint cntr;
-
-	for (cntr = 0; cntr < *linecntr; cntr++) {
-		if (e_address_western_is_line_blank (lines[cntr])) {
-			/* Delete the blank line, and shift all subsequent lines up
-			   one spot to fill its old spot. */
-			e_address_western_shift_line (lines, cntr, *linecntr);
-
-			/* Since we must check the newly shifted line, let's 
-			  not advance the counter on this next pass. */
-			cntr--;
-
-			/* There is now one less line, total. */
-			*linecntr -= 1;
-		}
-	}
-}
- 
-
-static gboolean
-e_address_western_is_po_box (gchar *line)
-{
-	gboolean retval = FALSE;
-
-	/* In which phase of processing are we? */
-	enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state;
-	
-	
-	/* If the first two letters of the line are `p' and `o', and these
-	 are in turn followed by whitespace before another letter, then I
-	 will deem the line a representation of a PO Box address. */
-	
-	gint cntr;
-
-	state = FIRSTCHAR;
-	for (cntr = 0; line[cntr] != '\0'; cntr++) {
-		if (state == FIRSTCHAR)	{
-			if (isalnum(line[cntr])) {
-				if (tolower(line[cntr]) == 'p')
-					state = SECONDCHAR;
-				else {
-					retval = FALSE;
-					break;
-				}
-			}
-		}
-		else if (state == SECONDCHAR) {
-			if (isalnum (line[cntr])) {
-				if (tolower(line[cntr]) == 'o')
-					state = WHITESPACE;
-				else {
-					retval = FALSE;
-					break;
-				}
-			}
-		}
-		else if (state == WHITESPACE) {
-			if (isspace (line[cntr])) {
-				retval = TRUE;
-				break;
-			}
-			else if (isalnum (line[cntr])) {
-				retval = FALSE;
-				break;
-			}
-		}
-	}
-
-	return retval;
-}
-
-/* A line that contains a comma followed eventually by a number is
-  deemed to be the line in the form of <town, region postal-code>. */
-
-static gboolean
-e_address_western_is_postal (guchar *line)
-{
-	gboolean retval;
-	int cntr;
-	
-	if (strchr (line, ',') == NULL)
-		retval = FALSE;  /* No comma. */
-	else {
-		int index;
-		
-		/* Ensure that the first character after the comma is
-		 a letter. */
-		index = strcspn (line, ",");
-		index++;
-		while (isspace(line[index]))
-			index++;
-		
-		if (!isalpha (line[index]))
-			return FALSE;   /* FIXME: ugly control flow. */
-
-		cntr = strlen(line) - 1;
-
-		/* Go to the character immediately following the last
-		  whitespace character. */
-		while (cntr >= 0 && isspace(line[cntr]))
-			cntr--;	
-		
-		while (cntr >= 0 && !isspace(line[cntr]))
-			cntr--;
-
-		if (cntr == 0)
-			retval = FALSE;
-		else {
-			if (isdigit (line[cntr+1]))
-				retval = TRUE;
-			else
-				retval = FALSE;
-		}
-	}	
-
-	return retval;
-}
-
-static gchar *
-e_address_western_extract_po_box (gchar *line)
-{
-	/* Return everything from the beginning of the line to
-	   the end of the first word that contains a number. */
-	
-	int index;
-
-	index = 0;
-	while (!isdigit(line[index]))
-		index++;
-	
-	while (isgraph(line[index]))
-		index++;
-	
-	return g_strndup (line, index);
-}
-
-static gchar *
-e_address_western_extract_locality (gchar *line)
-{
-	gint index;
-
-	/* Everything before the comma is the locality. */
-	index = strcspn(line, ",");
-
-	if (index == 0)
-		return NULL;
-	else
-		return g_strndup (line, index);
-}
-
-
-/* Whatever resides between the comma and the start of the
-  postal code is deemed to be the region. */
-
-static gchar *
-e_address_western_extract_region (gchar *line)
-{
-	gint start, end;
-
-	start = strcspn (line, ",");
-	start++;
-	while (isspace(line[start]))
-		start++;
-	
-	end = strlen(line) - 1;
-	while (isspace (line[end]))
-		end--;
-
-	while (!isspace (line[end]))
-		end--;
-
-	while (isspace (line[end]))
-		end--;
-	end++;
-
-	/* Between start and end lie the string. */
-	return g_strndup ( (line+start), end-start);
-}
-
-static gchar *
-e_address_western_extract_postal_code (gchar *line)
-{
-	int start, end;
-
-	end = strlen (line) - 1;
-	while (isspace(line[end]))
-		end--;
-	
-	start = end;
-	end++;
-
-	while (!isspace(line[start]))
-		start--;
-	start++;	
-
-	/* Between start and end lie the string. */
-	return g_strndup ( (line+start), end-start);
-}
-
-
-
-static void
-e_address_western_extract_street (gchar *line, gchar **street, gchar **extended)
-{
-        const gchar *split = NULL;
-	gint cntr;
-
-	for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) {
-		split = e_strstrcase (line, extended_keywords[cntr]);
-		if (split != NULL)
-			break;
-	}
-
-	if (split != NULL) {
-		*street = g_strndup (line, (split - line));
-		*extended = g_strdup (split);
-	}
-	else {
-		*street = g_strdup (line);
-		*extended = NULL;
-	}
-
-}
-
-
-
-EAddressWestern *
-e_address_western_parse (const gchar *in_address)
-{
-	gchar **lines;
-	gint linecntr, lineindex;
-	gchar *address;
-	gint cntr;
-	gboolean found_po_box, found_postal;
-
-	EAddressWestern *eaw;
-#if 0
-	gint start, end;  /* To be used to classify address lines. */
-#endif
-
-	if (in_address == NULL)
-		return NULL;
-	
-	eaw = (EAddressWestern *)g_malloc (sizeof(EAddressWestern));
-	eaw->po_box = NULL;
-	eaw->extended = NULL;
-	eaw->street = NULL;
-	eaw->locality = NULL;
-	eaw->region = NULL;
-	eaw->postal_code = NULL;
-	eaw->country = NULL;
-	
-	address = g_strdup (in_address);
-
-	/* The first thing I'll do is divide the multiline input string
-	into lines. */
-
-	/* ... count the lines. */
-	linecntr = 1;
-	lineindex = 0;
-	while (address[lineindex] != '\0') {
-		if (address[lineindex] == '\n')
-			linecntr++;
-			
-		lineindex++;
-	}
-
-	/* ... tally them. */
-	lines = (gchar **)g_malloc (sizeof(gchar *) * (linecntr+3));
-	lineindex = 0;
-	lines[0] = &address[0];
-	linecntr = 1;
-	while (address[lineindex] != '\0') {
-		if (address[lineindex] == '\n') {
-			lines[linecntr] = &address[lineindex + 1];
-			linecntr++;
-		}
-
-		lineindex++;
-	}
-
-	/* Convert the newlines at the end of each line (except the last,
-	 because it is already NULL terminated) to NULLs. */
-	for (cntr = 0; cntr < (linecntr - 1); cntr++) {
-		*(strchr (lines[cntr], '\n')) = '\0';
-	}
-
-	e_address_western_remove_blank_lines (lines, &linecntr);
-
-	/* Let's just test these functions. */
-	found_po_box = FALSE;
-	found_postal = FALSE;
-
-   	for (cntr = 0; cntr < linecntr; cntr++)  {
-		if (e_address_western_is_po_box (lines[cntr])) {
-			if (eaw->po_box == NULL)
-				eaw->po_box = e_address_western_extract_po_box (lines[cntr]);
-			found_po_box = TRUE;
-		}
-		else if (e_address_western_is_postal (lines[cntr])) {
-			if (eaw->locality == NULL)
-				eaw->locality = e_address_western_extract_locality (lines[cntr]);
-			if (eaw->region == NULL)
-				eaw->region = e_address_western_extract_region (lines[cntr]);
-			if (eaw->postal_code == NULL)
-				eaw->postal_code = e_address_western_extract_postal_code (lines[cntr]);
-			found_postal = TRUE;
-		}
-		else {
-			if (found_postal) {
-				if (eaw->country == NULL)
-					eaw->country = g_strdup (lines[cntr]);
-				else {
-					gchar *temp;
-					temp = g_strconcat (eaw->country, "\n", lines[cntr], NULL);
-					g_free (eaw->country);
-					eaw->country = temp;
-				}
-			}
-			else {
-				if (eaw->street == NULL) {
-					e_address_western_extract_street (lines[cntr], &eaw->street,
-										&eaw->extended );
-				}
-				else {
-					if (eaw->extended == NULL) {
-						eaw->extended = g_strdup (lines[cntr]);
-					}
-					else {
-						gchar *temp;
-						temp = g_strconcat (eaw->extended, "\n", lines[cntr], NULL);
-						g_free (eaw->extended);
-						eaw->extended = temp;
-					}
-				}
-			}
-		}
-	}			
-	
-	g_free (lines);
-	g_free (address);	
-	
-	return eaw;
-}	
-
-
-void 
-e_address_western_free (EAddressWestern *eaw)
-{
-	if (eaw == NULL)
-		return;
-	
-	if (eaw->po_box != NULL)
-		g_free(eaw->po_box);
-	if (eaw->extended != NULL)
-		g_free(eaw->extended);
-	if (eaw->street != NULL)
-		g_free(eaw->street);
-	if (eaw->locality != NULL)
-		g_free(eaw->locality);
-	if (eaw->region != NULL)
-		g_free(eaw->region);
-	if (eaw->postal_code != NULL)
-		g_free(eaw->postal_code);
-	if (eaw->country != NULL)
-		g_free(eaw->country);
-	
-	g_free (eaw);
-}
-
diff --git a/e-util/ename/e-address-western.h b/e-util/ename/e-address-western.h
deleted file mode 100644
index e6417f88c4..0000000000
--- a/e-util/ename/e-address-western.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __E_ADDRESS_WESTERN_H__
-#define __E_ADDRESS_WESTERN_H__
-
-typedef struct {
-	
-	/* Public */
-	char *po_box;
-	char *extended;  /* I'm not sure what this is. */
-	char *street;
-	char *locality;  /* For example, the city or town. */
-	char *region;	/* The state or province. */
-	char *postal_code;
-	char *country;
-} EAddressWestern;
-
-EAddressWestern *e_address_western_parse (const char *address);
-void e_address_western_free (EAddressWestern *eaw);
-
-#endif  /* ! __E_ADDRESS_WESTERN_H__ */
-
-
diff --git a/e-util/ename/e-name-western-tables.h b/e-util/ename/e-name-western-tables.h
deleted file mode 100644
index 2e94a94845..0000000000
--- a/e-util/ename/e-name-western-tables.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __E_NAME_WESTERN_TABLES_H__
-#define __E_NAME_WESTERN_TABLES_H__
-
-char *e_name_western_pfx_table[] = {
-
-	/*
-	 * English.
-	 */
-	"mister", "miss.", "mr.", "mrs.", "ms.",
-	"miss", "mr", "mrs", "ms", "sir", 
-	"professor", "prof.", "dr", "dr.", "doctor",
-	"judge", "justice", "chief justice", 
-	"congressman", "congresswoman", "commander",
-	"lieutenant", "lt.", "colonel", "col.", "major", "maj.",
-	"general", "gen.", "admiral", "admr.", "sergeant", "sgt.",
-	"lord", "lady", "baron", "baroness", "duke", "duchess",
-	"king", "queen", "prince", "princess",
-
-	"the most honorable", "the honorable",
-	"the reverend", "his holiness",
-	"his eminence", "his majesty", "her majesty", 
-	"his grace", "her grace",
-
-	"president", "vice president", "secretary", "undersecretary",
-	"consul", "ambassador",
-
-	"senator", "saint", "st.", "pastor", "deacon",
-	"father", "bishop", "archbishop", "cardinal", "pope",
-	"reverend", "rev.", "rabbi", 
-
-	/*
-	 * French.
-	 */
-	"monsieur", "m.", "mademoiselle", "melle",
-	"madame", "mme", "professeur", "dauphin", "dauphine",
-
-	/*
-	 * German
-	 */
-	"herr", "frau", "fraulein", "herr doktor", "doktor frau", "doktor frau doktor",
-	"frau doktor",
- 
-
-	/*
-	 * Spanish.
-	 */
-	"senor", "senora", "sra.", "senorita", "srita.", 
-
-	NULL};
-
-char *e_name_western_sfx_table[]  = {
-
-	/*
-	 * English.
-	 */
-         "junior", "senior", "jr", "sr", "I", "II", "III", "IV", "V",
-	 "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV",
-	 "XV", "XVI", "XVII", "XVIII", "XIX", "XX", "XXI", "XXII",
-	 "phd", "ms", "md", "esq", "esq.", "esquire",
-
-	NULL};
-
-char *e_name_western_twopart_sfx_table[] = {
-
-	/*
-	 * English.
-	 */
-	"the first", "the second", "the third",
-
-	NULL};
-
-char *e_name_western_complex_last_table[] = {"van", "von", "de", NULL};
-
-#endif /* ! __E_NAME_WESTERN_TABLES_H__ */
diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c
deleted file mode 100644
index 3848e7249b..0000000000
--- a/e-util/ename/e-name-western.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/*
- * A simple Western name parser.
- *
- * <Nat> Jamie, do you know anything about name parsing?
- * <jwz> Are you going down that rat hole?  Bring a flashlight.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, Helix Code, Inc.
- */
-
-#include <ctype.h>
-#include <string.h>
-#include <glib.h>
- 
-#include <ename/e-name-western.h>
-#include <ename/e-name-western-tables.h>
-
-typedef struct {
-	int prefix_idx;
-	int first_idx;
-	int middle_idx;
-	int nick_idx;
-	int last_idx;
-	int suffix_idx;
-} ENameWesternIdxs;
-
-static int
-e_name_western_str_count_words (char *str)
-{
-	int word_count;
-	char *p;
-
-	word_count = 0;
-
-	for (p = str; p != NULL; p = strchr (p, ' ')) {
-		word_count ++;
-		p ++;
-	}
-
-	return word_count;
-}
-
-static void
-e_name_western_cleanup_string (char **str)
-{
-	char *newstr;
-	char *p;
-
-	if (*str == NULL)
-		return;
-
-	/* skip any spaces and commas at the start of the string */
-	p = *str;
-	while (isspace (*p) || *p == ',')
-		p ++;
-
-	/* make the copy we're going to return */
-	newstr = g_strdup (p);
-
-	if ( strlen(newstr) > 0) {
-		/* now search from the back, skipping over any spaces and commas */
-		p = newstr + strlen (newstr) - 1;
-		while (isspace (*p) || *p == ',')
-			p --;
-		/* advance p to after the character that caused us to exit the
-		   previous loop, and end the string. */
-		if ((! isspace (*p)) && *p != ',')
-			p ++;
-		*p = '\0';
-	}
-
-	g_free (*str);
-	*str = newstr;
-}
-
-static char *
-e_name_western_get_words_at_idx (char *str, int idx, int num_words)
-{
-	char *words;
-	char *p;
-	int   word_count;
-	int   words_len;
-
-	/*
-	 * Walk to the end of the words.
-	 */
-	word_count = 0;
-	p = str + idx;
-	while (word_count < num_words && *p != '\0') {
-		while (! isspace (*p) && *p != '\0')
-			p ++;
-
-		while (isspace (*p) && *p != '\0')
-			p ++;
-
-		word_count ++;
-	}
-
-	words_len = p - str - idx - 1;
-
-	if (*p == '\0')
-		words_len ++;
-
-	words = g_malloc0 (1 + words_len);
-	strncpy (words, str + idx, words_len);
-
-	return words;
-}
-
-/*
- * What the fuck is wrong with glib's MAX macro.
- */ 
-static int
-e_name_western_max (const int a, const int b)
-{
-	if (a > b)
-		return a;
-
-	return b;
-}
-
-static gboolean
-e_name_western_word_is_suffix (char *word)
-{
-	int i;
-
-	for (i = 0; e_name_western_sfx_table [i] != NULL; i ++) {
-		if (g_strcasecmp (word, e_name_western_sfx_table [i]))
-			continue;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static char *
-e_name_western_get_one_prefix_at_str (char *str)
-{
-	char *word;
-	int   i;
-
-	/*
-	 * Check for prefixes from our table.
-	 */
-	for (i = 0; e_name_western_pfx_table [i] != NULL; i ++) {
-		int pfx_words;
-		char *words;
-
-		pfx_words = e_name_western_str_count_words (e_name_western_pfx_table [i]);
-		words = e_name_western_get_words_at_idx (str, 0, pfx_words);
-
-		if (! g_strcasecmp (words, e_name_western_pfx_table [i]))
-			return words;
-
-		g_free (words);
-	}
-
-	/*
-	 * Check for prefixes we don't know about.  These are always a
-	 * sequence of more than one letters followed by a period.
-	 */
-	word = e_name_western_get_words_at_idx (str, 0, 1);
-
-	if (strlen (word) > 2 && 
-	    isalpha ((unsigned char) word [0]) &&
-	    isalpha ((unsigned char) word [1]) &&
-	    word [strlen (word) - 1] == '.')
-		return word;
-
-	g_free (word);
-
-	return NULL;
-}
-
-static char *
-e_name_western_get_prefix_at_str (char *str)
-{
-	char *pfx;
-	char *pfx1;
-	char *pfx2;
-	char *p;
-
-	/* Get the first prefix. */
-	pfx1 = e_name_western_get_one_prefix_at_str (str);
-
-	if (pfx1 == NULL)
-		return NULL;
-
-	/* Check for a second prefix. */
-	p = str + strlen (pfx1);
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	pfx2 = e_name_western_get_one_prefix_at_str (p);
-
-	if (pfx2 != NULL) {
-		int pfx_len;
-
-		pfx_len = (p + strlen (pfx2)) - str;
-		pfx = g_malloc0 (pfx_len + 1);
-		strncpy (pfx, str, pfx_len);
-	} else {
-		pfx = g_strdup (pfx1);
-	}
-
-	g_free (pfx1);
-	g_free (pfx2);
-
-	return pfx;
-}
-
-static void
-e_name_western_extract_prefix (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *pfx;
-
-	pfx = e_name_western_get_prefix_at_str (name->full);
-
-	if (pfx == NULL)
-		return;
-
-	idxs->prefix_idx = 0;
-	name->prefix     = pfx;
-}
-
-static gboolean
-e_name_western_is_complex_last_beginning (char *word)
-{
-	int i;
-
-	for (i = 0; e_name_western_complex_last_table [i] != NULL; i ++) {
-
-		if (! g_strcasecmp (
-			word, e_name_western_complex_last_table [i]))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-e_name_western_extract_first (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	/*
-	 * If there's a prefix, then the first name is right after it.
-	 */
-	if (idxs->prefix_idx != -1) {
-		int   first_idx;
-		char *p;
-
-		first_idx = idxs->prefix_idx + strlen (name->prefix);
-
-		/* Skip past white space. */
-		p = name->full + first_idx;
-		while (isspace (*p) && *p != '\0')
-			p++;
-
-		if (*p == '\0')
-			return;
-
-		idxs->first_idx = p - name->full;
-		name->first = e_name_western_get_words_at_idx (
-			name->full, idxs->first_idx, 1);
-
-	} else {
-
-		/*
-		 * Otherwise, the first name is probably the first string.
-		 */
-		idxs->first_idx = 0;
-		name->first = e_name_western_get_words_at_idx (
-			name->full, idxs->first_idx, 1);
-	}
-
-	/*
-	 * Check that we didn't just assign the beginning of a
-	 * compound last name to the first name.
-	 */
-	if (name->first != NULL) {
-		if (e_name_western_is_complex_last_beginning (name->first)) {
-			g_free (name->first);
-			name->first = NULL;
-			idxs->first_idx = -1;
-		}
-	}
-}
-
-static void
-e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *word;
-	int   middle_idx;
-
-	/*
-	 * Middle names can only exist if you have a first name.
-	 */
-	if (idxs->first_idx == -1)
-		return;
-
-	middle_idx = idxs->first_idx + strlen (name->first) + 1;
-
-	if (middle_idx > strlen (name->full))
-		return;
-	
-	/*
-	 * Search for the first space (or the terminating \0)
-	 */
-	while (isspace (name->full [middle_idx]) &&
-	       name->full [middle_idx] != '\0')
-		middle_idx ++;
-		
-	if (name->full [middle_idx] == '\0')
-		return;
-
-	/*
-	 * Skip past the nickname, if it's there.
-	 */
-	if (name->full [middle_idx] == '\"') {
-		if (idxs->nick_idx == -1)
-			return;
-
-		middle_idx = idxs->nick_idx + strlen (name->nick) + 1;
-		
-		while (isspace (name->full [middle_idx]) &&
-		       name->full [middle_idx] != '\0')
-			middle_idx ++;
-
-		if (name->full [middle_idx] == '\0')
-			return;
-	}
-
-	/*
-	 * Make sure this isn't the beginning of a complex last name.
-	 */
-	word = e_name_western_get_words_at_idx (name->full, middle_idx, 1);
-	if (e_name_western_is_complex_last_beginning (word)) {
-		g_free (word);
-		return;
-	}
-
-	/*
-	 * Make sure this isn't a suffix.
-	 */
-	e_name_western_cleanup_string (& word);
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return;
-	}
-
-	/*
-	 * Make sure we didn't just grab a cute nickname.
-	 */
-	if (word [0] == '\"') {
-		g_free (word);
-		return;
-	}
-	
-	idxs->middle_idx = middle_idx;
-	name->middle = word;
-}
-
-static void
-e_name_western_extract_nickname (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	int   idx;
-	int   start_idx;
-	char *str;
-
-	if (idxs->first_idx == -1)
-		return;
-
-	if (idxs->middle_idx > idxs->first_idx)
-		idx = idxs->middle_idx + strlen (name->middle);
-	else
-		idx = idxs->first_idx + strlen (name->first);
-
-	while (name->full [idx] != '\"' && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] != '\"')
-		return;
-
-	start_idx = idx;
-
-	/*
-	 * Advance to the next double quote.
-	 */
-	idx ++;
-	
-	while (name->full [idx] != '\"' && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] == '\0')
-		return;
-
-	str = g_malloc0 (idx - start_idx + 2);
-	strncpy (str, name->full + start_idx, idx - start_idx + 1);
-
-	name->nick = str;
-	idxs->nick_idx = start_idx;
-}
-
-static int
-e_name_western_last_get_max_idx (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	int max_idx = -1;
-
-	if (name->prefix != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->prefix_idx + strlen (name->prefix));
-
-	if (name->first != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->first_idx + strlen (name->first));
-
-	if (name->middle != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->middle_idx + strlen (name->middle));
-
-	if (name->nick != NULL)
-		max_idx = e_name_western_max (
-			max_idx, idxs->nick_idx + strlen (name->nick));
-
-	return max_idx;
-}
-
-static void
-e_name_western_extract_last (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *word;
-	int   idx = -1;
-
-	idx = e_name_western_last_get_max_idx (name, idxs);
-
-	/*
-	 * In the case where there is no preceding name element, the
-	 * name is either just a first name ("Nat", "John"), is a
-	 * single-element name ("Cher", which we treat as a first
-	 * name), or is just a last name.  The only time we can
-	 * differentiate a last name alone from a single-element name
-	 * or a first name alone is if it's a complex last name ("de
-	 * Icaza", "van Josephsen").  So if there is no preceding name
-	 * element, we check to see whether or not the first part of
-	 * the name is the beginning of a complex name.  If it is,
-	 * we subsume the entire string.  If we accidentally subsume
-	 * the suffix, this will get fixed in the fixup routine.
-	 */
-	if (idx == -1) {
-		word = e_name_western_get_words_at_idx (name->full, 0, 1);
-		if (! e_name_western_is_complex_last_beginning (word)) {
-			g_free (word);
-			return;
-		}
-
-		name->last     = g_strdup (name->full);
-		idxs->last_idx = 0;
-		return;
-	}
-
-	/* Skip past the white space. */
-	while (isspace (name->full [idx]) && name->full [idx] != '\0')
-		idx ++;
-
-	if (name->full [idx] == '\0')
-		return;
-
-	word = e_name_western_get_words_at_idx (name->full, idx, 1);
-	e_name_western_cleanup_string (& word);
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return;
-	}
-	g_free (word);
-
-	/*
-	 * Subsume the rest of the string into the last name.  If we
-	 * accidentally include the prefix, it will get fixed later.
-	 * This is the only way to handle things like "Miguel de Icaza
-	 * Amozorrutia" without dropping data and forcing the user
-	 * to retype it.
-	 */
-	name->last = g_strdup (name->full + idx);
-	idxs->last_idx = idx;
-}
-
-static char *
-e_name_western_get_preceding_word (char *str, int idx)
-{
-	int   word_len;
-	char *word;
-	char *p;
-
-	p = str + idx;
-
-	while (isspace (*p) && p > str)
-		p --;
-
-	while (! isspace (*p) && p > str)
-		p --;
-
-	if (isspace (*p))
-	    p ++;
-
-	word_len = (str + idx) - p;
-	word = g_malloc0 (word_len + 1);
-	if (word_len > 0)
-		strncpy (word, p, word_len);
-
-	return word;
-}
-
-static char *
-e_name_western_get_suffix_at_str_end (char *str)
-{
-	char *suffix;
-	char *p;
-
-	/*
-	 * Walk backwards till we reach the beginning of the
-	 * (potentially-comma-separated) list of suffixes.
-	 */
-	p = str + strlen (str);
-	while (1) {
-		char *nextp;
-		char *word;
-
-		word = e_name_western_get_preceding_word (str, p - str);
-		nextp = p - strlen (word) - 1;
-		
-		e_name_western_cleanup_string (& word);
-
-		if (e_name_western_word_is_suffix (word)) {
-			p = nextp;
-			g_free (word);
-		} else {
-			g_free (word);
-			break;
-		}
-	}
-
-	if (p == (str + strlen (str)))
-		return NULL;
-
-	suffix = g_strdup (p);
-	e_name_western_cleanup_string (& suffix);
-
-	if (strlen (suffix) == 0) {
-		g_free (suffix);
-		return NULL;
-	}
-
-	return suffix;
-}
-
-static void
-e_name_western_extract_suffix (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-
-	name->suffix = e_name_western_get_suffix_at_str_end (name->full);
-
-	if (name->suffix == NULL)
-		return;
-
-	idxs->suffix_idx = strlen (name->full) - strlen (name->suffix);
-}
-
-static gboolean
-e_name_western_detect_backwards (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *comma;
-	char *word;
-
-	comma = strchr (name->full, ',');
-
-	if (comma == NULL)
-		return FALSE;
-
-	/*
-	 * If there's a comma, we need to detect whether it's
-	 * separating the last name from the first or just separating
-	 * suffixes.  So we grab the word which comes before the
-	 * comma and check if it's a suffix.
-	 */
-	word = e_name_western_get_preceding_word (name->full, comma - name->full);
-
-	if (e_name_western_word_is_suffix (word)) {
-		g_free (word);
-		return FALSE;
-	}
-
-	g_free (word);
-	return TRUE;
-}
-
-static void
-e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	char *prefix;
-	char *last;
-	char *suffix;
-	char *firstmidnick;
-	char *newfull;
-
-	char *comma;
-	char *p;
-
-	if (! e_name_western_detect_backwards (name, idxs))
-		return;
-
-	/*
-	 * Convert
-	 *    <Prefix> <Last name>, <First name> <Middle[+nick] name> <Suffix>
-	 * to
-	 *    <Prefix> <First name> <Middle[+nick] name> <Last name> <Suffix>
-	 */
-	
-	/*
-	 * Grab the prefix from the beginning.
-	 */
-	prefix = e_name_western_get_prefix_at_str (name->full);
-
-	/*
-	 * Everything from the end of the prefix to the comma is the
-	 * last name.
-	 */
-	comma = strchr (name->full, ',');
-	if (comma == NULL)
-		return;
-
-	p = name->full + (prefix == NULL ? 0 : strlen (prefix));
-
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	last = g_malloc0 (comma - p + 1);
-	strncpy (last, p, comma - p);
-
-	/*
-	 * Get the suffix off the end.
-	 */
-	suffix = e_name_western_get_suffix_at_str_end (name->full);
-
-	/*
-	 * Firstmidnick is everything from the comma to the beginning
-	 * of the suffix.
-	 */
-	p = comma + 1;
-
-	while (isspace (*p) && *p != '\0')
-		p ++;
-
-	if (suffix != NULL) {
-		char *q;
-
-		/*
-		 * Point q at the beginning of the suffix.
-		 */
-		q = name->full + strlen (name->full) - strlen (suffix) - 1;
-
-		/*
-		 * Walk backwards until we hit the space which
-		 * separates the suffix from firstmidnick.
-		 */
-		while (! isspace (*q) && q > comma)
-			q --;
-
-		if ((q - p + 1) > 0) {
-			firstmidnick = g_malloc0 (q - p + 1);
-			strncpy (firstmidnick, p, q - p);
-		} else
-			firstmidnick = NULL;
-	} else {
-		firstmidnick = g_strdup (p);
-	}
-
-	/*
-	 * Create our new reordered version of the name.
-	 */
-#define NULLSTR(a) ((a) == NULL ? "" : (a))
-	newfull = g_strdup_printf ("%s %s %s %s", NULLSTR (prefix), NULLSTR (firstmidnick),
-				   NULLSTR (last), NULLSTR (suffix));
-	g_strstrip (newfull);
-	g_free (name->full);
-	name->full = newfull;
-
-
-	g_free (prefix);
-	g_free (firstmidnick);
-	g_free (last);
-	g_free (suffix);
-}
-
-static void
-e_name_western_zap_nil (char **str, int *idx)
-{
-	if (*str == NULL)
-		return;
-
-	if (strlen (*str) != 0)
-		return;
-
-	*idx = -1;
-	g_free (*str);
-	*str = NULL;
-}
-
-static void
-e_name_western_fixup (ENameWestern *name, ENameWesternIdxs *idxs)
-{
-	/*
-	 * The middle and last names cannot be the same.
-	 */
-	if (idxs->middle_idx != -1 && idxs->middle_idx == idxs->last_idx) {
-		idxs->middle_idx = -1;
-		g_free (name->middle);
-		name->middle = NULL;
-	}
-
-	/*
-	 * If we have a middle name and no last name, then we mistook
-	 * the last name for the middle name.
-	 */
-	if (idxs->last_idx == -1 && idxs->middle_idx != -1) {
-		idxs->last_idx   = idxs->middle_idx;
-		name->last       = name->middle;
-		name->middle     = NULL;
-		idxs->middle_idx = -1;
-	}
-
-	/*
-	 * Check to see if we accidentally included the suffix in the
-	 * last name.
-	 */
-	if (idxs->suffix_idx != -1 && idxs->last_idx != -1 &&
-	    idxs->suffix_idx < (idxs->last_idx + strlen (name->last))) {
-		char *sfx;
-
-		sfx = name->last + (idxs->suffix_idx - idxs->last_idx);
-		if (sfx != NULL) {
-			char *newlast;
-			char *p;
-
-			p = sfx - 1;
-			while (isspace (*p) && p > name->last)
-				p --;
-			p ++;
-
-			newlast = g_malloc0 (p - name->last + 1);
-			strncpy (newlast, name->last, p - name->last);
-			g_free (name->last);
-			name->last = newlast;
-		}
-	}
-
-	/*
-	 * If we have a prefix and a first name, but no last name,
-	 * then we need to assign the first name to the last name.
-	 * This way we get things like "Mr Friedman" correctly.
-	 */
-	if (idxs->first_idx != -1 && idxs->prefix_idx != -1 &&
-	    idxs->last_idx == -1) {
-		name->last      = name->first;
-		idxs->last_idx  = idxs->first_idx;
-		idxs->first_idx = -1;
-		name->first     = NULL;
-	}
-
-	/*
-	 * Remove stray spaces and commas (although there don't seem
-	 * to be any in the test cases, they might show up later).
-	 */
-	e_name_western_cleanup_string (& name->prefix);
-	e_name_western_cleanup_string (& name->first);
-	e_name_western_cleanup_string (& name->middle);
-	e_name_western_cleanup_string (& name->nick);
-	e_name_western_cleanup_string (& name->last);
-	e_name_western_cleanup_string (& name->suffix);
-
-	/*
-	 * Make zero-length strings just NULL.
-	 */
-	e_name_western_zap_nil (& name->prefix, & idxs->prefix_idx);
-	e_name_western_zap_nil (& name->first,  & idxs->first_idx);
-	e_name_western_zap_nil (& name->middle, & idxs->middle_idx);
-	e_name_western_zap_nil (& name->nick,   & idxs->nick_idx);
-	e_name_western_zap_nil (& name->last,   & idxs->last_idx);
-	e_name_western_zap_nil (& name->suffix, & idxs->suffix_idx);
-}
-
-/**
- * e_name_western_western_parse_fullname:
- * @full_name: A string containing a Western name.
- *
- * Parses @full_name and returns an #ENameWestern object filled with
- * the component parts of the name.
- */
-ENameWestern *
-e_name_western_parse (const char *full_name)
-{
-	ENameWesternIdxs *idxs;
-	ENameWestern *wname;
-
-	wname = g_new0 (ENameWestern, 1);
-
-	wname->full = g_strdup (full_name);
-
-	idxs = g_new0 (ENameWesternIdxs, 1);
-
-	idxs->prefix_idx = -1;
-	idxs->first_idx  = -1;
-	idxs->middle_idx = -1;
-	idxs->nick_idx   = -1;
-	idxs->last_idx   = -1;
-	idxs->suffix_idx = -1;
-	
-	/*
-	 * An extremely simple algorithm.
-	 *
-	 * The goal here is to get it right 95% of the time for
-	 * Western names.
-	 *
-	 * First we check to see if this is an ass-backwards name
-	 * ("Prefix Last, First Middle Suffix").  These names really
-	 * suck (imagine "Dr von Johnson, Albert Roderick Jr"), so
-	 * we reorder them first and then parse them.
-	 *
-	 * Next, we grab the most obvious assignments for the various
-	 * parts of the name.  Once this is done, we check for stupid
-	 * errors and fix them up.
-	 */
-	e_name_western_reorder_asshole  (wname, idxs);
-
-	e_name_western_extract_prefix   (wname, idxs);
-	e_name_western_extract_first    (wname, idxs);
-	e_name_western_extract_nickname (wname, idxs);
-	e_name_western_extract_middle   (wname, idxs);
-	e_name_western_extract_last     (wname, idxs);
-	e_name_western_extract_suffix   (wname, idxs);
-
-	e_name_western_fixup            (wname, idxs);
-
-	g_free (idxs);
-
-	return wname;
-}
-
-/**
- * e_name_western_free:
- * @name: An ENameWestern object which needs to be freed.
- *
- * Deep-frees @name
- */
-void
-e_name_western_free (ENameWestern *w)
-{
-
-	g_free (w->prefix);
-	g_free (w->first);
-	g_free (w->middle);
-	g_free (w->nick);
-	g_free (w->last);
-	g_free (w->suffix);
-	
-	g_free (w->full);
-
-	g_free (w);
-}
diff --git a/e-util/ename/e-name-western.h b/e-util/ename/e-name-western.h
deleted file mode 100644
index fa5bac494c..0000000000
--- a/e-util/ename/e-name-western.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __E_NAME_WESTERN_H__
-#define __E_NAME_WESTERN_H__
-
-typedef struct {
-
-	/* Public */
-	char *prefix;
-	char *first;
-	char *middle;
-	char *nick;
-	char *last;
-	char *suffix;
-
-	/* Private */
-	char *full;
-} ENameWestern;
-
-ENameWestern *e_name_western_parse (const char   *full_name);
-void          e_name_western_free  (ENameWestern *w);
-
-#endif /* ! __E_NAME_WESTERN_H__ */
diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c
deleted file mode 100644
index 74adb2a0b4..0000000000
--- a/e-util/ename/test-ename-western-gtk.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <ename/e-name-western.h>
-
-ENameWestern *name;
-GtkWidget    *full;
-GtkWidget    *prefix;
-GtkWidget    *first;
-GtkWidget    *middle;
-GtkWidget    *nick;
-GtkWidget    *last;
-GtkWidget    *suffix;
-
-static void
-fill_entries (void)
-{
-
-#define SET(a,b) (e_utf8_gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))
-	SET(prefix, name->prefix);
-	SET(first,  name->first);
-	SET(middle, name->middle);
-	SET(nick,   name->nick);
-	SET(last,   name->last);
-	SET(suffix, name->suffix);
-}
-
-static void
-full_changed_cb (GtkEntry *fulle)
-{
-	gchar *str;
-
-	e_name_western_free (name);
-	str = e_utf8_gtk_entry_get_text (fulle);
-	name = e_name_western_parse (str);
-	fill_entries ();
-
-	g_free (str);
-}
-
-static void
-create_window (void)
-{
-	GtkWidget *app;
-	GtkTable  *table;
-
-	GtkWidget *prefix_label;
-	GtkWidget *first_label;
-	GtkWidget *middle_label;
-	GtkWidget *nick_label;
-	GtkWidget *last_label;
-	GtkWidget *suffix_label;
-
-	app = gnome_app_new ("test", "Evolution Western Name Parser");
-
-	table = GTK_TABLE (gtk_table_new (3, 6, FALSE));
-
-	full   = gtk_entry_new ();
-	prefix = gtk_entry_new ();
-	first  = gtk_entry_new ();
-	middle = gtk_entry_new ();
-	nick   = gtk_entry_new ();
-	last   = gtk_entry_new ();
-	suffix = gtk_entry_new ();
-
-	gtk_widget_set_usize (prefix, 100, 0);
-	gtk_widget_set_usize (first,  100, 0);
-	gtk_widget_set_usize (middle, 100, 0);
-	gtk_widget_set_usize (nick,   100, 0);
-	gtk_widget_set_usize (last,   100, 0);
-	gtk_widget_set_usize (suffix, 100, 0);
-
-	gtk_table_attach (table, full, 0, 6, 0, 1,
-			  GTK_EXPAND | GTK_FILL, 0,
-			  0, 0);
-
-	gtk_table_attach (table, prefix, 0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, first, 1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, middle, 2, 3, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, nick, 3, 4, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, last, 4, 5, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, suffix, 5, 6, 1, 2,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
-			  0, 0);
-
-	prefix_label = gtk_label_new ("Prefix"); 
-	first_label  = gtk_label_new ("First"); 
-	middle_label = gtk_label_new ("Middle"); 
-	nick_label   = gtk_label_new ("Nick"); 
-	last_label   = gtk_label_new ("Last"); 
-	suffix_label = gtk_label_new ("Suffix"); 
-
-	gtk_table_attach (table, prefix_label, 0, 1, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, first_label, 1, 2, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, middle_label, 2, 3, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, nick_label, 3, 4, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, last_label, 4, 5, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gtk_table_attach (table, suffix_label, 5, 6, 2, 3,
-			  GTK_SHRINK, 0,
-			  0, 0);
-
-	gnome_app_set_contents (GNOME_APP (app), GTK_WIDGET (table));
-
-	gtk_widget_show_all (app);
-
-	gtk_entry_set_text (GTK_ENTRY (full),
-			    "The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");
-
-	name = e_name_western_parse ("The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");
-	fill_entries ();
-
-	gtk_signal_connect (GTK_OBJECT (full), "changed", full_changed_cb, NULL);
-}
-
-int
-main (int argc, char **argv)
-{
-	gnome_init ("Test EName", "Test EName", argc, argv);
-
-	create_window ();
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c
deleted file mode 100644
index 6d3beaf16f..0000000000
--- a/e-util/ename/test-ename-western.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <gnome.h>
-#include <ctype.h>
-
-#include <ename/e-name-western.h>
-
-static void
-do_name (char *n)
-{
-	ENameWestern *wname;
-
-	wname = e_name_western_parse (n);
-
-	printf ("Full Name: [%s]\n", n);
-
-	printf ("Prefix: [%s]\n", wname->prefix);
-	printf ("First:  [%s]\n", wname->first);
-	printf ("Middle: [%s]\n", wname->middle);
-	printf ("Nick:   [%s]\n", wname->nick);
-	printf ("Last:   [%s]\n", wname->last);
-	printf ("Suffix: [%s]\n", wname->suffix);
-
-	printf ("\n");
-
-	e_name_western_free (wname);
-}
-
-int
-main (int argc, char **argv)
-{
-	if (argc == 2) {
-		while (! feof (stdin)) {
-			char s[256];
-
-			if (fgets (s, sizeof (s), stdin) == NULL)
-				return 0;
-
-			g_strstrip (s);
-
-			do_name (s);
-		}
-
-		return 0;
-	}
-
-	do_name ("Nat");
-	do_name ("Karl Anders Carlsson");
-	do_name ("Miguel de Icaza Amozorrutia");
-	do_name ("The Honorable Doctor de Icaza, Miguel \"Sparky\" Junior, PhD, MD");
-	do_name ("Nat Friedman MD, Phd");
-	do_name ("Nat Friedman PhD");
-	do_name ("Friedman, Nat");
-	do_name ("Miguel de Icaza Esquire");
-	do_name ("Dr Miguel \"Sparky\" de Icaza");
-	do_name ("Robert H.B. Netzer");
-	do_name ("W. Richard Stevens");
-	do_name ("Nat Friedman");
-	do_name ("N. Friedman");
-	do_name ("Miguel de Icaza");
-	do_name ("Drew Johnson");
-	do_name ("President Bill \"Slick Willy\" Clinton");
-	do_name ("The Honorable Mark J. Einstein Jr");
-	do_name ("Friedman, Nat");
-	do_name ("de Icaza, Miguel");
-	do_name ("Mr de Icaza, Miguel");
-	do_name ("Smith, John Jr");
-	do_name ("Nick Glennie-Smith");
-	do_name ("Dr von Johnson, Albert Roderick Jr");
-
-	return 0;
-}
diff --git a/e-util/md5-utils.c b/e-util/md5-utils.c
deleted file mode 100644
index a4dd42af8b..0000000000
--- a/e-util/md5-utils.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to md5_init, call md5_update as
- * needed on buffers full of bytes, and then call md5_Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-/* parts of this file are :
- * Written March 1993 by Branko Lankester
- * Modified June 1993 by Colin Plumb for altered md5.c.
- * Modified October 1995 by Erik Troan for RPM
- */
-
-
-#include "md5-utils.h"
-#include <stdio.h>
-#include <string.h>
-
-static void md5_transform (guint32 buf[4], const guint32 in[16]);
-
-static gint _ie = 0x44332211;
-static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&_ie;
-#define	IS_BIG_ENDIAN()		(_endian->b[0] == '\x44')
-#define	IS_LITTLE_ENDIAN()	(_endian->b[0] == '\x11')
-
-
-/*
- * Note: this code is harmless on little-endian machines.
- */
-static void 
-_byte_reverse (guchar *buf, guint32 longs)
-{
-	guint32 t;
-	do {
-		t = (guint32) ((guint32) buf[3] << 8 | buf[2]) << 16 |
-			((guint32) buf[1] << 8 | buf[0]);
-		*(guint32 *) buf = t;
-		buf += 4;
-	} while (--longs);
-}
-
-/**
- * md5_init: Initialise an md5 context object
- * @ctx: md5 context 
- * 
- * Initialise an md5 buffer. 
- *
- **/
-void 
-md5_init (MD5Context *ctx)
-{
-	ctx->buf[0] = 0x67452301;
-	ctx->buf[1] = 0xefcdab89;
-	ctx->buf[2] = 0x98badcfe;
-	ctx->buf[3] = 0x10325476;
-	
-	ctx->bits[0] = 0;
-	ctx->bits[1] = 0;
-	
-	if (IS_BIG_ENDIAN())	
-		ctx->doByteReverse = 1;		
-	else 
-		ctx->doByteReverse = 0;	
-}
-
-
-
-/**
- * md5_update: add a buffer to md5 hash computation
- * @ctx: conetxt object used for md5 computaion
- * @buf: buffer to add
- * @len: buffer length
- * 
- * Update context to reflect the concatenation of another buffer full
- * of bytes. Use this to progressively construct an md5 hash.
- **/
-void 
-md5_update (MD5Context *ctx, const guchar *buf, guint32 len)
-{
-	guint32 t;
-	
-	/* Update bitcount */
-	
-	t = ctx->bits[0];
-	if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
-		ctx->bits[1]++;		/* Carry from low to high */
-	ctx->bits[1] += len >> 29;
-	
-	t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
-	
-	/* Handle any leading odd-sized chunks */
-	
-	if (t) {
-		guchar *p = (guchar *) ctx->in + t;
-		
-		t = 64 - t;
-		if (len < t) {
-			memcpy (p, buf, len);
-			return;
-		}
-		memcpy (p, buf, t);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		buf += t;
-		len -= t;
-	}
-	/* Process data in 64-byte chunks */
-	
-	while (len >= 64) {
-		memcpy (ctx->in, buf, 64);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		buf += 64;
-		len -= 64;
-	}
-	
-	/* Handle any remaining bytes of data. */
-	
-	memcpy (ctx->in, buf, len);
-}
-
-
-
-
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-/**
- * md5_final: copy the final md5 hash to a bufer
- * @digest: 16 bytes buffer
- * @ctx: context containing the calculated md5
- * 
- * copy the final md5 hash to a bufer
- **/
-void 
-md5_final (MD5Context *ctx, guchar digest[16])
-{
-	guint32 count;
-	guchar *p;
-	
-	/* Compute number of bytes mod 64 */
-	count = (ctx->bits[0] >> 3) & 0x3F;
-	
-	/* Set the first char of padding to 0x80.  This is safe since there is
-	   always at least one byte free */
-	p = ctx->in + count;
-	*p++ = 0x80;
-	
-	/* Bytes of padding needed to make 64 bytes */
-	count = 64 - 1 - count;
-	
-	/* Pad out to 56 mod 64 */
-	if (count < 8) {
-		/* Two lots of padding:  Pad the first block to 64 bytes */
-		memset (p, 0, count);
-		if (ctx->doByteReverse)
-			_byte_reverse (ctx->in, 16);
-		md5_transform (ctx->buf, (guint32 *) ctx->in);
-		
-		/* Now fill the next block with 56 bytes */
-		memset (ctx->in, 0, 56);
-	} else {
-		/* Pad block to 56 bytes */
-		memset (p, 0, count - 8);
-	}
-	if (ctx->doByteReverse)
-		_byte_reverse (ctx->in, 14);
-	
-	/* Append length in bits and transform */
-	((guint32 *) ctx->in)[14] = ctx->bits[0];
-	((guint32 *) ctx->in)[15] = ctx->bits[1];
-	
-	md5_transform (ctx->buf, (guint32 *) ctx->in);
-	if (ctx->doByteReverse)
-		_byte_reverse ((guchar *) ctx->buf, 4);
-	memcpy (digest, ctx->buf, 16);
-}
-
-
-
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data.  md5_Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-static void 
-md5_transform (guint32 buf[4], const guint32 in[16])
-{
-	register guint32 a, b, c, d;
-	
-	a = buf[0];
-	b = buf[1];
-	c = buf[2];
-	d = buf[3];
-	
-	MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-	MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-	MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);
-	MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-	MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-	MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-	MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);
-	MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);
-	MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);
-	MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-	MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-	MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-	MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);
-	MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);
-	MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);
-	MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);
-	
-	MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-	MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);
-	MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-	MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-	MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-	MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);
-	MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-	MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-	MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-	MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-	MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-	MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-	MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-	MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-	MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-	MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-	
-	MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-	MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);
-	MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-	MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-	MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-	MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-	MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-	MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-	MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-	MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-	MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-	MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);
-	MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-	MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-	MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-	MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-	
-	MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);
-	MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);
-	MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-	MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-	MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-	MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-	MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-	MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-	MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-	MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-	MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);
-	MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-	MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-	MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-	MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-	MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-	
-	buf[0] += a;
-	buf[1] += b;
-	buf[2] += c;
-	buf[3] += d;
-}
-
-
-
-
-/**
- * md5_get_digest: get the md5 hash of a buffer
- * @buffer: byte buffer
- * @buffer_size: buffer size (in bytes)
- * @digest: 16 bytes buffer receiving the hash code.
- * 
- * Get the md5 hash of a buffer. The result is put in 
- * the 16 bytes buffer @digest .
- **/
-void
-md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])
-{	
-	MD5Context ctx;
-
-	md5_init (&ctx);
-	md5_update (&ctx, buffer, buffer_size);
-	md5_final (&ctx, digest);
-	
-}
-
-
-/**
- * md5_get_digest_from_file: get the md5 hash of a file
- * @filename: file name
- * @digest: 16 bytes buffer receiving the hash code.
- * 
- * Get the md5 hash of a file. The result is put in 
- * the 16 bytes buffer @digest .
- **/
-void
-md5_get_digest_from_file (const gchar *filename, guchar digest[16])
-{	
-	MD5Context ctx;
-	guchar tmp_buf[1024];
-	gint nb_bytes_read;
-	FILE *fp;
-
-	printf("generating checksum\n");
-
-	md5_init (&ctx);
-	fp = fopen(filename, "r");
-	if (!fp) {
-	return;
-	}
-	
-	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) > 0)
-		md5_update (&ctx, tmp_buf, nb_bytes_read);
-	
-	if (ferror(fp)) {
-		fclose(fp);
-		return;
-	}
-
-	
-	md5_final (&ctx, digest);
-	
-	printf("checksum done\n");
-}
-
-
-
-
diff --git a/e-util/md5-utils.h b/e-util/md5-utils.h
deleted file mode 100644
index 08e014e86e..0000000000
--- a/e-util/md5-utils.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to rpmMD5Init, call rpmMD5Update as
- * needed on buffers full of bytes, and then call rpmMD5Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-/* parts of this file are :
- * Written March 1993 by Branko Lankester
- * Modified June 1993 by Colin Plumb for altered md5.c.
- * Modified October 1995 by Erik Troan for RPM
- */
-
-
-#ifndef MD5_UTILS_H
-#define MD5_UTILS_H
-
-#include <glib.h>
-
-typedef struct {
-	guint32 buf[4];
-	guint32 bits[2];
-	guchar in[64];
-	gint doByteReverse;
-
-} MD5Context ;
-
-
-void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);
-
-/* use this one when speed is needed */
-/* for use in provider code only */
-void md5_get_digest_from_file (const gchar *filename, guchar digest[16]);
-
-/* raw routines */
-void md5_init (MD5Context *ctx);
-void md5_update (MD5Context *ctx, const guchar *buf, guint32 len);
-void md5_final (MD5Context *ctx, guchar digest[16]);
-
-
-#endif	/* MD5_UTILS_H */
diff --git a/evolution.desktop b/evolution.desktop
deleted file mode 100644
index 665f94792e..0000000000
--- a/evolution.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Name=Evolution
-Name[pt_BR]=Evolution
-Name[es]=Evolution
-Name[fr]=Evolution
-Name[it]=Evolution
-Name[sl]=Evolucija
-Name[sv]=Evolution
-Name[tr]=Evolution
-Comment=The Evolution groupware suite
-Comment[pt_BR]=Suíte do grupo Evolution
-Comment[es]=El programa de trabajo en grupo Evolution
-Comment[fr]=La suite de travail collaboratif Evolution
-Comment[it]=La suite di produttivita' personale Evolution
-Comment[sl]=Programje za delo v skupini Evolucija
-Comment[sv]=Grupprogramvaran Evolution
-Comment[tr]=Evolution kitlesel iþlemler uygulamasý
-Exec=evolution
-Icon=evolution.png
-Terminal=0
-Type=Application
diff --git a/evolution.png b/evolution.png
deleted file mode 100644
index 3b0f90b292..0000000000
--- a/evolution.png
+++ /dev/null
diff --git a/executive-summary/.cvsignore b/executive-summary/.cvsignore
deleted file mode 100644
index aed809a312..0000000000
--- a/executive-summary/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-core
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
deleted file mode 100644
index cd46827052..0000000000
--- a/executive-summary/ChangeLog
+++ /dev/null
@@ -1,226 +0,0 @@
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-services/Makefile.am: Clean the idl-generated files
-	properly.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c:
-	  component/e-summary-factory.c:
-	  component/e-summary-url.c: Warning's cleanup.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): Requeue the redraw
-	if there is a selection on the widget.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_display_window): Draw the window 
-	controls to move, close and configure the window.
-	(e_summary_window_move_(left|right|up|down)): Move the window around the
-	window list.
-
-	* component/e-summary-url.c (e_summary_url_click): Add handlers for the
-	window control URIs (close:// configure:// up:// down:// left:// and 
-	right://).
-	(get_protocol): Add support for the new protocols.
-	(parse_uri): Ditto.
-	(e_summary_url_describe): ditto.
-
-2000-10-30  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-factory.c (embed_service): Generate the uid here
-	and pass it into the create_view method.
-
-	* evolution-services/executive-summary-component-client.c
-	(executive_summary_component_client_create_view): Use the passed in UID
-	to generate a view.
-
-	* evolution-services/executive-summary-component.c
-	(impl_Evolution_SummaryComponent_create_view): Don't generate the id here
-	but use the passed in one instead.
-
-	* idl/SummaryComponent.idl: create_view now takes an ID parameter.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (load_default): Neaten the Report bug link.
-	(e_summary_end_load): Put in a <hr> and a mailto to me.
-	(e_summary_new): Create an EvolutionShellClient from the Evolution_Shell.
-	(e_summary_get_shell_client): Retrieve the shell-client.
-
-	* component/e-summary-url.c (e_summary_url_click): On a PROTOCOL_VIEW
-	change the current view to the one specified in the URL. 
-
-2000-10-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/executive-summary/evolution-services' and
-	`-I$(top_srcdir)/executive-summary/evolution-services'.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-url.c (e_summary_url_exec): Execute a program
-	specified in the format "exec://program args".
-	(e_summary_url_mail_compose): Run the mail composer when a mailto:
-	URL is clicked.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_start_load): Add a hack to stop the
-	GtkHTML widget returning to the top when it is redrawn.
-
-	* component/e-summary-url.[ch]
-	* component/e-summary-util.[ch]: Split some functions out of e-summary.c
-
-	* component/Makefile.am: Added the new files, and run orbit-idl on the
-	mail composer idl.
-
-2000-10-25    <jpr@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): User 
-	bonobo_control_get_remote_uid_container, not the old version
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/main.c: Store each individual views data with the view.
-	Add comments to explain everything.
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Only try to create a 
-	control if the returned control != NULL.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Set the UID of the view 
-	before passing it to the create_view method.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* idl/Summary.idl: Added set_icon method, and changed update_html_component
-	to update_component. Made all methods take a long ID instead of an
-	SummaryComponent.
-
-	* idl/SummaryComponent.idl: Combined the create_bonobo_view and 
-	create_html_view into create_view.
-	Added a destroy_view method.
-
-	* evolution-services/Makefile.am: Added the 2 new files.
-
-	* evolution-services/executive-summary-component-view.[ch]: New
-	files implementing a view of an ExecutiveSummaryComponent.
-
-	* evolution-services/executive-summary.[ch]
-	* evolution-services/executive-summary-client.[ch]
-	* evolution-services/executive-summary-component.[ch]
-	* evolution-services/executive-summary-component-client.[ch]:
-	* component/e-summary-factory.c
-	* component/e-summary.c
-	* test-service/main.c:
-	Updated to use new methods and the new ExecutiveSummaryComponentView
-	object.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary.c (executive_summary_class_init):
-	Implement the update, set_title and flash functionality as signals
-	instead of methods.
-	(impl_Evolution_Summary_set_title): Emit signal.
-	(impl_Evolution_Summary_flash): Emit signal.
-	(impl_Evolution_Summary_update_html_component): Emit signal.
-	(executive_summary_new): Don't need the methods anymore.
-	(executive_summary_construct): Same.
-	(executive_summary_init): Remove the private initialisation.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* idl/Makefile.am (INCLUDES): 
-	* evolution-services/Makefile.am (INCLUDES): 
-	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-executive-summary.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* evolution-services/Makefile.am (IDLS): make the built sources
-	depend on the idl files
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added an icon parameter to the
-	create_view methods.
-
-	* evolution-services/executive-summary-component.c: Implement
-	the icon parameter.
-
-	* evolution-services/executive-summary-component-client.c: Ditto
-
-	* component/e-summary.c: Draw the specified icon.
-
-	* component/e-summary-factory.c: Use the icon parameter.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) to 
-	find gnomesupport.h
-
-2000-10-06  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (request_cb): Use gnome-vfs to retrieve
-	the requested files. Allows services to specify remote urls.
-	(load_default, e_summary_display_window, e_summary_rebuild_page): 
-	Change the html to match TigerT's lovely design.
-	(e_summary_add_html_service, e_summary_add_html_service): Add
-	the client argument so we can destroy it when we've quit.
-	(e_summary_window_update): Only do an update if there isn't one
-	pending.
-
-	* component/e-summary-factory.c (embed_service): upd.
-
-	* test-service/main.c: Made the test service be really silly and count
-	the number of seconds since it was started.
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Fix builddir != srcdir.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* widgets/.cvsignore: ignore more stuff.
-
-	* .cvsignore: ignore more stuff.
-
-	* idl/.cvsignore: ignore more stuff.
-
-	* evolution-services/.cvsignore: ignore more stuff.
-
-	* component/.cvsignore: ignore more stuff.
-
-	* .cvsignore: add Makefile
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* component/component-factory.c: include
-	<gal/widgets/e-gui-utils.h> instead of "e-util/e-gui-utils.h" to
-	clear up e_notice declaration, and #include <gnome.h> to get "_".
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): upd.
-	(set_pixmap): upd. (update_pixmaps): upd.
-	(control_activate_cb): upd.
-	(control_deactivate): upd.
-
-2000-10-04  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added a title argument to the 
-	create_view methods.
-
-2000-09-13  Iain Holmes  <iain@helixcode.com>
-
-	* Started the Executive Summary
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am
deleted file mode 100644
index 3c14ed5593..0000000000
--- a/executive-summary/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = idl widgets evolution-services component test-service
-
-oafdir = $(datadir)/oaf
-oaf_DATA = evolution-executive-summary.oafinfo
-
-EXTRA_DIST = $(oaf_DATA) 
diff --git a/executive-summary/component/.cvsignore b/executive-summary/component/.cvsignore
deleted file mode 100644
index 75f1a012f2..0000000000
--- a/executive-summary/component/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-core
-Makefile.in
-Makefile
-.deps
-.libs
-evolution-executive-summary
-Composer-common.c
-Composer.h
-Composer-stubs.c
-Composer-skels.c
\ No newline at end of file
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
deleted file mode 100644
index 5b3f147dfd..0000000000
--- a/executive-summary/component/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-bin_PROGRAMS =	evolution-executive-summary
-
-INCLUDES = \
-	-I$(top_srcdir)/widgets					\
-	-I$(top_srcdir)/widgets/e-text				\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/executive-summary			\
-	-I$(top_srcdir)/executive-summary			\
-	-I$(top_builddir)/executive-summary/evolution-services  \
-	-I$(top_srcdir)/executive-summary/evolution-services    \
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_VFS_CFLAGS)					\
-	$(UNICODE_CFLAGS)					\
-	$(GTKHTML_CFLAGS)					\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-CLEANFILES = $(COMPOSER_GENERATED)
-
-COMPOSER_GENERATED = \
-	Composer.h			\
-	Composer-common.c		\
-	Composer-skels.c		\
-	Composer-stubs.c
-
-Composer-impl.o: Composer.h
-
-$(COMPOSER_GENERATED):
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(top_srcdir)/composer/Composer.idl
-
-evolution_executive_summary_SOURCES =		\
-	$(COMPOSER_GENERATED)		\
-	component-factory.c		\
-	component-factory.h		\
-	e-summary.c			\
-	e-summary.h			\
-	e-summary-factory.c		\
-	e-summary-factory.h		\
-	e-summary-url.c			\
-	e-summary-url.h			\
-	e-summary-util.c		\
-	e-summary-util.h		\
-	main.c
-
-evolution_executive_summary_LDADD = 					\
-	$(top_builddir)/shell/libeshell.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(top_builddir)/executive-summary/widgets/libesummary-widgets.a	\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
deleted file mode 100644
index 9af99c7e67..0000000000
--- a/executive-summary/component/component-factory.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include <gal/widgets/e-gui-utils.h>
-
-#include "component-factory.h"
-#include "e-summary-factory.h"
-
-#define COMPONENT_FACTORY_IID "OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-
-static BonoboGenericFactory *factory = NULL;
-static gint running_objects = 0;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-  { "executive-summary", "evolution-today.png" },
-  { NULL, NULL }
-};
-
-char *evolution_dir;
-
-/* EvolutionShellComponent methods and signals */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *folder_type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-  EvolutionShellClient *shell_client;
-  Evolution_Shell corba_shell;
-  BonoboControl *control;
-
-  if (g_strcasecmp (folder_type, "executive-summary") != 0)
-    return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-  shell_client = evolution_shell_component_get_owner (shell_component);
-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-  control = e_summary_factory_new_control (physical_uri, corba_shell);
-  if (!control)
-    return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-
-  *control_return = control;
-
-  return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-  Evolution_Shell corba_shell;
-
-  evolution_dir = g_strdup (evolution_homedir);
-
-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-  gtk_main_quit ();
-}
-
-static void
-factory_destroy (BonoboEmbeddable *embeddable,
-		 gpointer dummy)
-{
-  running_objects--;
-
-  if (running_objects > 0)
-    return;
-
-  if (factory)
-    bonobo_object_unref (BONOBO_OBJECT (factory));
-  else
-    g_warning ("Serious ref counting error");
-  factory = NULL;
-
-  gtk_main_quit ();
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-  EvolutionShellComponent *shell_component;
-
-  running_objects++;
-
-  shell_component = evolution_shell_component_new (folder_types,
-						   create_view,
-						   NULL,
-						   NULL,
-						   NULL,
-						   NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-		      GTK_SIGNAL_FUNC (factory_destroy), NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-		      GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-		      GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-  return BONOBO_OBJECT (shell_component);
-}
-
-void
-component_factory_init (void)
-{
-  if (factory != NULL)
-    return;
-
-  factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					factory_fn, NULL);
-
-  if (factory == NULL) {
-    e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-	      _("Cannot initialize Evolution's Executive Summary component."));
-    exit (1);
-  }
-}
diff --git a/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h
deleted file mode 100644
index 65e4ad1d56..0000000000
--- a/executive-summary/component/component-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
-
-
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
deleted file mode 100644
index 79105c18a0..0000000000
--- a/executive-summary/component/e-summary-factory.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-
-#include <liboaf/liboaf.h>
-
-#include "gal/util/e-util.h"
-#include "e-util/e-gui-utils.h"
-
-#include "e-summary-factory.h"
-
-#include "e-summary.h"
-#include "Evolution.h"
-
-#include <evolution-services/executive-summary-component-client.h>
-#include <evolution-services/Executive-Summary.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-static GList *control_list = NULL;
-
-void embed_service (GtkWidget *widget,
-		    ESummary *esummary);
-
-BonoboUIVerb verbs[] = {
-	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),
-	BONOBO_UI_VERB_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *component,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
-	gdk_pixbuf_unref (pixbuf);
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *component)
-{
-	set_pixmap (component, "/Toolbar/AddService", "add-service.png");
-}
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *ui_component,
-		  ESummary          *esummary)
-{
-	Bonobo_UIContainer container;
-
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (ui_component, container);
-	bonobo_object_release_unref (container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);
-	
-	bonobo_ui_component_freeze (ui_component, NULL);
-
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
-			       "evolution-executive-summary.xml", 
-			       "evolution-executive-summary");
-
-	update_pixmaps (ui_component);
-	bonobo_ui_component_thaw (ui_component, NULL);
-}
-
-static void
-control_deactivate (BonoboControl     *control,
-		    BonoboUIComponent *ui_component,
-		    ESummary          *esummary)
-{
-	bonobo_ui_component_unset_container (ui_component);
-}
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	ESummary *summary;
-	BonoboUIComponent *ui_component;
-	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	ui_component = bonobo_control_get_ui_component (control);
-	g_assert (ui_component != NULL);
-
-	if (gtk_object_get_data (GTK_OBJECT (control), "shell_view_interface") == NULL) {
-		control_frame = bonobo_control_get_control_frame (control);
-		if (control_frame == NULL) {
-			goto out;
-		}
-
-		CORBA_exception_init (&ev);
-		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-								      "IDL:Evolution/ShellView:1.0",
-								      &ev);
-		CORBA_exception_free (&ev);
-
-		if (shell_view_interface != CORBA_OBJECT_NIL) {
-			gtk_object_set_data (GTK_OBJECT (control),
-					     "shell_view_interface",
-					     shell_view_interface);
-		} else {
-			g_warning ("Control frame doesn't have Evolution/ShellView.");
-		}
-									       
-		summary = E_SUMMARY (user_data);
-		e_summary_set_shell_view_interface (summary, 
-						    shell_view_interface);
-	}
-
- out:
-	if (activate)
-		control_activate (control, ui_component, user_data);
-	else
-		control_deactivate (control, ui_component, user_data);
-}
-
-static void
-control_destroy_cb (BonoboControl *control,
-		    gpointer user_data)
-{
-	GtkWidget *esummary = user_data;
-
-	control_list = g_list_remove (control_list, control);
-
-	gtk_object_destroy (GTK_OBJECT (esummary));
-}
-
-static void 
-update (ExecutiveSummary *summary,
-	int id,
-	const char *html,
-	ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-
-	view = e_summary_view_from_id (esummary, id);
-	executive_summary_component_view_set_html (view, html);
-	e_summary_update_window (esummary, summary, html);
-}
-
-static void
-set_title (ExecutiveSummary *summary,
-	   int id,
-	   const char *title,
-	   ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-	
-	view = e_summary_view_from_id (esummary, id);
-	executive_summary_component_view_set_title (view, title);
-}
-
-static void
-flash (ExecutiveSummary *summary,
-       int id,
-       gpointer user_data)
-{
-	g_print ("FLASH!\n");
-}
-
-static void
-view_destroyed (ExecutiveSummaryComponentView *view,
-		ExecutiveSummaryComponentClient *client)
-{
-	int id;
-
-	g_print ("%s\n", __FUNCTION__);
-	id = executive_summary_component_view_get_id (view);
-	g_print ("%d\n", id);
-	executive_summary_component_client_destroy_view (client, view);
-}
-
-/* A ********very********
-   temporary function to embed something
-*/
-void
-embed_service (GtkWidget *widget,
-	       ESummary *esummary)
-{
-	char *required_interfaces[2] = {"IDL:Evolution:SummaryComponent:1.0",
-					NULL};
-	char *obj_id;
-	
-	obj_id = bonobo_selector_select_id ("Select a service",
-					    (const char **) required_interfaces);
-	if (obj_id == NULL)
-		return;
-
-	e_summary_factory_embed_service_from_id (esummary, obj_id);
-}
-
-void
-e_summary_factory_embed_service_from_id (ESummary *esummary,
-					 const char *obj_id)
-{
-	ExecutiveSummaryComponentClient *client;
-	ExecutiveSummary *summary;
-	ExecutiveSummaryComponentView *view;
-	int id;
-	
-	client = executive_summary_component_client_new (obj_id);
-	
-	g_return_if_fail (client != NULL);
-
-	/* Set the owner */
-	summary = EXECUTIVE_SUMMARY (executive_summary_new ());
-	executive_summary_component_client_set_owner (client, summary);
-	gtk_signal_connect (GTK_OBJECT (summary), "flash",
-			    GTK_SIGNAL_FUNC (flash), esummary);
-	gtk_signal_connect (GTK_OBJECT (summary), "set_title",
-			    GTK_SIGNAL_FUNC (set_title), esummary);
-	gtk_signal_connect (GTK_OBJECT (summary), "update",
-			    GTK_SIGNAL_FUNC (update), esummary);
-
-	/* Create view */
-	id = executive_summary_component_create_unique_id ();
-	view = executive_summary_component_client_create_view (client, id);
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroyed), client);
-
-	e_summary_add_service (esummary, summary, view, obj_id);
-	e_summary_rebuild_page (esummary);
-}
-
-BonoboControl *
-e_summary_factory_new_control (const char *uri,
-			       const Evolution_Shell shell)
-{
-  BonoboControl *control;
-  GtkWidget *esummary;
-
-  esummary = e_summary_new (shell);
-  if (esummary == NULL)
-    return NULL;
-
-  gtk_widget_show (esummary);
-
-  control = bonobo_control_new (esummary);
-
-  if (control == NULL) {
-    gtk_object_destroy (GTK_OBJECT (esummary));
-    return NULL;
-  }
-
-  gtk_signal_connect (GTK_OBJECT (control), "activate",
-		      control_activate_cb, esummary);
-
-  gtk_signal_connect (GTK_OBJECT (control), "destroy",
-		      control_destroy_cb, esummary);
-
-  control_list = g_list_prepend (control_list, control);
-
-  e_summary_rebuild_page (E_SUMMARY (esummary));
-  return control;
-}
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
deleted file mode 100644
index 175988a78c..0000000000
--- a/executive-summary/component/e-summary-factory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_FACTORY_H__
-#define _E_SUMMARY_FACTORY_H__
-
-#include <Evolution.h>
-#include "e-summary.h"
-
-BonoboControl *e_summary_factory_new_control (const char *uri,
-					      const Evolution_Shell shell);
-void e_summary_factory_embed_service_from_id (ESummary *esummary,
-					      const char *obj_id);
-
-#endif
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
deleted file mode 100644
index c07a3efc99..0000000000
--- a/executive-summary/component/e-summary-url.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "e-summary.h"
-#include "e-summary-url.h"
-#include "e-summary-util.h"
-
-#include <evolution-services/executive-summary-component-view.h>
-#include "Composer.h"
-
-typedef enum _ESummaryProtocol {
-	PROTOCOL_NONE,
-	PROTOCOL_HTTP,
-	PROTOCOL_MAILTO,
-	PROTOCOL_VIEW,
-	PROTOCOL_EXEC,
-	PROTOCOL_FILE,
-	PROTOCOL_CLOSE,
-	PROTOCOL_LEFT,
-	PROTOCOL_RIGHT,
-	PROTOCOL_UP,
-	PROTOCOL_DOWN,
-	PROTOCOL_CONFIGURE,
-	PROTOCOL_OTHER
-} ESummaryProtocol;
-
-static char *descriptions[] = {
-	N_("Open %s with the default GNOME application"),
-	N_("Open %s with the default GNOME web browser"),
-	N_("Send an email to %s"),
-	N_("Change the view to %s"),
-	N_("Run %s"),
-	N_("Open %s with the default GNOME application"),
-	N_("Close %s"),
-	N_("Move %s to the left"),
-	N_("Move %s to the right"),
-	N_("Move %s into the previous row"),
-	N_("Move %s into the next row"),
-	N_("Configure %s"),
-	N_("Open %s with the default GNOME application")
-};
-
-#define COMPOSER_IID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
-
-gboolean e_summary_url_mail_compose (ESummary *esummary,
-				     const char *url);
-gboolean e_summary_url_exec (const char *exec);
-
-void
-e_summary_url_request (GtkHTML *html,
-		       const gchar *url,
-		       GtkHTMLStream *stream)
-{
-	char *filename;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-
-	if (strncasecmp (url, "file:", 5) == 0) {
-		url += 5;
-		filename = e_pixmap_file (url);
-	} else if (strchr (url, ':') >= strchr (url, '/')) {
-		filename = e_pixmap_file (url);
-	} else
-		filename = g_strdup (url);
-
-	if (filename == NULL) {
-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		return;
-	}
-	
-	result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
-	
-	if (result != GNOME_VFS_OK) {
-		g_warning ("%s: %s", filename, 
-			   gnome_vfs_result_to_string (result));
-		g_free (filename);
-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		return;
-	}
-
-	g_free (filename);
-	while (1) {
-		char buffer[4096];
-		GnomeVFSFileSize size;
-
-		/* Clear buffer */
-		memset (buffer, 0x00, 4096);
-
-		result = gnome_vfs_read (handle, buffer, 4096, &size);
-		if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-			g_warning ("Error reading data: %s", 
-				   gnome_vfs_result_to_string (result));
-			gnome_vfs_close (handle);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		}
-
-		if (size == 0)
-			break; /* EOF */
-
-		gtk_html_stream_write (stream, buffer, size);
-	}
-	
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-	gnome_vfs_close (handle);
-}
-
-static char *
-parse_uri (const char *uri,
-	   ESummaryProtocol protocol,
-	   ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-	char *parsed;
-	char *p;
-	int id;
-
-	switch (protocol) {
-		
-	case PROTOCOL_HTTP:
-		/* "http://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_EXEC:
-		/* "exec://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_VIEW:
-		/* "view://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_MAILTO:
-		/* Fun. Mailto's might be "mailto:" or "mailto://" */
-		if (strstr (uri, "mailto://") == NULL) {
-			parsed = (char *) (uri + 7);
-		} else {
-			parsed = (char *) (uri + 9);
-		}
-
-		/* Now strip anything after a question mark, 
-		   as it is a parameter (that we ignore for the time being) */
-		if ( (p = strchr (parsed, '?')) != NULL) {
-			parsed = g_strndup (parsed, p - parsed);
-		} else {
-			parsed = g_strdup (parsed);
-		}
-
-		break;
-
-	case PROTOCOL_CLOSE:
-		id = atoi (uri + 8);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_LEFT:
-		id = atoi (uri + 7);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_RIGHT:
-		id = atoi (uri + 8);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_UP:
-		id = atoi (uri + 5);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_DOWN:
-		id = atoi (uri + 7);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		id = atoi (uri + 12);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_NONE:
-	case PROTOCOL_OTHER:
-	default:
-		/* Just return the uneditted uri. */
-		parsed = g_strdup (uri);
-		break;
-	}
-
-	return parsed;
-}
-
-static ESummaryProtocol
-get_protocol (const char *url)
-{
-	char *lowerurl;
-	ESummaryProtocol protocol = PROTOCOL_OTHER;
-	
-	lowerurl = g_strdup (url);
-	g_strdown (lowerurl);
-	
-	/* Check for no :/ */
-	if (strstr (lowerurl, "://") == NULL) {
-		
-		/* Annoying alternative for mailto URLs */
-		if (strncmp (lowerurl, "mailto:", 6) != 0) {
-			g_free (lowerurl);
-			return PROTOCOL_NONE;
-		} else {
-			g_free (lowerurl);
-			return PROTOCOL_MAILTO;
-		}
-	}
-	
-	switch (lowerurl[0]) {
-	case 'c':
-		switch (lowerurl[1]) {
-		case 'l':
-			if (strncmp (lowerurl + 2, "ose", 3) == 0)
-				protocol = PROTOCOL_CLOSE;
-			break;
-		case 'o':
-			if (strncmp (lowerurl + 2, "nfigure", 7) == 0)
-				protocol = PROTOCOL_CONFIGURE;
-			break;
-		}
-
-	case 'd':
-		if (strncmp (lowerurl + 1, "own", 3) == 0)
-			protocol = PROTOCOL_DOWN;
-		break;
-
-	case 'e':
-		if (strncmp (lowerurl + 1, "xec", 3) == 0)
-			protocol = PROTOCOL_EXEC;
-		break;
-		
-	case 'f':
-		if (strncmp (lowerurl + 1, "ile", 3) == 0)
-			protocol = PROTOCOL_FILE;
-		break;
-
-	case 'h':
-		if (strncmp (lowerurl + 1, "ttp", 3) == 0)
-			protocol = PROTOCOL_HTTP;
-		break;
-		
-	case 'l':
-		if (strncmp (lowerurl + 1, "eft", 3) == 0)
-			protocol = PROTOCOL_LEFT;
-		break;
-
-	case 'm':
-		if (strncmp (lowerurl + 1, "ailto", 5) == 0)
-			protocol = PROTOCOL_MAILTO;
-		break;
-		
-	case 'r':
-		if (strncmp (lowerurl + 1, "ight", 4) == 0)
-			protocol = PROTOCOL_RIGHT;
-		break;
-
-	case 'u':
-		if (lowerurl[1] == 'p')
-			protocol = PROTOCOL_UP;
-		break;
-		
-	case 'v':
-		if (strncmp (lowerurl + 1, "iew", 3) == 0)
-			protocol = PROTOCOL_VIEW;
-		break;
-		
-	default:
-		break;
-	}
-	
-	g_free (lowerurl);
-	
-	return protocol;
-}
-
-void
-e_summary_url_click (GtkWidget *widget,
-		     const char *url,
-		     ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	ExecutiveSummaryComponentView *view;
-	gpointer window; /* FIXME */
-	char *parsed;
-	int id;
-
-	protocol = get_protocol (url);
-
-	parsed = parse_uri (url, protocol, esummary);
-
-	switch (protocol) {
-	case PROTOCOL_MAILTO:
-		/* Open a composer window */
-		e_summary_url_mail_compose (esummary, parsed);
-		break;
-		
-	case PROTOCOL_VIEW:
-		/* Change the EShellView's current uri */
-		e_summary_change_current_view (esummary, parsed);
-		break;
-		
-	case PROTOCOL_EXEC:
-		/* Execute the rest of the url */
-		e_summary_url_exec (parsed);
-		break;
-
-	case PROTOCOL_CLOSE:
-		/* Close the window. */
-		id = atoi (url + 8);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-		e_summary_window_remove_from_ht (window, esummary);
-		e_summary_window_free (window, esummary);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		/* Configure the window. . . */
-		id = atoi (url + 12);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-	
-		/* Issue the configure command some how :) */
-		break;
-
-	case PROTOCOL_LEFT:
-		/* Window left */
-		id = atoi (url + 7);
-		view = e_summary_view_from_id (esummary, id);
-
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_left (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_RIGHT:
-		id = atoi (url + 8);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_right (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_UP:
-		id = atoi (url + 5);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_up (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_DOWN:
-		id = atoi (url + 7);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_down (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_NONE:
-	case PROTOCOL_OTHER:
-	case PROTOCOL_HTTP:
-	case PROTOCOL_FILE:
-	default:
-		/* Let browser handle it */
-		gnome_url_show (url);
-		break;
-		
-	}      
-
-	g_free (parsed);
-}
-
-gboolean
-e_summary_url_mail_compose (ESummary *esummary,
-			    const char *url)
-{
-	CORBA_Object composer;
-	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to, *cc, *bcc;
-	Evolution_Composer_Recipient *recipient;
-	char *address, *proto;
-	CORBA_char *subject;
-	
-	CORBA_exception_init (&ev);
-	
-	/* FIXME: Query for IIDs? */
-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Unable to start composer component!");
-		return FALSE;
-	}
-
-	if ( (proto = strstr (url, "://")) != NULL){
-		address = proto + 3;
-	} else {
-		if (strncmp (url, "mailto:", 7) == 0)
-			address = (char *) (url + 7);
-		else
-			address = (char *) url;
-	}
-
-	to = Evolution_Composer_RecipientList__alloc ();
-	to->_length = 1;
-	to->_maximum = 1;
-	to->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to->_maximum);
-	
-	recipient = to->_buffer;
-	recipient->name = CORBA_string_dup ("");
-	recipient->address = CORBA_string_dup (address?address:"");
-	
-	/* FIXME: Get these out of the URL */
-	cc = Evolution_Composer_RecipientList__alloc ();
-	cc->_length = 0;
-	cc->_maximum = 0;
-	cc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
-	
-	bcc = Evolution_Composer_RecipientList__alloc ();
-	bcc->_length = 0;
-	bcc->_maximum = 0;
-	bcc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
-	
-	subject = CORBA_string_dup ("");
-	
-	CORBA_exception_init (&ev);
-	Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		CORBA_free (to);
-		g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_free (to);
-	
-	CORBA_exception_init (&ev);  
-	Evolution_Composer_show (composer, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	/* FIXME: Free the composer? */
-	
-	return TRUE;
-}
-
-gboolean
-e_summary_url_exec (const char *exec)
-{
-	gchar **exec_array;
-	int argc;
-	
-	exec_array = g_strsplit (exec, " ", 0);
-	
-	argc = 0;
-	while (exec_array[argc] != NULL) {
-		argc++;
-	}
-	
-	gnome_execute_async (NULL, argc, exec_array);
-	
-	g_strfreev (exec_array);
-	return TRUE;
-}
-
-static char *
-e_summary_url_describe (const char *uri, 
-			ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	char *contents, *description;
-
-	protocol = get_protocol (uri);
-	contents = parse_uri (uri, protocol, esummary);
-
-	description = g_strdup_printf (_(descriptions[protocol]), contents);
-	g_free (contents);
-
-	return description;
-}
-
-void
-e_summary_url_over (GtkHTML *html,
-		    const char *uri,
-		    ESummary *esummary)
-{
-	char *description;
-
-	if (uri != NULL) {
-		description = e_summary_url_describe (uri, esummary);
-		e_summary_set_message (esummary, description, FALSE);
-		g_free (description);
-	} else {
-		e_summary_unset_message (esummary);
-	}
-}
diff --git a/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h
deleted file mode 100644
index 9844d384e0..0000000000
--- a/executive-summary/component/e-summary-url.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_URL_H__
-#define _E_SUMMARY_URL_H__
-
-void e_summary_url_request (GtkHTML *html,
-			    const gchar *url,
-			    GtkHTMLStream *stream);
-void e_summary_url_click (GtkWidget *widget,
-			  const char *url,
-			  ESummary *esummary);
-void e_summary_url_over (GtkHTML *html,
-			 const char *uri,
-			 ESummary *esummary);
-
-#endif
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
deleted file mode 100644
index 8ed8d4daea..0000000000
--- a/executive-summary/component/e-summary-util.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-
-char *
-e_pixmap_file (const char *filename)
-{
-	char *ret;
-	char *edir;
-
-	if (g_file_exists (filename)) {
-		ret = g_strdup (filename);
-
-		return ret;
-	}
-
-	/* Try the evolution images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-
-		return ret;
-	}
-
-	/* Try the evolution button images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-		
-		return ret;
-	}
-
-	/* Fall back to the gnome_pixmap_file */
-	return gnome_pixmap_file (filename);
-}
-	
diff --git a/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h
deleted file mode 100644
index 0cfd50403a..0000000000
--- a/executive-summary/component/e-summary-util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-util.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_UTIL_H__
-#define _E_SUMMARY_UTIL_H__
-
-char *e_pixmap_file (const char *filename);
-
-#endif
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
deleted file mode 100644
index dca8f98f0f..0000000000
--- a/executive-summary/component/e-summary.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gal/util/e-util.h>
-
-#include "e-summary.h"
-#include "e-summary-factory.h"
-#include "e-summary-util.h"
-#include "e-summary-url.h"
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-/* From component-factory.c */
-extern char *evolution_dir;
-
-static GtkObjectClass *e_summary_parent_class;
-
-struct _ESummaryPrivate {
-	Evolution_Shell shell;
-	Evolution_ShellView shell_view_interface;
-
-	GtkWidget *html_scroller;
-	GtkWidget *html;
-
-	GHashTable *id_to_view;
-	GHashTable *view_to_window;
-	GHashTable *summary_to_window;
-	GList *window_list;
-
-	guint idle;
-
-	GtkHTMLStream *stream;
-	gboolean grabbed;
-};
-
-static gboolean on_object_requested (GtkHTML *html,
-				     GtkHTMLEmbedded *eb,
-				     ESummary *summary);
-static void e_summary_save_state (ESummary *esummary,
-				  const char *path);
-static void e_summary_load_state (ESummary *esummary,
-				  const char *path);
-		
-/* GtkObject methods */
-
-static void
-s2w_foreach (gpointer *key,
-	     gpointer *value,
-	     ESummary *esummary)
-{
-	e_summary_window_free ((ESummaryWindow *) value, esummary);
-	g_free (value);
-}
-
-static void
-e_summary_destroy (GtkObject *object)
-{
-	ESummary *esummary = E_SUMMARY (object);
-	ESummaryPrivate *priv;
-	char *prefix;
-
-	priv = esummary->private;
-	if (priv == NULL)
-		return;
-
-	prefix = g_concat_dir_and_file (evolution_dir, "config/Executive-Summary");
-	e_summary_save_state (esummary, prefix);
-	g_free (prefix);
-
-	g_hash_table_foreach (priv->summary_to_window, 
-			      (GHFunc) s2w_foreach, esummary);
-	g_hash_table_destroy (priv->summary_to_window);
-	g_hash_table_destroy (priv->id_to_view);
-	g_hash_table_destroy (priv->view_to_window);
-
-	g_free (esummary->private);
-	esummary->private = NULL;
-
-	e_summary_parent_class->destroy (object);
-}
-
-static void
-e_summary_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = e_summary_destroy;
-	
-	e_summary_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_start_load (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *header = "<html><body bgcolor=\"#ffffff\">";
-
-	priv = summary->private;
-
-	priv->stream = gtk_html_begin (GTK_HTML (priv->html));
-
-	/* Hack to stop page returning to the top */
-	GTK_HTML (priv->html)->engine->newPage = FALSE;
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream,
-			header, strlen (header));
-}
-
-static void
-load_default (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *def = "<table width=\"100%\"><tr><td align=\"right\">"
-		"<img src=\"ccsplash.png\"></td></tr></table>"
-		"<table><tr><td><a href=\"exec://bug-buddy\"><img src=\"file://gnome-spider.png\" width=\"24\" height=\"24\" border=\"0\">"
-		"</a></td><td><a href=\"exec://bug-buddy\">Submit a bug report"
-		"</a></td></tr></table><hr>";
-
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (summary));
-
-	priv = summary->private;
-
-	g_return_if_fail (priv->stream != NULL);
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, def, strlen (def));
-}
-
-static void
-e_summary_end_load (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *footer = "<hr><p align=\"right\">All Executive Summary comments to <a href=\"mailto:iain@helixcode.com\">Iain Holmes (iain@helixcode.com)</a></p></body></html>";
-
-	priv = summary->private;
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, 
-			footer, strlen (footer));
-	gtk_html_end (GTK_HTML (priv->html), priv->stream, GTK_HTML_STREAM_OK);
-
-	priv->stream = NULL;
-}
-
-static void
-e_summary_init (ESummary *esummary)
-{
-	GdkColor bgcolour = {0, 0xdfff, 0xdfff, 0xffff};
-	ESummaryPrivate *priv;
-
-	esummary->private = g_new0 (ESummaryPrivate, 1);
-	priv = esummary->private;
-
-	priv->window_list = NULL;
-	priv->idle = 0;
-
-	/* HTML widget */
-	priv->html_scroller = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->html_scroller),
-					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	priv->html = gtk_html_new ();
-	gtk_html_set_editable (GTK_HTML (priv->html), FALSE);
-	gtk_html_set_default_background_color (GTK_HTML (priv->html), &bgcolour);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url-requested",
-			    GTK_SIGNAL_FUNC (e_summary_url_request), esummary);
-  	gtk_signal_connect (GTK_OBJECT (priv->html), "object-requested", 
-  			    GTK_SIGNAL_FUNC (on_object_requested), esummary); 
-	gtk_signal_connect (GTK_OBJECT (priv->html), "link-clicked",
-			    GTK_SIGNAL_FUNC (e_summary_url_click), esummary);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "on_url",
-			    GTK_SIGNAL_FUNC (e_summary_url_over), esummary);
-
-	gtk_container_add (GTK_CONTAINER (priv->html_scroller), priv->html);
-	gtk_widget_show_all (priv->html_scroller);
-
-	e_summary_rebuild_page (esummary);
-
-	/* Pack stuff */
-	gtk_box_pack_start (GTK_BOX (esummary), priv->html_scroller, 
-			    TRUE, TRUE, 0);
-
-	/* Init hashtables */
-	priv->summary_to_window = g_hash_table_new (NULL, NULL);
-	priv->id_to_view = g_hash_table_new (NULL, NULL);
-	priv->view_to_window = g_hash_table_new (NULL, NULL);
-}
-
-E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
-	     e_summary_init, PARENT_TYPE);
-
-GtkWidget *
-e_summary_new (const Evolution_Shell shell)
-{
-	ESummary *esummary;
-	ESummaryPrivate *priv;
-	char *path;
-
-	esummary = gtk_type_new (e_summary_get_type ());
-	priv = esummary->private;
-
-	priv->shell = shell;
-
-	/* Restore services */
-	path = g_concat_dir_and_file (evolution_dir, 
-				      "config/Executive-Summary");
-	e_summary_load_state (esummary, path);
-	g_free (path);
-
-	return GTK_WIDGET (esummary);
-}
-
-static gboolean
-on_object_requested (GtkHTML *html,
-		     GtkHTMLEmbedded *eb,
-		     ESummary *summary)
-{
-	ESummaryWindow *window;
-	int type;
-
-	if (sscanf (eb->classid, "cid:%d-%p", &type, &window) != 2) {
-		g_warning ("Could not get the window reference\n");
-		return FALSE;
-	}
-
-	switch (type) {
-	case 1:
-		g_assert_not_reached ();
-		break;
-
-	case 2:
-		g_warning ("Bonobo services are not supported in this version.");
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return TRUE;
-}
-
-static void
-e_summary_display_window (ESummary *esummary,
-			  ESummaryWindow *window,
-			  int row,
-			  int col)
-{
-	ESummaryPrivate *priv;
-	char *footer = "</td></tr></table>";
-	char *title_html;
-	char *control_html;
-	char *colour[2] = {"e6e8e4", 
-			   "edeeeb"};
-	char *title_colour[2] = {"bac1b6", 
-				 "cdd1c7"};
-	const char *title, *icon, *html;
-	int id;
-
-	priv = esummary->private;
-
-	title = executive_summary_component_view_get_title (window->view);
-	icon = executive_summary_component_view_get_icon (window->view);
-	html = executive_summary_component_view_get_html (window->view);
-	id = executive_summary_component_view_get_id (window->view);
-
-	/** FIXME: Make this faster by caching it? */
-
-	control_html = g_strdup_printf 
-		("<table width=\"32\" height=\"48\"><tr><td>"
-		 "<a href=\"close://%d\"><img border=\"0\" src=\"service-close.png\"></a></td>"
-		 "<td><a href=\"configure://%d\"><img border=\"0\" src=\"service-configure.png\"></a></td></tr>"
-		 "<tr><td><a href=\"left://%d\"><img border=\"0\" src=\"service-left.png\"></a></td>"
-		 "<td><a href=\"right://%d\"><img border=\"0\" src=\"service-right.png\"></a></td></tr>"
-		 "<tr><td><a href=\"down://%d\"><img border=\"0\" src=\"service-down.png\"></a></td>"
-		 "<td><a href=\"up://%d\"><img border=\"0\" src=\"service-up.png\"></a></td></tr></table>", id, id, id, id, id, id);
-	
-	title_html = g_strdup_printf ("<table cellspacing=\"0\" "
-				      "cellpadding=\"0\" border=\"0\" width=\"100%%\" height=\"100%%\">"
-				      "<tr><td bgcolor=\"#%s\">"
-				      "<table width=\"100%%\"><tr><td>"
-				      "<img src=\"%s\"></td>"
-				      "<td nowrap align=\"center\" width=\"100%%\">"
-				      "<b>%s</b></td><td>%s</td></tr></table></td></tr><tr>"
-				      "<td bgcolor=\"#%s\" height=\"100%%\">",
-				      title_colour[col % 2], icon, title,
-				      control_html, colour[col % 2]);
-	g_free (control_html);
-	
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, title_html,
-			strlen (title_html));
-	g_free (title_html);
-	
-	if (html != NULL && *html != '\0') {
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				html, strlen (html));
-	} else {
-		g_warning ("Bonobo executive summary components are not supported at this time.");
-#if 0
-		body_cid = g_strdup_printf ("<object classid=\"cid:2-%p\"></object>", window);
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				body_cid, strlen (body_cid));
-#endif
-	}
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream,
-			footer, strlen (footer));
-}
-
-int
-e_summary_rebuild_page (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	GList *windows;
-	char *service_table = "<table numcols=\"3\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" height=\"100%\">";
-	int loc;
-
-	g_return_val_if_fail (esummary != NULL, FALSE);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE);
-
-	priv = esummary->private;
-
-	/* If there is a selection, don't redraw the page so that the selection
-	   isn't cleared */
-	if (GTK_HTML (priv->html)->in_selection == TRUE ||
-	    GTK_HTML (priv->html)->engine->active_selection == TRUE)
-		return TRUE;
-
-	gtk_layout_freeze (GTK_LAYOUT (priv->html));
-	e_summary_start_load (esummary);
-	load_default (esummary);
-
-	/* Load the start of the services */
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, service_table,
-			strlen (service_table));
-	/* Load each of the services */
-	loc = 0;
-	for (windows = priv->window_list; windows; windows = windows->next) {
-		ESummaryWindow *window;
-		char *td = "<td height=\"100%\" width=\"33%\" valign=\"top\">";
-		
-		window = windows->data;
-
-		if (loc % 3 == 0) {
-			if (loc != 0) {
-				gtk_html_write (GTK_HTML (priv->html),
-						priv->stream, "</tr>", 5);
-			}
-			gtk_html_write (GTK_HTML (priv->html),
-					priv->stream, "<tr height=\"100%\">", 18);
-		}
-
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				td, strlen (td));
-
-		e_summary_display_window (esummary, window, 
-					  (loc / 3), (loc % 3));
-
-		gtk_html_write (GTK_HTML (priv->html), priv->stream, "</td>", 5);
-		loc++;
-	}
-				
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, "</tr></table>",
-			13);
-	e_summary_end_load (esummary);
-	gtk_layout_thaw (GTK_LAYOUT (priv->html));
-
-	priv->idle = 0;
-	return FALSE;
-}
-
-void
-e_summary_add_service (ESummary *esummary,
-		       ExecutiveSummary *summary,
-		       ExecutiveSummaryComponentView *view,
-		       const char *iid)     
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-	int id;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	window = g_new0 (ESummaryWindow, 1);
-	window->summary = summary;
-	window->iid = g_strdup (iid);
-	window->view = view;
-
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-	
-	id = executive_summary_component_view_get_id (view);
-	g_hash_table_insert (priv->id_to_view, GINT_TO_POINTER (id), view);
-	g_hash_table_insert (priv->view_to_window, view, window);
-}
-
-#if 0
-void
-e_summary_add_html_service (ESummary *esummary,
-			    ExecutiveSummary *summary,
-			    ExecutiveSummaryComponentClient *client,
-			    const char *html,
-			    const char *title,
-			    const char *icon)
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-
-	window = g_new0 (ESummaryWindow, 1);
-	window->type = E_SUMMARY_WINDOW_HTML;
-	window->html = g_strdup (html);
-	window->title = g_strdup (title);
-	window->icon = icon ? g_strdup (icon) : NULL;
-	window->client = client;
-
-	window->summary = summary;
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-}
-
-void
-e_summary_add_bonobo_service (ESummary *esummary,
-			      ExecutiveSummary *summary,
-			      ExecutiveSummaryComponentClient *client,
-			      GtkWidget *control,
-			      const char *title,
-			      const char *icon)
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-	
-	window = g_new0 (ESummaryWindow, 1);
-	window->type = E_SUMMARY_WINDOW_BONOBO;
-	window->control = control;
-
-	window->client = client;
-
-	window->title = g_strdup (title);
-	window->summary = summary;
-	window->icon = icon ? g_strdup (icon): NULL;
-
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-}
-#endif
-
-void
-e_summary_window_free (ESummaryWindow *window,
-		       ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (window != NULL);
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-	g_free (window->iid);
-
-	priv->window_list = g_list_remove (priv->window_list, window);
-
-	bonobo_object_unref (BONOBO_OBJECT (window->summary));
-	gtk_object_unref (GTK_OBJECT (window->view));
-}
-
-/* Call this before e_summary_window_free, execpt when you are freeing
-   the hash table */
-void
-e_summary_window_remove_from_ht (ESummaryWindow *window,
-				 ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	priv = esummary->private;
-	g_hash_table_remove (priv->summary_to_window, window->summary);
-}
-
-void
-e_summary_update_window (ESummary *esummary,
-			 ExecutiveSummary *summary,
-			 const char *html)
-{
-	ESummaryPrivate *priv;
-	
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (summary != NULL);
-	
-	priv = esummary->private;
-	
-	if (priv->idle != 0)
-		return;
-	
-	priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);
-}
-
-ExecutiveSummaryComponentView *
-e_summary_view_from_id (ESummary *esummary,
-			int id)
-{
-	ESummaryPrivate *priv;
-	ExecutiveSummaryComponentView *view;
-
-	g_return_val_if_fail (esummary != NULL, NULL);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL);
-	g_return_val_if_fail (id > 0, NULL);
-
-	priv = esummary->private;
-	view = g_hash_table_lookup (priv->id_to_view, GINT_TO_POINTER (id));
-
-	return view;
-}
-
-void
-e_summary_set_shell_view_interface (ESummary *summary,
-				    Evolution_ShellView svi)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (summary));
-	g_return_if_fail (svi != CORBA_OBJECT_NIL);
-
-	priv = summary->private;
-	priv->shell_view_interface = svi;
-}
-
-/* Wrappers for Evolution_ShellView */
-void
-e_summary_set_message (ESummary *esummary,
-		       const char *message,
-		       gboolean busy)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	if (message != NULL)
-		Evolution_ShellView_set_message (svi, message, busy, &ev);
-	else 
-		Evolution_ShellView_set_message (svi, "", busy, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_unset_message (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_unset_message (svi, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_change_current_view (ESummary *esummary,
-			       const char *uri)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_change_current_view (svi, uri, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_set_title (ESummary *esummary,
-		     const char *title)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_set_title (svi, title, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-e_summary_load_state (ESummary *esummary,
-		      const char *path)
-{
-	char *fullpath;
-	char **argv;
-	int argc, i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	fullpath = g_strdup_printf ("=%s=/services/iids", path);
-	gnome_config_get_vector (fullpath, &argc, &argv);
-
-	for (i = 0; i < argc; i++) {
-		e_summary_factory_embed_service_from_id (esummary, argv[i]);
-	}
-	
-	g_free (argv);
-	g_free (fullpath);
-}
-
-static void
-e_summary_save_state (ESummary *esummary,
-		      const char *path)
-{
-	ESummaryPrivate *priv;
-	GList *windows;
-	char *fullpath;
-	char **argv;
-	int argc, i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	fullpath = g_strdup_printf("=%s=/services/iids", path);
-	priv = esummary->private;
-
-	argc = g_list_length (priv->window_list);
-	argv = g_new (char *, argc);
-
-	for (windows = priv->window_list, i = 0; windows; 
-	     windows = windows->next, i++) {
-		ESummaryWindow *window;
-
-		window = windows->data;
-		g_print ("%s: IID: %s\n", path, window->iid);
-		argv[i] = window->iid;
-	}
-
-	gnome_config_set_vector (fullpath, argc, (const char **)argv);
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-
-	g_free (fullpath);
-	g_free (argv);
-}
-
-ESummaryWindow *
-e_summary_window_from_view (ESummary *esummary,
-			    ExecutiveSummaryComponentView *view)
-{
-	ESummaryPrivate *priv;
-
-	priv = esummary->private;
-	return g_hash_table_lookup (priv->view_to_window, view);
-}
-
-void
-e_summary_window_move_left (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *grandparent;
-	int position;
-
-	priv = esummary->private;
-
-	/* Need to cache this location */
-	win_item = g_list_find (priv->window_list, window);
-	
-	/* Find the item 2 previous. */
-	if (win_item->prev == NULL)
-		return; /* Item was first, can't be moved left */
-
-	grandparent = win_item->prev->prev;
-
-	/* Remove it from the list */
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	/* Insert it after the grandparent */
-	position = g_list_position (priv->window_list, grandparent);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_right (ESummary *esummary,
-			     ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *child;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	if (win_item->next == NULL)
-		return;
-
-	child = win_item->next;
-	
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-	
-	position = g_list_position (priv->window_list, child);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_up (ESummary *esummary,
-			  ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-	
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position - 3);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_down (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 3);
-}
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
deleted file mode 100644
index f68575d76c..0000000000
--- a/executive-summary/component/e-summary.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_H__
-#define _E_SUMMARY_H__
-
-#include <gtk/gtksignal.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtk/gtkvbox.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component-client.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#include <Evolution.h>
-
-#define E_SUMMARY_TYPE (e_summary_get_type ())
-#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary))
-#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass))
-#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE))
-#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE))
-
-typedef struct _ESummaryPrivate ESummaryPrivate;
-typedef struct _ESummary ESummary;
-typedef struct _ESummaryClass ESummaryClass;
-typedef struct _ESummaryWindow ESummaryWindow;
-
-struct _ESummaryWindow {
-	ExecutiveSummary *summary;
-	ExecutiveSummaryComponentView *view;
-	char *iid;
-};
-
-struct _ESummary {
-  GtkVBox parent;
-
-  ESummaryPrivate *private;
-};
-
-struct _ESummaryClass {
-  GtkVBoxClass parent_class;
-};
-
-GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const Evolution_Shell shell);
-int e_summary_rebuild_page (ESummary *esummary);
-void e_summary_add_html_service (ESummary *esummary,
-				 ExecutiveSummary *summary,
-				 ExecutiveSummaryComponentClient *client,
-				 const char *html,
-				 const char *title,
-				 const char *icon);
-void e_summary_add_bonobo_service (ESummary *esummary,
-				   ExecutiveSummary *summary,
-				   ExecutiveSummaryComponentClient *client,
-				   GtkWidget *control,
-				   const char *title,
-				   const char *icon);
-void e_summary_update_window (ESummary *esummary,
-			      ExecutiveSummary *summary,
-			      const char *html);
-void e_summary_window_free (ESummaryWindow *window,
-			    ESummary *esummary);
-void  e_summary_window_remove_from_ht (ESummaryWindow *window,
-				       ESummary *esummary);
-void e_summary_add_service (ESummary *esummary,
-			    ExecutiveSummary *summary,
-			    ExecutiveSummaryComponentView *view,
-			    const char *iid);
-ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,
-							int id);
-void e_summary_set_shell_view_interface (ESummary *summary,
-					 Evolution_ShellView svi);
-void e_summary_set_message (ESummary *esummary,
-			    const char *message,
-			    gboolean busy);
-void e_summary_unset_message (ESummary *esummary);
-void e_summary_change_current_view (ESummary *esummary,
-				    const char *uri);
-void e_summary_set_title (ESummary *esummary,
-			  const char *title);
-ESummaryWindow *e_summary_window_from_view (ESummary *esummary,
-					    ExecutiveSummaryComponentView *view);
-void e_summary_window_move_left (ESummary *esummary,
-				 ESummaryWindow *window);
-void e_summary_window_move_right (ESummary *esummary,
-				  ESummaryWindow *window);
-void e_summary_window_move_up (ESummary *esummary,
-			       ESummaryWindow *window);
-void e_summary_window_move_down (ESummary *esummary,
-				 ESummaryWindow *window);
-
-#endif
diff --git a/executive-summary/component/executive-summary.png b/executive-summary/component/executive-summary.png
deleted file mode 100644
index 10a122f39e..0000000000
--- a/executive-summary/component/executive-summary.png
+++ /dev/null
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
deleted file mode 100644
index 9c331ce813..0000000000
--- a/executive-summary/component/main.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * main.c: The core of the executive summary component.
- *
- * Copyright (C) 2000 Helix Code, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#include <config.h>
-
-#include <signal.h>
-
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object-directory.h>
-#include <liboaf/liboaf.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include "gal/widgets/e-gui-utils.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-unicode.h"
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "component-factory.h"
-
-int
-main (int argc,
-      char **argv)
-{
-  CORBA_ORB orb;
-
-#ifdef ENABLE_NLS
-  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-  textdomain (PACKAGE);
-#endif
-
-  gnome_init_with_popt_table ("evolution-executive-summary", VERSION,
-			      argc, argv, oaf_popt_options, 0, NULL);
-  orb = oaf_init (argc, argv);
-
-  gdk_rgb_init ();
-  if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-    g_error (_("Executive summary component could not initialize Bonobo.\n"
-	       "If there was a warning message about the "
-	       "RootPOA, it probably means\nyou compiled "
-	       "Bonobo against GOAD instead of OAF."));
-  }
-
-#ifdef GTKHTML_HAVE_GCONF
-  gconf_init (argc, argv, NULL);
-#endif
-
-  e_unicode_init ();
-
-  e_cursors_init ();
-
-  component_factory_init ();
-
-  signal (SIGSEGV, SIG_DFL);
-  signal (SIGBUS, SIG_DFL);
-
-  gnome_vfs_init ();
-  bonobo_main ();
-
-  return 0;
-}
diff --git a/executive-summary/default-header.html b/executive-summary/default-header.html
deleted file mode 100644
index 64fc119ea6..0000000000
--- a/executive-summary/default-header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>Evolution - Executive Summary</title>
-</head>
-
-<body bgcolor="#ffffff">
-<table>
-<tr valign="center">
-<td align="right"><img src="executive-summary.png"></td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/evolution-executive-summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/evolution-services/.cvsignore b/executive-summary/evolution-services/.cvsignore
deleted file mode 100644
index d9807cd94f..0000000000
--- a/executive-summary/evolution-services/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Executive-Summary.h
-Executive-Summary-common.c
-Executive-Summary-skels.c
-Executive-Summary-stubs.c
-Makefile.in
-Makefile
-core
-.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
deleted file mode 100644
index 09b19f6bc9..0000000000
--- a/executive-summary/evolution-services/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-lib_LTLIBRARIES = libevolution-services.la
-
-INCLUDES = \
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/executive-summary		\
-	-I$(top_builddir)/executive-summary		\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-services\"
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
-Executive-Summary-impl.o: Executive-Summary.h
-
-IDLS = \
-	$(srcdir)/../idl/Executive-Summary.idl		\
-	$(srcdir)/../idl/Summary.idl			\
-	$(srcdir)/../idl/SummaryComponent.idl
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(srcdir)/../idl/Executive-Summary.idl
-
-libevolution_services_la_SOURCES =		\
-	$(IDL_GENERATED)		\
-	executive-summary.c		\
-	executive-summary.h		\
-	executive-summary-client.c	\
-	executive-summary-client.h	\
-	executive-summary-component.c	\
-	executive-summary-component.h	\
-	executive-summary-component-client.c	\
-	executive-summary-component-client.h	\
-	executive-summary-component-view.c	\
-	executive-summary-component-view.h
-
-libevolution_services_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
deleted file mode 100644
index 88796d1753..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary-client.h"
-#include "executive-summary-component.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryClient *client;
-	ExecutiveSummaryClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_client_init (ExecutiveSummaryClient *client)
-{
-	ExecutiveSummaryClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_client_class_init (ExecutiveSummaryClientClass *client)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (client);
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = executive_summary_client_destroy;
-}
-
-void
-executive_summary_client_construct (ExecutiveSummaryClient *client,
-				    CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-E_MAKE_TYPE (executive_summary_client, "ExecutiveSummaryClient",
-	     ExecutiveSummaryClient, executive_summary_client_class_init,
-	     executive_summary_client_init, PARENT_TYPE);
-
-void
-executive_summary_client_set_title (ExecutiveSummaryClient *client,
-				    int id,
-				    const char *title)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_set_title (summary, id, title, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-				   int id,
-				   const char *icon)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_set_icon (summary, id, icon, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_flash (ExecutiveSummaryClient *client,
-				int id)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_flash (summary, id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error flashing");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_update (ExecutiveSummaryClient *client,
-				 int id,
-				 const char *html)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_update_component (summary, id, html, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error updating the component");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-		
diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h
deleted file mode 100644
index c6c138dd69..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))
-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))
-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryClientPrivate ExecutiveSummaryClientPrivate;
-typedef struct _ExecutiveSummaryClient ExecutiveSummaryClient;
-typedef struct _ExecutiveSummaryClientClass ExecutiveSummaryClientClass;
-
-struct _ExecutiveSummaryClient {
-	BonoboObjectClient parent;
-	
-	ExecutiveSummaryClientPrivate *private;
-};
-
-struct _ExecutiveSummaryClientClass {
-	BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_client_get_type (void);
-void executive_summary_client_construct (ExecutiveSummaryClient *client,
-					 CORBA_Object object);
-void executive_summary_client_set_title (ExecutiveSummaryClient *client,
-					 int id,
-					 const char *title);
-void executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-					int id,
-					const char *icon);
-void executive_summary_client_flash (ExecutiveSummaryClient *client,
-				     int id);
-void executive_summary_client_update (ExecutiveSummaryClient *client,
-				      int id,
-				      const char *html);
-
-#endif
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
deleted file mode 100644
index ecd806af52..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <Executive-Summary.h>
-#include "executive-summary-component-client.h"
-#include "executive-summary-component-view.h"
-#include "executive-summary.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryComponentClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_component_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentClient *client;
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_COMPONENT_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_client_init (ExecutiveSummaryComponentClient *client)
-{
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_component_client_class_init (ExecutiveSummaryComponentClientClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_client_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-void
-executive_summary_component_client_construct (ExecutiveSummaryComponentClient *client,
-					      CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-ExecutiveSummaryComponentClient*
-executive_summary_component_client_new (const char *id)
-{
-	ExecutiveSummaryComponentClient *client;
-	CORBA_Environment ev;
-	CORBA_Object corba_object;
-	
-	g_return_val_if_fail (id != NULL, NULL);
-	
-	CORBA_exception_init (&ev);
-	
-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start %s\n", id);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (corba_object == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate %s\n", id);
-		return NULL;
-	}
-	
-	client = gtk_type_new (executive_summary_component_client_get_type ());
-	executive_summary_component_client_construct (client, corba_object);
-	
-	return client;
-}
-
-/* External API */
-void
-executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-					      ExecutiveSummary *summary)
-{
-	Evolution_SummaryComponent component;
-	Evolution_Summary corba_object;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));
-
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	Evolution_SummaryComponent_set_owner (component, corba_object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-void
-executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	
-	Evolution_SummaryComponent_unset_owner (component, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error unsetting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-#if 0
-void
-executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,
-					     gboolean *bonobo,
-					     gboolean *html)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_SummaryComponent_supports (component, bonobo, html, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error checking supports");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-#endif
-
-ExecutiveSummaryComponentView *
-executive_summary_component_client_create_view (ExecutiveSummaryComponentClient *client,
-						int id)
-{
-	ExecutiveSummaryComponentView *view;
-	Evolution_SummaryComponent component;
-	char *html, *title, *icon;
-	Bonobo_Control control;
-	BonoboControl *bc;
-	int ret_id;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),
-			      NULL);
-	
-	CORBA_exception_init (&ev);
-	if (client)
-		component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	/* Get all the details about the view */
-	g_print ("In %s\n", __FUNCTION__);
-	ret_id = Evolution_SummaryComponent_create_view (component, id, &control, 
-							 &html, &title, &icon, &ev);
-	g_print ("Out %s\n", __FUNCTION__);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error creating view");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/* Create a local copy of the remote view */
-	if (control != CORBA_OBJECT_NIL) {
-		bc = BONOBO_CONTROL (bonobo_widget_new_control_from_objref (control, NULL));
-	} else {
-		bc = NULL;
-	}
-
-	view = executive_summary_component_view_new (NULL, bc, html, title,
-						     icon);
-	executive_summary_component_view_set_id (view, ret_id);
-	
-	return view;
-}
-
-#if 0
-char *
-executive_summary_component_client_create_html_view (ExecutiveSummaryComponentClient *client,
-						     char **title,
-						     char **icon)
-{
-	CORBA_char *ret_html;
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),
-			      NULL);
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	ret_html = Evolution_SummaryComponent_create_html_view (component, title, icon, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error creating HTML view");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return (char *)g_strdup (ret_html);
-}
-#endif
-
-void
-executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_configure (component, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error configuring service");
-		bonobo_object_unref (BONOBO_OBJECT (client));
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-	
-	return;
-}
-
-void
-executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,
-						 ExecutiveSummaryComponentView *view) 
-{
-	int id;
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	id = executive_summary_component_view_get_id (view);
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_destroy_view (component, id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error destroying view #%d", id);
-	}
-
-	CORBA_exception_free (&ev);
-
-	return;
-}
-
-E_MAKE_TYPE (executive_summary_component_client, 
-	     "ExecutiveSummaryComponentClient", 
-	     ExecutiveSummaryComponentClient,
-	     executive_summary_component_client_class_init,
-	     executive_summary_component_client_init, PARENT_TYPE)
diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h
deleted file mode 100644
index 3a9edd7a1c..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentClientPrivate ExecutiveSummaryComponentClientPrivate;
-typedef struct _ExecutiveSummaryComponentClient ExecutiveSummaryComponentClient;
-typedef struct _ExecutiveSummaryComponentClientClass ExecutiveSummaryComponentClientClass;
-
-struct _ExecutiveSummaryComponentClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentClientPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClientClass {
-  BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_component_client_get_type (void);
-ExecutiveSummaryComponentClient *executive_summary_component_client_new (const char *id);
-
-void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-						   ExecutiveSummary *summary);
-void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client);
-
-void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,
-						  gboolean *bonobo,
-						  gboolean *html);
-
-void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client);
-void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,
-						      ExecutiveSummaryComponentView *view);
-
-#endif
-
diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c
deleted file mode 100644
index ebcbeb9e09..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-struct _ExecutiveSummaryComponentViewPrivate {
-	ExecutiveSummaryComponent *component;
-
-	BonoboControl *control;
-	char *html;
-	
-	char *title;
-	char *icon;
-	
-	int id;
-};
-
-static GtkObjectClass *parent_class = NULL;
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static void
-executive_summary_component_view_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentView *view;
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	view = EXECUTIVE_SUMMARY_COMPONENT_VIEW (object);
-	priv = view->private;
-	if (priv == NULL)
-		return;
-
-	if (priv->component)
-		bonobo_object_unref (BONOBO_OBJECT (priv->component));
-
-	if (priv->control)
-		bonobo_object_unref (BONOBO_OBJECT (priv->control));
-
-	g_free (priv->html);
-	g_free (priv->title);
-	g_free (priv->icon);
-
-	g_free (priv);
-	view->private = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_view_class_init (ExecutiveSummaryComponentViewClass *view_class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (view_class);
-
-	object_class->destroy = executive_summary_component_view_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-executive_summary_component_view_init (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryComponentViewPrivate, 1);
-	view->private = priv;
-
-	priv->control = NULL;
-	priv->html = NULL;
-	priv->title = NULL;
-	priv->icon = NULL;
-	priv->id = -1;
-}
-
-E_MAKE_TYPE (executive_summary_component_view, "ExecutiveSummaryComponentView",
-	     ExecutiveSummaryComponentView, 
-	     executive_summary_component_view_class_init,
-	     executive_summary_component_view_init, PARENT_TYPE);
-
-void
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	g_return_if_fail (control != NULL || html != NULL);
-	
-	priv = view->private;
-
-	if (component != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (component));
-		priv->component = component;
-	} else {
-		priv->component = NULL;
-	}
-
-	if (control != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (control));
-		priv->control = control;
-	} else {
-		priv->control = NULL;
-	}
-
-	if (html) {
-		priv->html = g_strdup (html);
-	} else {
-		priv->html = NULL;
-	}
-
-	if (title) {
-		priv->title = g_strdup (title);
-	} else {
-		priv->title = NULL;
-	}
-
-	if (icon) {
-		priv->icon = g_strdup (icon);
-	} else {
-		priv->icon = NULL;
-	}
-}
-
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon)
-{
-	ExecutiveSummaryComponentView *view;
-
-	g_return_val_if_fail (control != NULL || html != NULL, NULL);
-	
-	view = gtk_type_new (executive_summary_component_view_get_type ());
-	executive_summary_component_view_construct (view, component, control,
-						    html, title, icon);
-
-	return view;
-}
-
-void
-executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-					    const char *title)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->title)
-		g_free (priv->title);
-	priv->title = g_strdup (title);
-
-	component = priv->component;
-	if (component == NULL) {
-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);
-		return;
-	}
-
-	executive_summary_component_set_title (component, view);
-}
-
-const char *
-executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return priv->title;
-}
-
-void
-executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-					   const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->icon)
-		g_free (priv->icon);
-	priv->icon = g_strdup (icon);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	
-	executive_summary_component_set_icon (component, view);
-}
-
-const char *
-executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->icon;
-}
-
-void
-executive_summary_component_view_flash (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	
-	priv = view->private;
-	component = priv->component;
-	if (component == NULL) {
-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);
-		return;
-	}
-
-	executive_summary_component_flash (component, view);
-}
-
-void
-executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-					   const char *html)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->html)
-		g_free (priv->html);
-
-	priv->html = g_strdup (html);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	executive_summary_component_update (component, view);
-}
-
-const char *
-executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->html;
-}
-
-BonoboObject *
-executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return priv->control;
-}
-
-void
-executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,
-					 int id)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-
-	priv->id = id;
-}
-
-int
-executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, -1);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), -1);
-
-	priv = view->private;
-	
-	return priv->id;
-}
diff --git a/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h
deleted file mode 100644
index ecd0c7ab33..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-#define __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))
-
-typedef struct _ExecutiveSummaryComponentViewPrivate ExecutiveSummaryComponentViewPrivate;
-typedef struct _ExecutiveSummaryComponentView ExecutiveSummaryComponentView;
-typedef struct _ExecutiveSummaryComponentViewClass ExecutiveSummaryComponentViewClass;
-
-struct _ExecutiveSummaryComponentView {
-  GtkObject object;
-
-  ExecutiveSummaryComponentViewPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentViewClass {
-  GtkObjectClass parent_class;
-};
-
-GtkType executive_summary_component_view_get_type (void);
-void 
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon);
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon);
-
-void executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-						 const char *title);
-const char *executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-						const char *icon);
-const char *executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_flash (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-						const char *html);
-const char *executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view);
-BonoboObject *executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view);
-
-int executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view);
-
-#endif
-
-
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
deleted file mode 100644
index c07afc498a..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary.h"
-#include "executive-summary-component.h"
-#include "executive-summary-component-view.h"
-#include "executive-summary-client.h"
-
-static void executive_summary_component_destroy (GtkObject *object);
-static void executive_summary_component_init (ExecutiveSummaryComponent *component);
-static void executive_summary_component_class_init (ExecutiveSummaryComponentClass *esc_class);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *parent_class;
-
-struct _ExecutiveSummaryComponentPrivate {
-	EvolutionServicesCreateViewFn create_view;
-	EvolutionServicesConfigureFn configure;
-	
-	ExecutiveSummaryClient *owner_client;
-	
-	void *closure;
-
-	GHashTable *id_to_view;
-};
-
-/* CORBA interface */
-static POA_Evolution_SummaryComponent__vepv SummaryComponent_vepv;
-
-static POA_Evolution_SummaryComponent *
-create_servant (void)
-{
-	POA_Evolution_SummaryComponent *servant;
-	CORBA_Environment ev;
-	
-	servant = (POA_Evolution_SummaryComponent *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SummaryComponent_vepv;
-	
-	CORBA_exception_init (&ev);
-	POA_Evolution_SummaryComponent__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return servant;
-}
-
-#if 0
-static void
-impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant,
-					  CORBA_boolean *html,
-					  CORBA_boolean *bonobo,
-					  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	*html = (priv->create_html_view != NULL);
-	*bonobo = (priv->create_bonobo_view != NULL);
-}
-#endif
-
-static void
-impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant,
-					   Evolution_Summary summary,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	ExecutiveSummaryClient *client;
-	Evolution_Summary summary_duplicate;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	/* Create a summary client */
-	client = gtk_type_new (executive_summary_client_get_type ());
-
-	summary_duplicate = CORBA_Object_duplicate (summary, ev);
-	executive_summary_client_construct (client, summary_duplicate);
-
-	priv->owner_client = client;
-}
-
-static void
-impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant,
-					     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	if (priv->owner_client == NULL)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-	priv->owner_client = NULL;
-}
-
-static CORBA_long
-impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant,
-					     CORBA_long id,
-					     Bonobo_Control *control,
-					     CORBA_char **html,
-					     CORBA_char **title,
-					     CORBA_char **icon,
-					     CORBA_Environment *ev)
-{
-	ExecutiveSummaryComponentView *view;
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	BonoboObject *initial_control;
-	const char *initial_title, *initial_icon, *initial_html;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-	
-	view = gtk_type_new (executive_summary_component_view_get_type ());
-	executive_summary_component_view_set_id (view, id);
-
-	(* priv->create_view) (component, view, priv->closure);
-	
-	/* Extract the values */
-	initial_title = executive_summary_component_view_get_title (view);
-	initial_icon = executive_summary_component_view_get_icon (view);
-	initial_html = executive_summary_component_view_get_html (view);
-	initial_control = executive_summary_component_view_get_control (view);
-
-	/* Put the view in the hash table so it can be found later */
-	g_hash_table_insert (priv->id_to_view, GINT_TO_POINTER (id), view);
-
-	/* Duplicate the values */
-	if (initial_control != NULL) {
-		*control = bonobo_object_corba_objref (BONOBO_OBJECT (initial_control));
-	} else {
-		*control = CORBA_OBJECT_NIL;
-	}
-
-	*html = CORBA_string_dup (initial_html ? initial_html:"");
-	*title = CORBA_string_dup (initial_title ? initial_title:"");
-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");
-
-	return id;
-}
-
-#if 0
-static CORBA_char *
-impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant,
-						  CORBA_char **title,
-						  CORBA_char **icon,
-						  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	CORBA_char *ret_str;
-	char *ret_html;
-	char *initial_title, *initial_icon;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	ret_html = (* priv->create_html_view) (component, &initial_title,
-					       &initial_icon,
-					       priv->closure);
-
-	*title = CORBA_string_dup (initial_title ? initial_title:"");
-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");
-	g_free (initial_title);
-	g_free (initial_icon);
-
-	ret_str = CORBA_string_dup (ret_html ? ret_html:"");
-	g_free (ret_html);
-	return ret_str;
-}
-#endif	
-
-static void
-impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant,
-					      CORBA_long id,
-					      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	ExecutiveSummaryComponentView *view;
-
-	g_print ("%s\n", __FUNCTION__);
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	view = g_hash_table_lookup (priv->id_to_view, GINT_TO_POINTER (id));
-	if (view == NULL) {
-		g_warning ("Unknown view: %d. Emit exception", id);
-		return;
-	}
-
-	/* Destroy the view */
-	gtk_object_unref (GTK_OBJECT (view));
-}
-
-static void
-impl_Evolution_SummaryComponent_configure (PortableServer_Servant servant,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-	
-	(* priv->configure) (component, priv->closure);
-}
-
-static void
-executive_summary_component_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	CORBA_Environment ev;
-	
-	component = EXECUTIVE_SUMMARY_COMPONENT (object);
-	priv = component->private;
-	
-	if (priv == NULL)
-		return;
-	
-	CORBA_exception_init (&ev);
-	
-	if (priv->owner_client != NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-		priv->owner_client = NULL;
-	}
-
-	CORBA_exception_free (&ev);
-	
-	g_free (priv);
-	component->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Init */
-static void
-corba_class_init (void)
-{
-	POA_Evolution_SummaryComponent__vepv *vepv;
-	POA_Evolution_SummaryComponent__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-	
-	epv = g_new0 (POA_Evolution_SummaryComponent__epv, 1);
-	epv->set_owner = impl_Evolution_SummaryComponent_set_owner;
-	epv->unset_owner = impl_Evolution_SummaryComponent_unset_owner;
-	epv->create_view = impl_Evolution_SummaryComponent_create_view;
-	epv->destroy_view = impl_Evolution_SummaryComponent_destroy_view;
-	epv->configure = impl_Evolution_SummaryComponent_configure;
-	
-	vepv = &SummaryComponent_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_SummaryComponent_epv = epv;
-}
-
-static void
-executive_summary_component_class_init (ExecutiveSummaryComponentClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	corba_class_init ();
-}
-
-static void
-executive_summary_component_init (ExecutiveSummaryComponent *component)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentPrivate, 1);
-	
-	priv->create_view = NULL;
-	priv->configure = NULL;
-	
-	priv->owner_client = NULL;
-	priv->closure = NULL;
-
-	priv->id_to_view = g_hash_table_new (NULL, NULL);
-	component->private = priv;
-}
-
-static void
-executive_summary_component_construct (ExecutiveSummaryComponent *component,
-				       Evolution_SummaryComponent corba_object,
-				       EvolutionServicesCreateViewFn create_view,
-				       EvolutionServicesConfigureFn configure,
-				       void *closure)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_construct (BONOBO_OBJECT (component), corba_object);
-	
-	priv = component->private;
-	
-	priv->create_view = create_view;
-	priv->configure = configure;
-	
-	priv->closure = closure;
-}
-
-BonoboObject *
-executive_summary_component_new (EvolutionServicesCreateViewFn create_view,
-				 EvolutionServicesConfigureFn configure,
-				 void *closure)
-{
-	ExecutiveSummaryComponent *component;
-	POA_Evolution_SummaryComponent *servant;
-	Evolution_SummaryComponent corba_object;
-	
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	component = gtk_type_new (executive_summary_component_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (component),
-						       servant);
-	
-	executive_summary_component_construct (component, corba_object,
-					       create_view, configure, closure);
-	
-	return BONOBO_OBJECT (component);
-}
-
-E_MAKE_TYPE (executive_summary_component, "ExecutiveSummaryComponent", 
-	     ExecutiveSummaryComponent, executive_summary_component_class_init,
-	     executive_summary_component_init, PARENT_TYPE);
-
-void
-executive_summary_component_set_title (ExecutiveSummaryComponent *component,
-				       gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *title;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	title = executive_summary_component_view_get_title (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_set_title (priv->owner_client, id, title);
-}
-
-void
-executive_summary_component_set_icon (ExecutiveSummaryComponent *component,
-				      gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *icon;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	icon = executive_summary_component_view_get_icon (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_set_icon (priv->owner_client, id, icon);
-}
-
-void
-executive_summary_component_flash (ExecutiveSummaryComponent *component,
-				   gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_flash (priv->owner_client, id);
-}
-
-void
-executive_summary_component_update (ExecutiveSummaryComponent *component,
-				    gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *html;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not ownded!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	html = executive_summary_component_view_get_html (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_update (priv->owner_client, id, html);
-}
-
-int
-executive_summary_component_create_unique_id (void)
-{
-	static int id = 0;
-
-	id++;
-	g_print ("%s -- %d\n", __FUNCTION__, id);
-	return id;
-}
diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h
deleted file mode 100644
index 7d5ab904cc..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentPrivate ExecutiveSummaryComponentPrivate;
-typedef struct _ExecutiveSummaryComponent ExecutiveSummaryComponent;
-typedef struct _ExecutiveSummaryComponentClass ExecutiveSummaryComponentClass;
-
-/* view is a ExecutiveSummaryComponentView * */
-typedef void (* EvolutionServicesCreateViewFn) (ExecutiveSummaryComponent *component,
-						gpointer view,
-						void *closure);
-typedef void (* EvolutionServicesConfigureFn) (ExecutiveSummaryComponent *component,
-					       void *closure);
-
-struct _ExecutiveSummaryComponent {
-  BonoboObject parent;
-
-  ExecutiveSummaryComponentPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClass {
-  BonoboObjectClass parent_class;
-};
-
-GtkType executive_summary_component_get_type (void);
-
-BonoboObject *executive_summary_component_new (EvolutionServicesCreateViewFn create_view,
-					       EvolutionServicesConfigureFn configure,
-					       void *closure);
-void executive_summary_component_set_title (ExecutiveSummaryComponent *component,
-					    gpointer view);
-void executive_summary_component_set_icon (ExecutiveSummaryComponent *component,
-					   gpointer view);
-
-void executive_summary_component_flash (ExecutiveSummaryComponent *component,
-					gpointer view);
-void executive_summary_component_update (ExecutiveSummaryComponent *component,
-					 gpointer view);
-int executive_summary_component_create_unique_id (void);
-
-#endif
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
deleted file mode 100644
index f8a0f7ecf8..0000000000
--- a/executive-summary/evolution-services/executive-summary.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.c - Bonobo implementation of Summary.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary.h"
-
-static void executive_summary_destroy (GtkObject *object);
-static void executive_summary_class_init (ExecutiveSummaryClass *es_class);
-static void executive_summary_init (ExecutiveSummary *es);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-enum {
-	UPDATE,
-	SET_TITLE,
-	SET_ICON,
-	FLASH,
-	LAST_SIGNAL
-};
-
-static guint32 summary_signals [LAST_SIGNAL] = { 0 };
-static BonoboObjectClass *parent_class;
-
-struct _ExecutiveSummaryPrivate {
-	int dummy;
-};
-
-/* CORBA interface implementation */
-static POA_Evolution_Summary__vepv Summary_vepv;
-
-static POA_Evolution_Summary *
-create_servant (void)
-{
-	POA_Evolution_Summary *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_Summary *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Summary_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_Summary__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_Evolution_Summary_set_title (PortableServer_Servant servant,
-				  CORBA_long id,
-				  const CORBA_char *title,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_TITLE], 
-			 id, title);
-}
-
-static void
-impl_Evolution_Summary_set_icon (PortableServer_Servant servant,
-				 CORBA_long id,
-				 const CORBA_char *title,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_ICON],
-			 id, title);
-}
-
-static void
-impl_Evolution_Summary_flash (PortableServer_Servant servant,
-			      CORBA_long id,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[FLASH], id);
-}
-
-static void
-impl_Evolution_Summary_update_component (PortableServer_Servant servant,
-					 CORBA_long id,
-					 CORBA_char *html,
-					 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[UPDATE],
-			 id, html);
-}
-
-/* GtkObject methods */
-static void
-executive_summary_destroy (GtkObject *object)
-{
-	ExecutiveSummary *es;
-	ExecutiveSummaryPrivate *priv;
-	
-	es = EXECUTIVE_SUMMARY (object);
-	priv = es->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	es->private = NULL;
-}
-
-/* Initialisation */
-
-static void
-corba_class_init (void)
-{
-	POA_Evolution_Summary__vepv *vepv;
-	POA_Evolution_Summary__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_Evolution_Summary__epv, 1);
-	epv->set_title = impl_Evolution_Summary_set_title;
-	epv->set_icon = impl_Evolution_Summary_set_icon;
-	epv->flash = impl_Evolution_Summary_flash;
-	epv->update_component = impl_Evolution_Summary_update_component;
-
-	vepv = &Summary_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_Summary_epv = epv;
-}
-
-static void
-executive_summary_class_init (ExecutiveSummaryClass *es_class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) es_class;
-	
-	object_class->destroy = executive_summary_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	summary_signals[UPDATE] = gtk_signal_new ("update",
-						  GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, update),
-						  gtk_marshal_NONE__POINTER_POINTER,
-						  GTK_TYPE_NONE, 2,
-						  GTK_TYPE_POINTER,
-						  GTK_TYPE_POINTER);
-	summary_signals[SET_TITLE] = gtk_signal_new ("set_title",
-						     GTK_RUN_LAST,
-						     object_class->type,
-						     GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_title),
-						     gtk_marshal_NONE__POINTER_POINTER,
-						     GTK_TYPE_NONE, 2,
-						     GTK_TYPE_POINTER,
-						     GTK_TYPE_POINTER);
-	summary_signals[SET_ICON] = gtk_signal_new ("set_icon",
-						    GTK_RUN_LAST,
-						    object_class->type,
-						    GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_icon),
-						    gtk_marshal_NONE__POINTER_POINTER,
-						    GTK_TYPE_NONE, 2,
-						    GTK_TYPE_POINTER,
-						    GTK_TYPE_POINTER);
-	summary_signals[FLASH] = gtk_signal_new ("flash",
-						 GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, flash),
-						 gtk_marshal_NONE__POINTER,
-						 GTK_TYPE_NONE, 1,
-						 GTK_TYPE_POINTER);
-	gtk_object_class_add_signals (object_class, summary_signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-executive_summary_init (ExecutiveSummary *es)
-{
-	ExecutiveSummaryPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryPrivate, 1);
-	es->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,
-	     executive_summary_class_init, executive_summary_init, PARENT_TYPE);
-
-void
-executive_summary_construct (ExecutiveSummary *es,
-			     Evolution_Summary corba_object)
-{
-	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);
-}
-
-BonoboObject *
-executive_summary_new (void)
-{
-	POA_Evolution_Summary *servant;
-	Evolution_Summary corba_object;
-	ExecutiveSummary *es;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	es = gtk_type_new (executive_summary_get_type ());
-	
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (es), 
-						       servant);
-	executive_summary_construct (es, corba_object);
-	
-	return BONOBO_OBJECT (es);
-}  
diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h
deleted file mode 100644
index 4f6b959a9c..0000000000
--- a/executive-summary/evolution-services/executive-summary.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_H__
-#define _EXECUTIVE_SUMMARY_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-#include "Executive-Summary.h"
-
-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())
-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))
-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))
-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-
-typedef struct _ExecutiveSummaryPrivate ExecutiveSummaryPrivate;
-typedef struct _ExecutiveSummary ExecutiveSummary;
-typedef struct _ExecutiveSummaryClass ExecutiveSummaryClass;
-
-struct _ExecutiveSummary {
-	BonoboObject parent;
-	
-	ExecutiveSummaryPrivate *private;
-};
-
-struct _ExecutiveSummaryClass {
-	BonoboObjectClass parent_class;
-
-	void (* update) (ExecutiveSummary *summary,
-			 const Evolution_SummaryComponent component,
-			 const char *html);
-	void (* set_title) (ExecutiveSummary *summary,
-			    const Evolution_SummaryComponent component,
-			    const char *title);
-	void (* set_icon) (ExecutiveSummary *summary,
-			   const Evolution_SummaryComponent component,
-			   const char *icon);
-	void (* flash) (ExecutiveSummary *summary,
-			const Evolution_SummaryComponent component);
-};
-
-GtkType executive_summary_get_type (void);
-void executive_summary_construct (ExecutiveSummary *es,
-				  Evolution_Summary corba_object);
-BonoboObject *executive_summary_new (void);
-#endif
diff --git a/executive-summary/idl/.cvsignore b/executive-summary/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/executive-summary/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl
deleted file mode 100644
index ac3809e299..0000000000
--- a/executive-summary/idl/Executive-Summary.idl
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Bonobo.idl>
-#include <SummaryComponent.idl>
-#include <Summary.idl>
diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am
deleted file mode 100644
index e45784d49c..0000000000
--- a/executive-summary/idl/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-EXTRA_DIST = $(IDLS)
-
-CLEANFILES = $(IDL_GENERATED)
-
-IDLS = \
-	Executive-Summary.idl		\
-	Summary.idl			\
-	SummaryComponent.idl
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
deleted file mode 100644
index 76f98dd537..0000000000
--- a/executive-summary/idl/Summary.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution shell.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	interface Summary: Bonobo::Unknown {
-		exception NoSubWindow {};
-		
-		/**
-		 * set_title:
-		 * @component: The SummaryComponent whose window to set the title.
-		 * @title: The title.
-		 *
-		 * Sets the title of the subwindow that displays @component
-		 * to @title
-		 */
-		void set_title (in long id, 
-				in string title)
-			raises (NoSubWindow);
-
-		void set_icon (in long id,
-			       in string icon)
-			raises (NoSubWindow);
-
-		/**
-		 * flash:
-		 * @component: The SummaryComponent that owns a subwindow.
-		 *
-		 * Flashes the subwindow that displays @component.
-		 */
-		 void flash (in long id)
-			raises (NoSubWindow);
-
-		/**
-		 * update_html_component:
-		 * @component: The SummaryComponent that owns a subwindow.
-		 * @html: The new html that defines a component.
-		 *
-		 * Requests that the html that displays @component is changed
-		 * to @html.
-		 */
-		void update_component (in long id,
-				       in string html)
-			raises (NoSubWindow);
-	};
-};
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
deleted file mode 100644
index 1c60314fb2..0000000000
--- a/executive-summary/idl/SummaryComponent.idl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution Executive Summary Components.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-/* TODO: Needs Exceptions */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	interface Summary;
-
-	interface SummaryComponent: Bonobo::Unknown {
-
-		/**
-		 * set_owner:
-		 * @summary: A Summary object.
-		 *
-		 * Sets the owner of the component.
-		 */
-		void set_owner (in Summary owner);
-
-		/**
-		 * unset_owner:
-		 *
-		 * Unsets the owner of the component.
-		 */
-		void unset_owner ();
-
-		/**
-		 * create_view:
-		 * @control: A Bonobo_Control
-		 * @html: HTML of the view.
-		 * @title: Title of the view.
-		 * @icon: Icon to be used for the view.
-	 	 *
-		 * Creates a summary of the data that the component has.
-		 * Returns: The ID of the view.
-		 */
-		long create_view (in long id,
-				  out Bonobo::Control control,
-		                  out string html,
-				  out string title,
-			          out string icon);
-
-		/**
-		 * destroy_view:
-		 * @id: ID of the view to be destroyed.
-		 *
-		 * Tells a service that a view has been destroyed.
-		 */
-		void destroy_view (in long id);
-
-		/**
-		 * configure:
-		 * 
-		 * Instructs the component to open a preferences dialog.
-		 */
-		void configure ();
-
-	};
-};
diff --git a/executive-summary/test-service/.cvsignore b/executive-summary/test-service/.cvsignore
deleted file mode 100644
index 2473a602c4..0000000000
--- a/executive-summary/test-service/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-core
-.deps
-.libs
-test-service
\ No newline at end of file
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
deleted file mode 100644
index e294a3ea49..0000000000
--- a/executive-summary/test-service/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-bin_PROGRAMS = test-service
-
-CFLAGS += -g 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/executive-summary	\
-	$(EXTRA_GNOME_CFLAGS)		\
-	$(BONOBO_HTML_GNOME_CFLAGS)	\
-	$(UNICODE_CFLAGS)
-
-test_service_SOURCES = 			\
-	main.c
-
-test_service_LDADD = 			\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(BONOBO_VFS_GNOME_LIBS)	\
-	$(EXTRA_GNOME_LIBS)
-oafdir = $(datadir)/oaf
-oaf_DATA = test-service.oafinfo
-
-EXTRA_DIST = $(oaf_DATA) 
diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
deleted file mode 100644
index 75bbc3199b..0000000000
--- a/executive-summary/test-service/main.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- * Test Service that counts the number of seconds since it was started.
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <bonobo.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#include <liboaf/liboaf.h>
-
-static int running_views = 0;
-
-struct userdata {
-	int i;
-};
-
-#define TEST_SERVICE_ID "OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-
-static BonoboGenericFactory *factory = NULL;
-
-/* The "do something interesting" function */
-int
-add_one (ExecutiveSummaryComponentView *view) 
-{
-	char *html;
-	struct userdata *ud;
-	
-	/* Get the user data from the view */
-	ud = gtk_object_get_data (GTK_OBJECT (view), "timer-data");
-	if (ud == NULL) {
-		g_warning ("No user data");
-		return FALSE;
-	}
-	
-	/* Generate the new html */
-	html = g_strdup_printf ("Since you started this service<br>"
-				"<center>%d</center><br>seconds have passed.", ud->i);
-	
-	/* Change the html on the view
-	   which will tell the Executive Summary that something needs updating */
-	executive_summary_component_view_set_html (view, html);
-	
-	/* executive_summary_component_view_set_html () makes a copy of the HTML
-	   passed into it, so we don't need to keep it around */
-	g_free (html);
-	
-	/* Do something "fun" */
-	ud->i++;
-	
-	return TRUE;
-}
-
-void
-view_destroyed (GtkObject *object,
-		gpointer data)
-{
-	ExecutiveSummaryComponentView *view;
-	struct userdata *ud;
-	int id;
-	
-	/* Free the user data for this view*/
-	ud = gtk_object_get_data (object, "timer-data");
-	gtk_object_set_data (object, "timer-data", NULL);
-	g_free (ud);
-	
-	/* Remove one running view */
-	running_views--;
-	
-	/* If there are no running views left, quit */
-	if (running_views <= 0)
-		gtk_main_quit ();
-}
-
-/* Create the view:
-   HTML only */
-static void
-create_view (ExecutiveSummaryComponent *component,
-	     ExecutiveSummaryComponentView *view,
-	     void *closure)
-{
-	char *html = "Since you started this service<br><center>0</center><br>seconds have passed.";
-	struct userdata *ud;
-	
-	g_print ("In: %s\n", __FUNCTION__);
-	/* Create the userdata structure */
-	ud = g_new (struct userdata, 1);
-	
-	ud->i = 1;
-	executive_summary_component_view_construct (view, component, NULL,
-						    html, "The Magic Counter",
-						    "gnome-clock.png");
-	g_print ("Out: %s\n", __FUNCTION__);
-	/* Set the user data on the object */
-	gtk_object_set_data (GTK_OBJECT (view), "timer-data", ud);
-	
-	/* Connect the the destroyed signal to find out 
-	   when the view is destroyed */
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroyed), NULL);
-	
-	/* Increase the number of running views */
-	running_views++;
-	
-	/* Do something "interesting" once a second */
-	gtk_timeout_add (1000, add_one, view);
-}
-
-static void
-configure (ExecutiveSummaryComponent *component,
-	   void *closure)
-{
-	GtkWidget *window, *label;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	label = gtk_label_new ("This is a configuration dialog.\nNo it really is");
-	
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show_all (window);
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	ExecutiveSummaryComponent *component;
-	
-	/* Create an executive summary component for this factory */
-	component = executive_summary_component_new (create_view,
-						     configure,
-						     NULL);
-	return BONOBO_OBJECT (component);
-}
-
-void
-test_service_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-	
-	/* Register the factory creation function and the IID */
-	factory = bonobo_generic_factory_new (TEST_SERVICE_ID, factory_fn, NULL);
-	if (factory == NULL) {
-		g_warning ("Cannot initialize test service");
-		exit (0);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	CORBA_ORB orb;
-	
-	/* Init GNOME, oaf and bonobo */
-	gnome_init_with_popt_table ("Test service", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-	orb = oaf_init (argc, argv);
-	
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo");
-	}
-	
-	/* Register the factory */
-	test_service_factory_init ();
-	
-	/* Enter main */
-	bonobo_main ();
-	
-	return 0;
-}
-
diff --git a/executive-summary/test-service/test-service.oafinfo b/executive-summary/test-service/test-service.oafinfo
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/test-service.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/widgets/.cvsignore b/executive-summary/widgets/.cvsignore
deleted file mode 100644
index ddca354b6d..0000000000
--- a/executive-summary/widgets/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-esummary-window-test
\ No newline at end of file
diff --git a/executive-summary/widgets/Makefile.am b/executive-summary/widgets/Makefile.am
deleted file mode 100644
index f83d956d63..0000000000
--- a/executive-summary/widgets/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INCLUDES = 	\
-	-I$(top_srcdir) 	\
-	-I$(includedir)		\
-	$(GNOME_INCLUDEDIR)	\
-	-DG_LOG_DOMAIN=\"Executive-Summary-Widgets\"	\
-	-g 	\
-	-Wall	\
-	-Wmissing-prototypes	\
-	-Wmissing-declarations
-
-noinst_LIBRARIES = libesummary-widgets.a
-
-libesummary_widgets_a_SOURCES = 	\
-	e-summary-subwindow.c		\
-	e-summary-subwindow.h		\
-	e-summary-titlebar.c		\
-	e-summary-titlebar.h		\
-	e-summary-title-button.c	\
-	e-summary-title-button.h
-
-noinst_PROGRAMS =		\
-	esummary-window-test
-
-esummary_window_test_SOURCES =	\
-	esummary-window-test.c
-
-esummary_window_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libesummary-widgets.a	\
-	$(BONOBO_GNOME_LIBS)	\
-	$(top_builddir)/e-util/libeutil.la
-
diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c
deleted file mode 100644
index bf5bcb1eba..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include "e-summary-subwindow.h"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-static void e_summary_subwindow_destroy (GtkObject *object);
-static void e_summary_subwindow_class_init (GtkObjectClass *object_class);
-static void e_summary_subwindow_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-
-struct _ESummarySubwindowPrivate {
-  GnomeCanvasItem *titlebar;
-  GnomeCanvasItem *contents;
-
-  GtkWidget *container;
-
-  char *title;
-};
-
-enum {
-  ARG_0,
-  ARG_X,
-  ARG_Y,
-  ARG_WIDTH,
-  ARG_HEIGHT,
-  ARG_STATE
-};
-
-enum {
-  CLOSE_CLICKED,
-  SHADE_CLICKED,
-  EDIT_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint32 e_summary_subwindow_signals[LAST_SIGNAL] = { 0 };
-
-static void
-e_summary_subwindow_destroy (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  priv = subwindow->private;
-
-  if (priv == NULL)
-    return;
-
-  if (priv->container) {
-    gtk_widget_destroy (priv->container);
-    priv->container = NULL;
-  }
-
-  if (priv->title) {
-    g_free (priv->title);
-    priv->title = NULL;
-  }
-
-  g_free (subwindow->private);
-  subwindow->private = NULL;
-
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-  (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_subwindow_realize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_subwindow_unrealize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_subwindow_class_init (GtkObjectClass *object_class)
-{
-  GnomeCanvasItemClass *item_class;
-
-  item_class = (GnomeCanvasItemClass *) object_class;
-
-  object_class->destroy = e_summary_subwindow_destroy;
-
-  item_class->realize = e_summary_subwindow_realize;
-  item_class->unrealize = e_summary_subwindow_unrealize;
-
-  parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_subwindow_init (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  subwindow->private = g_new0 (ESummarySubwindowPrivate, 1);
-  priv = subwindow->private;
-
-  priv->title = NULL;
-}
-
-E_MAKE_TYPE (e_summary_subwindow, "ESummarySubwindow", ESummarySubwindow,
-	     e_summary_subwindow_class_init, e_summary_subwindow_init,
-	     PARENT_TYPE);
-
-static void
-container_size_allocate (GtkWidget *widget,
-			 GtkAllocation *allocation,
-			 ESummarySubwindow *subwindow)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-
-  priv = subwindow->private;
-
-  gnome_canvas_item_set (priv->titlebar,
-			 "width", (double) allocation->width - 1,
-			 NULL);
-
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummarySubwindow *subwindow)
-{
-	g_print ("EDIT!\n");
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("SHADE!\n");
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("CLOSE!\n");
-	gtk_object_destroy (GTK_OBJECT (subwindow));
-}
-
-void
-e_summary_subwindow_construct (GnomeCanvasItem *item)
-{
-  GnomeCanvasGroup *group;
-  ESummarySubwindow *subwindow;
-  ESummarySubwindowPrivate *priv;
-  EFont *font;
-  int titlebar_height;
-
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (item));
-
-  subwindow = E_SUMMARY_SUBWINDOW (item);
-  priv = subwindow->private;
-
-  group = GNOME_CANVAS_GROUP (item);
-
-  font = e_font_from_gdk_font ( ((GtkWidget *) item->canvas)->style->font);
-
-  titlebar_height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-
-  priv->titlebar = gnome_canvas_item_new (group,
-					  e_summary_titlebar_get_type (),
-					  "text", "Titlebar",
-					  "width", 100.0,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "edit",
-		      GTK_SIGNAL_FUNC (edit_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "shade",
-		      GTK_SIGNAL_FUNC (shade_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "close",
-		      GTK_SIGNAL_FUNC (close_cb), subwindow);
-
-  priv->container = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (priv->container), GTK_SHADOW_ETCHED_IN);
-  gtk_widget_show (priv->container);
-  
-  priv->contents = gnome_canvas_item_new (group,
-					  gnome_canvas_widget_get_type (),
-					  "x", (double) 0,
-					  "y", (double) titlebar_height + 1,
-					  "widget", priv->container,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->container), "size_allocate",
-		      GTK_SIGNAL_FUNC (container_size_allocate), subwindow);
-  
-}
-
-GnomeCanvasItem *
-e_summary_subwindow_new (GnomeCanvasGroup *parent,
-			 double x,
-			 double y)
-{
-  GnomeCanvasItem *item;
-
-  item = gnome_canvas_item_new (parent, e_summary_subwindow_get_type (), 
-				"x", x,
-				"y", y,
-				NULL);
-  e_summary_subwindow_construct (item);
-
-  return item;
-}
-
-/* These functions mimic the GtkContainer methods */
-
-void
-e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			 GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_add (GTK_CONTAINER (priv->container), widget);
-  
-}
-
-void
-e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-			    GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_remove (GTK_CONTAINER (priv->container), widget);
-}
-
-void
-e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-			       const char *title)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (title != NULL);
-
-  priv = subwindow->private;
-  if (priv->title)
-    g_free (priv->title);
-
-  priv->title = g_strdup (title);
-}
diff --git a/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h
deleted file mode 100644
index daad080a9c..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-subwindow.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_SUBWINDOW_H__
-#define _E_SUMMARY_SUBWINDIW_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_SUBWINDOW_TYPE (e_summary_subwindow_get_type ())
-#define E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindow))
-#define E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindowClass))
-#define IS_E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-#define IS_E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-
-typedef struct _ESummarySubwindowPrivate ESummarySubwindowPrivate;
-typedef struct _ESummarySubwindow ESummarySubwindow;
-typedef struct _ESummarySubwindowClass ESummarySubwindowClass;
-
-struct _ESummarySubwindow {
-  GnomeCanvasGroup parent;
-
-  ESummarySubwindowPrivate *private;
-};
-
-struct _ESummarySubwindowClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close_clicked) (ESummarySubwindow *window);
-  void (*shade_clicked) (ESummarySubwindow *window);
-  void (*edit_clicked) (ESummarySubwindow *window);
-};
-
-GtkType e_summary_subwindow_get_type (void);
-
-void e_summary_subwindow_construct (GnomeCanvasItem *subwindow);
-GnomeCanvasItem *e_summary_subwindow_new (GnomeCanvasGroup *parent,
-					  double x,
-					  double y);
-
-void e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			      GtkWidget *widget);
-void e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-				 GtkWidget *widget);
-void e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-				    const char *title);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c
deleted file mode 100644
index 81fa8e5923..0000000000
--- a/executive-summary/widgets/e-summary-title-button.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-buttons.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-title-button.h"
-
-#define PARENT_TYPE (gnome_canvas_rect_get_type ())
-
-enum {
-	ARG_0,
-	ARG_PIXBUF,
-	ARG_X,
-	ARG_Y
-};
-
-enum {
-	CLICKED,
-	LAST_SIGNAL
-};
-
-static void e_summary_title_button_destroy (GtkObject *object);
-static void e_summary_title_button_set_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_get_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class);
-static void e_summary_title_button_init (ESummaryTitleButton *estb);
-static double e_summary_title_button_point (GnomeCanvasItem *item,
-					    double x,
-					    double y,
-					    int cx,
-					    int cy,
-					    GnomeCanvasItem **actual_item);
-static void e_summary_title_button_update (GnomeCanvasItem *item,
-					   double affine[6],
-					   ArtSVP *clip_path,
-					   gint flags);
-static void e_summary_title_button_draw (GnomeCanvasItem *item,
-					 GdkDrawable *drawable,
-					 int x, int y,
-					 int width, int height);
-static gint e_summary_title_button_event (GnomeCanvasItem *item,
-					  GdkEvent *event);
-
-static GnomeCanvasRectClass *parent_class;
-static guint estb_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitleButtonPrivate {
-	GdkPixbuf *pixbuf;
-	double x, y;
-	int width, height;
-
-	int in_button : 1;
-	int button_down : 1;
-};
-
-static void
-e_summary_title_button_destroy (GtkObject *object)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	if (priv == NULL)
-		return;
-	
-	gdk_pixbuf_unref (priv->pixbuf);
-	
-	g_free (priv);
-	estb->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_title_button_set_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	gboolean update = FALSE;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		if (priv->pixbuf)
-			gdk_pixbuf_unref (priv->pixbuf);
-		
-		priv->pixbuf = GTK_VALUE_POINTER (*arg);
-		gdk_pixbuf_ref (priv->pixbuf);
-		
-		priv->width = gdk_pixbuf_get_width (priv->pixbuf);
-		priv->height = gdk_pixbuf_get_height (priv->pixbuf);
-		
-		update = TRUE;
-		break;
-		
-	case ARG_X: 
-		priv->x = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	case ARG_Y:
-		priv->y = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	default:
-		break;
-		
-	}
-	
-	if (update)
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (estb));
-	
-}
-
-static void
-e_summary_title_button_get_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = priv->pixbuf;
-		break;
-		
-	case ARG_X:
-		GTK_VALUE_DOUBLE (*arg) = priv->x;
-		break;
-		
-	case ARG_Y:
-		GTK_VALUE_DOUBLE (*arg) = priv->y;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-		
-	}
-}
-
-static void
-e_summary_title_button_init (ESummaryTitleButton *estb)
-{
-	estb->private = g_new0 (ESummaryTitleButtonPrivate, 1);
-}
-
-static void
-e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass *) estb_class;
-	item_class = (GnomeCanvasItemClass *) estb_class;
-	
-	object_class->destroy = e_summary_title_button_destroy;
-	object_class->set_arg = e_summary_title_button_set_arg;
-	object_class->get_arg = e_summary_title_button_get_arg;
-	
-	item_class->draw = e_summary_title_button_draw;
-	item_class->point = e_summary_title_button_point;
-	item_class->update = e_summary_title_button_update;
-	item_class->event = e_summary_title_button_event;
-	
-	gtk_object_add_arg_type ("ESummaryTitleButton::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("ESummaryTitleButton::x",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_X);
-	gtk_object_add_arg_type ("ESummaryTitleButton::y",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_Y);
-	estb_signals[CLICKED] = gtk_signal_new ("clicked", GTK_RUN_LAST,
-						object_class->type,
-						GTK_SIGNAL_OFFSET (ESummaryTitleButtonClass,
-								   clicked),
-						gtk_marshal_NONE__NONE,
-						GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, estb_signals, LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE (e_summary_title_button, "ESummaryTitleButton", 
-	     ESummaryTitleButton, e_summary_title_button_class_init,
-	     e_summary_title_button_init, PARENT_TYPE);
-
-static double
-e_summary_title_button_point (GnomeCanvasItem *item,
-			      double x,
-			      double y,
-			      int cx,
-			      int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double d = 1.0;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (x >= priv->x && x <= priv->x + gdk_pixbuf_get_width (priv->pixbuf)
-	    && y >= priv->y && y <= priv->y + gdk_pixbuf_get_height (priv->pixbuf)) {
-		d = 0.0;
-		*actual_item = item;
-	}
-
-	return d;
-}
-
-static void
-get_bounds (ESummaryTitleButton *estb,
-	    double *px1, double *py1,
-	    double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	int cx1, cy1, cx2, cy2;
-	
-	item = GNOME_CANVAS_ITEM (estb);
-	priv = estb->private;
-	
-	x1 = priv->x;
-	y1 = priv->y;
-	x2 = x1 + priv->width;
-	y2 = y1 + priv->height;
-	
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &x2);
-	gnome_canvas_w2c (item->canvas, x1, y1, &cx1, &cy1);
-	gnome_canvas_w2c (item->canvas, x2, y2, &cx2, &cy2);
-	
-	*px1 = cx1;
-	*py1 = cy1;
-	*px2 = cx2;
-	*py2 = cy2;
-}
-
-static void
-e_summary_title_button_update (GnomeCanvasItem *item,
-			       double affine[6],
-			       ArtSVP *clip_path,
-			       gint flags)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	get_bounds (estb, &x1, &y1, &x2, &y2);
-	gnome_canvas_update_bbox (item, (int) x1, (int) y1, (int) x2, (int) y2);
-}
-
-static void
-e_summary_title_button_draw (GnomeCanvasItem *item,
-			     GdkDrawable *drawable,
-			     int x, int y,
-			     int width, int height)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double i2w[6], w2c[6], i2c[6];
-	int x1, x2, y1, y2;
-	ArtPoint i1, i2;
-	ArtPoint c1, c2;
-	GdkGC *gc;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->draw)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->draw) (item, drawable, x, y, width, height);
-	
-	gnome_canvas_item_i2w_affine (item, i2w);
-	gnome_canvas_w2c_affine (item->canvas, w2c);
-	art_affine_multiply (i2c, i2w, w2c);
-	
-	i1.x = priv->x;
-	i1.y = priv->y;
-	i2.x = i1.x + priv->width + 4;
-	i2.y = i1.y + priv->height + 4;
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-	x1 = c1.x;
-	y1 = c1.y;
-	x2 = c2.x;
-	y2 = c2.y;
-	
-	gc = gdk_gc_new (item->canvas->layout.bin_window);
-	gdk_draw_rectangle (drawable, gc,
-			    FALSE, x1 - x,
-			    y1 - y,
-			    x2 - x1,
-			    y2 - y1);
-	gdk_gc_unref (gc);
-	
-	gdk_pixbuf_render_to_drawable_alpha (priv->pixbuf,
-					     drawable,
-					     0, 0,
-					     x1 + 2, y1 + 2,
-					     priv->width, priv->height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     127,
-					     GDK_RGB_DITHER_NORMAL,
-					     0, 0);
-}
-
-static gint
-e_summary_title_button_event (GnomeCanvasItem *item,
-			      GdkEvent *event)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-
-	switch (event->type) {
-	case GDK_ENTER_NOTIFY:
-		priv->in_button = TRUE;
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		priv->in_button = FALSE;
-		break;
-
-	case GDK_BUTTON_PRESS:
-		if (priv->in_button) {
-			priv->button_down = TRUE;
-			gnome_canvas_item_grab (item,
-						GDK_LEAVE_NOTIFY_MASK |
-						GDK_ENTER_NOTIFY_MASK |
-						GDK_POINTER_MOTION_MASK |
-						GDK_BUTTON_RELEASE_MASK,
-						NULL, event->button.time);
-		}
-		break;
-	
-	case GDK_BUTTON_RELEASE:
-		priv->button_down = FALSE;
-		gnome_canvas_item_ungrab (item, event->button.time);
-
-		if (priv->in_button) {
-			gtk_signal_emit (GTK_OBJECT (estb), estb_signals[CLICKED]);
-		}
-		break;
-		
-	default:
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h
deleted file mode 100644
index a99a96815a..0000000000
--- a/executive-summary/widgets/e-summary-title-button.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-button.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_TITLE_BUTTON_H__
-#define _E_SUMMARY_TITLE_BUTTON_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLE_BUTTON_TYPE (e_summary_title_button_get_type ())
-#define E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButton))
-#define E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButtonClass))
-#define IS_E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-#define IS_E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-
-typedef struct _ESummaryTitleButtonPrivate ESummaryTitleButtonPrivate;
-typedef struct _ESummaryTitleButton ESummaryTitleButton;
-typedef struct _ESummaryTitleButtonClass ESummaryTitleButtonClass;
-
-struct _ESummaryTitleButton {
-	GnomeCanvasRect parent;
-	
-	ESummaryTitleButtonPrivate *private;
-};
-
-struct _ESummaryTitleButtonClass {
-	GnomeCanvasRectClass parent_class;
-	
-	void (*clicked) (ESummaryTitleButton *estb);
-};
-
-GtkType e_summary_title_button_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c
deleted file mode 100644
index 3188b78bf8..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-titlebar.h"
-#include "e-summary-title-button.h"
-
-/* XPMS */
-#include "edit.xpm"
-#include "x.xpm"
-#include "shade.xpm"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-enum {
-	ARG_0,
-	ARG_TEXT,
-	ARG_WIDTH,
-	ARG_HEIGHT
-};
-
-enum {
-	EDIT,
-	SHADE,
-	CLOSE,
-	LAST_SIGNAL
-};
-
-static void e_summary_titlebar_destroy (GtkObject *object);
-static void e_summary_titlebar_class_init (GtkObjectClass *object_class);
-static void e_summary_titlebar_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-static guint titlebar_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitlebarPrivate {
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *titletext;
-	
-	GnomeCanvasItem *edit;
-	GnomeCanvasItem *shade;
-	GnomeCanvasItem *close;
-	
-	char *text;
-	double width, height;
-};
-
-static void
-e_summary_titlebar_destroy (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	titlebar->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[EDIT]);
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[SHADE]);
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[CLOSE]);
-}
-
-static void
-e_summary_titlebar_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvasGroup *group;
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	GdkPixbuf *pb;
-	EFont *font;
-	int font_height;
-	
-	group = GNOME_CANVAS_GROUP (item);
-	titlebar = E_SUMMARY_TITLEBAR (item);
-	priv = titlebar->private;
-	
-	font = e_font_from_gdk_font (GTK_WIDGET (item->canvas)->style->font);
-	font_height = e_font_height (font);
-	priv->height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-	
-	priv->rect = gnome_canvas_item_new (group,
-					    gnome_canvas_rect_get_type (),
-					    "x1", 0.0,
-					    "y1", 0.0,
-					    "y2", (double) priv->height,
-					    "x2", priv->width, 
-					    "fill_color_rgba", 0x88AAFFFF,
-					    NULL);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) x_xpm);
-	priv->close = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - TITLEBAR_BORDER_WIDTH - 18,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) shade_xpm);
-	priv->shade = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 2) - 36,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->shade), "clicked",
-			    GTK_SIGNAL_FUNC (shade_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) edit_xpm);
-	priv->edit = gnome_canvas_item_new (group,
-					    e_summary_title_button_get_type (),
-					    "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 3) - 54,
-					    "y", (double) TITLEBAR_BORDER_WIDTH,
-					    "pixbuf", pb,
-					    NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_cb), titlebar);
-	
-	priv->titletext = gnome_canvas_item_new (group,
-						 e_text_get_type (),
-						 "text", priv->text,
-						 "font_gdk", GTK_WIDGET (item->canvas)->style->font,
-						 "clip_width", (double) priv->width - 
-						 (TITLEBAR_BORDER_WIDTH*4)- 50,
-						 "clip_height", (double) e_font_height (font),
-
-						 "clip", TRUE,
-						 "use_ellipsis", TRUE,
-						 "fill_color", "black",
-						 "anchor", GTK_ANCHOR_NW,
-						 NULL);
-	gnome_canvas_item_move (priv->titletext, TITLEBAR_BORDER_WIDTH,
-				(priv->height - font_height) / 2);
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_titlebar_unrealize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_titlebar_set_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		if (priv->text)
-			g_free (priv->text);
-		
-		priv->text = g_strdup (GTK_VALUE_STRING (*arg));
-		
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "text", priv->text,
-					       NULL);
-		break;
-		
-	case ARG_WIDTH:
-		priv->width = GTK_VALUE_DOUBLE (*arg);
-		
-		if (priv->rect)
-			gnome_canvas_item_set (priv->rect,
-					       "x2", priv->width,
-					       NULL);
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "clip_width", priv->width - 
-					       (TITLEBAR_BORDER_WIDTH* 4) - 42,
-					       NULL);
-		break;
-		
-	default:
-		break;
-	}
-}
-
-static void
-e_summary_titlebar_get_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = priv->text;
-		break;
-		
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = priv->width;
-		break;
-		
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = priv->height;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static gint
-e_summary_titlebar_event (GnomeCanvasItem *item,
-			  GdkEvent *event)
-{
-	if (event->type == GDK_2BUTTON_PRESS &&
-	    event->button.button == 1) {
-		gtk_signal_emit (GTK_OBJECT (item), titlebar_signals[SHADE]);
-		return FALSE;
-	} else {
-		return TRUE;
-	}
-}
-
-static double
-e_summary_titlebar_point (GnomeCanvasItem *item,
-			  double x,
-			  double y,
-			  int cx,
-			  int cy,
-			  GnomeCanvasItem **actual_item)
-{
-	ESummaryTitlebar *est;
-	ESummaryTitlebarPrivate *priv;
-	GnomeCanvasItem *ret_item;
-	double d;
-
-	est = E_SUMMARY_TITLEBAR (item);
-	priv = est->private;
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->edit)->klass)->point) (priv->edit,
-						       x, y, 
-						       cx, cy,
-						       &ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->shade)->klass)->point) (priv->shade,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS
-	     (GTK_OBJECT (priv->close)->klass)->point) (priv->close,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	*actual_item = item;
-	return 0.0;
-}
-
-static void
-e_summary_titlebar_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class;
-	
-	item_class = (GnomeCanvasItemClass *) object_class;
-	
-	object_class->destroy = e_summary_titlebar_destroy;
-	object_class->set_arg = e_summary_titlebar_set_arg;
-	object_class->get_arg = e_summary_titlebar_get_arg;
-	
-	item_class->realize = e_summary_titlebar_realize;
-	item_class->unrealize = e_summary_titlebar_unrealize;
-	item_class->event = e_summary_titlebar_event;
-	item_class->point = e_summary_titlebar_point;
-	
-	gtk_object_add_arg_type ("ESummaryTitlebar::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE,
-				 ARG_TEXT);
-	gtk_object_add_arg_type ("ESummaryTitlebar::width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_WIDTH);
-	gtk_object_add_arg_type ("ESummaryTitlebar::height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE,
-				 ARG_HEIGHT);
-	
-	titlebar_signals[EDIT] = gtk_signal_new ("edit", GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								    edit),
-						 gtk_marshal_NONE__NONE,
-						 GTK_TYPE_NONE, 0);
-	titlebar_signals[SHADE] = gtk_signal_new ("shade", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     shade),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	titlebar_signals[CLOSE] = gtk_signal_new ("close", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     close),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, titlebar_signals,
-				      LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_titlebar_init (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	titlebar->private = g_new0 (ESummaryTitlebarPrivate, 1);
-	priv = titlebar->private;
-	
-	priv->width = 100.0;
-	priv->text = NULL;
-	
-	gdk_rgb_init ();
-}
-
-E_MAKE_TYPE (e_summary_titlebar, "ESummaryTitlebar", ESummaryTitlebar,
-	     e_summary_titlebar_class_init, e_summary_titlebar_init,
-	     PARENT_TYPE);
-
diff --git a/executive-summary/widgets/e-summary-titlebar.h b/executive-summary/widgets/e-summary-titlebar.h
deleted file mode 100644
index b748a4dc8b..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _E_SUMMARY_TITLEBAR_H__
-#define _E_SUMMARY_TITLEBAR_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLEBAR_TYPE (e_summary_titlebar_get_type ())
-#define E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebar))
-#define E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebarClass))
-#define IS_E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-#define IS_E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-
-typedef struct _ESummaryTitlebarPrivate ESummaryTitlebarPrivate;
-typedef struct _ESummaryTitlebar ESummaryTitlebar;
-typedef struct _ESummaryTitlebarClass ESummaryTitlebarClass;
-
-struct _ESummaryTitlebar {
-  GnomeCanvasGroup parent;
-
-  ESummaryTitlebarPrivate *private;
-};
-
-struct _ESummaryTitlebarClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close) (ESummaryTitlebar *window);
-  void (*shade) (ESummaryTitlebar *window);
-  void (*edit) (ESummaryTitlebar *window);
-};
-
-GtkType e_summary_titlebar_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/edit.xpm b/executive-summary/widgets/edit.xpm
deleted file mode 100644
index 7f2deb1525..0000000000
--- a/executive-summary/widgets/edit.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * edit_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-"              ",
-"     ...      ",
-"    .   .     ",
-"    .   .     ",
-"        .     ",
-"        .     ",
-"      ..      ",
-"      ..      ",
-"      ..      ",
-"              ",
-"      ..      ",
-"      ..      ",
-"              "};
diff --git a/executive-summary/widgets/esummary-window-test.c b/executive-summary/widgets/esummary-window-test.c
deleted file mode 100644
index 3a0ad0ab6b..0000000000
--- a/executive-summary/widgets/esummary-window-test.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-summary-subwindow.h"
-#include "e-summary-titlebar.h"
-
-void
-close_test (GtkWidget *widget,
-	    gpointer data)
-{
-  gtk_main_quit ();
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  GtkWidget *window, *canvas;
-  ESummarySubwindow *subwindow;
-  GtkWidget *control;
-
-  gnome_init ("Executive Summary Subwindow Test", "1.0", argc, argv);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (close_test), NULL);
-
-  canvas = e_canvas_new ();
-
-  subwindow = e_summary_subwindow_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas)->root), 100, 100);
-
-  control = gtk_button_new_with_label ("A big button");
-  gtk_widget_set_usize (control, 400, 200);
-
-  e_summary_subwindow_add (subwindow, control); 
-  gtk_widget_show (control);
-
-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 1000.0, 1300.0); 
-  gtk_container_add (GTK_CONTAINER (window), canvas);
-  gtk_widget_show_all (window);
-
-  gtk_main ();
-
-  exit(0);
-}
diff --git a/executive-summary/widgets/shade.xpm b/executive-summary/widgets/shade.xpm
deleted file mode 100644
index 349212e906..0000000000
--- a/executive-summary/widgets/shade.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * shade_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ............ ",
-" ............ ",
-" ............ ",
-" ............ ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" ............ ",
-"              "};
diff --git a/executive-summary/widgets/x.xpm b/executive-summary/widgets/x.xpm
deleted file mode 100644
index ce9e9f19dc..0000000000
--- a/executive-summary/widgets/x.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * x_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ..        .. ",
-" ...      ... ",
-"  ...    ...  ",
-"   ...  ...   ",
-"    ......    ",
-"     ....     ",
-"     ....     ",
-"    ......    ",
-"   ...  ...   ",
-"  ...    ...  ",
-" ...      ... ",
-" ..        .. ",
-"              "};
diff --git a/filter/.cvsignore b/filter/.cvsignore
deleted file mode 100644
index 7c13af9a14..0000000000
--- a/filter/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.la
-*.lo
-.libs
-.deps
-.pure
-Makefile
-Makefile.in
-filter-driver
-filter-editor
diff --git a/filter/ChangeLog b/filter/ChangeLog
deleted file mode 100644
index 55b4c0b7e1..0000000000
--- a/filter/ChangeLog
+++ /dev/null
@@ -1,1203 +0,0 @@
-2000-11-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_log): Fix for when 'desc' is
-	NULL.
-	(filter_driver_filter_message): Use a more user-friendly filter
-	name in the log file.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Use
-	filter_driver_log() where appropriate.
-	(do_copy): Use the service url for the path rather than the
-	folder->full_name because that'll only get you a "/mbox" which is
-	entirely useless. Replace occurences of report_status with
-	filter_driver_log.
-	(do_move): Same.
-	(report_status): Don't use this for logging anymore, use only for
-	reporting the status back to the caller.
-	(filter_driver_log): Renamed from filter_driver_status_log. Now
-	ONLY handles file logging and is for INTERNAL USE ONLY.
-	(do_flag): Replace occurences of report_status with
-	filter_driver_log.
-	(do_score): Same.
-	(do_colour): Same.
-	(do_stop): Same.
-
-2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-datespec.c (validate): Check to make sure the user has
-	entered a valid date.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to select "sounds
-	like" or "does not sound like" (uses header-soundex).
-
-	* filter-message-search.c (header_matches): Oops. Should be using
-	!g_strncasecmp. This should fix it so this filter match works
-	right.
-	(header_starts_with): Same.
-	(header_ends_with): Same.
-	(header_soundex): New filter callback for soundex matching (yes,
-	it's probably a bloated feature but hey, it was fun to code)
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-folder.c (validate): Override the default validate
-	function to only return TRUE if a folder has been selected.
-
-	* filter-editor.c (rule_add): Validate that all the rule parts and
-	action parts are correctly filled in.
-	(rule_edit): Same.
-
-2000-10-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to add an action to set message flags.
-
-	* filter-driver.c (do_flag): New callback to set message info
-	flags.
-
-	* filter-element.c (filter_element_set_data): New convenience
-	function to set the data on a FilterElement.
-
-	* filter-url.c (get_widget): Set the sources list to point to the
-	FilterElement data.
-
-2000-10-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* filter-rule.c (get_widget): Do not pad around the Name hbox;
-	its parent already has spacing.  
-	Do not pad around the inframe's children; the inframe already has
-	spacing.
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-option.c (option_activate): If a regex option is
-	selected, change the FilterElement data to TRUE else set to FALSE.
-
-	* filter-rule.c (more_parts): Validate the previously entered
-	FilterPart before allowing the user to add a new FilterPart.
-
-	* filter-part.c (filter_part_validate): New convenience function
-	to validate an entire FilterPart expression.
-
-	* filter-input.c (validate): Validate the entry text if it
-	contains a regular expression.
-
-	* filter-element.[c,h]: New virtual function to validate the
-	contents of the FilterElement (useful for regex and sexp).
-	(filter_element_validate): You get the idea...	
-
-2000-10-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* filter-input.c: 
-	* filter-option.c: 
-	* filter-part.c: Pure formatting changes, no actual code
-	changes. Since I know I'm going to get flamed for this, I'm sorry
-	but I'll probably have to modify code in these files and it's
-	easier if the code is quickly readable by me.
-
-	* filter-rule.c (get_widget): Set the "remove" button insensitive
-	for <= 1 instead of == 1.
-
-2000-10-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_message): Copy the message
-	to the default folder if it wasn't marked as deleted.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added header-starts-with, header-ends-with, and
-	header-exists menu items.
-
-	* filter-message-search.c (header_starts_with): New callback to
-	match the beginnings of headers.
-	(header_ends_with): New callback to match the ends of headers.
-	(header_exists): New callback to determine if a header exists
-	which is useful when filtering out all those pesky bug-buddy
-	emails!
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Add header-matches expressions ("is" / "is not").
-
-	* filter-message-search.c (header_matches): New callback to match
-	headers exactly (aka strcmp rather than strstr).
-
-2000-10-27  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): divide before
-	multiple so that we don't overflow.
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Fixed this to include EXTRA_GNOME_CFLAGS.
-
-2000-10-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (do_move): Don't mark as deleted here, otherwise
-	the message will have the DELETED flag set in the folder it's
-	being moved to.
-	(do_delete): Don't set the DELETED flag here either...we'll only
-	set it at the very end of the filtering process.
-	(filter_driver_filter_message): Set the DELETED flag after all
-	processing is completed.
-
-2000-10-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Readded Source url stuff.
-
-	* filter-element.c (filter_element_new_type_name): Added url stuff
-	back in.
-
-	* filter-url.[c,h]: Back from the dead...
-
-	* Makefile.am: Re-added filter-url.[c,h].
-
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added option menu items to allow searching
-	based on regular expressions.
-
-	* filter-message-search.c (body_regex): New callback to match text
-	in the body using regex.
-	(body_contains): Modified to only match using strstr.
-	(header_regex): New callback to match headers using regex.
-	(header_contains): Modified to only match using strstr.
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Take out the reference to "Source".
-
-	* filter-element.c (filter_element_new_type_name): Remove
-	filter-url code.
-
-	* filter-url.[c,h]: What was I smoking? There's no good reason to
-	filter on source urls as there are other ways to get the same
-	effect. Thanks to both Zucchi and Miguel for helping me see this
-	:-)
-
-2000-10-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Fixed NULL in fprintf.
-
-2000-10-24  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (libfilter-i18n.h): Build a fake header file with
-	the titles from the xml files, for translation purposes.
-
-	* filter-rule.c (get_rule_part_widget): Call _() on the rule's
-	title.
-
-	* filter-option.c (get_widget): Call _() on the option's title.
-
-	* filter.glade: Turn on translatable strings.
-
-	* libfilter-i18n.h, filter.glade.h: Translatable string files.
-
-	* add #include <config.h> to a bunch of C files so that _()
-	actually does anything. Undo some UTF8 frobs since we're now
-	dealing in localized strings.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-filter.c (less_parts): Set the remove button insensitive
-	if there is only 1 action left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more actions).
-	(get_widget): If there is only 1 action, disable the remove
-	button.
-
-	* filter-rule.c (xml_encode): If there is a defined source, don't
-	set it to "incoming", set it to whatever the source is!
-	(less_parts): Set the remove button insensitive if there is only 1
-	criterion left.
-	(more_parts): Set the remove button sensitive (since we now have 2
-	or more criterion).
-	(get_widget): If there is no name for the filter then set it to
-	"Untitled", highlight it, and grab the focus. If there is only 1
-	criterion, disable the remove button.
-
-	* filter-editor.c, vfolder-editor.c: GUI fixes here and there as
-	well as some consistancy fixes between them.
-
-	* filter-driver.c (filter_driver_filter_mbox): Updated to send the
-	source url to filter_driver_filter_message()
-	(filter_driver_filter_folder): Updated to send the source url of
-	the folder to filter_driver_filter_message()
-	(filter_driver_filter_message): Now takes a source_url argument
-	that represents the url of the folder the message is coming from
-	(so that we may filter based upon that information).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter.glade: Fixed these widgets to resize properly.
-
-2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Remove the "demand" source from the list.
-
-	* filter.glade: Remove the "On Demand" option and replace it with
-	an "Outgoing" option.
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-part.c, filter-rule.c, rule-context.c, score-editor.c,
-	vfolder-editor.c: Fixed these widgets to resize properly.
-
-2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: Added filter-url.[c,h].
-
-	* filter-message-search.c (get_source): New callback to get the
-	source url of the message being filtered.
-	(filter_message_search): Now takes a source argument.
-
-	* filter-element.c (filter_element_new_type_name): Added code to
-	handle URL types.
-
-	* filter-url.[c,h]: New filter object to handle URLs (ie in the
-	case of filtering on source url). FIXME: find a way to populate
-	the source combo box (including mail-config.h breaks the build in
-	the addressbook - how does including mail-tools.h not break the
-	build???)
-
-	* filtertypes.xml: Added the source filter type and added the
-	move-to action.
-
-	* filter-driver.c (do_move): New callback, a "Copy" action should
-	just copy the message to another location while a Move should both
-	copy the message to a new location and delete it from the source
-	location.
-	(do_delete): Set the deleted flag on the message info.
-	(filter_driver_filter_message): Now returns void as we don't care
-	if it was copied or not in the caller functions. Also check the
-	CamelMessageInfo being passed in - if the message has been marked
-	as deleted prior to being filtered, then return immediately as we
-	don't want to apply filter actions to deleted messages.
-
-2000-10-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_filter_folder): Start fetching at
-	1, not 0.
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_filter_mbox): Report the
-	percentage of file complete for the filter.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Why on earth does this code
-	ref all these objects for?  This is not right at all.
-	(filter_driver_run): Changed source type to a string.
-	(filter_driver_run): REmove the very weird exception copying
-	stuff - just ref it instead.
-	(do_score): 
-	(do_colour): 
-	(do_stop): 
-	(do_copy): 
-	(mark_forward): 
-	(do_delete): Removed bogus 'terminated' testing.  This is NOT
-	NEEDED HERE.  It is tested after every rule/action, and
-	termination only makes sense at that point.
-	(filter_driver_filter_message): new funciton (renamed), filter
-	only a message.
-	(filter_driver_filter_mbox): Filter a whole mbox.
-	(filter_driver_run): If we aren't given an info, create a simple
-	one based on the message headers.
-	(filter_driver_filter_message): Renamed from filter_driver_run().
-	(filter_driver_set_status_func): Set the status callback function.
-	(filter_driver_set_default_folder): Set the default folder for
-	filtering.
-	(report_status): Internal function to report the status of a given
-	event.
-	(do_copy): Removed a pointless cache lookup - duh, we do it in
-	open_folder anyway (infact, we do it in camel too!!).
-	(filter_driver_filter_message): Removed pointless re-refing of
-	arguments.  Why would anyone think this could be any use at all?
-	(filter_driver_filter_folder): New function to filter a whole
-	folder.
-
-	* filter-editor.c (rule_add): api fixes.
-	(rule_edit): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): This didn't take into account the source, now it
-	does.
-	(select_source): Fix for api changes.  Changed the rather generic
-	'number' argument to be 'source', and a string.
-	(filter_editor_construct): Changed the 'number' to 'source', and
-	set the string appropriately.  Added a warning for one case where
-	the glade file is out of sync.
-
-	* score-editor.c (score_editor_construct): 
-	(rule_edit): 
-	(rule_delete): 
-	(rule_up): 
-	(rule_down): 
-	(set_sensitive): api fixes.
-
-	* vfolder-editor.c (set_sensitive): Api fixes.
-	(vfolder_editor_construct): 
-	(rule_edit): 
-	(vfolder_editor_construct): 
-
-	* rule-context.h (RCNextRuleFunc): Added a source argument.
-
-	* rule-context.c (rule_context_next_rule): Added source argument.
-	(rule_context_find_rule): Added source argument.
-	(rule_context_get_rank_rule): Added source argument.
-	(rule_context_get_rank_rule_with_source): Removed.
-	(save): Fixed for changes to RCNextRuleFunc prototype.
-
-	* filter-rule.h: Changed the source to be a string, removed the
-	filter_source_t type.
-
-	* filter-rule.c (filter_rule_set_source): New function to set the
-	source of a rule.  What idiot ran this code through indent?
-	(filter_rule_find_list): Added a source argument.
-	(filter_rule_next_list): Added a source argument.
-	(get_widget): Fixed the wording.  You dont remove search parts,
-	you can only remove the last one.  Why you even need to mention
-	they are search 'criteria' is beyond me.  Whoever added the
-	scrolled window needs to be shot, its the single most awful GUI
-	feature ever invented (ranks with the close button next to
-	maximise).
-	(xml_encode): Save source as a string (if present).
-	(xml_decode): Likewise for loading & fixed a small memleak.
-	(filter_rule_finalise): Free source.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (load): Remove the stupid on-demand cb shit.
-	(rule_context_load): And here too.
-
-2000-09-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes an argument to
-	specify the log file (or NULL if logging is not to be performed).
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (gladedir, filterdir): Use $(datadir), not
-	$(prefix)/share.
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Modified to use more intuitive naming
-
-	* score-rule.c (xml_decode): Make sure the score is within our
-	range
-	(get_widget): Changed range to -3 to +3
-
-	* filter-score.c (get_widget): Changed range to -3 to +3
-	(xml_decode): Make sure the score is within our range
-
-	* filter-rule.c (get_widget): Rearranged widgets.
-
-	* filter-filter.c (get_widget): Rearranged widgets.
-
-	* filter-editor.c (filter_editor_construct): Updated to allow for
-	double-clicking on a rule to edit it.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c,
-	filter-input.c, filter-message-search.c, filter-option.c,
-	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	Fixed the #include lines to deal properly with gal.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-message-search.c (body_contains): Modified to only match
-	text MIME parts in the message rather than the entire MIME message
-	(header_contains): Added regex matching
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* rule-context.c (d): 
-	* filter-datespec.c (d): Turn off debugging output.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: We now use a "copied" variable to record
-	whether a message was marked as copied or not instead of trying to
-	"guess" by looking at the folders hash table as that won't work at
-	all anymore.
-	(do_copy): Renamed as this is more appropriate now that it
-	actually copies the message rather than marking it for copying
-	later. Also fixed a logic error which prevented a message from
-	being dumped into a folder if the fodler had been previously
-	opened.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): No longer takes a
-	self_destruct argument.
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Don't freeze/thaw the
-	default inbox here, let the caller freeze/thaw it. Don't destroy
-	the folders hash table here, it's faster if we wait till the
-	filter-driver is destroyed.
-	(filter_driver_finalise): Destroy the folders hash table here
-	(filter_driver_init): Initialize the folders hash table here
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Changed "Header" to be "Message header" so it's
-	not quite as confusing (??)
-
-2000-09-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Updated to allow the user to specify arbitrary
-	headers.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Fixed a logic error. Only
-	mark filtered as TRUE if it was successfully copied to another
-	folder, this means don't mark true if the default inbox is NULL.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Erm, okay I misunderstood
-	what camel_folder_[un]hook_event() did - we don't even need this
-	crap in the filter driver so lets take it completely out and let
-	the caller handle this junk.
-
-2000-09-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to not emit the
-	folder_changed signal when a message is appended to the default
-	mailbox - lets leave that up to the caller so we don't queue up a
-	bunch of these emits if the caller is downloading messages for
-	example.
-
-2000-09-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filtertypes.xml: Added scoring xml stuffs
-	
-	* Makefile.am: added filter-score.[c,h]
-	
-	* filter-score.[c,h]: New functions to handle the "score" filter
-	type.
-	
-	* filter-element.c (filter_element_new_type_name): Added support
-	for "score" type.
-	
-	* filter-driver.c (do_score): New ESExp callback for filter
-	actions to set the score on a message.
-	
-	* filter-message-search.c (get_score): New ESExp callback for
-	getting the score tag as an integer value.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Now takes a
-	CamelMessageInfo argument in preparation for handling scoring
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Modified to return a
-	boolean value specifying whether or not the message was filtered
-	into a folder other than the default. The default mailbox can now
-	also be specified as NULL if the message shouldn't be appended to
-	it in the case that it's not filtered into some other folder.
-
-2000-09-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Rewrote - this shouldn't
-	need to be an async function
-
-	* filter-message-search.c (match_all): Modified to look at the
-	boolean value being fed to it and just to return that instead of
-	always returning TRUE
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-editor.c, filter-filter.c, filter-folder.c, filter-option.c:
-	* filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
-	More UTF-8 wrapping
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Totally rewritten to filter
-	a single message at a time instead of filtering a folder.
-
-	* filter-message-search.c (filter_message_search): New convenience
-	function for searching a message.
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* filter-folder.c: Use e_utf8 wrappers
-
-	* filter-input.c: Use e_utf8 wrappers
-
-	* filter-rule.c: Use e_utf8 wrappers
-	
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* filter-datespec.c (cal_day_selected): Set seltime.tm_isdst to
-	-1, not daylight, because the current dst value is not relevant to
-	the selected date.
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Unlink a new parameter, path_to_unlink,
-	if it is empty once the mail is filtered. Fixes a race in 
-	mail_tool_filter_contents_into.
-
-	* filter-driver.h: Update the prototype.
-
-2000-08-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* vfolder-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* score-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* rule-context.c (rule_context_add_rule_gui): Add translation
-	marks and use stock buttons.
-
-	* filter-part.c (main): Add translation marks and use
-	stock buttons.
-
-	* filter-folder.c (button_clicked): Add translation marks and use
-	stock buttons.
-
-	* filter-editor.c (rule_add): Add translation marks and use stock
-	buttons.
-	(rule_edit): Likewise.
-
-	* filter-rule.c (get_widget): Add translation marks.
-
-	* filter-filter.c (get_widget): Add translation marks.  Add
-	padding to make it look like the buttons in `filter-rule.c'.
-
-2000-08-17  Peter Williams  <peterw@helixcode.com>
-
-	Implement filtering on demand.
-
-	* rule-context.h: Add a new callback to rule_context_load
-	that allows the caller to hook on-demand rules into its UI.
-
-	* rule-context.c (rule_context_load): Changed to pass the
-	extra parameters to load().
-	(load): If the rule is successfully loaded, call the provided
-	callback so that the UI can be updated.
-
-	* filter-editor.c (rule_add): Set the source of the new filter.
-	(rule_edit): Use the new rule_context_get_rank_rule_with_source()
-	so that we don't get a bad index into the GtkList.
-	(rule_delete): Same as above.
-	(rule_up): Same as above.
-	(rule_down): Same as above.
-	(select_source): New function. When the user changes the 
-	dropdown list to select a new source type, repopulate the
-	list with rules of the appropriate type.
-	(filter_editor_construct): Code moved from here into
-	select_source(). Hook up all the elements of the source optionmenu
-	to callbacks to select_source().
-
-	* filter-rule.c (xml_encode): Save the rule's source type.
-	(xml_decode): Load it. Default to 'incoming' if unspecified.
-
-	* filter-rule.h: New enumeration, _filter_source_t, the
-	specifies the rule's source. Add it to struct _FilterRule.
-	
-	* filter-driver.c (filter_driver_run): Add a new input,
-	sourcetype, that specifies which rules to run (only ones
-	with the same source will be run). struct filter_mail_input_t
-	changed to accomodate.
-	(do_filter_mail): Skip rules if they're not the specified source.
-	If source and dest are the same, don't delete the messages or
-	copy unnecessarily.
-
-	* filter.glade: Make the optionmenu sensitive. Change "Outgoing"
-	to "On Demand" (outgoing should be added later).
-	
-2000-08-15  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* vfoldertype.xml, filtertypes.xml: Add entries defining the
-	date-based message filtering and vfoldering.
-
-	* filter-datespec.{c,h}: New files implementing the UI for
-	date-based filtering and vfoldering -- specifically, choosing
-	what to compare the message to.
-
-	* filter-element,c: Hook up to create a datespec filter if
-	that's what's called for.
-
-	* Makefile.am: Build the new -datespec files.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (EXTRA_DIST): remove blank.xpm and check.xpm which
-	no longer exist. Add filter.glade.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (describe_filter_mail): Use
-	mail_tool_get_folder_name here too. (Hm... this directory really
-	shouldn't depend on stuff in mail/, but it already did. We'll have
-	to sort this out later.)
-
-2000-08-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Remove an '#if 0' that must
-	have been left in accidentally, so that messages which are copied
-	to other folders will not also be copied into the Inbox. Also,
-	#ifdef out the line that printfs the rule, because the rules are
-	often very large.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (do_colour): Use proper accessor function
-	instead of poking the structure.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c, filter-folder.c, rule-context.c,
-	vfolder-editor.c: Fixed some warnings.
-
-2000-08-10  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (do_filter_mail): Fix the infinite fetchmail.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Save the results of
-	searches till we're done.  So we dont have to go strduping strings
-	agian and again and again and again ...  Remove all the unecessary
-	strdups.
-	(do_colour): Implement.
-	(filter_driver_run): Change for append api change.
-	(free_key): Removed.
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* rule-context.c (rule_context_add_rule_gui): Helper function to
-	add a rule, but present a gui first, asking for confirmation/allow
-	editing.
-	(rule_context_add_rule_gui): Keep track of context so it isn't freed under us.
-
-	* filter-context.c (filter_context_create_action): Implement,
-	helper to aid filter generation.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (close_folder): Fix an accidental GTK unref
-	of a CamelObject.
-
-2000-08-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-folder.c (button_clicked): Use the base name of the
-	Evoluton URI for the button's label.
-	(get_widget): Likewise.
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (op_filter_mail): Conform to the new mail-threads
-	interface.
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* vfolder-editor.c (rule_add): Oops, create a vfolder_rule when we
-	add a new one.
-
-	* rule-context.c (load): If there are no user rules, dont bomb
-	out.
-
-2000-07-31  Not Zed  <NotZed@HelixCode.com>
-
-	* filter-input.c (filter_input_set_value): Set value of a simple
-	type to a new string.
-
-	* filter-option.c (filter_option_set_current): New function to set
-	the current value of an option.
-
-	* filter-rule.c (filter_rule_find_list): New function to find a
-	rule in a list, by name.
-	(filter_rule_set_name): Let you set the name of a rule.
-
-	* rule-context.c (rule_context_find_rule): Find a rule by name.
-	(rule_context_create_part): Helper to find and clone a part by
-	name.
-
-	* filter-folder.c (button_clicked): Fix warning.
-
-	* filter.glade: Add new widgets for vfolder rule editor.
-	
-	* vfolder-context.c (vfolder_context_init): Changed to use vfolder
-	rule as the rule type.
-
-	* vfolder-rule.c: New class to encode extra information required
-	for vfolder rules.
-
-2000-07-30  Not Zed  <NotZed@HelixCode.com>
-
-	**  Almost a total rewrite of every file, except for filter-driver
-	which just had minor updates.
-
-	The rule format has changed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for
-	CamelFolder API changes. (delete_message and get_uids don't take
-	exceptions any more.)
-
-2000-07-21  Peter Williams  <peterw@helixcode.com>
-
-	* filter-driver.c (cleanup_filter_mail): Use the exception
-	provided to us by the async manager instead of allocating
-	our own; use mail_tool_camel_lock_{up,down} around camel
-	operations.
-	(filter_driver_run): Make it return void.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Update to make "async".
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): Updated to reflect changes to
-	camel_folder_append_message ()
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* filter-xml.[ch]: add a "string" type
-
-	* filtertype.xml, vfoldertypes.xml: Use type="string" rather than
-	"folder" for subject/body matching.
-
-	* filter-arg-types.c: Update some strings for "text" input. Fix
-	some warnings (including one that pointed out a real bug).
-
-	* filter-arg.c, filter-druid.c, filter-format.c: fix warnings
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: Update for camel_folder_search_by_expression
-	change (GList -> GPtrArray).
-
-	* vfoldertypes.xml: sync this to filtertypes.xml (to/cc thing)
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* remove some non-error case debugging messages.
-
-	* filtertypes.xml: Fix typos and update the "to-address" rule to
-	match To or Cc.
-	* vfoldertypes.xml: Fix typos.
-
-	* filter-driver.c (do_delete, do_copy, do_stop,
-	filter_driver_run): Add uids to the "processed" list only after
-	succesfully doing something with them. Fixes the problem where
-	copying a message to a folder that didn't exist would result in it
-	disapearing.
-
-2000-07-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): Don't free the ruleset nor
-	the xmlDoc.  This will make us leak [I think], but at least
-	filters work.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): freeze the folder to avoid
-	multiple folder_changed's
-	(close_folder): and thaw it.
-	
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_new): kill
-	filter_driver_set_session and filter_driver_set_rules and instead
-	make filter_driver_new take the rules and a callback function it
-	can use to turn URIs into folders.
-	(open_folder): Use the callback function rather than calling camel
-	directly: some URIs need special handling to turn them into stores
-	and folders correctly, so let the mailer do that.
-
-2000-07-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c (arg_folder_edit_value): Only allow type
-	"mail" when selecting a folder for the filter.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-driver.c: Updated to reflect changes made to 
-	camel-folder.
-
-2000-06-30  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* filter-xml.c (filter_load_optionset_file): Check for failure
-	when loading the filter doc.
-
-	* filter-driver.c (filter_driver_set_rules): Ditto.
-
-	* filter-editor.c (filter_editor_set_rule_files): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-arg-types.c: Replaced `global_shell_interface' with
-	`global_shell_client'.
-	(arg_folder_edit_value): Use
-	`evolution_shell_client_user_select_folder()'.
-	(create_listener): Removed.
-	(impl_FolderSelectionListener_selected): Removed, together with
-	all the ::Listener stuff.
-
-2000-06-29  Arik Devens  <arik@helixcode.com>
-
-	* vfoldertypes.xml (ruleset type="match"): Changed Cc to CC to be
-	the same as the other CC rule. None of this works however, cause
-	the CC code is not hooked up to camel... oh well ;-(
-	
-2000-06-29  Arik Devens  <arik@helixcode.com>
-	
-	* vfoldertypes.xml (ruleset type="match"): Added a Cc rule to
-	vfolders. Works like To except on the Cc of a message ;-)
-	
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-arg-types.c (arg_string_edit_value): Changed "Filter name"
-	to "Option value" as "Filter name" made no sense in the dialog
-	(arg_address_edit_value): Same
-	(arg_folder_edit_value): What do we want to return??
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-xml.c (load_desc): Strdup content before assigning the
-	value.  Also, no need to check for NULL when g_strdup()ing as
-	g_strdup() returns NULL for a NULL arg.
-
-2000-06-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): `-I$(top_builddir)/shell' so that it
-	works with builddir != srcdir.  [We need to #include
-	"Evolution.h".]
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* Makefile.am (INCLUDES): Add the shell dir for includes (for
-	corba interfaces).
-
-	* filter-arg-types.c (impl_FolderSelectionListener_selected):
-	Listener for folder query.  Sigh.
-	(create_listener): Create the listener object for the folder
-	dialogue query.  Uses a global for linkage to the shell object,
-	via the mail component.
-	(arg_folder_edit_value): Call the folder selection dialogue to
-	edit the value, rather than a simple text widget.
-
-2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* filter-editor.c: Added a #include <gnome-xml/parser.h> as this
-	was needed (since we used the xml parser...)
-	(druid_dialogue_clicked): Do we want to use struct filter_option
-	or do we instead want to use struct filter_optionrule as we had before?
-	Since the function we pass the data to expects filter_option, I suspect 
-	that that is what we want.
-
-	* filter-format.h (filter_description_html_write): Renamed from
-	description_html_write in order to match function name in
-	filter-format.c
-
-	* filter-druid.c (option_name_changed): Fixed a memory leak (Free'd
-	a filter description list).
-
-	* filter-arg-types.c (arg_folder_edit_values): Free'd GList data in
-	argin->values.
-
-	* filter-driver.c (filter_driver_set_rules): Added code to free an
-	xmlDoc and some other data.
-
-	* filter-arg.h: Add prototypes for filter_arg_write_html() and 
-	filter_arg_write_text();
-
-	* filter-arg-types.c: Lets see if we can't get rid of some of these 
-	warnings... (use some casts to make warnings go away)
-	(arg_address_edit_value): Lets make sure that ad exists before looking
-	at member data.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (do_delete, filter_driver_run): Update for Camel
-	flag handling changes.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder, close_folder): Update for
-	CamelFolder changes.
-
-2000-06-09  Jacob Berkman  <jacob@helixcode.com>
-
-	* filter-editor.c (add_or_edit): use stock pixmap buttons
-
-	* filter-druid.c (build_druid): remove the border on the notebook,
-	put the html widget in a scroll frame, and add some padding
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (open_folder): Update for folder
-	existence/creation changes.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-driver.c: Free the exception and the priv struct.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg-types.c (arg_address_edit_value): Search for ad in
-	arg->values instead of text since it's a list of
-	filter_arg_adresses.  Also, free the old value in the list.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* filtertypes.xml: And here too.
-
-	* vfoldertypes.xml: Add body-contains and not-body-contains
-	types.
-
-2000-05-27  Not Zed  <NotZed@HelixCode.com>
-
-	* vfoldertypes.xml: New file - lists rules appropriate for
-	vfolders (no actions, etc).
-
-	* Makefile.am (EXTRA_DIST): Add vfoldertypes.xml
-
-	* filter-driver.c (filter_driver_expand_option): Made public from
-	expand_filter_option.
-	(filter_driver_rule_count): find out how many user rules are
-	defined.
-	(filter_driver_rule_get): Get a user rule by index.
-
-2000-05-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* filter-druid.c: Don't pass an empty URL to `gtk_html_begin()'
-	anymore.
-
-	* filter-arg-types.c: Updated for the new GtkHTML API which uses
-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
-	* filter-arg.c: Likewise.
-	* filter-arg.h: Likewise.
-	* filter-druid.c: Likewise.
-
-	* filter-format.c: Likewise.
-	* filter-format.h: Likewise.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (filter_driver_run): update for
-	camel_folder_get_uids change
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Fix some html formatting.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (filter_driver_run): Delete all processed
-	messages.  This is probably going to slow it down a bit.
-	(filter_driver_run): Close folders before destroying them *sigh*.
-	(open_folder): Actually open the folder. Doh.
-
-	* filtertypes.xml: Initial filter rules.
-
-	* filter-xml.c (filter_write_optionset): Save the description
-	also.
-	(write_description): Routine to save description - only saves 1
-	node of description.
-
-	* filter-arg.c (filter_arg_edit_clicked): Dont free edata here,
-	let the destroy do it(?)
-
-	* filter-editor.c (main): Simple driver program for testing, so i
-	can fix all this really broken code *sigh*
-
-2000-05-15  NotZed  <NotZed@HelixCode.com>
-
-	* filter-editor.c (filter_editor_set_rule_files): filename based
-	interface.
-	(filter_editor_save_rules): Interface to save the options to a
-	filename.
-
-	* filter-xml.[ch]: Bunch of cleanup.
-
-	* filter-xml.c (filter_*_file): New interfaces to read/write files
-	directly, rather than messing with xmldoc crap.
-
-	* Makefile.am: Removed filter-driver test program, now just part
-	of libfilter.
-
-	* filter-driver.c: Made an object, with an api and everything, can
-	apply a filter to a given mailbox.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* filter-arg.h: Changed tree.h to gnome-xml/tree.h.
-
-	* Makefile.am: Added filter-arg-types.h, filter-arg.h,
-	filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Fix for api.
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c (start): Remove no-longer-necessary call to
-	camel_provider_register_as_module.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Use `$(GTKHTML_CFLAGS)'.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c: Removed a bunch of crappy unrequired headers.
-
-	* Makefile.am (filter_driver_LDADD): Added libibex back again.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* filter-driver.c: remove unused camel-log.h include
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* filter-arg.c (filter_arg_edit_value): Return a value.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (tokenise_xmlfreeprop): Free a prop after
-	tokenising it.
-	(find_node_attr): Free the prop after using it.
-	(load_desc): Ditto.   I use free() because xmlFree() is nowhere to
-	be found.
-	(filter_load_optionset): Ditto.
-
-	* filter-arg-types.c (arg_address_values_add_xml): free() xml
-	stuff, plugs a leak.
-	(arg_folder_values_add_xml): Ditto.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Changed to use async search api.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (html_write_options): Output 'and' bits between
-	the rules.
-
-	* filter-driver.c (main): Actually implement filtering, at least,
-	from Inbox.  Copy messages to folder (in the same store only, so
-	far), delete, and stop processing are implemented, and the logic
-	to handle default processing.
-
-	* filter-xml.c (load_optionvalue): Fix up a bug where we lost the
-	name of the arg (ouch).
-	* filter-xml.c: Wrapped printf's in debug macros.
-
-2000-03-02  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c (object_destroy): Disconnect the list signal, so
-	we dont get spurious emits during destroy.
-	(arg_changed): Callback to update filter arg asynchronously.
-	(arg_link_clicked): Edit the value non-modally.
-
-	* filter-arg.c (filter_arg_edit_values_1): Changed to use
-	non-modal interface.
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am: New file.
-
-	* Makefile: Removed.  I wonder why we are using plain Makefiles
-	instead of automake Makefiles at all.
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* filter-driver.c (main): Remove gui code, this will be actual
-	filtering code.
-
-	* Makefile: Added filter-editor to the library.
-
-	* filter-editor.c (main): Comment out, make it a proper library.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* filter-druid.c: Removed unused header.
-
-	* Makefile: Removed references to filter-sexp.[ch].
-
-	* filter-sexp.[ch]: Removed some unecessary includes.  Moved to
-	e-util.  Renamed callers.
-
-2000-02-24  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_description_free): 
-	(filter_load_ruleset_free): 
-	(filter_load_optionset_free): Functions for memory management.
-
-	* filter-arg.c (filter_arg_copy): Copy the values of one arg into
-	another.
-
-	* filter-editor.c: New widget, a dialogue which uses filter-druid
-	to present the various editing views.
-	(druid_dialogue_clicked): On finish, save the user's new filter
-	definition where it came from.
-
-	* filter-druid.c: Changed to just being a notebook with no tabs,
-	rather than a full druid (no next/prev/etc buttons).
-	(option_name_changed): Update the option's description as the user
-	enters it in.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* filter-xml.c (filter_clone_optionrule):
-	(filter_clone_optionrule_free): 
-	(filter_optionrule_new_from_rule): New utility functions for
-	working with the internal rule format.
-
-	* filter-arg.[ch]: Added new callbacks for editing a single value,
-	and a new editor which shows all items in a list, and allows you
-	to edit them via the single-edit method.  This needs some cleanup
-	for some unused/unusable virtual methods (edit_values,
-	write_html?).
-
-	* Makefile: Add the druid for build.
-
-	* filter-druid.c: A 'druid' widget for editing a single filter
-	rule.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: New file.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* blank/check.xpm: Added forgotten files.
-
-	* Uh, more changes, lots, its still work in progress.
-
-2000-02-14  NotZed  <notzed@helixcode.com>
-
-	* Initial import.
-
diff --git a/filter/Makefile.am b/filter/Makefile.am
deleted file mode 100644
index 1b32ae9fcb..0000000000
--- a/filter/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = filter.glade
-
-INCLUDES = 					\
-	-I $(top_srcdir)			\
-	-I $(top_srcdir)/libibex		\
-	-I $(top_srcdir)/camel			\
-	-I $(top_srcdir)/e-util			\
-	-I $(top_srcdir)/shell			\
-	-I $(top_srcdir)/camel/providers/mbox	\
-	-I $(top_builddir)/shell		\
-	-I $(GNOME_INCLUDEDIR)			\
-	$(GTKHTML_CFLAGS)			\
-	$(UNICODE_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
-	-DG_LOG_DOMAIN=\"filter\"
-##
-
-noinst_LTLIBRARIES =				\
-	libfilter.la
-
-libfilter_la_SOURCES =				\
-	filter-code.c				\
-	filter-code.h				\
-	filter-colour.c				\
-	filter-colour.h				\
-	filter-context.c			\
-	filter-context.h			\
-	filter-datespec.c			\
-	filter-datespec.h			\
-	filter-driver.c				\
-	filter-driver.h				\
-	filter-editor.c				\
-	filter-editor.h				\
-	filter-element.c			\
-	filter-element.h			\
-	filter-filter.c				\
-	filter-filter.h				\
-	filter-folder.c				\
-	filter-folder.h				\
-	filter-input.c				\
-	filter-input.h				\
-	filter-message-search.c			\
-	filter-message-search.h			\
-	filter-option.c				\
-	filter-option.h				\
-	filter-part.c				\
-	filter-part.h				\
-	filter-rule.c				\
-	filter-rule.h				\
-	filter-score.c				\
-	filter-score.h				\
-	filter-url.c				\
-	filter-url.h				\
-	rule-context.c				\
-	rule-context.h				\
-	score-context.c				\
-	score-context.h				\
-	score-editor.c				\
-	score-editor.h				\
-	score-rule.c				\
-	score-rule.h				\
-	vfolder-context.c			\
-	vfolder-context.h			\
-	vfolder-editor.c			\
-	vfolder-editor.h			\
-	vfolder-rule.c				\
-	vfolder-rule.h
-
-libfilter_la_DEPENDENCIES = libfilter-i18n.h
-
-EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
-	filter.glade filter.glade.h libfilter-i18n.h
-
-# basic rules.
-filterdir = $(datadir)/evolution
-filter_DATA = filtertypes.xml vfoldertypes.xml
-
-libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
-	echo "/* Automatically generated. Do not edit. */" > $@;	      \
-	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \
-		sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
-		sort -u >> $@
diff --git a/filter/filter-code.c b/filter/filter-code.c
deleted file mode 100644
index cbab60359e..0000000000
--- a/filter/filter-code.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-code.h"
-
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_code_class_init	(FilterCodeClass *class);
-static void filter_code_init	(FilterCode *gspaper);
-static void filter_code_finalise	(GtkObject *obj);
-
-static FilterInputClass *parent_class;
-
-guint
-filter_code_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterCode",
-			sizeof(FilterCode),
-			sizeof(FilterCodeClass),
-			(GtkClassInitFunc)filter_code_class_init,
-			(GtkObjectInitFunc)filter_code_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_input_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_code_class_init (FilterCodeClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_input_get_type ());
-
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	object_class->finalize = filter_code_finalise;
-	/* override methods */
-
-}
-
-static void
-filter_code_init (FilterCode *o)
-{
-	((FilterInput *)o)->type = g_strdup("code");
-}
-
-static void
-filter_code_finalise(GtkObject *obj)
-{
-	FilterCode *o = (FilterCode *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_code_new:
- *
- * Create a new FilterCode object.
- * 
- * Return value: A new #FilterCode object.
- **/
-FilterCode *
-filter_code_new(void)
-{
-	FilterCode *o = (FilterCode *)gtk_type_new(filter_code_get_type ());
-	return o;
-}
-
-/* here, the string IS the code */
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-
-	l = fi->values;
-	while (l) {
-		g_string_append(out, (char *)l->data);
-		l = g_list_next(l);
-	}
-}
-
-/* and we have no value */
-static void format_sexp(FilterElement *fe, GString *out)
-{
-	return;
-}
diff --git a/filter/filter-code.h b/filter/filter-code.h
deleted file mode 100644
index c4bb04caab..0000000000
--- a/filter/filter-code.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_CODE_H
-#define _FILTER_CODE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-input.h"
-
-#define FILTER_CODE(obj)	GTK_CHECK_CAST (obj, filter_code_get_type (), FilterCode)
-#define FILTER_CODE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_code_get_type (), FilterCodeClass)
-#define IS_FILTER_CODE(obj)      GTK_CHECK_TYPE (obj, filter_code_get_type ())
-
-typedef struct _FilterCode	FilterCode;
-typedef struct _FilterCodeClass	FilterCodeClass;
-
-struct _FilterCode {
-	FilterInput parent;
-};
-
-struct _FilterCodeClass {
-	FilterInputClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_code_get_type	(void);
-FilterCode	*filter_code_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_CODE_H */
-
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
deleted file mode 100644
index 202908d016..0000000000
--- a/filter/filter-colour.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-colour.h"
-
-#define d(x)
-
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_colour_class_init	(FilterColourClass *class);
-static void filter_colour_init	(FilterColour *gspaper);
-static void filter_colour_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterColour *)(x))->priv)
-
-struct _FilterColourPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_colour_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterColour",
-			sizeof(FilterColour),
-			sizeof(FilterColourClass),
-			(GtkClassInitFunc)filter_colour_class_init,
-			(GtkObjectInitFunc)filter_colour_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_colour_class_init (FilterColourClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_colour_finalise;
-
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_colour_init (FilterColour *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-}
-
-static void
-filter_colour_finalise(GtkObject *obj)
-{
-	FilterColour *o = (FilterColour *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_colour_new:
- *
- * Create a new FilterColour object.
- * 
- * Return value: A new #FilterColour object.
- **/
-FilterColour *
-filter_colour_new(void)
-{
-	FilterColour *o = (FilterColour *)gtk_type_new(filter_colour_get_type ());
-	return o;
-}
-
-static void xml_create(FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterColour *fc = (FilterColour *)fe;*/
-
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr xml_encode(FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterColour *fc = (FilterColour *)fe;
-	char hex[16];
-
-	d(printf("Encoding colour as xml\n"));
-	value = xmlNewNode(NULL, "value");
-	xmlSetProp(value, "name", fe->name);
-	xmlSetProp(value, "type", "colour");
-
-	sprintf(hex, "%04x", fc->r);
-	xmlSetProp(value, "red", hex);
-	sprintf(hex, "%04x", fc->g);
-	xmlSetProp(value, "green", hex);
-	sprintf(hex, "%04x", fc->b);
-	xmlSetProp(value, "blue", hex);
-	sprintf(hex, "%04x", fc->a);
-	xmlSetProp(value, "alpha", hex);
-
-	return value;
-}
-
-static guint16
-get_value(xmlNodePtr node, char *name)
-{
-	unsigned int ret;
-	char *value;
-
-	value = xmlGetProp(node, name);
-	sscanf(value, "%04x", &ret);
-	xmlFree(value);
-	return ret;
-}
-
-
-static int xml_decode(FilterElement *fe, xmlNodePtr node)
-{
-	FilterColour *fc = (FilterColour *)fe;
-
-	fe->name = xmlGetProp(node, "name");
-	fc->r = get_value(node, "red");
-	fc->g = get_value(node, "green");
-	fc->b = get_value(node, "blue");
-	fc->a = get_value(node, "alpha");
-
-	return 0;
-}
-
-static void set_colour(GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc)
-{
-	fc->r = r;
-	fc->g = g;
-	fc->b = b;
-	fc->a = a;
-}
-
-static GtkWidget *get_widget(FilterElement *fe)
-{
-	FilterColour *fc = (FilterColour *)fe;
-	GnomeColorPicker *cp;
-
-	cp = (GnomeColorPicker *)gnome_color_picker_new();
-	gnome_color_picker_set_i16(cp, fc->r, fc->g, fc->b, fc->a);
-	gtk_widget_show((GtkWidget *)cp);
-	gtk_signal_connect((GtkObject *)cp, "color_set", set_colour, fe);
-	return (GtkWidget *)cp;
-}
-
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void format_sexp(FilterElement *fe, GString *out)
-{
-	char *str;
-	FilterColour *fc = (FilterColour *)fe;
-
-	str =g_strdup_printf("rgb:%04x/%04x/%04x", fc->r, fc->g, fc->b);
-	e_sexp_encode_string(out, str);
-	g_free(str);
-}
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
deleted file mode 100644
index 3526dfcfda..0000000000
--- a/filter/filter-colour.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_COLOUR_H
-#define _FILTER_COLOUR_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_COLOUR(obj)	GTK_CHECK_CAST (obj, filter_colour_get_type (), FilterColour)
-#define FILTER_COLOUR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_colour_get_type (), FilterColourClass)
-#define IS_FILTER_COLOUR(obj)      GTK_CHECK_TYPE (obj, filter_colour_get_type ())
-
-typedef struct _FilterColour	FilterColour;
-typedef struct _FilterColourClass	FilterColourClass;
-
-struct _FilterColour {
-	FilterElement parent;
-	struct _FilterColourPrivate *priv;
-
-	guint16 r,g,b,a;
-};
-
-struct _FilterColourClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_colour_get_type	(void);
-FilterColour	*filter_colour_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_COLOUR_H */
-
diff --git a/filter/filter-context.c b/filter/filter-context.c
deleted file mode 100644
index c31eba205a..0000000000
--- a/filter/filter-context.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-context.h"
-#include "filter-filter.h"
-
-#define d(x)
-
-static void filter_context_class_init	(FilterContextClass *class);
-static void filter_context_init	(FilterContext *gspaper);
-static void filter_context_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterContext *)(x))->priv)
-
-struct _FilterContextPrivate {
-};
-
-static RuleContextClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterContext",
-			sizeof(FilterContext),
-			sizeof(FilterContextClass),
-			(GtkClassInitFunc)filter_context_class_init,
-			(GtkObjectInitFunc)filter_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_context_class_init (FilterContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = filter_context_finalise;
-	/* override methods */
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_context_init (FilterContext *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_add_part_set((RuleContext *)o, "actionset", filter_part_get_type(),
-				  (RCPartFunc)filter_context_add_action,
-				  (RCNextPartFunc)filter_context_next_action);
-
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", filter_filter_get_type(),
-				  (RCRuleFunc)rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-filter_context_finalise(GtkObject *obj)
-{
-	FilterContext *o = (FilterContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_context_new:
- *
- * Create a new FilterContext object.
- * 
- * Return value: A new #FilterContext object.
- **/
-FilterContext *
-filter_context_new(void)
-{
-	FilterContext *o = (FilterContext *)gtk_type_new(filter_context_get_type ());
-	return o;
-}
-
-void filter_context_add_action(FilterContext *f, FilterPart *action)
-{
-	d(printf("find action : "));
-	f->actions = g_list_append(f->actions, action);
-}
-
-FilterPart *filter_context_find_action(FilterContext *f, const char *name)
-{
-	d(printf("find action : "));
-	return filter_part_find_list(f->actions, name);
-}
-
-FilterPart 	*filter_context_create_action(FilterContext *f, const char *name)
-{
-	FilterPart *part;
-
-	part = filter_context_find_action(f, name);
-	if (part)
-		part = filter_part_clone(part);
-	return part;
-}
-
-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last)
-{
-	return filter_part_next_list(f->actions, last);
-}
diff --git a/filter/filter-context.h b/filter/filter-context.h
deleted file mode 100644
index 1fa0b80af7..0000000000
--- a/filter/filter-context.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_CONTEXT_H
-#define _FILTER_CONTEXT_H
-
-#include <gtk/gtk.h>
-#include "rule-context.h"
-
-#define FILTER_CONTEXT(obj)	GTK_CHECK_CAST (obj, filter_context_get_type (), FilterContext)
-#define FILTER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_context_get_type (), FilterContextClass)
-#define IS_FILTER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, filter_context_get_type ())
-
-typedef struct _FilterContext	FilterContext;
-typedef struct _FilterContextClass	FilterContextClass;
-
-struct _FilterContext {
-	RuleContext parent;
-	struct _FilterContextPrivate *priv;
-
-	GList *actions;
-};
-
-struct _FilterContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_context_get_type	(void);
-FilterContext	*filter_context_new	(void);
-
-/* methods */
-void		filter_context_add_action(FilterContext *f, FilterPart *action);
-FilterPart	*filter_context_find_action(FilterContext *f, const char *name);
-FilterPart	*filter_context_create_action(FilterContext *f, const char *name);
-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last);
-
-#endif /* ! _FILTER_CONTEXT_H */
-
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
deleted file mode 100644
index db98efd1ef..0000000000
--- a/filter/filter-datespec.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-datespec.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe, gpointer data);
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *fds);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_datespec_class_init (FilterDatespecClass *class);
-static void filter_datespec_init (FilterDatespec *gspaper);
-static void filter_datespec_finalise (GtkObject *obj);
-
-static void make_span_editor (FilterDatespec *fds);
-static void adj_value_changed (GtkAdjustment *adj, gpointer user_data);
-static gchar *describe_button (FilterDatespec *fds);
-static gchar *stringify_agoness (FilterDatespec *fds);
-static void set_adjustments (FilterDatespec *fds);
-
-static void cal_day_selected (GtkCalendar *cal, gpointer user_data);
-static void cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data);
-
-#define PRIV(x) (((FilterDatespec *)(x))->priv)
-
-typedef struct _timespan {
-	guint32 seconds;
-	const gchar *singular;
-	const gchar *plural;
-	gfloat max;
-} timespan;
-
-static const timespan timespans[] = {
-	{ 31557600, N_("year"), N_("years"), 1000.0 },
-	{ 2419200, N_("month"), N_("months"), 12.0 },
-	{ 604800, N_("week"), N_("weeks"), 52.0 },
-	{ 86400, N_("day"), N_("days"), 31.0 },
-	{ 3600, N_("hour"), N_("hours"), 23.0 },
-	{ 60, N_("minute"), N_("minutes"), 59.0 },
-	{ 1, N_("second"), N_("seconds"), 59.0 }
-};
-
-#define N_TIMECHUNKS 3
-
-static const guint timechunks[N_TIMECHUNKS] = { 2, 2, 3 };
-#define MAX_CHUNK 3
-
-#define N_TIMESPANS (sizeof (timespans) / sizeof (timespans[0]))
-
-struct _FilterDatespecPrivate {
-	GnomeDialog *gd;
-	GtkWidget *descriptive_label;
-	GtkWidget *cur_extra_widget;
-	FilterDatespec_type selected_type;
-
-	GtkWidget *date_chooser;
-	GtkWidget *span_chooser;
-	gboolean double_click;
-	GtkWidget **spinbuttons;
-};
-
-static FilterElementClass *parent_class;
-
-guint
-filter_datespec_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterDatespec",
-			sizeof (FilterDatespec),
-			sizeof (FilterDatespecClass),
-			(GtkClassInitFunc) filter_datespec_class_init,
-			(GtkObjectInitFunc) filter_datespec_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_datespec_class_init (FilterDatespecClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_datespec_finalise;
-	
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-}
-
-static void
-filter_datespec_init (FilterDatespec *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-	o->type = FDST_UNKNOWN;
-	PRIV(o)->selected_type = FDST_UNKNOWN;
-	PRIV(o)->spinbuttons = g_new (GtkWidget *, N_TIMESPANS);
-}
-
-static void
-filter_datespec_finalise(GtkObject *obj)
-{
-	FilterDatespec *o = (FilterDatespec *)obj;
-	
-	if (o->priv) {
-		g_free (PRIV(o)->spinbuttons);
-		g_free (o->priv);
-	}
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_datespec_new:
- *
- * Create a new FilterDatespec object.
- * 
- * Return value: A new #FilterDatespec object.
- **/
-FilterDatespec *
-filter_datespec_new (void)
-{
-	FilterDatespec *o = (FilterDatespec *)gtk_type_new (filter_datespec_get_type ());
-	return o;
-}
-
-static gboolean
-validate (FilterElement *fe, gpointer data)
-{
-	FilterDatespec *fds = (FilterDatespec *) fe;
-	gboolean valid = TRUE;
-	
-	if (fds->value < 0) {
-		GtkWidget *gd;
-		
-		valid = FALSE;
-		
-		if (fds->type == FDST_UNKNOWN)
-			gd = gnome_ok_dialog (_("Oops. You have forgotten to choose a date."));
-		else
-			gd = gnome_ok_dialog (_("Oops. You have chosen an invalid date."));
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	}
-	
-	return valid;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value, work;
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	gchar str[32];
-	
-	d(printf ("Encoding datespec as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "datespec");
-	
-	work = xmlNewChild (value, NULL, "datespec", NULL);
-	sprintf (str, "%d", fds->type);
-	xmlSetProp (work, "type", str);
-	sprintf (str, "%d", (int)fds->value);
-	xmlSetProp (work, "value", str);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	xmlNodePtr n;
-	gchar *val;
-	
-	d(printf ("Decoding datespec from xml %p\n", fe));
-	
-	fe->name = xmlGetProp (node, "name");
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "datespec")) {
-			val = xmlGetProp (n, "type");
-			fds->type = atoi (val);
-			g_free (val);
-			val = xmlGetProp (n, "value");
-			fds->value = atoi (val);
-			g_free (val);
-			break;
-		}
-		n = n->next;
-	}
-	return 0;
-}
-
-static void
-activate_now (GtkMenuItem *item, FilterDatespec *fds)
-{
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV(fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "whatever the time is when the filter is run\n"
-			      "or vfolder is opened."));
-	
-	PRIV (fds)->selected_type = FDST_NOW;
-}
-
-static void
-activate_specified (GtkMenuItem *item, FilterDatespec *fds)
-{
-	struct tm *seltime;
-	
-	/* Remove other widget if it exists */
-	
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	/* Set description */
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "the time that you specify here."));
-	
-	/* Reset if going from one type to another */
-	if (PRIV (fds)->selected_type != FDST_SPECIFIED)
-		fds->value = 0;
-	
-	PRIV (fds)->selected_type = FDST_SPECIFIED;
-	
-	/* Set the calendar's time */
-	
-	if (fds->value > 0) {
-		/* gmtime? */
-		seltime = localtime (&(fds->value));
-		
-		gtk_calendar_select_month (GTK_CALENDAR (PRIV (fds)->date_chooser),
-					   seltime->tm_mon,
-					   seltime->tm_year + 1900);
-		gtk_calendar_select_day (GTK_CALENDAR (PRIV (fds)->date_chooser),
-					 seltime->tm_mday);
-		/* free seltime?? */
-	}
-	
-	gtk_box_pack_start (GTK_BOX (PRIV (fds)->gd->vbox),
-			    PRIV (fds)->date_chooser,
-			    TRUE, TRUE, 3);
-	gtk_widget_show (PRIV (fds)->date_chooser);
-	PRIV (fds)->cur_extra_widget = PRIV (fds)->date_chooser;
-}
-
-static void
-activate_x_ago (GtkMenuItem *item, FilterDatespec *fds)
-{
-	if (PRIV (fds)->cur_extra_widget) {
-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)->gd->vbox),
-				      PRIV (fds)->cur_extra_widget);
-		PRIV (fds)->cur_extra_widget = NULL;
-	}
-	
-	gtk_label_set_text (GTK_LABEL (PRIV (fds)->descriptive_label),
-			    _("The message's date will be compared against\n"
-			      "a time relative to when the filter is run;\n"
-			      "\"a week ago\", for example."));
-	
-	/* Reset if going from one type to another */
-	if (PRIV (fds)->selected_type != FDST_X_AGO)
-		fds->value = 0;
-	
-	PRIV (fds)->selected_type = FDST_X_AGO;
-	
-	if (fds->value > 0)
-		set_adjustments (fds);
-	
-	gtk_box_pack_start (GTK_BOX (PRIV (fds)->gd->vbox),
-			    PRIV (fds)->span_chooser,
-			    TRUE, TRUE, 3);
-	gtk_widget_show (PRIV (fds)->span_chooser);
-	PRIV (fds)->cur_extra_widget = PRIV (fds)->span_chooser;
-}
-
-typedef void (*my_menu_callback) (GtkMenuItem *, FilterDatespec *);
-
-static void
-button_clicked (GtkButton *button, FilterDatespec *fds)
-{
-	GnomeDialog *gd;
-	GtkWidget *box;
-	GtkWidget *label;
-	GtkWidget *menu;
-	GtkWidget *selectomatic;
-	GtkWidget *sep;
-	int i;
-	gchar *desc;
-	
-	/* keep in sync with FilterDatespec_type! */
-	const char *items[] = { N_("the current time"), N_("a time you specify"), 
-			       N_("a time relative to the current time"), NULL };
-	const my_menu_callback callbacks[]
-		= { activate_now, activate_specified, activate_x_ago };
-	
-	PRIV (fds)->descriptive_label = gtk_label_new("");
-	PRIV (fds)->cur_extra_widget = NULL;
-	PRIV (fds)->double_click = FALSE;
-	
-	/* The calendar */
-	
-	PRIV (fds)->date_chooser = gtk_calendar_new ();
-	gtk_object_ref (GTK_OBJECT (PRIV (fds)->date_chooser));
-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)->date_chooser), "day_selected",
-			    cal_day_selected, fds);
-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)->date_chooser), "day_selected_double_click",
-			    cal_day_selected_double_click, fds);
-	
-	/* The span editor thingie */
-	
-	make_span_editor (fds);
-	gtk_object_ref (GTK_OBJECT (PRIV (fds)->span_chooser));
-	
-	/* The dialog */
-	
-	gd = (GnomeDialog *) gnome_dialog_new ("Select a time to compare against", 
-					       GNOME_STOCK_BUTTON_OK, 
-					       GNOME_STOCK_BUTTON_CANCEL, 
-					       NULL);
-	PRIV (fds)->gd = gd;
-	
-	/* The menu */
-	
-	menu = gtk_menu_new ();
-	
-	for (i = 0; items[i]; i++) {
-		GtkWidget *item;
-		
-		item = gtk_menu_item_new_with_label (gettext (items[i]));
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    callbacks[i], fds);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-	}
-	
-	gtk_widget_show (menu);
-	
-	/* The selector */
-	
-	selectomatic = gtk_option_menu_new();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (selectomatic), GTK_WIDGET (menu));
-	if (fds->type != FDST_UNKNOWN)
-		/* Keep in sync with FilterDatespec_type! */
-		gtk_option_menu_set_history (GTK_OPTION_MENU (selectomatic), fds->type);
-	
-	gtk_widget_show ((GtkWidget *)selectomatic);
-	
-	/* The label */
-	
-	label = gtk_label_new (_("Compare against"));
-	gtk_widget_show (label);
-	
-	/* The hbox */
-	
-	box = gtk_hbox_new (FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (box), label,
-			    TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (box), selectomatic,
-			    TRUE, TRUE, 2);
-	gtk_widget_show (box);
-	gtk_box_pack_start ((GtkBox *)gd->vbox, (GtkWidget *)box, TRUE, TRUE, 3);
-	
-	/* The separator */
-	
-	sep = gtk_hseparator_new ();
-	gtk_widget_show (sep);
-	gtk_box_pack_start (GTK_BOX (gd->vbox), sep, TRUE, TRUE, 3);
-	
-	/* The descriptive label */
-	
-	gtk_box_pack_start (GTK_BOX (gd->vbox), PRIV (fds)->descriptive_label, TRUE, TRUE, 3);
-	gtk_misc_set_alignment (GTK_MISC (PRIV (fds)->descriptive_label), 0.5, 0.5);
-	gtk_widget_show (PRIV (fds)->descriptive_label);
-	
-	/* Set up the current view */
-	
-	if (fds->type == FDST_UNKNOWN)
-		fds->type = FDST_NOW;
-
-	(callbacks[fds->type]) (NULL, fds);
-	
-	/* go go gadget gnomedialog! */
-	
-	switch (gnome_dialog_run_and_close(gd)) {
-	case -1: /*wm close*/
-		if (PRIV (fds)->double_click == FALSE)
-			break;
-		/* else fall */
-	case 0:
-		fds->type = PRIV (fds)->selected_type;
-		
-		PRIV (fds)->descriptive_label = NULL;
-		
-		desc = describe_button (fds);
-		gtk_label_set_text (GTK_LABEL (GTK_BIN (button)->child), desc);
-		g_free (desc);
-		/* falllllll */
-	case 1:
-		/* cancel */
-		break;
-	}
-	
-	gtk_widget_destroy (PRIV (fds)->date_chooser);
-	gtk_widget_destroy (PRIV (fds)->span_chooser);
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	GtkWidget *button;
-	GtkWidget *label;
-	gchar *desc;
-	
-	desc = describe_button (fds);
-	label = gtk_label_new (desc);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-	g_free (desc);
-	
-	button = gtk_button_new();
-	gtk_container_add (GTK_CONTAINER (button), label);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, fds);
-	
-	gtk_widget_show (button);
-	gtk_widget_show (label);
-	return button;
-}
-
-static void 
-build_code (FilterElement *fe, GString *out, struct _FilterPart *fp)
-{
-	return;
-}
-
-static void 
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterDatespec *fds = (FilterDatespec *)fe;
-	
-	switch (fds->type) {
-	case FDST_UNKNOWN:
-		g_warning ("user hasn't selected a datespec yet!");
-		/* fall through */
-	case FDST_NOW:
-		g_string_append (out, "(get-current-date)");
-		break;
-	case FDST_SPECIFIED:
-		g_string_sprintfa (out, "%d", (int) fds->value);
-		break;
-	case FDST_X_AGO:
-		g_string_sprintfa (out, "(- (get-current-date) %d)", (int) fds->value);
-		break;
-	}
-}
-
-static gchar *
-stringify_agoness (FilterDatespec *fds)
-{
-	time_t val;
-	GString *str;
-	gchar *ret;
-	
-	str = g_string_new("");
-	val = fds->value;
-	
-	if (val == 0) {
-		g_string_append (str, _("now"));
-	} else {
-		int where;
-		
-		where = 0;
-		
-		while (val) {
-			int count;
-			
-			count = 0;
-			
-			while (timespans[where].seconds <= val) {
-				count++;
-				val -= timespans[where].seconds;
-			}
-			
-			if (count != 0 ) {
-				if (count > 1)
-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].plural));
-				else
-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].singular));
-				
-				if (val)
-					g_string_append (str, ", ");
-			}
-			
-			where++;
-		}
-		
-		g_string_append (str, " ago");
-	}
-	
-	ret = str->str;
-	g_string_free (str, FALSE);
-	return ret;
-}
-
-static void
-make_span_editor (FilterDatespec *fds)
-{
-	int i;
-	int chunk;
-	int delta;
-	GtkWidget *table;
-	
-	/*PRIV (fds)->span_chooser = gtk_vbox_new (TRUE, 3);*/
-	table = gtk_table_new (N_TIMECHUNKS, MAX_CHUNK * 2, FALSE);
-	
-	i = 0;
-	
-	for (chunk = 0; chunk < N_TIMECHUNKS; chunk++ ) {
-		/*GtkWidget *hbox;*/
-
-		/*hbox = gtk_hbox_new (FALSE, 1);*/
-		/*gtk_box_pack_start (GTK_BOX (PRIV (fds)->span_chooser),
-		 *		    hbox, TRUE, TRUE, 1);
-		 */
-		/*gtk_table_attach (GTK_TABLE (PRIV (fds)->span_chooser),
-		 *		  hbox,
-		 *		  0, 1, chunk, chunk + 1,
-		 *		  0, GTK_EXPAND | GTK_FILL,
-		 *		  3, 3);
-		 *gtk_widget_show (hbox);
-		 */
-		
-		for (delta = 0; delta < timechunks[chunk]; delta++, i++ ) {
-			gchar *text;
-			GtkObject *adj;
-			GtkWidget *sb;
-			GtkWidget *label;
-			
-			adj = gtk_adjustment_new (0.0, 0.0,
-						  timespans[i].max,
-						  1.0, 10.0, 0.0);
-			
-			sb = gtk_spin_button_new (GTK_ADJUSTMENT (adj),
-						  0, 0);
-			
-			/*gtk_box_pack_start (GTK_BOX (hbox), sb, FALSE, FALSE, 1);*/
-			gtk_table_attach (GTK_TABLE (table), sb,
-					  delta * 2, delta * 2 + 1,
-					  chunk, chunk + 1,
-					  0, GTK_EXPAND | GTK_FILL,
-					  2, 4);
-			PRIV (fds)->spinbuttons[i] = sb;
-			
-			gtk_widget_show (GTK_WIDGET (sb));
-			
-			if (delta + 1 < timechunks[chunk])
-				text = g_strdup_printf ("%s, ", gettext (timespans[i].plural));
-			else
-				text = g_strdup_printf ("%s ago", gettext (timespans[i].plural));
-
-			label = gtk_label_new (text);
-			g_free (text);
-			
-			/*gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);*/
-			gtk_table_attach (GTK_TABLE (table), label,
-					  delta * 2 + 1, (delta + 1) * 2,
-					  chunk, chunk + 1,
-					  0, GTK_EXPAND | GTK_FILL,
-					  2, 4);
-			gtk_widget_show (label);
-			
-			gtk_signal_connect (adj, "value_changed",
-					    adj_value_changed, fds);
-		}
-	}
-	
-	PRIV (fds)->span_chooser = table;
-}
-
-static void
-adj_value_changed (GtkAdjustment *adj, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *) user_data;
-	int i;
-	
-	fds->value = 0;
-	
-	for (i = 0; i < N_TIMESPANS; i++)
-		fds->value += timespans[i].seconds * 
-			(gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PRIV (fds)->spinbuttons[i])));
-}
-
-static void
-set_adjustments (FilterDatespec *fds)
-{
-	time_t val;
-	int where;
-	
-	val = fds->value;
-	where = 0;
-	
-	while (val) {
-		int count;
-		
-		count = 0;
-		
-		while (timespans[where].seconds <= val) {
-			count++;
-			val -= timespans[where].seconds;
-		}
-			
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (PRIV (fds)->spinbuttons[where]),
-					   (gfloat) count);
-		where++;
-	}
-}
-
-static gchar *
-describe_button (FilterDatespec *fds)
-{
-	gchar *desc = NULL;
-	
-	switch (fds->type) {
-	case FDST_UNKNOWN:
-		desc = g_strdup (_("<click here to select a date>"));
-		break;
-	case FDST_NOW:
-		desc = g_strdup (_("now"));
-		break;
-	case FDST_SPECIFIED:
-		desc = g_strdup (ctime (&(fds->value)));
-		break;
-	case FDST_X_AGO:
-		desc = stringify_agoness (fds);
-		break;
-	}
-	
-	return desc;
-}
-
-static void
-cal_day_selected (GtkCalendar *cal, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *)user_data;
-	struct tm seltime;
-	
-	seltime.tm_sec = 0;
-	seltime.tm_min = 0;
-	seltime.tm_hour = 0;
-	seltime.tm_mday = cal->selected_day;
-	seltime.tm_mon = cal->month;
-	seltime.tm_year = cal->year - 1900;
-	seltime.tm_isdst = -1;
-	
-	fds->value = mktime (&seltime);
-}
-
-static void 
-cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data)
-{
-	FilterDatespec *fds = (FilterDatespec *)user_data;
-	
-	cal_day_selected (cal, user_data);
-	PRIV (fds)->double_click = TRUE;
-	gnome_dialog_close (PRIV (fds)->gd);
-}
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
deleted file mode 100644
index 1292a94e36..0000000000
--- a/filter/filter-datespec.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_DATESPEC_H
-#define _FILTER_DATESPEC_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_DATESPEC(obj)	GTK_CHECK_CAST (obj, filter_datespec_get_type (), FilterDatespec)
-#define FILTER_DATESPEC_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_datespec_get_type (), FilterDatespecClass)
-#define IS_FILTER_DATESPEC(obj)      GTK_CHECK_TYPE (obj, filter_datespec_get_type ())
-
-typedef struct _FilterDatespec	FilterDatespec;
-typedef struct _FilterDatespecClass	FilterDatespecClass;
-
-typedef enum _FilterDatespec_type { FDST_NOW, FDST_SPECIFIED, FDST_X_AGO, FDST_UNKNOWN } FilterDatespec_type;
-
-struct _FilterDatespec {
-	FilterElement parent;
-	struct _FilterDatespecPrivate *priv;
-
-	FilterDatespec_type type;
-
-	/* either a timespan, an absolute time, or 0
-	 * depending on type -- the above mapping to
-	 * (X_AGO, SPECIFIED, NOW)
-	 */
-
-	time_t value;
-};
-
-struct _FilterDatespecClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_datespec_get_type	(void);
-FilterDatespec	*filter_datespec_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_DATESPEC_H */
-
diff --git a/filter/filter-driver.c b/filter/filter-driver.c
deleted file mode 100644
index f32699559a..0000000000
--- a/filter/filter-driver.c
+++ /dev/null
@@ -1,804 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#include "filter-driver.h"
-#include "filter-message-search.h"
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include <time.h>
-
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-
-#include <camel/camel.h>
-#include "mail/mail-tools.h" /*mail_tool_camel_lock_up/down*/
-#include "filter-context.h"
-#include "filter-filter.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-/* type of status for a log report */
-enum filter_log_t {
-	FILTER_LOG_NONE,
-	FILTER_LOG_START,       /* start of new log entry */
-	FILTER_LOG_ACTION,      /* an action performed */
-	FILTER_LOG_END,	        /* end of log */
-};
-
-struct _FilterDriverPrivate {
-	GHashTable *globals;       /* global variables */
-
-	CamelFolder *defaultfolder;	/* defualt folder */
-	
-	FDStatusFunc *statusfunc; 	/* status callback */
-	void *statusdata;		/* status callback data */
-	
-	FilterContext *context;
-	
-	/* for callback */
-	FilterGetFolderFunc get_folder;
-	void *data;
-	
-	/* run-time data */
-	GHashTable *folders;       /* folders that message has been copied to */
-	GHashTable *forwards;      /* addresses that have been forwarded the message */
-	
-	gboolean terminated;       /* message processing was terminated */
-	gboolean deleted;          /* message was marked for deletion */
-	gboolean copied;           /* message was copied to some folder or another */
-	
-	CamelMimeMessage *message; /* input message */
-	CamelMessageInfo *info;    /* message summary info */
-	
-	FILE *logfile;             /* log file */
-	
-	CamelException *ex;
-	
-	/* evaluator */
-	ESExp *eval;
-};
-
-#define _PRIVATE(o) (((FilterDriver *)(o))->priv)
-
-static void filter_driver_class_init (FilterDriverClass *klass);
-static void filter_driver_init       (FilterDriver *obj);
-static void filter_driver_finalise   (GtkObject *obj);
-
-static void filter_driver_log (FilterDriver *driver, enum filter_log_t status, const char *desc, ...);
-
-static CamelFolder *open_folder (FilterDriver *d, const char *folder_url);
-static int close_folders (FilterDriver *d);
-
-static ESExpResult *do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-static ESExpResult *do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *);
-
-/* these are our filter actions - each must have a callback */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "delete",     (ESExpFunc *) do_delete,    0 },
-	{ "forward-to", (ESExpFunc *) mark_forward, 0 },
-	{ "copy-to",    (ESExpFunc *) do_copy,      0 },
-	{ "move-to",    (ESExpFunc *) do_move,      0 },
-	{ "stop",       (ESExpFunc *) do_stop,      0 },
-	{ "set-colour", (ESExpFunc *) do_colour,    0 },
-	{ "set-score",  (ESExpFunc *) do_score,     0 },
-	{ "set-flag",   (ESExpFunc *) do_flag,      0 }
-};
-
-static GtkObjectClass *filter_driver_parent;
-
-enum SIGNALS {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_driver_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterDriver",
-			sizeof (FilterDriver),
-			sizeof (FilterDriverClass),
-			(GtkClassInitFunc) filter_driver_class_init,
-			(GtkObjectInitFunc) filter_driver_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_driver_class_init (FilterDriverClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	
-	filter_driver_parent = gtk_type_class (gtk_object_get_type ());
-	
-	object_class->finalize = filter_driver_finalise;
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_driver_init (FilterDriver *obj)
-{
-	struct _FilterDriverPrivate *p;
-	int i;
-	
-	p = _PRIVATE (obj) = g_malloc0 (sizeof (*p));
-	
-	p->eval = e_sexp_new ();
-	/* Load in builtin symbols */
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (p->eval, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, obj);
-		} else {
-			e_sexp_add_function (p->eval, 0, symbols[i].name, symbols[i].func, obj);
-		}
-	}
-	
-	p->globals = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-}
-
-static void
-free_hash_strings (void *key, void *value, void *data)
-{
-	g_free (key);
-	g_free (value);
-}
-
-static void
-filter_driver_finalise (GtkObject *obj)
-{
-	FilterDriver *driver = (FilterDriver *) obj;
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	/* close all folders that were opened for appending */
-	close_folders (driver);
-	g_hash_table_destroy (p->folders);
-	
-	g_hash_table_foreach (p->globals, free_hash_strings, driver);
-	g_hash_table_destroy (p->globals);
-	
-	gtk_object_unref (GTK_OBJECT (p->eval));
-
-	if (p->defaultfolder)
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	
-	g_free (p);
-	
-	((GtkObjectClass *)(filter_driver_parent))->finalize (GTK_OBJECT (obj));
-}
-
-/**
- * filter_driver_new:
- * @system: path to system rules
- * @user: path to user rules
- * @get_folder: function to call to fetch folders
- *
- * Create a new FilterDriver object.
- * 
- * Return value: A new FilterDriver widget.
- **/
-FilterDriver *
-filter_driver_new (FilterContext *context, FilterGetFolderFunc get_folder, void *data)
-{
-	FilterDriver *new;
-	struct _FilterDriverPrivate *p;
-	
-	new = FILTER_DRIVER (gtk_type_new (filter_driver_get_type ()));
-	p = _PRIVATE (new);
-	
-	p->get_folder = get_folder;
-	p->data = data;
-	p->context = context;
-	gtk_object_ref (GTK_OBJECT (context));
-	
-	return new;
-}
-
-void
-filter_driver_set_logfile (FilterDriver *d, FILE *logfile)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->logfile = logfile;
-}
-
-void
-filter_driver_set_status_func (FilterDriver *d, FDStatusFunc *func, void *data)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	p->statusfunc = func;
-	p->statusdata = data;
-}
-
-void
-filter_driver_set_default_folder (FilterDriver *d, CamelFolder *def)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	
-	if (p->defaultfolder)
-		camel_object_unref (CAMEL_OBJECT (p->defaultfolder));
-	
-	p->defaultfolder = def;
-	
-	if (p->defaultfolder)
-		camel_object_ref (CAMEL_OBJECT (p->defaultfolder));
-}
-
-static void
-report_status (FilterDriver *driver, enum filter_status_t status, const char *desc, ...)
-{
-	/* call user-defined status report function */
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	va_list ap;
-	char *str;
-	
-	if (p->statusfunc) {
-		va_start (ap, desc);
-		str = g_strdup_vprintf (desc, ap);
-		p->statusfunc (driver, status, str, p->statusdata);
-		g_free (str);
-	}
-}
-
-
-#if 0
-void
-filter_driver_set_global (FilterDriver *d, const char *name, const char *value)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (d);
-	char *oldkey, *oldvalue;
-	
-	if (g_hash_table_lookup_extended (p->globals, name, (void *)&oldkey, (void *)&oldvalue)) {
-		g_free (oldvalue);
-		g_hash_table_insert (p->globals, oldkey, g_strdup (value));
-	} else {
-		g_hash_table_insert (p->globals, g_strdup (name), g_strdup (value));
-	}
-}
-#endif
-
-static ESExpResult *
-do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "doing delete\n"));
-	p->deleted = TRUE;
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Delete");
-	
-	return NULL;
-}
-
-static ESExpResult *
-mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	/*struct _FilterDriverPrivate *p = _PRIVATE (driver);*/
-	
-	d(fprintf (stderr, "marking message for forwarding\n"));
-	/* FIXME: do stuff here */
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Forward");
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "copying message...\n"));
-	p->copied = TRUE;
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to copy to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				continue;
-			
-			mail_tool_camel_lock_up ();
-			
-			camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s", service_url);
-			g_free (service_url);
-			
-			mail_tool_camel_lock_down ();
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	int i;
-	
-	d(fprintf (stderr, "moving message...\n"));
-	p->copied = TRUE;
-	p->deleted = TRUE;  /* a 'move' is a copy & delete */
-	for (i = 0; i < argc; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING) {
-			/* open folders we intent to move to */
-			char *folder = argv[i]->value.string;
-			char *service_url;
-			CamelFolder *outbox;
-			
-			outbox = open_folder (driver, folder);
-			if (!outbox)
-				continue;
-			
-			mail_tool_camel_lock_up ();
-			
-			camel_folder_append_message (outbox, p->message, p->info, p->ex);
-			
-			service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (outbox)));
-			filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s", service_url);
-			g_free (service_url);
-			
-			mail_tool_camel_lock_down ();
-		}
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	filter_driver_log (driver, FILTER_LOG_ACTION, "Stopped processing");
-	d(fprintf (stderr, "terminating message processing\n"));
-	p->terminated = TRUE;
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting colour tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_STRING) {
-		camel_tag_set (&p->info->user_tags, "colour", argv[0]->value.string);
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set colour to %s", argv[0]->value.string);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting score tag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_INT) {
-		char *value;
-		
-		value = g_strdup_printf ("%d", argv[0]->value.number);
-		camel_tag_set (&p->info->user_tags, "score", value);
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set score to %d", argv[0]->value.number);
-		g_free (value);
-	}
-	
-	return NULL;
-}
-
-static ESExpResult *
-do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	d(fprintf (stderr, "setting flag\n"));
-	if (argc > 0 && argv[0]->type == ESEXP_RES_INT) {
-		char *flag;
-		
-		switch (argv[0]->value.number) {
-		case CAMEL_MESSAGE_ANSWERED:
-			p->info->flags |= CAMEL_MESSAGE_ANSWERED;
-			flag = "Answered";
-			break;
-		case CAMEL_MESSAGE_DELETED:
-			p->info->flags |= CAMEL_MESSAGE_DELETED;
-			flag = "Deleted";
-			break;
-		case CAMEL_MESSAGE_DRAFT:
-			p->info->flags |= CAMEL_MESSAGE_DRAFT;
-			flag = "Draft";
-			break;
-		case CAMEL_MESSAGE_FLAGGED:
-			p->info->flags |= CAMEL_MESSAGE_FLAGGED;
-			flag = "Flagged";
-			break;
-		case CAMEL_MESSAGE_SEEN:
-			p->info->flags |= CAMEL_MESSAGE_SEEN;
-			flag = "Seen";
-			break;
-		default:
-			flag = "Unknown";
-		}
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Set %s flag", flag);
-	}
-	
-	return NULL;
-}
-
-static CamelFolder *
-open_folder (FilterDriver *driver, const char *folder_url)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	CamelFolder *camelfolder;
-	
-	/* we have a lookup table of currently open folders */
-	camelfolder = g_hash_table_lookup (p->folders, folder_url);
-	if (camelfolder)
-		return camelfolder;
-	
-	camelfolder = p->get_folder (driver, folder_url, p->data);
-	
-	if (camelfolder) {
-		g_hash_table_insert (p->folders, g_strdup (folder_url), camelfolder);
-		mail_tool_camel_lock_up ();
-		camel_folder_freeze (camelfolder);
-		mail_tool_camel_lock_down ();
-	}
-	
-	return camelfolder;
-}
-
-static void
-close_folder (void *key, void *value, void *data)
-{	
-	CamelFolder *folder = value;
-	FilterDriver *driver = data;
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	g_free (key);
-	mail_tool_camel_lock_up ();
-	camel_folder_sync (folder, FALSE, p->ex);
-	camel_folder_thaw (folder);
-	camel_object_unref (CAMEL_OBJECT (folder));
-	mail_tool_camel_lock_down ();
-}
-
-/* flush/close all folders */
-static int
-close_folders (FilterDriver *driver)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	g_hash_table_foreach (p->folders, close_folder, driver);
-	g_hash_table_destroy (p->folders);
-	p->folders = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	/* FIXME: status from driver */
-	return 0;
-}
-
-#if 0
-static void
-free_key (gpointer key, gpointer value, gpointer user_data)
-{
-	g_free (key);
-}
-#endif
-
-
-static void
-filter_driver_log (FilterDriver *driver, enum filter_log_t status, const char *desc, ...)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	
-	if (p->logfile) {
-		char *str = NULL;
-		
-		if (desc) {
-			va_list ap;
-			
-			va_start (ap, desc);
-			str = g_strdup_vprintf (desc, ap);
-		}
-		
-		switch (status) {
-		case FILTER_LOG_START: {
-			/* write log header */
-			const char *subject = NULL;
-			const char *from = NULL;
-			char date[50];
-			time_t t;
-			
-			from = camel_mime_message_get_from (p->message);
-			subject = camel_mime_message_get_subject (p->message);
-			
-			time (&t);
-			strftime (date, 49, "%a, %d %b %Y %H:%M:%S", localtime (&t));
-			fprintf (p->logfile, "Applied filter \"%s\" to message from %s - \"%s\" at %s\n",
-				 str, from ? from : "unknown", subject ? subject : "", date);
-			break;
-		}
-		case FILTER_LOG_ACTION:
-			fprintf (p->logfile, "Action: %s\n", str);
-			break;
-		case FILTER_LOG_END:
-			fprintf (p->logfile, "\n");
-			break;
-		default:
-			/* nothing else is loggable */
-			break;
-		}
-		
-		g_free (str);
-	}
-}
-
-
-/* will filter only an mbox - is more efficient as it doesn't need to open the folder through camel directly */
-void
-filter_driver_filter_mbox (FilterDriver *driver, const char *mbox, const char *source, CamelException *ex)
-{
-	CamelMimeParser *mp = NULL;
-	char *source_url = NULL;
-	int fd = -1;
-	int i = 0;
-	struct stat st;
-	
-	fd = open (mbox, O_RDONLY);
-	if (fd == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to open spool folder");
-		goto fail;
-	}
-	/* to get the filesize */
-	fstat (fd, &st);
-	
-	mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mp, TRUE);
-	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to process spool folder");
-		goto fail;
-	}
-	fd = -1;
-	
-	source_url = g_strdup_printf ("file://%s", mbox);
-	
-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
-		CamelMimeMessage *msg;
-		int pc = 0;
-		
-		if (st.st_size > 0)
-			pc = (int)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));
-		
-		report_status (driver, FILTER_STATUS_START, "Getting message %d (%d%% of file)", i, pc);
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			report_status (driver, FILTER_STATUS_END, "Failed message %d", i);
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Cannot open message");
-			camel_object_unref (CAMEL_OBJECT (msg));
-			goto fail;
-		}
-		
-		filter_driver_filter_message (driver, msg, NULL, source_url, source, ex);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed message %d", i);
-			goto fail;
-		}
-		
-		report_status (driver, FILTER_STATUS_END, "Finished message %d", i);
-		i++;
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-	}
-fail:
-	g_free (source_url);
-	if (fd != -1)
-		close (fd);
-	if (mp)
-		camel_object_unref (CAMEL_OBJECT (mp));
-}
-
-/* will filter a folder */
-void
-filter_driver_filter_folder (FilterDriver *driver, CamelFolder *folder, const char *source,
-			     GPtrArray *uids, gboolean remove, CamelException *ex)
-{
-	int i;
-	int freeuids = FALSE;
-	CamelMimeMessage *message;
-	const CamelMessageInfo *info;
-	char *source_url, *service_url;
-	
-	service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (folder)));
-	source_url = g_strdup_printf ("%s%s", service_url, camel_folder_get_full_name (folder));
-	g_free (service_url);
-	
-	if (uids == NULL) {
-		uids = camel_folder_get_uids (folder);
-		freeuids = TRUE;
-	}
-	
-	for (i = 0; i < uids->len; i++) {
-		report_status (driver, FILTER_STATUS_START, "Getting message %d of %d", i+1, uids->len);
-		
-		message = camel_folder_get_message (folder, uids->pdata[i], ex);
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed at message %d of %d", i+1, uids->len);
-			break;
-		}
-		
-		if (camel_folder_has_summary_capability (folder))
-			info = camel_folder_get_message_info (folder, uids->pdata[i]);
-		else
-			info = NULL;
-		
-		filter_driver_filter_message (driver, message, (CamelMessageInfo *)info, source_url, source, ex);
-		if (camel_exception_is_set (ex)) {
-			report_status (driver, FILTER_STATUS_END, "Failed at message %d of %d", i+1, uids->len);
-			break;
-		}
-		
-		if (remove)
-			camel_folder_set_message_flags (folder, uids->pdata[i],
-							CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-		
-		camel_object_unref (CAMEL_OBJECT (message));
-	}
-	
-	if (freeuids)
-		camel_folder_free_uids (folder, uids);
-	
-	g_free (source_url);
-}
-
-void
-filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
-			      const char *source_url, const char *source, CamelException *ex)
-{
-	struct _FilterDriverPrivate *p = _PRIVATE (driver);
-	ESExpResult *r;
-	GString *fsearch, *faction;
-	FilterFilter *rule;
-	int freeinfo = FALSE;
-	
-	if (info == NULL) {
-		struct _header_raw *h = CAMEL_MIME_PART (message)->headers;
-		
-		info = g_new0 (CamelMessageInfo, 1);
-		freeinfo = TRUE;
-		info->subject = camel_folder_summary_format_string (h, "subject");
-		info->from = camel_folder_summary_format_address (h, "from");
-		info->to = camel_folder_summary_format_address (h, "to");
-		info->cc = camel_folder_summary_format_address (h, "cc");
-	} else {
-		if (info->flags & CAMEL_MESSAGE_DELETED)
-			return;
-	}
-	
-	p->ex = ex;
-	p->terminated = FALSE;
-	p->deleted = FALSE;
-	p->copied = FALSE;
-	p->message = message;
-	p->info = info;
-	
-	fsearch = g_string_new ("");
-	faction = g_string_new ("");
-	
-	rule = NULL;
-	while ((rule = (FilterFilter *)rule_context_next_rule ((RuleContext *)p->context, (FilterRule *)rule, source))) {
-		gboolean matched;
-		
-		g_string_truncate (fsearch, 0);
-		g_string_truncate (faction, 0);
-		
-		filter_rule_build_code (FILTER_RULE (rule), fsearch);
-		filter_filter_build_action (rule, faction);
-		
-		d(fprintf (stderr, "applying rule %s\n action %s\n", fsearch->str, faction->str));
-		
-		mail_tool_camel_lock_up ();
-		matched = filter_message_search (p->message, p->info, source_url, fsearch->str, p->ex);
-		mail_tool_camel_lock_down ();
-		
-		if (matched) {
-			filter_driver_log (driver, FILTER_LOG_START, FILTER_RULE (rule)->name);
-#ifndef NO_WARNINGS
-#warning "Must check expression parsed and executed properly?"
-#endif			
-			/* perform necessary filtering actions */
-			e_sexp_input_text (p->eval, faction->str, strlen (faction->str));
-			e_sexp_parse (p->eval);
-			r = e_sexp_eval (p->eval);
-			e_sexp_result_free (r);
-			if (p->terminated)
-				break;
-		}
-	}
-	
-	g_string_free (fsearch, TRUE);
-	g_string_free (faction, TRUE);
-	
-	if (p->defaultfolder && !p->deleted) {
-		/* copy it to the default inbox */
-		filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");
-		mail_tool_camel_lock_up ();
-		camel_folder_append_message (p->defaultfolder, p->message, p->info, p->ex);
-		mail_tool_camel_lock_down ();
-	}
-	
-	/* *Now* we can set the DELETED flag... */
-	if (p->deleted)
-		info->flags = info->flags | CAMEL_MESSAGE_DELETED;	
-	
-	if (freeinfo) {
-		camel_flag_list_free (&info->user_flags);
-		camel_tag_list_free (&info->user_tags);
-		g_free (info->subject);
-		g_free (info->from);
-		g_free (info->to);
-		g_free (info->cc);
-		g_free (info);
-	}
-	
-	filter_driver_log (driver, FILTER_LOG_END, NULL);
-}
diff --git a/filter/filter-driver.h b/filter/filter-driver.h
deleted file mode 100644
index 8c6454c9b4..0000000000
--- a/filter/filter-driver.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or 
- *  modify it under the terms of the GNU General Public License as 
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- *  USA
- */
-
-#ifndef _FILTER_DRIVER_H
-#define _FILTER_DRIVER_H
-
-#include <gtk/gtk.h>
-#include <camel/camel-session.h>
-#include <camel/camel-folder.h>
-#include <mail/mail-threads.h>
-
-#include "filter-context.h"
-
-#define FILTER_DRIVER(obj)         GTK_CHECK_CAST (obj, filter_driver_get_type (), FilterDriver)
-#define FILTER_DRIVER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_driver_get_type (), FilterDriverClass)
-#define IS_FILTER_DRIVER(obj)      GTK_CHECK_TYPE (obj, filter_driver_get_type ())
-
-typedef struct _FilterDriver      FilterDriver;
-typedef struct _FilterDriverClass FilterDriverClass;
-
-struct _FilterDriver {
-	GtkObject parent;
-
-	struct _FilterDriverPrivate *priv;
-};
-
-struct _FilterDriverClass {
-	GtkObjectClass parent_class;
-};
-
-/* FIXME: this maybe should change... */
-/* type of status for a status report */
-enum filter_status_t {
-	FILTER_STATUS_NONE,
-	FILTER_STATUS_START,	/* start of new message processed */
-	FILTER_STATUS_ACTION,	/* an action performed */
-	FILTER_STATUS_PROGRESS,	/* (an) extra update(s), if its taking longer to process */
-	FILTER_STATUS_END,	/* end of message */
-};
-
-typedef CamelFolder * (*FilterGetFolderFunc) (FilterDriver *, const char *uri, void *data);
-/* report status */
-typedef void (FDStatusFunc)(FilterDriver *driver, enum filter_status_t status, const char *desc, void *data);
-
-guint         filter_driver_get_type (void);
-FilterDriver  *filter_driver_new     (FilterContext *ctx, FilterGetFolderFunc fetcher, void *data);
-
-/* modifiers */
-void    filter_driver_set_logfile         (FilterDriver *d, FILE *logfile);
-void	filter_driver_set_status_func     (FilterDriver *d, FDStatusFunc *func, void *data);
-void	filter_driver_set_default_folder  (FilterDriver *d, CamelFolder *def);
-
-/*void filter_driver_set_global(FilterDriver *, const char *name, const char *value);*/
-
-void    filter_driver_filter_message      (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
-					   const char *source_url, const char *source, CamelException *ex);
-void    filter_driver_filter_mbox         (FilterDriver *driver, const char *mbox, const char *source, CamelException *ex);
-void    filter_driver_filter_folder       (FilterDriver *driver, CamelFolder *folder, const char *source,
-					   GPtrArray *uids, gboolean remove, CamelException *ex);
-
-#if 0
-/* generate the search query/action string for a filter option */
-void filter_driver_expand_option (FilterDriver *d, GString *s, GString *action, struct filter_option *op);
-
-/* get info about rules (options) */
-int filter_driver_rule_count (FilterDriver *d);
-struct filter_option *filter_driver_rule_get (FilterDriver *d, int n);
-#endif
-
-#endif /* ! _FILTER_DRIVER_H */
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
deleted file mode 100644
index 96e1b22b09..0000000000
--- a/filter/filter-editor.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "filter-editor.h"
-#include "filter-context.h"
-#include "filter-filter.h"
-
-#define d(x)
-
-#if 0
-static void filter_editor_class_init (FilterEditorClass *class);
-static void filter_editor_init (FilterEditor *gspaper);
-static void filter_editor_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterEditor *)(x))->priv)
-
-struct _FilterEditorPrivate {
-};
-
-static GnomeDialogClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterEditor",
-			sizeof(FilterEditor),
-			sizeof(FilterEditorClass),
-			(GtkClassInitFunc)filter_editor_class_init,
-			(GtkObjectInitFunc)filter_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_editor_class_init (FilterEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = filter_editor_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_editor_init (FilterEditor *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_editor_finalise (GtkObject *obj)
-{
-	FilterEditor *o = (FilterEditor *)obj;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_editor_new:
- *
- * Create a new FilterEditor object.
- * 
- * Return value: A new #FilterEditor object.
- **/
-FilterEditor *
-filter_editor_new (void)
-{
-	FilterEditor *o = (FilterEditor *)gtk_type_new (filter_editor_get_type ());
-	return o;
-}
-
-#endif
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-	char *current_source;
-};
-
-static void set_sensitive (struct _editor_data *data);
-
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterFilter *rule;
-	int result;
-	GtkWidget *gd;
-	GtkWidget *w;
-	FilterPart *part;
-	gboolean done = FALSE;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = filter_filter_new ();
-	filter_rule_set_source ((FilterRule *)rule, data->current_source);
-	
-	part = rule_context_next_part (data->f, NULL);
-	filter_rule_add_part ((FilterRule *)rule, filter_part_clone (part));
-	part = filter_context_next_action ((FilterContext *)data->f, NULL);
-	filter_filter_add_action (rule, filter_part_clone (part));
-	
-	w = filter_rule_get_widget ((FilterRule *)rule, data->f);
-	gd = gnome_dialog_new (_("Add Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-	
-		if (result == 0) {
-			GtkWidget *item;
-			GList *parts, *l = NULL;
-			gchar *s;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = ((FilterRule *)rule)->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = rule->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), ((FilterRule *)rule)->name);
-				item = gtk_list_item_new_with_label (s);
-				g_free (s);
-				
-				gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-				gtk_widget_show (item);
-				
-				l = g_list_append (l, GTK_LIST_ITEM (item));
-				
-				gtk_list_append_items (data->list, l);
-				gtk_list_select_child (data->list, item);
-				
-				data->current = (FilterRule *)rule;
-				rule_context_add_rule (data->f, (FilterRule *)rule);
-				
-				set_sensitive (data);
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			gtk_object_unref (GTK_OBJECT (rule));
-			done = TRUE;
-		}
-	}
-}
-
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	gboolean done = FALSE;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-		
-		if (result == 0) {
-			GList *parts;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = rule->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = ((FilterFilter *)rule)->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-				if (pos != -1) {
-					GtkListItem *item = g_list_nth_data (data->list->children, pos);
-					gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
-					gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
-					g_free (s);
-				}
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			done = TRUE;
-		}
-	}
-}
-
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("delete rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, data->current_source);
-	if (pos != -1) {
-		rule_context_remove_rule (data->f, data->current);
-		
-		item = g_list_nth_data (data->list->children, pos);
-		l = g_list_append (NULL, item);
-		gtk_list_remove_items (data->list, l);
-		g_list_free (l);
-		
-		gtk_object_unref (GTK_OBJECT (data->current));
-		data->current = NULL;
-	}
-	
-	set_sensitive (data);
-}
-
-static void
-rule_move (struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule (data->f, data->current, to);
-	
-	item = g_list_nth_data (data->list->children, from);
-	l = g_list_append (NULL, item);
-	gtk_list_remove_items_no_unref (data->list, l);
-	gtk_list_insert_items (data->list, l, to);			      
-	gtk_list_select_child (data->list, GTK_WIDGET (item));
-	set_sensitive (data);
-}
-
-static void
-rule_up (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
-}
-
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	rule_move (data, pos, pos + 1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive (struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index = -1, count = 0;
-	
-	while ((rule = rule_context_next_rule (data->f, rule, data->current_source))) {
-		if (rule == data->current)
-			index = count;
-		count++;
-	}
-	
-	d(printf ("index = %d count=%d\n", index, count));
-	
-	count--;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DOWN]), index >= 0 && index < count);
-}
-
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
-	
-	if (data->current)
-		d(printf ("selected rule: %s\n", data->current->name));
-	else
-		d(printf ("bad data?\n"));
-	
-	set_sensitive (data);
-}
-
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	if (event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, user_data);
-}
-
-/* FIXME: we need a way to change a rule from one source type
- * to a different type. Maybe keep the selected ones? 
- */
-
-static void
-select_source (GtkMenuItem *mi, struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	GList *newitems = NULL;
-	char *source;
-	
-	source = gtk_object_get_data (GTK_OBJECT (mi), "source");
-	
-	gtk_list_clear_items (GTK_LIST (data->list), 0, -1);
-	
-	d(printf ("Checking for rules that are of type %d\n", source));
-	while ((rule = rule_context_next_rule (data->f, rule, source)) != NULL) {
-		GtkWidget *item;
-		char *s;
-		
-		d(printf ("   hit %s (%d)\n", rule->name, source));
-		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (GTK_WIDGET (item));
-		newitems = g_list_append (newitems, item);
-	}
-	
-	gtk_list_append_items (data->list, newitems);
-	data->current_source = source;
-	data->current = NULL;
-	set_sensitive (data);
-}
-
-static char *source_names[] = {
-	"incoming",
-	/*"demand",*/
-	"outgoing"
-};
-
-GtkWidget *
-filter_editor_construct (struct _FilterContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w, *b, *firstitem = NULL;
-	GList *l;
-	struct _editor_data *data;
-	int i;
-	
-	g_assert (IS_FILTER_CONTEXT (f));
-	
-	data = g_malloc0 (sizeof (*data));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_filter");
-        d = glade_xml_get_widget (gui, "edit_filter");
-	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
-	
-	gtk_window_set_title (GTK_WINDOW (d), _("Edit Filters"));
-	for (i = 0; i < BUTTON_LAST; i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
-	}
-	
-        w = glade_xml_get_widget (gui, "filter_source");
-	l = GTK_MENU_SHELL (GTK_OPTION_MENU (w)->menu)->children;
-	i = 0;
-	while (l) {
-		b = GTK_WIDGET (l->data);
-		
-		if (i == 0)
-			firstitem = b;
-		
-		/* make sure that the glade is in sync with the source list! */
-		if (i < sizeof (source_names) / sizeof (source_names[0])) {
-			gtk_object_set_data (GTK_OBJECT (b), "source", source_names[i]);
-		} else {
-			g_warning("Glade file " FILTER_GLADEDIR "/filter.glade out of sync with editor code");
-		}
-		gtk_signal_connect (GTK_OBJECT (b), "activate", select_source, data);
-		
-		i++;
-		l = l->next;
-	}
-	
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = GTK_LIST (w);
-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
-	select_source (GTK_MENU_ITEM (firstitem), data);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
-}
diff --git a/filter/filter-editor.h b/filter/filter-editor.h
deleted file mode 100644
index 20369a9536..0000000000
--- a/filter/filter-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_EDITOR_H
-#define _FILTER_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define FILTER_EDITOR(obj)	GTK_CHECK_CAST (obj, filter_editor_get_type (), FilterEditor)
-#define FILTER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_editor_get_type (), FilterEditorClass)
-#define IS_FILTER_EDITOR(obj)      GTK_CHECK_TYPE (obj, filter_editor_get_type ())
-
-typedef struct _FilterEditor	FilterEditor;
-typedef struct _FilterEditorClass	FilterEditorClass;
-
-struct _FilterEditor {
-	GnomeDialog parent;
-	struct _FilterEditorPrivate *priv;
-
-};
-
-struct _FilterEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_editor_get_type	(void);
-FilterEditor	*filter_editor_new	(void);
-#endif
-
-struct _FilterContext;
-
-/* methods */
-GtkWidget	*filter_editor_construct	(struct _FilterContext *f);
-
-#endif /* ! _FILTER_EDITOR_H */
-
diff --git a/filter/filter-element.c b/filter/filter-element.c
deleted file mode 100644
index 1084ca6ca0..0000000000
--- a/filter/filter-element.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "filter-element.h"
-#include "filter-input.h"
-#include "filter-option.h"
-#include "filter-code.h"
-#include "filter-colour.h"
-#include "filter-datespec.h"
-#include "filter-score.h"
-#include "filter-folder.h"
-#include "filter-url.h"
-
-static gboolean validate (FilterElement *fe, gpointer data);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static FilterElement *clone(FilterElement *fe);
-
-static void filter_element_class_init	(FilterElementClass *class);
-static void filter_element_init	(FilterElement *gspaper);
-static void filter_element_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterElement *)(x))->priv)
-struct _FilterElementPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_element_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterElement",
-			sizeof(FilterElement),
-			sizeof(FilterElementClass),
-			(GtkClassInitFunc)filter_element_class_init,
-			(GtkObjectInitFunc)filter_element_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_element_class_init (FilterElementClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->finalize = filter_element_finalise;
-
-	/* override methods */
-	class->validate = validate;
-	class->xml_create = xml_create;
-	class->clone = clone;
-
-	/* signals */
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_element_init (FilterElement *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_element_finalise (GtkObject *obj)
-{
-	FilterElement *o = (FilterElement *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_element_new:
- *
- * Create a new FilterElement object.
- * 
- * Return value: A new #FilterElement object.
- **/
-FilterElement *
-filter_element_new (void)
-{
-	FilterElement *o = (FilterElement *)gtk_type_new(filter_element_get_type ());
-	return o;
-}
-
-gboolean
-filter_element_validate (FilterElement *fe, gpointer data)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->validate (fe, data);
-}
-
-/**
- * filter_element_xml_create:
- * @fe: filter element
- * @node: xml node
- * 
- * Create a new filter element based on an xml definition of
- * that element.
- **/
-void
-filter_element_xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_create(fe, node);
-}
-
-/**
- * filter_element_xml_encode:
- * @fe: filter element
- * 
- * Encode the values of a filter element into xml format.
- * 
- * Return value: 
- **/
-xmlNodePtr
-filter_element_xml_encode (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_encode(fe);
-}
-
-/**
- * filter_element_xml_decode:
- * @fe: filter element
- * @node: xml node
- * 
- * Decode the values of a fitler element from xml format.
- * 
- * Return value: 
- **/
-int
-filter_element_xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->xml_decode(fe, node);
-}
-
-/**
- * filter_element_clone:
- * @fe: filter element
- * 
- * Clones the FilterElement @fe.
- * 
- * Return value: 
- **/
-FilterElement *
-filter_element_clone (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->clone(fe);
-}
-
-/**
- * filter_element_get_widget:
- * @fe: filter element
- * @node: xml node
- * 
- * Create a widget to represent this element.
- * 
- * Return value: 
- **/
-GtkWidget *
-filter_element_get_widget (FilterElement *fe)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->get_widget(fe);
-}
-
-/**
- * filter_element_build_code:
- * @fe: filter element
- * @out: output buffer
- * @ff: 
- * 
- * Add the code representing this element to the output string @out.
- **/
-void
-filter_element_build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->build_code(fe, out, ff);
-}
-
-/**
- * filter_element_format_sexp:
- * @fe: filter element
- * @out: output buffer
- * 
- * Format the value(s) of this element in a method suitable for the context of
- * sexp where it is used.  Usually as space separated, double-quoted strings.
- **/
-void
-filter_element_format_sexp (FilterElement *fe, GString *out)
-{
-	return ((FilterElementClass *)((GtkObject *)fe)->klass)->format_sexp(fe, out);
-}
-
-/**
- * filter_element_new_type_name:
- * @type: filter element type
- * 
- * Create a new filter element based on its type name.
- * 
- * Return value: 
- **/
-FilterElement *
-filter_element_new_type_name (const char *type)
-{
-	if (type == NULL)
-		return NULL;
-
-	if (!strcmp (type, "string")) {
-		return (FilterElement *)filter_input_new ();
-	} else if (!strcmp (type, "folder")) {
-		return (FilterElement *)filter_folder_new ();
-	} else if (!strcmp (type, "address")) {
-		/* FIXME: temporary ... need real address type */
-		return (FilterElement *)filter_input_new_type_name (type);
-	} else if (!strcmp (type, "code")) {
-		return (FilterElement *)filter_code_new ();
-	} else if (!strcmp (type, "colour")) {
-		return (FilterElement *)filter_colour_new ();
-	} else if (!strcmp (type, "optionlist")) {
-		return (FilterElement *)filter_option_new ();
-	} else if (!strcmp (type, "datespec")) {
-		return (FilterElement *)filter_datespec_new ();
-	} else if (!strcmp (type, "score")) {
-		return (FilterElement *)filter_score_new ();
-	} else if (!strcmp (type, "url")) {
-		return (FilterElement *)filter_url_new ();
-	} else {
-		g_warning("Unknown filter type '%s'", type);
-		return 0;
-	}
-}
-
-void
-filter_element_set_data (FilterElement *fe, gpointer data)
-{
-	fe->data = data;
-}
-
-/* default implementations */
-static gboolean
-validate (FilterElement *fe, gpointer data)
-{
-	return TRUE;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	fe->name = xmlGetProp (node, "name");
-}
-
-static FilterElement *
-clone (FilterElement *fe)
-{
-	xmlNodePtr node;
-	FilterElement *new;
-
-	new = (FilterElement *)gtk_type_new (GTK_OBJECT (fe)->klass->type);
-	node = filter_element_xml_encode (fe);
-	filter_element_xml_decode (new, node);
-	xmlFreeNodeList (node);
-	
-	return new;
-}
diff --git a/filter/filter-element.h b/filter/filter-element.h
deleted file mode 100644
index 63befc3969..0000000000
--- a/filter/filter-element.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_ELEMENT_H
-#define _FILTER_ELEMENT_H
-
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-
-#define FILTER_ELEMENT(obj)	GTK_CHECK_CAST (obj, filter_element_get_type (), FilterElement)
-#define FILTER_ELEMENT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_element_get_type (), FilterElementClass)
-#define IS_FILTER_ELEMENT(obj)      GTK_CHECK_TYPE (obj, filter_element_get_type ())
-
-typedef struct _FilterElement	FilterElement;
-typedef struct _FilterElementClass	FilterElementClass;
-
-struct _FilterElement {
-	GtkObject parent;
-	struct _FilterElementPrivate *priv;
-
-	char *name;
-	gpointer data;
-};
-
-struct _FilterPart;
-
-struct _FilterElementClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-	gboolean (*validate)(FilterElement *fe, gpointer data);
-	
-	void (*xml_create)(FilterElement *, xmlNodePtr);
-	xmlNodePtr (*xml_encode)(FilterElement *);
-	int (*xml_decode)(FilterElement *, xmlNodePtr);
-
-	FilterElement *(*clone)(FilterElement *fe);
-
-	GtkWidget *(*get_widget)(FilterElement *);
-	void (*build_code)(FilterElement *, GString *, struct _FilterPart *ff);
-	void (*format_sexp)(FilterElement *, GString *);
-
-	/* signals */
-};
-
-guint		filter_element_get_type	(void);
-FilterElement	*filter_element_new	(void);
-
-FilterElement	*filter_element_new_type_name	(const char *type);
-
-void            filter_element_set_data (FilterElement *fe, gpointer data);
-
-/* methods */
-gboolean        filter_element_validate         (FilterElement *fe, gpointer data);
-
-void		filter_element_xml_create	(FilterElement *fe, xmlNodePtr node);
-
-xmlNodePtr	filter_element_xml_encode	(FilterElement *fe);
-int		filter_element_xml_decode	(FilterElement *fe, xmlNodePtr node);
-FilterElement	*filter_element_clone		(FilterElement *fe);
-
-GtkWidget	*filter_element_get_widget	(FilterElement *fe);
-void		filter_element_build_code	(FilterElement *fe, GString *out, struct _FilterPart *ff);
-void		filter_element_format_sexp	(FilterElement *fe, GString *out);
-
-#endif /* ! _FILTER_ELEMENT_H */
-
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
deleted file mode 100644
index 88c8c76a02..0000000000
--- a/filter/filter-filter.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "filter-filter.h"
-#include "filter-context.h"
-
-#define d(x)
-
-static xmlNodePtr xml_encode (FilterRule *);
-static int xml_decode (FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget (FilterRule *fr, struct _RuleContext *f);
-
-static void filter_filter_class_init (FilterFilterClass *class);
-static void filter_filter_init (FilterFilter *gspaper);
-static void filter_filter_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterFilter *)(x))->priv)
-
-struct _FilterFilterPrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_filter_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterFilter",
-			sizeof(FilterFilter),
-			sizeof(FilterFilterClass),
-			(GtkClassInitFunc)filter_filter_class_init,
-			(GtkObjectInitFunc)filter_filter_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_filter_class_init (FilterFilterClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_rule_get_type ());
-	
-	object_class->finalize = filter_filter_finalise;
-	
-	/* override methods */
-	filter_rule->xml_encode = xml_encode;
-	filter_rule->xml_decode = xml_decode;
-	/*filter_rule->build_code = build_code;*/
-	filter_rule->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_filter_init (FilterFilter *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-unref_list (GList *l)
-{
-	while (l) {
-		gtk_object_unref (GTK_OBJECT (l->data));
-		l = g_list_next (l);
-	}
-}
-
-static void
-filter_filter_finalise (GtkObject *obj)
-{
-	FilterFilter *o = (FilterFilter *)obj;
-	
-	unref_list (o->actions);
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_filter_new:
- *
- * Create a new FilterFilter object.
- * 
- * Return value: A new #FilterFilter object.
- **/
-FilterFilter *
-filter_filter_new (void)
-{
-	FilterFilter *o = (FilterFilter *)gtk_type_new(filter_filter_get_type ());
-	return o;
-}
-
-void
-filter_filter_add_action (FilterFilter *fr, FilterPart *fp)
-{
-	fr->actions = g_list_append (fr->actions, fp);
-}
-
-void
-filter_filter_remove_action (FilterFilter *fr, FilterPart *fp)
-{
-	fr->actions = g_list_remove (fr->actions, fp);
-}
-
-void
-filter_filter_replace_action (FilterFilter *fr, FilterPart *fp, FilterPart *new)
-{
-	GList *l;
-	
-	l = g_list_find (fr->actions, fp);
-	if (l) {
-		l->data = new;
-	} else {
-		fr->actions = g_list_append (fr->actions, new);
-	}
-}
-
-void
-filter_filter_build_action (FilterFilter *fr, GString *out)
-{
-	g_string_append (out, "(begin\n");
-	filter_part_build_code_list (fr->actions, out);
-	g_string_append (out, ")\n");
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	FilterFilter *ff = (FilterFilter *)fr;
-	
-        node = ((FilterRuleClass *)(parent_class))->xml_encode (fr);
-	g_assert (node != NULL);
-	set = xmlNewNode (NULL, "actionset");
-	xmlAddChild (node, set);
-	l = ff->actions;
-	while (l) {
-		work = filter_part_xml_encode ((FilterPart *)l->data);
-		xmlAddChild (set, work);
-		l = g_list_next (l);
-	}
-	
-	return node;
-
-}
-
-static void
-load_set (xmlNodePtr node, FilterFilter *ff, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *rulename;
-	FilterPart *part;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "part")) {
-			rulename = xmlGetProp (work, "name");
-			part = filter_context_find_action ((FilterContext *)f, rulename);
-			if (part) {
-				part = filter_part_clone (part);
-				filter_part_xml_decode (part, work);
-				filter_filter_add_action (ff, part);
-			} else {
-				g_warning ("cannot find rule part '%s'\n", rulename);
-			}
-			xmlFree (rulename);
-		} else {
-			g_warning ("Unknwon xml node in part: %s", work->name);
-		}
-		work = work->next;
-	}
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	xmlNodePtr work;
-	FilterFilter *ff = (FilterFilter *)fr;
-	int result;
-	
-        result = ((FilterRuleClass *)(parent_class))->xml_decode (fr, node, f);
-	if (result != 0)
-		return result;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "actionset")) {
-			load_set (work, ff, f);
-		}
-		work = work->next;
-	}
-	
-	return 0;
-}
-
-/*static void build_code(FilterRule *fr, GString *out)
-{
-        return ((FilterRuleClass *)(parent_class))->build_code(fr, out);
-}*/
-
-struct _part_data {
-	FilterRule *fr;
-	FilterContext *f;
-	FilterPart *part;
-	GtkWidget *partwidget, *container;
-};
-
-static void
-option_activate (GtkMenuItem *item, struct _part_data *data)
-{
-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");
-	FilterPart *newpart;
-	
-	/* dont update if we haven't changed */
-	if (!strcmp (part->title, data->part->title))
-		return;
-	
-	/* here we do a widget shuffle, throw away the old widget/rulepart,
-	   and create another */
-	if (data->partwidget)
-		gtk_container_remove (GTK_CONTAINER (data->container), data->partwidget);
-	
-	newpart = filter_part_clone (part);
-	filter_filter_replace_action ((FilterFilter *)data->fr, data->part, newpart);
-	gtk_object_unref (GTK_OBJECT (data->part));
-	data->part = newpart;
-	data->partwidget = filter_part_get_widget (newpart);
-	if (data->partwidget)
-		gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, FALSE, FALSE, 0);
-}
-
-static GtkWidget *
-get_rule_part_widget (FilterContext *f, FilterPart *newpart, FilterRule *fr)
-{
-	FilterPart *part = NULL;
-	GtkWidget *menu;
-	GtkWidget *item;
-	GtkWidget *omenu;
-	GtkWidget *hbox;
-	GtkWidget *p;
-	int index = 0, current = 0;
-	struct _part_data *data;
-	
-	data = g_malloc0 (sizeof (*data));
-	data->fr = fr;
-	data->f = f;
-	data->part = newpart;
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	p = filter_part_get_widget (newpart);
-	
-	data->partwidget = p;
-	data->container = hbox;
-	
-	menu = gtk_menu_new ();
-	while ((part = filter_context_next_action (f, part))) {
-		item = gtk_menu_item_new_with_label (_(part->title));
-		
-		gtk_object_set_data (GTK_OBJECT (item), "part", part);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		
-		if (!strcmp (newpart->title, part->title)) {
-			current = index;
-		}
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	gtk_widget_show (omenu);
-	
-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	if (p) {
-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);
-	}
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-struct _rule_data {
-	FilterRule *fr;
-	FilterContext *f;
-	GtkWidget *parts;
-};
-
-static void
-less_parts (GtkWidget *button, struct _rule_data *data)
-{
-	GList *l;
-	FilterPart *part;
-	GtkWidget *w;
-	
-	l = ((FilterFilter *)data->fr)->actions;
-	if (g_list_length (l) < 2)
-		return;
-	
-	/* remove the last one from the list */
-	l = g_list_last (l);
-	part = l->data;
-	filter_filter_remove_action ((FilterFilter *)data->fr, part);
-	gtk_object_unref (GTK_OBJECT (part));
-	
-	/* and from the display */
-	l = g_list_last (GTK_BOX (data->parts)->children);
-	w = ((GtkBoxChild *) l->data)->widget;
-	gtk_container_remove (GTK_CONTAINER (data->parts), w);
-	
-	/* if there's only 1 action, we can't remove anymore so set insensitive */
-	if (g_list_length (((FilterFilter *)data->fr)->actions) == 1)
-		gtk_widget_set_sensitive (button, FALSE);
-}
-
-static void
-more_parts (GtkWidget *button, struct _rule_data *data)
-{
-	FilterPart *new;
-	GtkWidget *w;
-	
-	/* create a new rule entry, use the first type of rule */
-	new = filter_context_next_action ((FilterContext *)data->f, NULL);
-	if (new) {
-		new = filter_part_clone (new);
-		filter_filter_add_action ((FilterFilter *)data->fr, new);
-		w = get_rule_part_widget (data->f, new, data->fr);
-		gtk_box_pack_start (GTK_BOX (data->parts), w, FALSE, FALSE, 0);
-	}
-	
-	/* set the "Remove action" button sensitive */
-	w = gtk_object_get_data (GTK_OBJECT (button), "remove");
-	gtk_widget_set_sensitive (w, TRUE);
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget;
-	GtkWidget *parts, *inframe;
-	GtkWidget *hbox;
-	GtkWidget *add, *remove, *pixmap;
-	GtkWidget *w;
-	GtkWidget *frame;
-	GtkWidget *scrolledwindow;
-	GtkObject *hadj, *vadj;
-	GList *l;
-	FilterPart *part;
-	struct _rule_data *data;
-	FilterFilter *ff = (FilterFilter *)fr;
-	
-        widget = ((FilterRuleClass *)(parent_class))->get_widget (fr, f);
-	
-	/* and now for the action area */
-	frame = gtk_frame_new (_("Then"));
-	inframe = gtk_vbox_new (FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), inframe);
-	
-	parts = gtk_vbox_new (FALSE, 3);
-	data = g_malloc0 (sizeof (*data));
-	data->f = (FilterContext *)f;
-	data->fr = fr;
-	data->parts = parts;
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);
-	add = gnome_pixmap_button (pixmap, _("Add action"));
-	gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);
-	remove = gnome_pixmap_button (pixmap, _("Remove action"));
-	gtk_object_set_data (GTK_OBJECT (add), "remove", remove);
-	gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), remove, FALSE, FALSE, 3);
-	
-	/* if we only have 1 action, then we can't remove any more so disable this */
-	if (g_list_length (ff->actions) == 1)
-		gtk_widget_set_sensitive (remove, FALSE);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3);
-	
-	l = ff->actions;
-	while (l) {
-		part = l->data;
-		d(printf ("adding action %s\n", part->title));
-		w = get_rule_part_widget ((FilterContext *)f, part, fr);
-		gtk_box_pack_start (GTK_BOX (parts), w, FALSE, FALSE, 3);
-		l = g_list_next (l);
-	}
-	
-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
-	
-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3);*/
-	
-	gtk_widget_show_all (frame);
-	
-	gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);
-	
-	return widget;
-}
diff --git a/filter/filter-filter.h b/filter/filter-filter.h
deleted file mode 100644
index 944aba42ae..0000000000
--- a/filter/filter-filter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_FILTER_H
-#define _FILTER_FILTER_H
-
-#include <gtk/gtk.h>
-#include "filter-rule.h"
-
-#define FILTER_FILTER(obj)	GTK_CHECK_CAST (obj, filter_filter_get_type (), FilterFilter)
-#define FILTER_FILTER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_filter_get_type (), FilterFilterClass)
-#define IS_FILTER_FILTER(obj)      GTK_CHECK_TYPE (obj, filter_filter_get_type ())
-
-typedef struct _FilterFilter	FilterFilter;
-typedef struct _FilterFilterClass	FilterFilterClass;
-
-struct _FilterFilter {
-	FilterRule parent;
-	struct _FilterFilterPrivate *priv;
-
-	GList *actions;
-};
-
-struct _FilterFilterClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_filter_get_type	(void);
-FilterFilter	*filter_filter_new	(void);
-
-/* methods */
-void		filter_filter_add_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_remove_action	(FilterFilter *fr, FilterPart *fp);
-void		filter_filter_replace_action	(FilterFilter *fr, FilterPart *fp, FilterPart *new);
-
-void		filter_filter_build_action	(FilterFilter *fr, GString *out);
-
-#endif /* ! _FILTER_FILTER_H */
-
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
deleted file mode 100644
index 0fc02a34a1..0000000000
--- a/filter/filter-folder.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#define SHELL
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-folder.h"
-#ifdef SHELL
-#include "shell/evolution-shell-client.h"
-#endif
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe, gpointer data);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-#ifdef SHELL
-extern EvolutionShellClient *global_shell_client;
-#endif
-
-static void filter_folder_class_init	(FilterFolderClass *class);
-static void filter_folder_init	(FilterFolder *gspaper);
-static void filter_folder_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterFolder *)(x))->priv)
-
-struct _FilterFolderPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-guint
-filter_folder_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterFolder",
-			sizeof(FilterFolder),
-			sizeof(FilterFolderClass),
-			(GtkClassInitFunc)filter_folder_class_init,
-			(GtkObjectInitFunc)filter_folder_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_folder_class_init (FilterFolderClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-
-	object_class->finalize = filter_folder_finalise;
-
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-}
-
-static void
-filter_folder_init (FilterFolder *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_folder_finalise (GtkObject *obj)
-{
-	FilterFolder *o = (FilterFolder *)obj;
-	
-	g_free (o->uri);
-	g_free (o->name);
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_folder_new:
- *
- * Create a new FilterFolder object.
- * 
- * Return value: A new #FilterFolder object.
- **/
-FilterFolder *
-filter_folder_new (void)
-{
-	FilterFolder *o = (FilterFolder *)gtk_type_new (filter_folder_get_type ());
-	return o;
-}
-
-static gboolean
-validate (FilterElement *fe, gpointer data)
-{
-	FilterFolder *ff = (FilterFolder *) fe;
-	
-	if (ff->uri && *ff->uri) {
-		return TRUE;
-	} else {
-		GtkWidget *dialog;
-		
-		dialog = gnome_ok_dialog (_("Oops, you forgot to choose a folder.\n"
-					    "Please go back and specify a valid folder to deliver mail to."));
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		
-		return FALSE;
-	}
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value, work;
-	FilterFolder *ff = (FilterFolder *)fe;
-	
-	d(printf ("Encoding folder as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "folder");
-	
-	work = xmlNewChild (value, NULL, "folder", NULL);
-	xmlSetProp (work, "name", ff->name);
-	xmlSetProp (work, "uri", ff->uri);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	xmlNodePtr n;
-	
-	d(printf ("Decoding folder from xml %p\n", fe));
-	
-	fe->name = xmlGetProp (node, "name");
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "folder")) {
-			ff->name = xmlGetProp (n, "name");
-			ff->uri = xmlGetProp (n, "uri");
-			break;
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-static void
-button_clicked (GtkButton *button, FilterFolder *ff)
-{
-#ifdef SHELL
-	const char *allowed_types[] = { "mail", NULL };
-	char *def, *physical_uri, *evolution_uri;
-	gchar *s;
-	
-	def = ff->uri ? ff->uri : "";
-	
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   _("Select Folder"),
-						   def, allowed_types,
-						   &evolution_uri,
-						   &physical_uri);
-	
-	if (physical_uri != NULL && physical_uri[0] != '\0') {
-		g_free (ff->uri);
-		ff->uri = physical_uri;
-		
-		g_free (ff->name);
-		ff->name = g_strdup (g_basename (evolution_uri));
-		s = e_utf8_to_gtk_string (GTK_WIDGET (button), ff->name);
-		gtk_label_set_text (GTK_LABEL (GTK_BIN (button)->child), s);
-		g_free (s);
-	} else {
-		g_free (physical_uri);
-	}
-	g_free (evolution_uri);
-#else
-	GnomeDialog *gd;
-	GtkEntry *entry;
-	char *uri, *str;
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("Enter folder URI"),
-					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-					     NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	entry = (GtkEntry *)gtk_entry_new();
-	if (ff->uri) {
-		e_utf8_gtk_entry_set_text(entry, ff->uri);
-	}
-	gtk_box_pack_start((GtkBox *)gd->vbox, (GtkWidget *)entry, TRUE, TRUE, 3);
-	gtk_widget_show((GtkWidget *)entry);
-	switch (gnome_dialog_run(gd)) {
-	case 0:
-		g_free(ff->uri);
-		g_free(ff->name);
-		uri = e_utf8_gtk_entry_get_text(entry);
-		ff->uri = uri;
-		str = strstr(uri, "//");
-		if (str)
-			str = strchr(str+2, '/');
-		if (str)
-			str++;
-		else
-			str = uri;
-		ff->name = g_strdup(str);
-		s = e_utf8_to_gtk_string ((GtkWidget *) button, ff->name);
-		gtk_label_set_text((GtkLabel *)GTK_BIN(button)->child, s);
-		g_free (s);
-	case 1:
-		gnome_dialog_close(gd);
-	case -1:
-		/* nothing */
-	}
-
-#endif
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	GtkWidget *button;
-	GtkWidget *label;
-	
-	if (ff->name && ff->name[0])
-		label = gtk_label_new (g_basename (ff->name));
-	else
-		label = gtk_label_new (_("<click here to select a folder>"));
-	
-	button = gtk_button_new ();
-	gtk_container_add (GTK_CONTAINER (button), label);
-	gtk_widget_show (button);
-	gtk_widget_show (label);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, ff);
-	
-	return button;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterFolder *ff = (FilterFolder *)fe;
-	
-	e_sexp_encode_string (out, ff->uri);
-}
diff --git a/filter/filter-folder.h b/filter/filter-folder.h
deleted file mode 100644
index ee52d7037b..0000000000
--- a/filter/filter-folder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_FOLDER_H
-#define _FILTER_FOLDER_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_FOLDER(obj)	GTK_CHECK_CAST (obj, filter_folder_get_type (), FilterFolder)
-#define FILTER_FOLDER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_folder_get_type (), FilterFolderClass)
-#define IS_FILTER_FOLDER(obj)      GTK_CHECK_TYPE (obj, filter_folder_get_type ())
-
-typedef struct _FilterFolder	FilterFolder;
-typedef struct _FilterFolderClass	FilterFolderClass;
-
-struct _FilterFolder {
-	FilterElement parent;
-	struct _FilterFolderPrivate *priv;
-
-	char *uri;
-	char *name;		/* name of folder for display? */
-};
-
-struct _FilterFolderClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_folder_get_type	(void);
-FilterFolder	*filter_folder_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_FOLDER_H */
-
diff --git a/filter/filter-input.c b/filter/filter-input.c
deleted file mode 100644
index fcee83a9eb..0000000000
--- a/filter/filter-input.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <regex.h>
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-input.h"
-#include "e-util/e-sexp.h"
-
-#define d(x)
-
-static gboolean validate (FilterElement *fe, gpointer data);
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_input_class_init	(FilterInputClass *class);
-static void filter_input_init	(FilterInput *gspaper);
-static void filter_input_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterInput *)(x))->priv)
-
-struct _FilterInputPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_input_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterInput",
-			sizeof(FilterInput),
-			sizeof(FilterInputClass),
-			(GtkClassInitFunc)filter_input_class_init,
-			(GtkObjectInitFunc)filter_input_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_input_class_init (FilterInputClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_input_finalise;
-
-	/* override methods */
-	filter_element->validate = validate;
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_input_init (FilterInput *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_input_finalise (GtkObject *obj)
-{
-	FilterInput *o = (FilterInput *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_input_new:
- *
- * Create a new FilterInput object.
- * 
- * Return value: A new #FilterInput object.
- **/
-FilterInput *
-filter_input_new (void)
-{
-	FilterInput *o = (FilterInput *)gtk_type_new(filter_input_get_type ());
-	return o;
-}
-
-FilterInput *
-filter_input_new_type_name (const char *type)
-{
-	FilterInput *o = filter_input_new ();
-	o->type = g_strdup (type);
-	
-	d(printf("new type %s = %p\n", type, o));
-	return o;
-}
-
-void
-filter_input_set_value (FilterInput *fi, const char *value)
-{
-	GList *l;
-	
-	l = fi->values;
-	while (l) {
-		g_free (l->data);
-		l = g_list_next (l);
-	}
-	g_list_free (fi->values);
-	
-	fi->values = g_list_append (NULL, g_strdup (value));
-}
-
-static gboolean
-validate (FilterElement *fe, gpointer data)
-{
-	FilterInput *fi = (FilterInput *)fe;
-	gboolean is_regex = FALSE;
-	gboolean valid = TRUE;
-	
-	if (data)
-		is_regex = GPOINTER_TO_INT (data);
-	
-	if (is_regex) {
-		regex_t regexpat;        /* regex patern */
-		gint regerr;
-		char *text;
-		
-		text = fi->values->data;
-		
-		regerr = regcomp (&regexpat, text, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			GtkWidget *dialog;
-			gchar *regmsg, *errmsg;
-			size_t reglen;
-			
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			
-			errmsg = g_strdup_printf (_("Error in regular expression '%s':\n%s"),
-						  text, regmsg);
-			g_free (regmsg);
-			
-			dialog = gnome_ok_dialog (errmsg);
-			
-			gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-			
-			g_free (errmsg);
-			valid = FALSE;
-		}
-		
-		regfree (&regexpat);
-	}
-	
-	return valid;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-	
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-	char *type;
-	
-	type = fi->type ? fi->type : "string";
-	
-	d(printf ("Encoding %s as xml\n", type));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", type);
-	l = fi->values;
-	while (l) {
-                xmlNodePtr cur;
-		char *str = l->data;
-		
-                cur = xmlNewChild (value, NULL, type, NULL);
-		xmlNodeSetContent (cur, str);
-                l = g_list_next (l);
-	}
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterInput *fi = (FilterInput *)fe;
-	char *name, *str, *type;
-	xmlNodePtr n;
-	
-	type = fi->type ? fi->type : "string";
-	
-	d(printf("Decoding %s from xml %p\n", type, fe));
-	
-	name = xmlGetProp (node, "name");
-	d(printf ("Name = %s\n", name));
-	fe->name = name;
-	fi->type = xmlGetProp (node, "type");
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, type)) {
-			str = xmlNodeGetContent (n);
-			d(printf ("  '%s'\n", str));
-			fi->values = g_list_append (fi->values, str);
-		} else {
-			g_warning ("Unknown node type '%s' encountered decoding a %s\n", n->name, type);
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-static void
-entry_changed (GtkEntry *entry, FilterElement *fe)
-{
-	char *new;
-	FilterInput *fi = (FilterInput *)fe;
-	GList *l;
-	
-	new = e_utf8_gtk_entry_get_text(entry);
-	
-	/* NOTE: entry only supports a single value ... */
-	l = fi->values;
-	while (l) {
-		g_free (l->data);
-		l = g_list_next (l);
-	}
-	
-	g_list_free (fi->values);
-	
-	fi->values = g_list_append (NULL, new);
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *entry;
-	FilterInput *fi = (FilterInput *)fe;
-	
-	entry = gtk_entry_new ();
-	if (fi->values && fi->values->data) {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), fi->values->data);
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe);
-	
-	return entry;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	GList *l;
-	FilterInput *fi = (FilterInput *)fe;
-	
-	l = fi->values;
-	while (l) {
-		e_sexp_encode_string (out, l->data);
-		l = g_list_next (l);
-	}
-}
diff --git a/filter/filter-input.h b/filter/filter-input.h
deleted file mode 100644
index 0ce43d980d..0000000000
--- a/filter/filter-input.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_INPUT_H
-#define _FILTER_INPUT_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_INPUT(obj)	GTK_CHECK_CAST (obj, filter_input_get_type (), FilterInput)
-#define FILTER_INPUT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_input_get_type (), FilterInputClass)
-#define IS_FILTER_INPUT(obj)      GTK_CHECK_TYPE (obj, filter_input_get_type ())
-
-typedef struct _FilterInput	FilterInput;
-typedef struct _FilterInputClass	FilterInputClass;
-
-struct _FilterInput {
-	FilterElement parent;
-	struct _FilterInputPrivate *priv;
-
-	char *type;		/* name of type */
-	GList *values;		/* strings */
-};
-
-struct _FilterInputClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_input_get_type	(void);
-FilterInput	*filter_input_new	(void);
-
-FilterInput	*filter_input_new_type_name	(const char *type);
-
-/* methods */
-void		filter_input_set_value(FilterInput *fi, const char *value);
-
-#endif /* ! _FILTER_INPUT_H */
-
diff --git a/filter/filter-message-search.c b/filter/filter-message-search.c
deleted file mode 100644
index 2e09489843..0000000000
--- a/filter/filter-message-search.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "filter-message-search.h"
-#include <e-util/e-sexp.h>
-#include <regex.h>
-#include <string.h>
-#include <ctype.h>
-
-typedef struct {
-	CamelMimeMessage *message;
-	CamelMessageInfo *info;
-	const char *source;
-	CamelException *ex;
-} FilterMessageSearch;
-
-/* ESExp callbacks */
-static ESExpResult *header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms);
-static ESExpResult *body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-static ESExpResult *get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);
-
-/* builtin functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "match-all",          (ESExpFunc *) match_all,          0 },
-	{ "body-contains",      (ESExpFunc *) body_contains,      0 },
-	{ "body-regex",         (ESExpFunc *) body_regex,         0 },
-	{ "header-contains",    (ESExpFunc *) header_contains,    0 },
-	{ "header-matches",     (ESExpFunc *) header_matches,     0 },
-	{ "header-starts-with", (ESExpFunc *) header_starts_with, 0 },
-	{ "header-ends-with",   (ESExpFunc *) header_ends_with,   0 },
-	{ "header-exists",      (ESExpFunc *) header_exists,      0 },
-	{ "header-soundex",     (ESExpFunc *) header_soundex,     0 },
-	{ "header-regex",       (ESExpFunc *) header_regex,       0 },
-	{ "user-tag",           (ESExpFunc *) user_tag,           0 },
-	{ "user-flag",          (ESExpFunc *) user_flag,          0 },
-	{ "get-sent-date",      (ESExpFunc *) get_sent_date,      0 },
-	{ "get-received-date",  (ESExpFunc *) get_received_date,  0 },
-	{ "get-current-date",   (ESExpFunc *) get_current_date,   0 },
-	{ "get-score",          (ESExpFunc *) get_score,          0 },
-	{ "get-source",         (ESExpFunc *) get_source,         0 },
-};
-
-static ESExpResult *
-header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			if (strstr (contents, match))
-				matched = TRUE;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c;
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			if (is_lowercase) {
-				if (!g_strcasecmp (contents, match))
-					matched = TRUE;
-			} else {
-				if (!strcmp (contents, match))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c;
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			if (is_lowercase) {
-				if (!g_strncasecmp (contents, match, strlen (match)))
-					matched = TRUE;
-			} else {
-				if (!strncmp (contents, match, strlen (match)))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents && strlen (contents) >= strlen (match)) {
-			/* danw says to use search-engine style matching...
-			 * This means that if the search match string is
-			 * lowercase then compare case-insensitive else
-			 * compare case-sensitive. */
-			gboolean is_lowercase = TRUE;
-			char *c, *end;
-			
-			for (c = match; *c; c++) {
-				if (isalpha (*c) && isupper (*c)) {
-					is_lowercase = FALSE;
-					break;
-				}
-			}
-			
-			end = (char *) contents + strlen (contents) - strlen (match);
-			
-			if (is_lowercase) {
-				if (!g_strcasecmp (end, match))
-					matched = TRUE;
-			} else {
-				if (!strcmp (end, match))
-					matched = TRUE;
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 1) {
-		char *header = (argv[0])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents)
-			matched = TRUE;
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static unsigned char soundex_table[256] = {
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,
-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-static void
-soundexify (const gchar *sound, gchar code[5])
-{
-	guchar *c, last = '\0';
-	gint n;
-	
-	for (c = (guchar *) sound; *c && !isalpha (*c); c++);
-	code[0] = toupper (*c);
-	memset (code + 1, '0', 3);
-	for (n = 1; *c && n < 5; c++) {
-		guchar ch = soundex_table[*c];
-		
-		if (ch && ch != last) {
-			code[n++] = ch;
-			last = ch;
-		}
-	}
-	code[4] = '\0';
-}
-
-static gint
-soundexcmp (const gchar *sound1, const gchar *sound2)
-{
-	gchar code1[5], code2[5];
-	
-	soundexify (sound1, code1);
-	soundexify (sound2, code2);
-	
-	return strcmp (code1, code2);
-}
-
-static ESExpResult *
-header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		if (contents) {
-			if (!soundexcmp (contents, match))
-				matched = TRUE;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *header = (argv[0])->value.string;
-		char *match = (argv[1])->value.string;
-		regex_t regexpat;        /* regex patern */
-		regmatch_t *fltmatch;
-		gint regerr = 0;
-		size_t reglen = 0;
-		gchar *regmsg;
-		const char *contents;
-		
-		contents = camel_medium_get_header (CAMEL_MEDIUM (fms->message), header);
-		
-		regerr = regcomp (&regexpat, match, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			camel_exception_setv (fms->ex, CAMEL_EXCEPTION_SYSTEM,
-					      "Failed to perform regex search on message body: %s",
-					      regmsg);
-			g_free (regmsg);
-			regfree (&regexpat);
-		} else {
-			if (contents) {
-				fltmatch = g_new0 (regmatch_t, regexpat.re_nsub);
-				
-				if (!regexec (&regexpat, contents, regexpat.re_nsub, fltmatch, 0))
-					matched = TRUE;
-				
-				g_free (fltmatch);
-				regfree (&regexpat);
-			}
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms)
-{
-	/* match-all: when dealing with single messages is a no-op */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	if (argv[0]->type == ESEXP_RES_BOOL)
-		r->value.bool = argv[0]->value.bool;
-	else
-		r->value.bool = FALSE;
-	
-	return r;
-}
-
-static gboolean
-mime_part_matches (CamelMimePart *mime_part, const char *match, gboolean regex, CamelException *ex)
-{
-	CamelStream *stream;
-	GByteArray *array;
-	char *text;
-	regex_t regexpat;        /* regex patern */
-	regmatch_t *fltmatch;
-	gint regerr = 0;
-	size_t reglen = 0;
-	gchar *regmsg;
-	gboolean matched = FALSE;
-	
-	array = g_byte_array_new ();
-	stream = camel_stream_mem_new_with_byte_array (array);
-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_part), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
-	
-	g_byte_array_append (array, "", 1);
-	
-	text = array->data;
-	
-	if (regex) {
-		regerr = regcomp (&regexpat, match, REG_EXTENDED | REG_NEWLINE | REG_ICASE);
-		if (regerr) {
-			/* regerror gets called twice to get the full error string 
-			   length to do proper posix error reporting */
-			reglen = regerror (regerr, &regexpat, 0, 0);
-			regmsg = g_malloc0 (reglen + 1);
-			regerror (regerr, &regexpat, regmsg, reglen);
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      "Failed to perform regex search on message body: %s",
-					      regmsg);
-			g_free (regmsg);
-			regfree (&regexpat);
-		} else {
-			fltmatch = g_new0 (regmatch_t, regexpat.re_nsub);
-			
-			if (!regexec (&regexpat, text, regexpat.re_nsub, fltmatch, 0))
-				matched = TRUE;
-			
-			g_free (fltmatch);
-			regfree (&regexpat);
-		}
-	} else {
-		if (strstr (text, match))
-			matched = TRUE;
-	}
-	
-	g_byte_array_free (array, TRUE);
-	
-	return matched;
-}
-
-static gboolean
-handle_multipart (CamelMultipart *multipart, const char *match, gboolean regex, CamelException *ex)
-{
-	gboolean matched = FALSE;
-	int i, nparts;
-	
-	nparts = camel_multipart_get_number (multipart);
-	
-	for (i = 0; i < nparts && !matched; i++) {
-		GMimeContentField *content;
-		CamelMimePart *mime_part;
-		
-		mime_part = camel_multipart_get_part (multipart, i);
-		content = camel_mime_part_get_content_type (mime_part);
-		
-		if (gmime_content_field_is_type (content, "text", "*")) {
-			/* we only want to match text parts */
-			matched = mime_part_matches (mime_part, match, regex, ex);
-			
-			if (camel_exception_is_set (ex))
-				break;
-		} else if (gmime_content_field_is_type (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *mpart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-			mpart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (mpart, match, regex, ex);
-			
-			if (camel_exception_is_set (ex))
-				break;
-		}
-	}
-	
-	return matched;
-}
-
-static ESExpResult *
-body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		GMimeContentField *content;
-		char *match;
-		
-		match = (*argv)->value.string;
-		
-		content = camel_mime_part_get_content_type (CAMEL_MIME_PART (fms->message));
-		
-		if (gmime_content_field_is_type (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *multipart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (fms->message)));
-			multipart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (multipart, match, FALSE, fms->ex);
-		} else {
-			/* single-part message so just search the entire message */
-			matched = mime_part_matches (CAMEL_MIME_PART (fms->message), match, FALSE, fms->ex);
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	gboolean matched = FALSE;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		GMimeContentField *content;
-		char *match;
-		
-		match = (*argv)->value.string;
-		
-		content = camel_mime_part_get_content_type (CAMEL_MIME_PART (fms->message));
-		
-		if (gmime_content_field_is_type (content, "multipart", "*")) {
-			CamelDataWrapper *wrapper;
-			CamelMultipart *multipart;
-			
-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (fms->message)));
-			multipart = CAMEL_MULTIPART (wrapper);
-			
-			matched = handle_multipart (multipart, match, TRUE, fms->ex);
-		} else {
-			/* single-part message so just search the entire message */
-			matched = mime_part_matches (CAMEL_MIME_PART (fms->message), match, TRUE, fms->ex);
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = matched;
-	
-	return r;
-}
-
-static ESExpResult *
-user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	gboolean truth = FALSE;
-	int i;
-	
-	/* performs an OR of all words */
-	for (i = 0; i < argc && !truth; i++) {
-		if (argv[i]->type == ESEXP_RES_STRING
-		    && camel_flag_get (&fms->info->user_flags, argv[i]->value.string)) {
-			truth = TRUE;
-			break;
-		}
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = truth;
-	
-	return r;
-}
-
-static ESExpResult *
-user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, argv[0]->value.string);
-	
-	r = e_sexp_result_new (ESEXP_RES_STRING);
-	r->value.string = g_strdup (tag ? tag : "");
-	
-	return r;
-}
-
-static ESExpResult *
-get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *sent_date;
-	time_t date;
-	
-	sent_date = camel_mime_message_get_sent_date (fms->message);
-	date = header_decode_date (sent_date, NULL);
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = date;
-	
-	return r;
-}
-
-static ESExpResult *
-get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *received_date;
-	time_t date;
-	
-	received_date = camel_mime_message_get_received_date (fms->message);
-	date = header_decode_date (received_date, NULL);
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = date;
-	
-	return r;
-}
-
-static ESExpResult *
-get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	
-	return r;
-}
-
-static ESExpResult *
-get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	const char *tag;
-	
-	tag = camel_tag_get (&fms->info->user_tags, "score");
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	if (tag)
-		r->value.number = atoi (tag);
-	else
-		r->value.number = 0;
-	
-	return r;
-}
-
-static ESExpResult *
-get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_STRING);
-	r->value.string = g_strdup (fms->source);
-	
-	return r;
-}
-
-gboolean
-filter_message_search (CamelMimeMessage *message, CamelMessageInfo *info,
-		       const char *source, const char *expression, CamelException *ex)
-{
-	FilterMessageSearch *fms;
-	ESExp *sexp;
-	ESExpResult *result;
-	gboolean retval;
-	int i;
-	
-	fms = g_new (FilterMessageSearch, 1);
-	fms->message = message;
-	fms->info = info;
-	fms->source = source;
-	fms->ex = ex;
-	
-	sexp = e_sexp_new ();
-	
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (sexp, 0, symbols[i].name,
-					      (ESExpIFunc *)symbols[i].func, fms);
-		} else {
-			e_sexp_add_function (sexp, 0, symbols[i].name,
-					     symbols[i].func, fms);
-		}
-	}
-	
-	e_sexp_input_text (sexp, expression, strlen (expression));
-	e_sexp_parse (sexp);
-	result = e_sexp_eval (sexp);
-	
-	g_free (fms);
-	
-	if (result->type == ESEXP_RES_BOOL)
-		retval = result->value.bool;
-	else
-		retval = FALSE;
-	
-	gtk_object_unref (GTK_OBJECT (sexp));
-	e_sexp_result_free (result);
-	
-	return retval;
-}
diff --git a/filter/filter-message-search.h b/filter/filter-message-search.h
deleted file mode 100644
index 453e888e54..0000000000
--- a/filter/filter-message-search.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef FILTER_MESSAGE_SEARCH_H
-#define FILTER_MESSAGE_SEARCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <glib.h>
-#include <camel.h>
-#include <camel-mime-message.h>
-#include <camel-folder-summary.h>
-
-gboolean filter_message_search (CamelMimeMessage *message, CamelMessageInfo *info,
-				const char *source, const char *expression, CamelException *ex); 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! FILTER_MESSAGE_SEARCH_H */
diff --git a/filter/filter-option.c b/filter/filter-option.c
deleted file mode 100644
index bdac9288d3..0000000000
--- a/filter/filter-option.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "filter-option.h"
-#include "filter-part.h"
-#include "e-util/e-sexp.h"
-#include <gal/widgets/e-unicode.h>
-
-#define d(x)
-
-static void xml_create(FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode(FilterElement *fe);
-static int xml_decode(FilterElement *fe, xmlNodePtr node);
-static FilterElement *clone(FilterElement *fe);
-static GtkWidget *get_widget(FilterElement *fe);
-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp(FilterElement *, GString *);
-
-static void filter_option_class_init	(FilterOptionClass *class);
-static void filter_option_init	(FilterOption *gspaper);
-static void filter_option_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterOption *)(x))->priv)
-
-struct _FilterOptionPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_option_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterOption",
-			sizeof(FilterOption),
-			sizeof(FilterOptionClass),
-			(GtkClassInitFunc)filter_option_class_init,
-			(GtkObjectInitFunc)filter_option_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_option_class_init (FilterOptionClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_element_get_type ());
-
-	object_class->finalize = filter_option_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->clone = clone;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_option_init (FilterOption *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_option_finalise (GtkObject *obj)
-{
-	FilterOption *o = (FilterOption *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_option_new:
- *
- * Create a new FilterOption object.
- * 
- * Return value: A new #FilterOption object.
- **/
-FilterOption *
-filter_option_new (void)
-{
-	FilterOption *o = (FilterOption *)gtk_type_new (filter_option_get_type ());
-	return o;
-}
-
-static struct _filter_option *
-find_option (FilterOption *fo, const char *name)
-{
-	GList *l = fo->options;
-	struct _filter_option *op;
-	
-	while (l) {
-		op = l->data;
-		if (!strcmp (name, op->value)) {
-			return op;
-		}
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-void
-filter_option_set_current (FilterOption *option, const char *name)
-{
-	g_assert(IS_FILTER_OPTION(option));
-	
-	option->current = find_option (option, name);
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	xmlNodePtr n, work;
-	struct _filter_option *op;
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "option")) {
-			op = g_malloc0 (sizeof (*op));
-			op->value = xmlGetProp (n, "value");
-			work = n->childs;
-			while (work) {
-				if (!strcmp (work->name, "title")) {
-					if (!op->title) {
-						op->title = xmlNodeGetContent (work);
-					}
-				} else if (!strcmp (work->name, "code")) {
-					if (!op->code) {
-						op->code = xmlNodeGetContent (work);
-					}
-				}
-				work = work->next;
-			}
-			d(printf ("creating new option:\n title %s\n value %s\n code %s\n",
-				  op->title, op->value, op->code));
-			fo->options = g_list_append (fo->options, op);
-			if (fo->current == NULL)
-				fo->current = op;
-		} else {
-			g_warning ("Unknown xml node within optionlist: %s\n", n->name);
-		}
-		n = n->next;
-	}
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterOption *fo = (FilterOption *)fe;
-	
-	d(printf ("Encoding option as xml\n"));
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "option");
-	if (fo->current) {
-		xmlSetProp (value, "value", fo->current->value);
-	}
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	char *value;
-	
-	d(printf ("Decoding option from xml\n"));
-	fe->name = xmlGetProp (node, "name");
-	value = xmlGetProp (node, "value");
-	if (value) {
-		fo->current = find_option (fo, value);
-		xmlFree (value);
-	} else {
-		fo->current = NULL;
-	}
-	return 0;
-}
-
-static void
-option_activate (GtkMenuItem *item, FilterOption *fo)
-{
-	FilterElement *fe = (FilterElement *) fo;
-	gboolean is_regex;
-	
-	fo->current = gtk_object_get_data (GTK_OBJECT (item), "option");
-	d(printf ("option changed to %s\n", fo->current->title));
-	
-	/* FIXME: there's probably a better way to do this */
-	is_regex = !(!strstr (fo->current->title, "regex"));
-	fe->data = GINT_TO_POINTER (is_regex);
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	GtkWidget *menu;
-	GtkWidget *omenu;
-	GtkWidget *item;
-	GList *l = fo->options;
-	struct _filter_option *op;
-	int index = 0, current = 0;
-	
-	menu = gtk_menu_new ();
-	while (l) {
-		op = l->data;
-		item = gtk_menu_item_new_with_label (_(op->title));
-		gtk_object_set_data (GTK_OBJECT (item), "option", op);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, fo);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		if (op == fo->current) {
-			current = index;
-		}
-		
-		l = g_list_next (l);
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	
-	return omenu;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	
-	d(printf ("building option code %p, current = %p\n", fo, fo->current));
-	
-	if (fo->current) {
-		filter_part_expand_code (ff, fo->current->code, out);
-	}
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterOption *fo = (FilterOption *)fe;
-	
-	if (fo->current) {
-		e_sexp_encode_string (out, fo->current->value);
-	}
-}
-
-static FilterElement *
-clone (FilterElement *fe)
-{
-	FilterOption *fo = (FilterOption *)fe, *new;
-	GList *l;
-	struct _filter_option *fn, *op;
-	
-	d(printf ("cloning option\n"));
-	
-        new = FILTER_OPTION (((FilterElementClass *)(parent_class))->clone(fe));
-	l = fo->options;
-	while (l) {
-		op = l->data;
-		fn = g_malloc (sizeof (*fn));
-		d(printf ("  option %s\n", op->title));
-		fn->title = g_strdup (op->title);
-		fn->value = g_strdup (op->value);
-		fn->code = g_strdup (op->code);
-		new->options = g_list_append (new->options, fn);
-		l = g_list_next (l);
-		
-		if (new->current == NULL)
-			new->current = fn;
-	}
-	
-	d(printf ("cloning option code %p, current = %p\n", new, new->current));
-	
-	return (FilterElement *)new;
-}
diff --git a/filter/filter-option.h b/filter/filter-option.h
deleted file mode 100644
index 1bbec79d84..0000000000
--- a/filter/filter-option.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_OPTION_H
-#define _FILTER_OPTION_H
-
-#include <gtk/gtk.h>
-
-#include "filter-element.h"
-
-#define FILTER_OPTION(obj)	GTK_CHECK_CAST (obj, filter_option_get_type (), FilterOption)
-#define FILTER_OPTION_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_option_get_type (), FilterOptionClass)
-#define IS_FILTER_OPTION(obj)      GTK_CHECK_TYPE (obj, filter_option_get_type ())
-
-typedef struct _FilterOption	FilterOption;
-typedef struct _FilterOptionClass	FilterOptionClass;
-
-struct _filter_option {
-	char *title;		/* button title */
-	char *value;		/* value, if it has one */
-	char *code;		/* used to string code segments together */
-};
-
-struct _FilterOption {
-	FilterElement parent;
-	struct _FilterOptionPrivate *priv;
-
-	GList *options;
-	struct _filter_option *current;
-};
-
-struct _FilterOptionClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_option_get_type	(void);
-FilterOption	*filter_option_new	(void);
-
-/* methods */
-void		filter_option_set_current(FilterOption *option, const char *name);
-
-#endif /* ! _FILTER_OPTION_H */
-
diff --git a/filter/filter-part.c b/filter/filter-part.c
deleted file mode 100644
index f32ed517c7..0000000000
--- a/filter/filter-part.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include <gnome-xml/xmlmemory.h>
-
-#include "filter-part.h"
-#include "filter-element.h"
-
-#define d(x)
-
-static void filter_part_class_init	(FilterPartClass *class);
-static void filter_part_init	(FilterPart *gspaper);
-static void filter_part_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterPart *)(x))->priv)
-
-struct _FilterPartPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_part_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterPart",
-			sizeof(FilterPart),
-			sizeof(FilterPartClass),
-			(GtkClassInitFunc)filter_part_class_init,
-			(GtkObjectInitFunc)filter_part_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gtk_object_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_part_class_init (FilterPartClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gtk_object_get_type ());
-	
-	object_class->finalize = filter_part_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_part_init (FilterPart *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_part_finalise(GtkObject *obj)
-{
-	FilterPart *o = (FilterPart *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_part_new:
- *
- * Create a new FilterPart object.
- * 
- * Return value: A new #FilterPart object.
- **/
-FilterPart *
-filter_part_new (void)
-{
-	FilterPart *o = (FilterPart *)gtk_type_new(filter_part_get_type ());
-	return o;
-}
-
-gboolean
-filter_part_validate (FilterPart *fp)
-{
-	gboolean correct = TRUE;
-	FilterElement *last = NULL;
-	GList *l;
-	
-	l = fp->elements;
-	while (l && correct) {
-		FilterElement *fe = l->data;
-		
-	        correct = filter_element_validate (fe, last ? last->data : NULL);
-		
-		last = fe;
-		l = l->next;
-	}
-	
-	return correct;
-}
-
-int
-filter_part_xml_create (FilterPart *ff, xmlNodePtr node)
-{
-	xmlNodePtr n;
-	char *type;
-	FilterElement *el;
-	
-	ff->name = xmlGetProp(node, "name");
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "input")) {
-			type = xmlGetProp (n, "type");
-			d(printf ("creating new element type input '%s'\n", type));
-			if (type != NULL
-			    && (el = filter_element_new_type_name (type)) != NULL) {
-				filter_element_xml_create (el, n);
-				xmlFree (type);
-				d(printf ("adding element part %p %s\n", el, el->name));
-				ff->elements = g_list_append (ff->elements, el);
-			} else {
-				g_warning ("Invalid xml format, missing/unknown input type");
-			}
-		} else if (!strcmp (n->name, "title")) {
-			if (!ff->title)
-				ff->title = xmlNodeGetContent (n);
-		} else if (!strcmp (n->name, "code")) {
-			if (!ff->code)
-				ff->code = xmlNodeGetContent (n);
-		} else {
-			g_warning ("Unknwon part element in xml: %s\n", n->name);
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-xmlNodePtr
-filter_part_xml_encode (FilterPart *fp)
-{
-	GList *l;
-	FilterElement *fe;
-	xmlNodePtr part, value;
-	
-	g_return_val_if_fail (fp != NULL, NULL);
-	
-	part = xmlNewNode (NULL, "part");
-	xmlSetProp (part, "name", fp->name);
-	l = fp->elements;
-	while (l) {
-		fe = l->data;
-		value = filter_element_xml_encode (fe);
-		xmlAddChild (part, value);
-		l = g_list_next (l);
-	}
-	
-	return part;
-}
-
-
-int
-filter_part_xml_decode (FilterPart *fp, xmlNodePtr node)
-{
-	FilterElement *fe;
-	xmlNodePtr n;
-	char *name;
-	
-	g_return_val_if_fail (fp != NULL, -1);
-	g_return_val_if_fail (node != NULL, -1);
-	
-	n = node->childs;
-	while (n) {
-		if (!strcmp (n->name, "value")) {
-			name = xmlGetProp (n, "name");
-			d(printf ("finding element part %p %s = %p\n", name, name, fe));
-			fe = filter_part_find_element (fp, name);
-			d(printf ("finding element part %p %s = %p\n", name, name, fe));
-			xmlFree (name);
-			if (fe) {
-				filter_element_xml_decode (fe, n);
-			}
-		}
-		n = n->next;
-	}
-	
-	return 0;
-}
-
-FilterPart *
-filter_part_clone (FilterPart *fp)
-{
-	FilterPart *new;
-	GList *l;
-	FilterElement *fe, *ne;
-	
-	new = (FilterPart *)gtk_type_new ((GTK_OBJECT (fp))->klass->type);
-	new->name = g_strdup (fp->name);
-	new->title = g_strdup (fp->title);
-	new->code = g_strdup (fp->code);
-	l = fp->elements;
-	while (l) {
-		fe = l->data;
-		ne = filter_element_clone (fe);
-		new->elements = g_list_append (new->elements, ne);
-		l = g_list_next (l);
-	}
-	
-	return new;
-}
-
-FilterElement *
-filter_part_find_element (FilterPart *ff, const char *name)
-{
-	GList *l = ff->elements;
-	FilterElement *fe;
-	
-	if (name == NULL)
-		return NULL;
-	
-	while (l) {
-		fe = l->data;
-		if (fe->name && !strcmp (fe->name, name))
-			return fe;
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-
-GtkWidget *
-filter_part_get_widget (FilterPart *ff)
-{
-	GtkWidget *hbox;
-	GList *l = ff->elements;
-	FilterElement *fe;
-	GtkWidget *w;
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	
-	while (l) {
-		fe = l->data;
-		w = filter_element_get_widget (fe);
-		if (w) {
-			gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 3);
-		}
-		l = g_list_next (l);
-	}
-	
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-/**
- * filter_part_build_code:
- * @ff: 
- * @out: 
- * 
- * Outputs the code of a part.
- **/
-void
-filter_part_build_code (FilterPart *ff, GString *out)
-{
-	GList *l = ff->elements;
-	FilterElement *fe;
-	
-	if (ff->code) {
-		filter_part_expand_code (ff, ff->code, out);
-	}
-	while (l) {
-		fe = l->data;
-		filter_element_build_code (fe, out, ff);
-		l = g_list_next (l);
-	}	
-}
-
-/**
- * filter_part_build_code_list:
- * @l: 
- * @out: 
- * 
- * Construct a list of the filter parts code into
- * a single string.
- **/
-void
-filter_part_build_code_list (GList *l, GString *out)
-{
-	FilterPart *fp;
-	
-	while (l) {
-		fp = l->data;
-		filter_part_build_code (fp, out);
-		g_string_append (out, "\n  ");
-		l = g_list_next (l);
-	}
-}
-
-/**
- * filter_part_find_list:
- * @l: 
- * @name: 
- * 
- * Find a filter part stored in a list.
- * 
- * Return value: 
- **/
-FilterPart *
-filter_part_find_list (GList *l, const char *name)
-{
-	FilterPart *part;
-	
-	d(printf ("Find part named %s\n", name));
-	
-	while (l) {
-		part = l->data;
-		if (!strcmp (part->name, name)) {
-			d(printf ("Found!\n"));
-			return part;
-		}
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
-
-/**
- * filter_part_next_list:
- * @l: 
- * @last: The last item retrieved, or NULL to start
- * from the beginning of the list.
- * 
- * Iterate through a filter part list.
- * 
- * Return value: The next value in the list, or NULL if the
- * list is expired.
- **/
-FilterPart *
-filter_part_next_list (GList *l, FilterPart *last)
-{
-	GList *node = l;
-	
-	if (last != NULL) {
-		node = g_list_find (node, last);
-		if (node == NULL)
-			node = l;
-		else
-			node = g_list_next (node);
-	}
-	if (node)
-		return node->data;
-	
-	return NULL;
-}
-
-/**
- * filter_part_expand_code:
- * @ff: 
- * @str: 
- * @out: 
- * 
- * Expands the variables in string @str based on the values of the part.
- **/
-void
-filter_part_expand_code (FilterPart *ff, const char *source, GString *out)
-{
-	const char *newstart, *start, *end;
-	char *name = alloca (32);
-	int len, namelen = 32;
-	FilterElement *fe;
-	
-	start = source;
-	while ( (newstart = strstr (start, "${"))
-		&& (end = strstr (newstart+2, "}")) ) {
-		len = end - newstart - 2;
-		if (len + 1 > namelen) {
-			namelen = (len + 1) * 2;
-			name = alloca (namelen);
-		}
-		memcpy (name, newstart+2, len);
-		name[len] = 0;
-		fe = filter_part_find_element (ff, name);
-		d(printf("expand code: looking up variab le '%s' = %p\n", name, fe));
-		if (fe) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
-			filter_element_format_sexp (fe, out);
-#if 0
-		} else if ( (val = g_hash_table_lookup (ff->globals, name)) ) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
-			e_sexp_encode_string (out, val);
-#endif
-		} else {
-			g_string_sprintfa (out, "%.*s", end-start+1, start);
-		}
-		start = end + 1;
-	}
-	g_string_append (out, start);
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	xmlDocPtr system;
-	FilterPart *ff;
-	GtkWidget *w;
-	GnomeDialog *gd;
-	xmlNodePtr node;
-	GString *code;
-
-	gnome_init("test", "0.0", argc, argv);
-
-	system = xmlParseFile("form.xml");
-	if (system==NULL) {
-		printf("i/o error\n");
-		return 1;
-	}
-
-	ff = filter_part_new();
-	filter_part_xml_create(ff, system->root);
-
-	w = filter_part_get_widget(ff);
-
-	gd = (GnomeDialog *)gnome_dialog_new(_("Test"), GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-
-	gnome_dialog_run_and_close(gd);
-
-	code = g_string_new("");
-	filter_part_build_code(ff, code);
-	printf("code is:\n%s\n", code->str);
-
-	return 0;
-}
-#endif
diff --git a/filter/filter-part.h b/filter/filter-part.h
deleted file mode 100644
index bc9424486b..0000000000
--- a/filter/filter-part.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_PART_H
-#define _FILTER_PART_H
-
-#include <gtk/gtk.h>
-#include "filter-input.h"
-
-#define FILTER_PART(obj)	GTK_CHECK_CAST (obj, filter_part_get_type (), FilterPart)
-#define FILTER_PART_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_part_get_type (), FilterPartClass)
-#define IS_FILTER_PART(obj)      GTK_CHECK_TYPE (obj, filter_part_get_type ())
-
-typedef struct _FilterPart	FilterPart;
-typedef struct _FilterPartClass	FilterPartClass;
-
-struct _FilterPart {
-	GtkObject parent;
-	struct _FilterPartPrivate *priv;
-
-	char *name;
-	char *title;
-	char *code;
-	GList *elements;
-};
-
-struct _FilterPartClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_part_get_type	(void);
-FilterPart	*filter_part_new	(void);
-
-/* methods */
-gboolean        filter_part_validate    (FilterPart *fp);
-
-int		filter_part_xml_create	(FilterPart *ff, xmlNodePtr node);
-
-xmlNodePtr	filter_part_xml_encode	(FilterPart *fe);
-int		filter_part_xml_decode	(FilterPart *fe, xmlNodePtr node);
-
-FilterPart	*filter_part_clone	(FilterPart *fp);
-
-FilterElement	*filter_part_find_element(FilterPart *ff, const char *name);
-
-GtkWidget	*filter_part_get_widget		(FilterPart *ff);
-void		filter_part_build_code		(FilterPart *ff, GString *out);
-void		filter_part_expand_code		(FilterPart *ff, const char *str, GString *out);
-
-/* static functions */
-void		filter_part_build_code_list	(GList *l, GString *out);
-FilterPart	*filter_part_find_list		(GList *l, const char *name);
-FilterPart	*filter_part_next_list		(GList *l, FilterPart *last);
-
-#endif /* ! _FILTER_PART_H */
-
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
deleted file mode 100644
index 11053a38da..0000000000
--- a/filter/filter-rule.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gal/widgets/e-unicode.h>
-
-#include "filter-rule.h"
-#include "filter-context.h"
-
-#define d(x)
-
-static xmlNodePtr xml_encode (FilterRule *);
-static int xml_decode (FilterRule *, xmlNodePtr, RuleContext *);
-static void build_code (FilterRule *, GString * out);
-static GtkWidget *get_widget (FilterRule * fr, struct _RuleContext *f);
-
-static void filter_rule_class_init (FilterRuleClass * class);
-static void filter_rule_init (FilterRule * gspaper);
-static void filter_rule_finalise (GtkObject * obj);
-
-#define _PRIVATE(x) (((FilterRule *)(x))->priv)
-
-struct _FilterRulePrivate {
-	GtkWidget *parts;	/* where the parts are stored */
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_rule_get_type ()
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterRule",
-			sizeof (FilterRule),
-			sizeof (FilterRuleClass),
-			(GtkClassInitFunc) filter_rule_class_init,
-			(GtkObjectInitFunc) filter_rule_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (gtk_object_get_type(), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_rule_class_init (FilterRuleClass * class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (gtk_object_get_type());
-	
-	object_class->finalize = filter_rule_finalise;
-	
-	/* override methods */
-	class->xml_encode = xml_encode;
-	class->xml_decode = xml_decode;
-	class->build_code = build_code;
-	class->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_rule_init (FilterRule * o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-unref_list (GList * l)
-{
-	while (l) {
-		gtk_object_unref (GTK_OBJECT (l->data));
-		l = g_list_next (l);
-	}
-}
-
-static void
-filter_rule_finalise (GtkObject * obj)
-{
-	FilterRule *o = (FilterRule *) obj;
-
-	g_free (o->name);
-	g_free (o->source);
-	unref_list (o->parts);
-	
-	((GtkObjectClass *) (parent_class))->finalize(obj);
-}
-
-/**
- * filter_rule_new:
- *
- * Create a new FilterRule object.
- * 
- * Return value: A new #FilterRule object.
- **/
-FilterRule *
-filter_rule_new ()
-{
-	FilterRule *o = (FilterRule *) gtk_type_new (filter_rule_get_type());
-	
-	return o;
-}
-
-void
-filter_rule_set_name (FilterRule *fr, const char *name)
-{
-	g_free (fr->name);
-	fr->name = g_strdup (name);
-}
-
-void
-filter_rule_set_source (FilterRule *fr, const char *source)
-{
-	g_free (fr->source);
-	fr->source = g_strdup (source);
-}
-
-xmlNodePtr
-filter_rule_xml_encode (FilterRule *fr)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->xml_encode(fr);
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	
-	node = xmlNewNode (NULL, "rule");
-	switch (fr->grouping) {
-	case FILTER_GROUP_ALL:
-		xmlSetProp (node, "grouping", "all");
-		break;
-	case FILTER_GROUP_ANY:
-		xmlSetProp (node, "grouping", "any");
-		break;
-	}
-	
-	if (fr->source) {
-		xmlSetProp (node, "source", fr->source);
-	} else {
-		/* set to the default filter type */
-		xmlSetProp (node, "source", "incoming");
-	}
-	
-	if (fr->name) {
-		work = xmlNewNode (NULL, "title");
-		xmlNodeSetContent (work, fr->name);
-		xmlAddChild (node, work);
-	}
-	
-	set = xmlNewNode (NULL, "partset");
-	xmlAddChild (node, set);
-	l = fr->parts;
-	while (l) {
-		work = filter_part_xml_encode ((FilterPart *) l->data);
-		xmlAddChild (set, work);
-		l = g_list_next (l);
-	}
-	
-	return node;
-}
-
-static void
-load_set (xmlNodePtr node, FilterRule *fr, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *rulename;
-	FilterPart *part;
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "part")) {
-			rulename = xmlGetProp (work, "name");
-			part = rule_context_find_part (f, rulename);
-			if (part) {
-				part = filter_part_clone (part);
-				filter_part_xml_decode (part, work);
-				filter_rule_add_part (fr, part);
-			} else {
-				g_warning ("cannot find rule part '%s'\n", rulename);
-			}
-			xmlFree (rulename);
-		} else {
-			g_warning ("Unknwon xml node in part: %s", work->name);
-		}
-		work = work->next;
-	}
-}
-
-int
-filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->xml_decode(fr, node, f);
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
-{
-	xmlNodePtr work;
-	char *grouping;
-	char *source;
-	
-	if (fr->name) {
-		g_free (fr->name);
-		fr->name = NULL;
-	}
-	
-	grouping = xmlGetProp (node, "grouping");
-	if (!strcmp (grouping, "any"))
-		fr->grouping = FILTER_GROUP_ANY;
-	else
-		fr->grouping = FILTER_GROUP_ALL;
-	xmlFree (grouping);
-	
-	source = xmlGetProp (node, "source");
-	if (source) {
-		fr->source = source;
-	} else {
-		/* default filter type */
-		fr->source = g_strdup ("incoming");
-	}
-	
-	work = node->childs;
-	while (work) {
-		if (!strcmp (work->name, "partset")) {
-			load_set (work, fr, f);
-		} else if (!strcmp (work->name, "title")) {
-			if (!fr->name)
-				fr->name = xmlNodeGetContent (work);
-		}
-		work = work->next;
-	}
-	
-	return 0;
-}
-
-void
-filter_rule_add_part (FilterRule *fr, FilterPart *fp)
-{
-	fr->parts = g_list_append (fr->parts, fp);
-}
-
-void
-filter_rule_remove_part (FilterRule *fr, FilterPart *fp)
-{
-	fr->parts = g_list_remove (fr->parts, fp);
-}
-
-void
-filter_rule_replace_part (FilterRule *fr, FilterPart *fp, FilterPart *new)
-{
-	GList *l;
-	
-	l = g_list_find (fr->parts, fp);
-	if (l) {
-		l->data = new;
-	} else {
-		fr->parts = g_list_append (fr->parts, new);
-	}
-}
-
-void
-filter_rule_build_code (FilterRule *fr, GString *out)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->build_code(fr, out);
-}
-
-static void
-build_code (FilterRule *fr, GString *out)
-{
-	switch (fr->grouping) {
-	case FILTER_GROUP_ALL:
-		g_string_append (out, " (and\n  ");
-		break;
-	case FILTER_GROUP_ANY:
-		g_string_append (out, " (or\n  ");
-		break;
-	default:
-		g_warning ("Invalid grouping");
-	}
-	
-	filter_part_build_code_list (fr->parts, out);
-	g_string_append (out, ")\n");
-}
-
-static void
-match_all (GtkWidget *widget, FilterRule *fr)
-{
-	fr->grouping = FILTER_GROUP_ALL;
-}
-
-static void
-match_any (GtkWidget *widget, FilterRule *fr)
-{
-	fr->grouping = FILTER_GROUP_ANY;
-}
-
-struct _part_data {
-	FilterRule *fr;
-	RuleContext *f;
-	FilterPart *part;
-	GtkWidget *partwidget, *container;
-};
-
-static void
-option_activate (GtkMenuItem *item, struct _part_data *data)
-{
-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");
-	FilterPart *newpart;
-	
-	/* dont update if we haven't changed */
-	if (!strcmp (part->title, data->part->title))
-		return;
-	
-	/* here we do a widget shuffle, throw away the old widget/rulepart,
-	   and create another */
-	if (data->partwidget)
-		gtk_container_remove (GTK_CONTAINER (data->container), data->partwidget);
-	
-	newpart = filter_part_clone (part);
-	filter_rule_replace_part (data->fr, data->part, newpart);
-	gtk_object_unref (GTK_OBJECT (data->part));
-	data->part = newpart;
-	data->partwidget = filter_part_get_widget (newpart);
-	if (data->partwidget)
-		gtk_box_pack_start (GTK_BOX (data->container), data->partwidget, FALSE, FALSE, 0);
-}
-
-static GtkWidget *
-get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr)
-{
-	FilterPart *part = NULL;
-	GtkWidget *menu;
-	GtkWidget *item;
-	GtkWidget *omenu;
-	GtkWidget *hbox;
-	GtkWidget *p;
-	int index = 0, current = 0;
-	struct _part_data *data;
-	
-	data = g_malloc0 (sizeof (*data));
-	data->fr = fr;
-	data->f = f;
-	data->part = newpart;
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	/* only set to automatically clean up the memory */
-	gtk_object_set_data_full (GTK_OBJECT (hbox), "data", data, g_free);
-	
-	p = filter_part_get_widget (newpart);
-	
-	data->partwidget = p;
-	data->container = hbox;
-	
-	menu = gtk_menu_new ();
-	/* sigh, this is a little ugly */
-	while ((part = rule_context_next_part (f, part))) {
-		item = gtk_menu_item_new_with_label (_(part->title));
-		gtk_object_set_data (GTK_OBJECT (item), "part", part);
-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
-		gtk_menu_append (GTK_MENU (menu), item);
-		gtk_widget_show (item);
-		if (!strcmp (newpart->title, part->title)) {
-			current = index;
-		}
-		index++;
-	}
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);
-	gtk_widget_show (omenu);
-	
-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	if (p) {
-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);
-	}
-	gtk_widget_show_all (hbox);
-	
-	return hbox;
-}
-
-struct _rule_data {
-	FilterRule *fr;
-	RuleContext *f;
-	GtkWidget *parts;
-};
-
-static void
-less_parts (GtkWidget *button, struct _rule_data *data)
-{
-	GList *l;
-	FilterPart *part;
-	GtkWidget *w;
-	
-	l = data->fr->parts;
-	if (g_list_length (l) < 2)
-		return;
-	
-	/* remove the last one from the list */
-	l = g_list_last (l);
-	part = l->data;
-	filter_rule_remove_part (data->fr, part);
-	gtk_object_unref (GTK_OBJECT (part));
-	
-	/* and from the display */
-	l = g_list_last (GTK_BOX (data->parts)->children);
-	w = ((GtkBoxChild *) l->data)->widget;
-	gtk_container_remove (GTK_CONTAINER (data->parts), w);
-	
-	/* if there's only 1 criterion, we can't remove anymore so set insensitive */
-	if (g_list_length (data->fr->parts) <= 1)
-		gtk_widget_set_sensitive (button, FALSE);
-}
-
-static void
-more_parts (GtkWidget *button, struct _rule_data *data)
-{
-	FilterPart *new;
-	GtkWidget *w;
-	
-	/* first make sure that the last part is ok */
-	if (data->fr->parts) {
-		FilterPart *part;
-		GList *l;
-		
-		l = g_list_last (data->fr->parts);
-		part = l->data;
-		if (!filter_part_validate (part))
-			return;
-	}
-	
-	/* create a new rule entry, use the first type of rule */
-	new = rule_context_next_part (data->f, NULL);
-	if (new) {
-		new = filter_part_clone (new);
-		filter_rule_add_part (data->fr, new);
-		w = get_rule_part_widget (data->f, new, data->fr);
-		gtk_box_pack_start (GTK_BOX (data->parts), w, FALSE, FALSE, 0);
-	}
-	
-	/* set the "Remove criterion" button sensitive */
-	w = gtk_object_get_data (GTK_OBJECT (button), "remove");
-	gtk_widget_set_sensitive (w, TRUE);
-}
-
-static void
-name_changed (GtkEntry *entry, FilterRule *fr)
-{
-	g_free (fr->name);
-	fr->name = e_utf8_gtk_entry_get_text (entry);
-}
-
-GtkWidget *
-filter_rule_get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	return ((FilterRuleClass *) ((GtkObject *) fr)->klass)->get_widget(fr, f);
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *vbox, *parts, *inframe;
-	GtkWidget *hbox;
-	GtkWidget *add, *remove, *pixmap;
-	GtkWidget *w;
-	GtkWidget *menu, *item, *omenu;
-	GtkWidget *frame;
-	GtkWidget *name;
-	GtkWidget *label;
-	GtkWidget *scrolledwindow;
-	GtkObject *hadj, *vadj;
-	GList *l;
-	FilterPart *part;
-	struct _rule_data *data;
-	
-	/* this stuff should probably be a table, but the
-	   rule parts need to be a vbox */
-	vbox = gtk_vbox_new (FALSE, 3);
-	
-	label = gtk_label_new (_("Rule name: "));
-	name = gtk_entry_new ();
-	
-	if (!fr->name) {
-		fr->name = g_strdup (_("Untitled"));
-		gtk_entry_set_text (GTK_ENTRY (name), fr->name);
-		gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);
-		gtk_widget_grab_focus (GTK_WIDGET (name));
-	} else {
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (name), fr->name);
-	}
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (name), "changed", name_changed, fr);
-	
-	frame = gtk_frame_new (_("If"));
-	inframe = gtk_vbox_new (FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), inframe);
-	
-	/* this is the parts list, it should probably be inside a scrolling list */
-	parts = gtk_vbox_new (FALSE, 3);
-	
-	/* data for the parts part of the display */
-	data = g_malloc0 (sizeof (*data));
-	data->f = f;
-	data->fr = fr;
-	data->parts = parts;
-	
-	/* only set to automatically clean up the memory */
-	gtk_object_set_data_full (GTK_OBJECT (vbox), "data", data, g_free);
-	
-	hbox = gtk_hbox_new (FALSE, 3);
-	label = gtk_label_new (_("Execute actions"));
-	
-	menu = gtk_menu_new ();
-	
-	item = gtk_menu_item_new_with_label (_("if all criteria are met"));
-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_all, fr);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_widget_show (item);
-	
-	item = gtk_menu_item_new_with_label (_("if any criteria are met"));
-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_any, fr);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_widget_show (item);
-	
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), fr->grouping == FILTER_GROUP_ALL ? 0 : 1);
-	gtk_widget_show (omenu);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);
-	add = gnome_pixmap_button (pixmap, _("Add criterion"));
-	gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);
-	
-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);
-	remove = gnome_pixmap_button (pixmap, _("Remove criterion"));
-	gtk_object_set_data (GTK_OBJECT (add), "remove", remove);
-	gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);
-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);
-	gtk_box_pack_start (GTK_BOX (hbox), remove, FALSE, FALSE, 3);
-	
-	/* if we only have 1 criterion, then we can't remove any more so disable this */
-	if (g_list_length (fr->parts) <= 1)
-		gtk_widget_set_sensitive (remove, FALSE);
-	
-	gtk_box_pack_end (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 0);
-	
-	l = fr->parts;
-	while (l) {
-		part = l->data;
-		w = get_rule_part_widget (f, part, fr);
-		gtk_box_pack_start (GTK_BOX (parts), w, FALSE, FALSE, 3);
-		l = g_list_next (l);
-	}
-	
-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
-	
-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0);
-	
-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */
-	
-	gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-	
-	gtk_widget_show_all (vbox);
-	
-	return vbox;
-}
-
-FilterRule *
-filter_rule_next_list (GList * l, FilterRule * last, const char *source)
-{
-	GList *node = l;
-	
-	if (last != NULL) {
-		node = g_list_find (node, last);
-		if (node == NULL)
-			node = l;
-		else
-			node = g_list_next (node);
-	}
-	
-	if (source) {
-		while (node) {
-			FilterRule *rule = node->data;
-			
-			if (rule->source && strcmp (rule->source, source) == 0)
-				break;
-			node = g_list_next (node);
-		}
-	}
-	
-	if (node)
-		return node->data;
-	
-	return NULL;
-}
-
-FilterRule *
-filter_rule_find_list (GList * l, const char *name, const char *source)
-{
-	while (l) {
-		FilterRule *rule = l->data;
-		
-		if (strcmp (rule->name, name) == 0)
-			if (source == NULL || (rule->source != NULL && strcmp (rule->source, source) == 0))
-				return rule;
-		l = g_list_next (l);
-	}
-	
-	return NULL;
-}
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
deleted file mode 100644
index 8c6f9cf42b..0000000000
--- a/filter/filter-rule.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FILTER_RULE_H
-#define _FILTER_RULE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-part.h"
-
-#define FILTER_RULE(obj)	GTK_CHECK_CAST (obj, filter_rule_get_type (), FilterRule)
-#define FILTER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_rule_get_type (), FilterRuleClass)
-#define IS_FILTER_RULE(obj)      GTK_CHECK_TYPE (obj, filter_rule_get_type ())
-
-typedef struct _FilterRule	FilterRule;
-typedef struct _FilterRuleClass	FilterRuleClass;
-
-struct _RuleContext;
-
-enum _filter_grouping_t {
-	FILTER_GROUP_ALL,	/* all rules must match */
-	FILTER_GROUP_ANY	/* any rule must match */
-};
-
-
-#define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
-#define FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder
-	 				   * when the user asks for it */
-#define	FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */
-
-struct _FilterRule {
-	GtkObject parent;
-	struct _FilterRulePrivate *priv;
-	
-	char *name;
-	char *source;
-	
-	enum _filter_grouping_t grouping;
-	GList *parts;
-};
-
-struct _FilterRuleClass {
-	GtkObjectClass parent_class;
-	
-	/* virtual methods */
-	xmlNodePtr (*xml_encode)(FilterRule *);
-	int (*xml_decode)(FilterRule *, xmlNodePtr, struct _RuleContext *);
-	
-	void (*build_code)(FilterRule *, GString *out);
-	
-	GtkWidget *(*get_widget)(FilterRule *fr, struct _RuleContext *f);
-	
-	/* signals */
-};
-
-guint		filter_rule_get_type	(void);
-FilterRule	*filter_rule_new	(void);
-
-/* methods */
-void		filter_rule_set_name	(FilterRule *fr, const char *name);
-void		filter_rule_set_source	(FilterRule *fr, const char *source);
-
-xmlNodePtr	filter_rule_xml_encode	(FilterRule *fr);
-int		filter_rule_xml_decode	(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f);
-
-void		filter_rule_add_part	(FilterRule *fr, FilterPart *fp);
-void		filter_rule_remove_part	(FilterRule *fr, FilterPart *fp);
-void		filter_rule_replace_part(FilterRule *fr, FilterPart *fp, FilterPart *new);
-
-GtkWidget	*filter_rule_get_widget	(FilterRule *fr, struct _RuleContext *f);
-
-void		filter_rule_build_code	(FilterRule *fr, GString *out);
-/*
-void		filter_rule_build_action(FilterRule *fr, GString *out);
-*/
-
-/* static functions */
-FilterRule	*filter_rule_next_list		(GList *l, FilterRule *last, const char *source);
-FilterRule	*filter_rule_find_list		(GList *l, const char *name, const char *source);
-
-#endif /* ! _FILTER_RULE_H */
-
diff --git a/filter/filter-score.c b/filter/filter-score.c
deleted file mode 100644
index 5053998444..0000000000
--- a/filter/filter-score.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-score.h"
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_score_class_init (FilterScoreClass *class);
-static void filter_score_init (FilterScore *gspaper);
-static void filter_score_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterScore *)(x))->priv)
-
-struct _FilterScorePrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_score_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterScore",
-			sizeof (FilterScore),
-			sizeof (FilterScoreClass),
-			(GtkClassInitFunc) filter_score_class_init,
-			(GtkObjectInitFunc) filter_score_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_score_class_init (FilterScoreClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_score_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_score_init (FilterScore *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_score_finalise(GtkObject *obj)
-{
-	FilterScore *o = (FilterScore *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * filter_score_new:
- *
- * Create a new FilterScore object.
- * 
- * Return value: A new #FilterScore object.
- **/
-FilterScore *
-filter_score_new (void)
-{
-	FilterScore *o = (FilterScore *)gtk_type_new(filter_score_get_type ());
-	return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterScore *fs = (FilterScore *)fe;*/
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create(fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterScore *fs = (FilterScore *)fe;
-	char *score;
-	
-	d(printf("Encoding score as xml\n"));
-	
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "score");
-	
-	score = g_strdup_printf ("%d", fs->score);
-	xmlSetProp (value, "score", score);
-	g_free (score);
-	
-	return value;
-}
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	char *name;
-	char *score;
-	
-	d(printf("Decoding score from xml %p\n", fe));
-	
-	name = xmlGetProp (node, "name");
-	d(printf ("Name = %s\n", name));
-	fe->name = name;
-	score = xmlGetProp (node, name);
-	if (score)
-		fs->score = atoi (score);
-	else
-		fs->score = 0;
-	
-	if (fs->score > 3)
-		fs->score = 3;
-	else if (fs->score < -3)
-		fs->score = -3;
-	
-	return 0;
-}
-
-static void
-spin_changed (GtkWidget *spin, FilterElement *fe)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	
-	fs->score = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *spin;
-	GtkObject *adjustment;
-	FilterScore *fs = (FilterScore *)fe;
-	
-	adjustment = gtk_adjustment_new (0.0, -3.0, 3.0, 1.0, 1.0, 1.0);
-	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
-	
-	if (fs->score) {
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs->score);
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (spin), "changed", spin_changed, fe);
-	
-	return spin;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterScore *fs = (FilterScore *)fe;
-	char *score;
-	
-	score = g_strdup_printf ("%d", fs->score);
-	e_sexp_encode_string (out, score);
-	g_free (score);
-}
diff --git a/filter/filter-score.h b/filter/filter-score.h
deleted file mode 100644
index 126a0fff0b..0000000000
--- a/filter/filter-score.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _FILTER_SCORE_H
-#define _FILTER_SCORE_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_SCORE(obj)           GTK_CHECK_CAST (obj, filter_score_get_type (), FilterScore)
-#define FILTER_SCORE_CLASS(klass)   GTK_CHECK_CLASS_CAST (klass, filter_score_get_type (), FilterScoreClass)
-#define IS_FILTER_SCORE(obj)        GTK_CHECK_TYPE (obj, filter_score_get_type ())
-
-typedef struct _FilterScore        FilterScore;
-typedef struct _FilterScoreClass   FilterScoreClass;
-
-struct _FilterScore {
-	FilterElement parent;
-	struct _FilterScorePrivate *priv;
-	
-	gint32 score;
-};
-
-struct _FilterScoreClass {
-	FilterElementClass parent_class;
-	
-	/* virtual methods */
-	
-	/* signals */
-};
-
-guint		filter_score_get_type	(void);
-FilterScore	*filter_score_new	(void);
-
-/* methods */
-
-#endif /* ! _FILTER_SCORE_H */
-
diff --git a/filter/filter-url.c b/filter/filter-url.c
deleted file mode 100644
index 7f507d0dca..0000000000
--- a/filter/filter-url.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-util/e-sexp.h"
-#include "filter-url.h"
-
-#define d(x)
-
-static void xml_create (FilterElement *fe, xmlNodePtr node);
-static xmlNodePtr xml_encode (FilterElement *fe);
-static int xml_decode (FilterElement *fe, xmlNodePtr node);
-static GtkWidget *get_widget (FilterElement *fe);
-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);
-static void format_sexp (FilterElement *, GString *);
-
-static void filter_url_class_init (FilterUrlClass *class);
-static void filter_url_init (FilterUrl *gspaper);
-static void filter_url_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((FilterUrl *)(x))->priv)
-
-struct _FilterUrlPrivate {
-};
-
-static FilterElementClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-filter_url_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"FilterUrl",
-			sizeof (FilterUrl),
-			sizeof (FilterUrlClass),
-			(GtkClassInitFunc) filter_url_class_init,
-			(GtkObjectInitFunc) filter_url_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (filter_element_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-filter_url_class_init (FilterUrlClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterElementClass *filter_element = (FilterElementClass *)class;
-	
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class (filter_element_get_type ());
-	
-	object_class->finalize = filter_url_finalise;
-	
-	/* override methods */
-	filter_element->xml_create = xml_create;
-	filter_element->xml_encode = xml_encode;
-	filter_element->xml_decode = xml_decode;
-	filter_element->get_widget = get_widget;
-	filter_element->build_code = build_code;
-	filter_element->format_sexp = format_sexp;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-filter_url_init (FilterUrl *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-filter_url_finalise (GtkObject *obj)
-{
-	FilterUrl *o = (FilterUrl *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * filter_url_new:
- *
- * Create a new FilterUrl object.
- * 
- * Return value: A new #FilterUrl object.
- **/
-FilterUrl *
-filter_url_new (void)
-{
-	FilterUrl *o = (FilterUrl *) gtk_type_new (filter_url_get_type ());
-	
-	return o;
-}
-
-static void
-xml_create (FilterElement *fe, xmlNodePtr node)
-{
-	/*FilterUrl *fu = (FilterUrl *)fe;*/
-	
-	/* parent implementation */
-        ((FilterElementClass *)(parent_class))->xml_create (fe, node);
-}
-
-static xmlNodePtr
-xml_encode (FilterElement *fe)
-{
-	xmlNodePtr value;
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	d(printf ("Encoding url as xml\n"));
-	value = xmlNewNode (NULL, "value");
-	xmlSetProp (value, "name", fe->name);
-	xmlSetProp (value, "type", "url");
-	
-	xmlSetProp (value, "url", fu->url);
-	
-	return value;
-}
-
-static gchar *
-get_value (xmlNodePtr node, char *name)
-{
-	gchar *value;
-	
-	value = xmlGetProp (node, name);
-	
-	return value;
-}
-
-
-static int
-xml_decode (FilterElement *fe, xmlNodePtr node)
-{
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	fe->name = xmlGetProp (node, "name");
-	fu->url = get_value (node, "url");
-	
-	return 0;
-}
-
-static void
-set_url (GtkWidget *entry, FilterUrl *fu)
-{
-	fu->url = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-}
-
-static GtkWidget *
-get_widget (FilterElement *fe)
-{
-	GtkWidget *combo;
-	GList *sources = fe->data;  /* this needs to be a list of urls */
-	
-	combo = gtk_combo_new ();
-	gtk_combo_set_popdown_strings (GTK_COMBO (combo), sources);
-	
-	gtk_widget_show (combo);
-	gtk_signal_connect (GTK_OBJECT (GTK_EDITABLE (GTK_COMBO (combo)->entry)), "changed", set_url, fe);
-	
-	return combo;
-}
-
-static void
-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
-{
-	return;
-}
-
-static void
-format_sexp (FilterElement *fe, GString *out)
-{
-	FilterUrl *fu = (FilterUrl *)fe;
-	
-	e_sexp_encode_string (out, fu->url);
-}
diff --git a/filter/filter-url.h b/filter/filter-url.h
deleted file mode 100644
index f526acc5bf..0000000000
--- a/filter/filter-url.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _FILTER_URL_H
-#define _FILTER_URL_H
-
-#include <gtk/gtk.h>
-#include "filter-element.h"
-
-#define FILTER_URL(obj)	        GTK_CHECK_CAST (obj, filter_url_get_type (), FilterUrl)
-#define FILTER_URL_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_url_get_type (), FilterUrlClass)
-#define IS_FILTER_URL(obj)      GTK_CHECK_TYPE (obj, filter_url_get_type ())
-
-typedef struct _FilterUrl	FilterUrl;
-typedef struct _FilterUrlClass	FilterUrlClass;
-
-struct _FilterUrl {
-	FilterElement parent;
-	struct _FilterUrlPrivate *priv;
-	
-	GList *urls;  /* maybe use this? I dunno */
-	gchar *url;
-};
-
-struct _FilterUrlClass {
-	FilterElementClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		filter_url_get_type (void);
-FilterUrl       *filter_url_new     (void);
-
-/* methods */
-
-#endif /* ! _FILTER_URL_H */
-
diff --git a/filter/filter.glade b/filter/filter.glade
deleted file mode 100644
index 1445ed7be8..0000000000
--- a/filter/filter.glade
+++ /dev/null
@@ -1,705 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Filter</name>
-  <program_name>filter</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>filter.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_filter</name>
-  <title>Edit Filters</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkOptionMenu</class>
-      <name>filter_source</name>
-      <can_focus>True</can_focus>
-      <items>Incoming
-Outgoing
-</items>
-      <initial_choice>0</initial_choice>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame1</name>
-      <label>Filter Rules</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <width>256</width>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport1</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>rule_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox1</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_edit</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Edit</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Delete</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_up</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_down</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_vfolder</name>
-  <title>Edit VFolders</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button13</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button15</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame2</name>
-      <label>Virtual Folders</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <width>256</width>
-	  <height>167</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport2</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>rule_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox2</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_edit</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Edit</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_delete</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Delete</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_up</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>rule_down</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>vfolder_source</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button16</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button17</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button18</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>vfolder_source_frame</name>
-      <label>vFolder Sources</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <width>256</width>
-	  <height>125</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport3</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>source_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox3</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_remove</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Remove</label>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>vfolder_source</name>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button16</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button17</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button18</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>vfolder_source_frame</name>
-      <label>vFolder Sources</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <width>256</width>
-	  <height>125</height>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkViewport</class>
-	    <name>viewport3</name>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkList</class>
-	      <name>source_list</name>
-	      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox3</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>0</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>6</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_add</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add</label>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>source_remove</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Remove</label>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/filter/filter.glade.h b/filter/filter.glade.h
deleted file mode 100644
index bcd3ae40d0..0000000000
--- a/filter/filter.glade.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Edit Filters");
-gchar *s = N_("Incoming\n"
-              "Outgoing\n"
-              "");
-gchar *s = N_("Filter Rules");
-gchar *s = N_("Add");
-gchar *s = N_("Edit");
-gchar *s = N_("Delete");
-gchar *s = N_("Edit VFolders");
-gchar *s = N_("Virtual Folders");
-gchar *s = N_("Add");
-gchar *s = N_("Edit");
-gchar *s = N_("Delete");
-gchar *s = N_("vFolder Sources");
-gchar *s = N_("Add");
-gchar *s = N_("Remove");
-gchar *s = N_("vFolder Sources");
-gchar *s = N_("Add");
-gchar *s = N_("Remove");
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
deleted file mode 100644
index 3fa396f57b..0000000000
--- a/filter/filtertypes.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="sender">
-   <title>Sender</title>
-   <input type="optionlist" name="sender-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-        (match-all (header-contains "From" ${sender}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-        (match-all (not (header-contains "From" ${sender})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-        (match-all (header-matches "From" ${sender}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-        (match-all (not (header-matches "From" ${sender})))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (header-starts-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (header-starts-with "From" ${sender})))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (header-ends-with "From" ${sender}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (header-ends-with "From" ${sender})))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex "From" ${sender}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex "From" ${sender})))
-     </code>
-    </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-        (match-all (header-regex "From" ${sender}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-        (match-all (not (header-regex "From" ${sender})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="sender"/>
- </part>
-
- <part name="to">
-   <title>Recipients</title>
-   <input type="optionlist" name="recipient-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (or (header-contains "To" ${recipient})
-	    	       (header-contains "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (or
-               (header-contains "To" ${recipient})
-	       (header-contains "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (or (header-matches "To" ${recipient})
-	    	       (header-matches "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (or
-               (header-matches "To" ${recipient})
-	       (header-matches "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-        (match-all (or (header-starts-with "To" ${recipient})
-	    	       (header-starts-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-        (match-all (not (or
-               (header-starts-with "To" ${recipient})
-	       (header-starts-with "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-        (match-all (or (header-ends-with "To" ${recipient})
-	    	       (header-ends-with "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-        (match-all (not (or
-               (header-ends-with "To" ${recipient})
-	       (header-ends-with "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-	(match-all (or (header-soundex "To" ${recipient})
-	    	       (header-soundex "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-	(match-all (not (or
-               (header-soundex "To" ${recipient})
-	       (header-soundex "Cc" ${recipient}))))
-     </code>
-    </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (or (header-regex "To" ${recipient})
-	    	       (header-regex "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (or
-               (header-regex "To" ${recipient})
-	       (header-regex "Cc" ${recipient}))))
-     </code>
-    </option>
-   </input>
-   <input type="address" name="recipient"/>
- </part>
-
- <part name="subject">
-   <title>Subject</title>
-   <input type="optionlist" name="subject-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains "Subject" ${subject})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (header-matches "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-	(match-all (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-	(match-all (not (header-starts-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-	(match-all (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-	(match-all (not (header-ends-with "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex "Subject" ${subject})))
-     </code>
-    </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (header-regex "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (header-regex "Subject" ${subject}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="subject"/>
- </part>
-
- <part name="header">
-   <title>Specific header</title>
-   <input type="string" name="header-field"/>
-   <input type="optionlist" name="header-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains ${header-field} ${word})))
-     </code>
-    </option>
-    <option value="is">
-     <title>is</title>
-     <code>
-	(match-all (header-matches ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="is not">
-     <title>is not</title>
-     <code>
-	(match-all (not (header-matches ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="starts with">
-     <title>starts with</title>
-     <code>
-	(match-all (header-starts-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not starts with">
-     <title>does not start with</title>
-     <code>
-	(match-all (not (header-starts-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="ends with">
-     <title>ends with</title>
-     <code>
-	(match-all (header-ends-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not ends with">
-     <title>does not end with</title>
-     <code>
-	(match-all (not (header-ends-with ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="exists">
-     <title>exists</title>
-     <code>
-	(match-all (header-exists ${header-field}))
-     </code>
-    </option>
-    <option value="not exists">
-     <title>does not exist</title>
-     <code>
-	(match-all (not (header-exists ${header-field}))
-     </code>
-    </option>
-    <option value="matches soundex">
-     <title>sounds like</title>
-     <code>
-        (match-all (header-soundex ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not match soundex">
-     <title>does not sound like</title>
-     <code>
-        (match-all (not (header-soundex ${header-field} ${word})))
-     </code>
-    </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (header-regex ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (header-regex ${header-field} ${word}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
-
- <part name="body">
-   <title>Message Body</title>
-   <input type="optionlist" name="body-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(body-contains ${word})
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(not (body-contains ${word}))
-     </code>
-    </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(body-regex ${word})
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(not (body-regex ${word}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
-
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
- </part>
-
- <part name="sent-date">
-  <title>Date sent</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-sent-date) ${versus})))
-    </code>
-   </option>
-   <option value="before">
-    <title>was before</title>
-    <code>
-       (match-all (&lt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="after">
-    <title>was after</title>
-    <code>
-       (match-all (&gt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus">
-  </input>
- </part>
-
- <part name="recv-date">
-  <title>Date received</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-received-date) ${versus})))
-    </code>
-   </option>
-   <option value="before">
-    <title>was before</title>
-    <code>
-       (match-all (&lt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="after">
-    <title>was after</title>
-    <code>
-       (match-all (&gt; (get-received-date) ${versus}))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus">
-  </input>
- </part>
-
- <part name="score">
-  <title>Priority</title>
-  <input type="optionlist" name="score-type">
-   <option value="less-than">
-    <title>is</title>
-    <code>
-       (match-all (= (get-score) ${versus}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-score) ${versus})))
-    </code>
-   </option>
-   <option value="greater-than">
-    <title>is greater than</title>
-    <code>
-       (match-all (&gt; (get-score) ${versus}))
-    </code>
-   </option>
-   <option value="less-than">
-    <title>is less than</title>
-    <code>
-       (match-all (&lt; (get-score) ${versus}))
-    </code>
-   </option>
-  </input>
-  <input type="score" name="versus">
-  </input>
- </part>
-
- <part name="source">
-  <title>Source</title>
-  <input type="optionlist" name="url-type">
-   <option value="is">
-    <title>is</title>
-    <code>
-       (match-all (= (get-source) ${source}))
-    </code>
-   </option>
-   <option value="is-not">
-    <title>is not</title>
-    <code>
-       (match-all (not (= (get-source) ${source})))
-    </code>
-   </option>
-  </input>
-  <input type="url" name="source">
-  </input>
- </part>
-
-</partset>
-
-
-<actionset>
- <part name="copy-to-folder">
-  <title>Copy to Folder</title>
-  <code>(copy-to ${folder})</code>
-  <input type="folder" name="folder"/>
- </part>
- <part name="move-to-folder">
-  <title>Move to Folder</title>
-  <code>(move-to ${folder})</code>
-  <input type="folder" name="folder"/>
- </part>
- <part name="forward-to">
-  <title>Forward to Address</title>
-  <code>(forward-to ${address})</code>
-  <input type="address" name="address"/>
- </part>
- <part name="delete">
-  <title>Delete</title>
-  <code>(delete)</code>
- </part>
- <part name="stop">
-  <title>Stop Processing</title>
-  <code>(stop)</code>
- </part>
- <part name="colour">
-  <title>Assign Colour</title>
-  <code>(set-colour ${colour})</code>
-  <input type="colour" name="colour"/>
- </part>
- <part name="score">
-  <title>Assign Score</title>
-  <code>(set-score ${score})</code>
-  <input type="score" name="score"/>
- </part>
- <part name="flag">
-  <title>Set Flag</title>
-   <input type="optionlist" name="flag-type">
-   <option value="answered">
-    <title>Answered</title>
-    <code>
-       (set-flag 1)
-    </code>
-   </option>
-   <option value="deleted">
-    <title>Deleted</title>
-    <code>
-       (set-flag 2)
-    </code>
-   </option>
-   <option value="draft">
-    <title>Draft</title>
-    <code>
-       (set-flag 4)
-    </code>
-   </option>
-   <option value="flagged">
-    <title>Flagged</title>
-    <code>
-       (set-flag 8)
-    </code>
-   </option>
-   <option value="seen">
-    <title>Seen</title>
-    <code>
-       (set-flag 16)
-    </code>
-   </option>
-   </input>
- </part>
-</actionset>
-</filterdescription>
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
deleted file mode 100644
index c725cb7bae..0000000000
--- a/filter/libfilter-i18n.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Automatically generated. Do not edit. */
-char *s = N_("Answered");
-char *s = N_("Assign Colour");
-char *s = N_("Assign Score");
-char *s = N_("Copy to Folder");
-char *s = N_("Date received");
-char *s = N_("Date sent");
-char *s = N_("Delete");
-char *s = N_("Deleted");
-char *s = N_("Draft");
-char *s = N_("Expression");
-char *s = N_("Flagged");
-char *s = N_("Forward to Address");
-char *s = N_("Message Body");
-char *s = N_("Message was received");
-char *s = N_("Message was sent");
-char *s = N_("Move to Folder");
-char *s = N_("Priority");
-char *s = N_("Recipients");
-char *s = N_("Seen");
-char *s = N_("Sender");
-char *s = N_("Set Flag");
-char *s = N_("Source");
-char *s = N_("Specific header");
-char *s = N_("Stop Processing");
-char *s = N_("Subject");
-char *s = N_("after");
-char *s = N_("before");
-char *s = N_("contains");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not match regex");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
-char *s = N_("ends with");
-char *s = N_("exists");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is");
-char *s = N_("matches regex");
-char *s = N_("on or after");
-char *s = N_("on or before");
-char *s = N_("sounds like");
-char *s = N_("starts with");
-char *s = N_("was after");
-char *s = N_("was before");
diff --git a/filter/rule-context.c b/filter/rule-context.c
deleted file mode 100644
index 7bb0b8fb65..0000000000
--- a/filter/rule-context.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <errno.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "rule-context.h"
-
-#define d(x)
-
-static int load(RuleContext * f, const char *system, const char *user);
-static int save(RuleContext * f, const char *user);
-
-static void rule_context_class_init(RuleContextClass * class);
-static void rule_context_init(RuleContext * gspaper);
-static void rule_context_finalise(GtkObject * obj);
-
-#define _PRIVATE(x) (((RuleContext *)(x))->priv)
-
-struct _RuleContextPrivate {
-};
-
-static GtkObjectClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-rule_context_get_type(void)
-{
-	static guint type = 0;
-
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"RuleContext",
-			sizeof(RuleContext),
-			sizeof(RuleContextClass),
-			(GtkClassInitFunc) rule_context_class_init,
-			(GtkObjectInitFunc) rule_context_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-
-		type = gtk_type_unique(gtk_object_get_type(), &type_info);
-	}
-
-	return type;
-}
-
-static void
-rule_context_class_init(RuleContextClass * class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-	parent_class = gtk_type_class(gtk_object_get_type());
-
-	object_class->finalize = rule_context_finalise;
-
-	/* override methods */
-	class->load = load;
-	class->save = save;
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-rule_context_init(RuleContext * o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	o->part_set_map = g_hash_table_new(g_str_hash, g_str_equal);
-	o->rule_set_map = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-static void
-rule_context_finalise(GtkObject * obj)
-{
-	RuleContext *o = (RuleContext *) obj;
-
-	o = o;
-
-	((GtkObjectClass *) (parent_class))->finalize(obj);
-}
-
-/**
- * rule_context_new:
- *
- * Create a new RuleContext object.
- * 
- * Return value: A new #RuleContext object.
- **/
-RuleContext *
-rule_context_new(void)
-{
-	RuleContext *o = (RuleContext *) gtk_type_new(rule_context_get_type());
-
-	return o;
-}
-
-void
-rule_context_add_part_set(RuleContext * f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)
-{
-	struct _part_set_map *map;
-
-	map = g_malloc0(sizeof(*map));
-	map->type = part_type;
-	map->append = append;
-	map->next = next;
-	map->name = g_strdup(setname);
-	g_hash_table_insert(f->part_set_map, map->name, map);
-	f->part_set_list = g_list_append(f->part_set_list, map);
-	d(printf("adding part set '%s'\n", setname));
-}
-
-void
-rule_context_add_rule_set(RuleContext * f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)
-{
-	struct _rule_set_map *map;
-
-	map = g_malloc0(sizeof(*map));
-	map->type = rule_type;
-	map->append = append;
-	map->next = next;
-	map->name = g_strdup(setname);
-	g_hash_table_insert(f->rule_set_map, map->name, map);
-	f->rule_set_list = g_list_append(f->rule_set_list, map);
-	d(printf("adding rule set '%s'\n", setname));
-}
-
-/**
- * rule_context_set_error:
- * @f: 
- * @error: 
- * 
- * Set the text error for the context, or NULL to clear it.
- **/
-static void
-rule_context_set_error(RuleContext * f, char *error)
-{
-	g_free(f->error);
-	f->error = error;
-}
-
-/**
- * rule_context_load:
- * @f: 
- * @system: 
- * @user: 
- *
- * Load a rule context from a system and user description file.
- * 
- * Return value: 
- **/
-int
-rule_context_load(RuleContext * f, const char *system, const char *user)
-{
-	d(printf("rule_context: loading %s %s\n", system, user));
-
-	return ((RuleContextClass *) ((GtkObject *) f)->klass)->load(f, system, user);
-}
-
-static int
-load(RuleContext * f, const char *system, const char *user)
-{
-	xmlNodePtr set, rule;
-	struct _part_set_map *part_map;
-	struct _rule_set_map *rule_map;
-
-	rule_context_set_error(f, NULL);
-
-	d(printf("loading rules %s %s\n", system, user));
-
-	f->system = xmlParseFile(system);
-	if (f->system == NULL) {
-		rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': %s",
-							  system, strerror(errno)));
-		return -1;
-	}
-	if (strcmp(f->system->root->name, "filterdescription")) {
-		rule_context_set_error(f, g_strdup_printf("Unable to load system rules '%s': Invalid format", system));
-		xmlFreeDoc(f->system);
-		f->system = NULL;
-		return -1;
-	}
-	/* doesn't matter if this doens't exist */
-	f->user = xmlParseFile(user);
-
-	/* now parse structure */
-	/* get rule parts */
-	set = f->system->root->childs;
-	while (set) {
-		d(printf("set name = %s\n", set->name));
-		part_map = g_hash_table_lookup(f->part_set_map, set->name);
-		if (part_map) {
-			d(printf("loading parts ...\n"));
-			rule = set->childs;
-			while (rule) {
-				if (!strcmp(rule->name, "part")) {
-					FilterPart *part = FILTER_PART(gtk_type_new(part_map->type));
-
-					if (filter_part_xml_create(part, rule) == 0) {
-						part_map->append(f, part);
-					} else {
-						gtk_object_unref((GtkObject *) part);
-						g_warning("Cannot load filter part");
-					}
-				}
-				rule = rule->next;
-			}
-		}
-		set = set->next;
-	}
-
-	/* now load actual rules */
-	if (f->user) {
-		set = f->user->root->childs;
-		while (set) {
-			d(printf("set name = %s\n", set->name));
-			rule_map = g_hash_table_lookup(f->rule_set_map, set->name);
-			if (rule_map) {
-				d(printf("loading rules ...\n"));
-				rule = set->childs;
-				while (rule) {
-					d(printf("checking node: %s\n", rule->name));
-					if (!strcmp(rule->name, "rule")) {
-						FilterRule *part = FILTER_RULE(gtk_type_new(rule_map->type));
-
-						if (filter_rule_xml_decode(part, rule, f) == 0) {
-							rule_map->append(f, part);
-						} else {
-							gtk_object_unref((GtkObject *) part);
-							g_warning("Cannot load filter part");
-						}
-					}
-					rule = rule->next;
-				}
-			}
-			set = set->next;
-		}
-	}
-	return 0;
-}
-
-/**
- * rule_context_save:
- * @f: 
- * @user: 
- * 
- * Save a rule context to disk.
- * 
- * Return value: 
- **/
-int
-rule_context_save(RuleContext * f, const char *user)
-{
-	return ((RuleContextClass *) ((GtkObject *) f)->klass)->save(f, user);
-}
-
-static int
-save(RuleContext * f, const char *user)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, rules, work;
-	GList *l;
-	FilterRule *rule;
-	struct _rule_set_map *map;
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewDocNode(doc, NULL, "filteroptions", NULL);
-	xmlDocSetRootElement(doc, root);
-	l = f->rule_set_list;
-	while (l) {
-		map = l->data;
-		rules = xmlNewDocNode(doc, NULL, map->name, NULL);
-		xmlAddChild(root, rules);
-		rule = NULL;
-		while ((rule = map->next(f, rule, NULL))) {
-			d(printf("processing rule %s\n", rule->name));
-			work = filter_rule_xml_encode(rule);
-			xmlAddChild(rules, work);
-		}
-		l = g_list_next(l);
-	}
-	xmlSaveFile(user, doc);
-	xmlFreeDoc(doc);
-	return 0;
-}
-
-FilterPart *
-rule_context_find_part(RuleContext * f, const char *name)
-{
-	d(printf("find part : "));
-	return filter_part_find_list(f->parts, name);
-}
-
-FilterPart *
-rule_context_create_part(RuleContext * f, const char *name)
-{
-	FilterPart *part;
-
-	part = rule_context_find_part(f, name);
-	if (part)
-		part = filter_part_clone(part);
-	return part;
-}
-
-FilterPart *
-rule_context_next_part(RuleContext * f, FilterPart * last)
-{
-	return filter_part_next_list(f->parts, last);
-}
-
-FilterRule *
-rule_context_next_rule(RuleContext * f, FilterRule * last, const char *source)
-{
-	return filter_rule_next_list(f->rules, last, source);
-}
-
-FilterRule *
-rule_context_find_rule(RuleContext * f, const char *name, const char *source)
-{
-	return filter_rule_find_list(f->rules, name, source);
-}
-
-void
-rule_context_add_part(RuleContext * f, FilterPart * part)
-{
-	f->parts = g_list_append(f->parts, part);
-}
-
-void
-rule_context_add_rule(RuleContext * f, FilterRule * new)
-{
-	f->rules = g_list_append(f->rules, new);
-}
-
-static void
-new_rule_clicked(GtkWidget * w, int button, RuleContext * context)
-{
-#ifndef NO_WARNINGS
-#warning "Need a changed signal for this to work best"
-#endif
-	if (button == 0) {
-		FilterRule *rule = gtk_object_get_data((GtkObject *) w, "rule");
-		char *user = gtk_object_get_data((GtkObject *) w, "path");
-
-		gtk_object_ref((GtkObject *) rule);
-		rule_context_add_rule(context, rule);
-		if (user) {
-			rule_context_save((RuleContext *) context, user);
-		}
-	}
-	if (button != -1) {
-		gnome_dialog_close((GnomeDialog *) w);
-	}
-}
-
-/* add a rule, with a gui, asking for confirmation first ... optionally save to path */
-void
-rule_context_add_rule_gui(RuleContext * f, FilterRule * rule, const char *title, const char *path)
-{
-	GtkWidget *w;
-	GnomeDialog *gd;
-
-	w = filter_rule_get_widget(rule, f);
-	gd = (GnomeDialog *) gnome_dialog_new(title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *) gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *) gd);
-	gtk_object_set_data_full((GtkObject *) gd, "rule", rule, (GtkDestroyNotify) gtk_object_unref);
-	if (path)
-		gtk_object_set_data_full((GtkObject *) gd, "path", g_strdup(path), (GtkDestroyNotify) g_free);
-	gtk_signal_connect((GtkObject *) gd, "clicked", new_rule_clicked, f);
-	gtk_object_ref((GtkObject *) f);
-	gtk_object_set_data_full((GtkObject *) gd, "context", f, (GtkDestroyNotify) gtk_object_unref);
-	gtk_widget_show((GtkWidget *) gd);
-}
-
-void
-rule_context_remove_rule(RuleContext * f, FilterRule * rule)
-{
-	f->rules = g_list_remove(f->rules, rule);
-}
-
-void
-rule_context_rank_rule(RuleContext * f, FilterRule * rule, int rank)
-{
-	f->rules = g_list_remove(f->rules, rule);
-	f->rules = g_list_insert(f->rules, rule, rank);
-}
-
-int
-rule_context_get_rank_rule(RuleContext * f, FilterRule * rule, const char *source)
-{
-	GList *n = f->rules;
-	int i = 0;
-
-	while (n) {
-		FilterRule *r = n->data;
-
-		if (r == rule)
-			return i;
-		if (source == NULL || (r->source && strcmp(r->source, source) == 0))
-			i++;
-		n = g_list_next(n);
-	}
-	return i;
-}
diff --git a/filter/rule-context.h b/filter/rule-context.h
deleted file mode 100644
index e2338d5cb5..0000000000
--- a/filter/rule-context.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _RULE_CONTEXT_H
-#define _RULE_CONTEXT_H
-
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-
-#include "filter-part.h"
-#include "filter-rule.h"
-
-#define RULE_CONTEXT(obj)	GTK_CHECK_CAST (obj, rule_context_get_type (), RuleContext)
-#define RULE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, rule_context_get_type (), RuleContextClass)
-#define IS_RULE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, rule_context_get_type ())
-
-typedef struct _RuleContext	RuleContext;
-typedef struct _RuleContextClass	RuleContextClass;
-
-struct _RuleContext {
-	GtkObject parent;
-	struct _RuleContextPrivate *priv;
-
-	char *error;		/* string version of error */
-
-	xmlDocPtr system;	/* system rules source */
-	xmlDocPtr user;		/* user defined rules source */
-
-	GList *parts;
-	GList *rules;
-
-	GHashTable *part_set_map;/* map set types to part types */
-	GList *part_set_list;
-	GHashTable *rule_set_map;/* map set types to rule types */
-	GList *rule_set_list;
-};
-
-typedef void (*RCRegisterFunc)(RuleContext *f, FilterRule *rule, gpointer data);
-
-struct _RuleContextClass {
-	GtkObjectClass parent_class;
-
-	/* virtual methods */
-	int (*load)(RuleContext *f, const char *system, const char *user);
-	int (*save)(RuleContext *f, const char *user);
-
-	/* signals */
-};
-
-typedef void (*RCPartFunc)(RuleContext *f, FilterPart *part);
-typedef void (*RCRuleFunc)(RuleContext *f, FilterRule *part);
-typedef FilterPart * (*RCNextPartFunc)(RuleContext *f, FilterPart *part);
-typedef FilterRule * (*RCNextRuleFunc)(RuleContext *f, FilterRule *rule, const char *source);
-
-struct _part_set_map {
-	char *name;
-	int type;
-	RCPartFunc append;
-	RCNextPartFunc next;
-};
-
-struct _rule_set_map {
-	char *name;
-	int type;
-	RCRuleFunc append;
-	RCNextRuleFunc next;
-};
-
-guint		rule_context_get_type	(void);
-RuleContext	*rule_context_new	(void);
-
-/* methods */
-int		rule_context_load(RuleContext *f, const char *system, const char *user);
-int		rule_context_save(RuleContext *f, const char *user);
-
-void		rule_context_add_part(RuleContext *f, FilterPart *new);
-FilterPart 	*rule_context_find_part(RuleContext *f, const char *name);
-FilterPart 	*rule_context_create_part(RuleContext *f, const char *name);
-FilterPart 	*rule_context_next_part(RuleContext *f, FilterPart *last);
-
-FilterRule 	*rule_context_next_rule(RuleContext *f, FilterRule *last, const char *source);
-FilterRule 	*rule_context_find_rule(RuleContext *f, const char *name, const char *source);
-void		rule_context_add_rule(RuleContext *f, FilterRule *new);
-void		rule_context_add_rule_gui(RuleContext *f, FilterRule *rule, const char *title, const char *path);
-void		rule_context_remove_rule(RuleContext *f, FilterRule *rule);
-
-/* get/set the rank (position) of a rule */
-void		rule_context_rank_rule(RuleContext *f, FilterRule *rule, int rank);
-int		rule_context_get_rank_rule(RuleContext *f, FilterRule *rule, const char *source);
-
-void		rule_context_delete_rule(RuleContext *f, FilterRule *rule);
-
-/* setup type for set parts */
-void		rule_context_add_part_set(RuleContext *f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next);
-void		rule_context_add_rule_set(RuleContext *f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next);
-
-#endif /* ! _RULE_CONTEXT_H */
-
diff --git a/filter/score-context.c b/filter/score-context.c
deleted file mode 100644
index a171bd1240..0000000000
--- a/filter/score-context.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "score-context.h"
-#include "score-rule.h"
-
-static void score_context_class_init	(ScoreContextClass *class);
-static void score_context_init	(ScoreContext *gspaper);
-static void score_context_finalise	(GtkObject *obj);
-
-static RuleContextClass *parent_class;
-
-guint
-score_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreContext",
-			sizeof(ScoreContext),
-			sizeof(ScoreContextClass),
-			(GtkClassInitFunc)score_context_class_init,
-			(GtkObjectInitFunc)score_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_context_class_init (ScoreContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = score_context_finalise;
-	/* override methods */
-
-}
-
-static void
-score_context_init (ScoreContext *o)
-{
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", score_rule_get_type(),
-				  rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-score_context_finalise(GtkObject *obj)
-{
-	ScoreContext *o = (ScoreContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * score_context_new:
- *
- * Create a new ScoreContext object.
- * 
- * Return value: A new #ScoreContext object.
- **/
-ScoreContext *
-score_context_new(void)
-{
-	ScoreContext *o = (ScoreContext *)gtk_type_new(score_context_get_type ());
-	return o;
-}
diff --git a/filter/score-context.h b/filter/score-context.h
deleted file mode 100644
index b89f70c1f8..0000000000
--- a/filter/score-context.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_CONTEXT_H
-#define _SCORE_CONTEXT_H
-
-#include <gtk/gtk.h>
-
-#include "rule-context.h"
-
-#define SCORE_CONTEXT(obj)	GTK_CHECK_CAST (obj, score_context_get_type (), ScoreContext)
-#define SCORE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_context_get_type (), ScoreContextClass)
-#define IS_SCORE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, score_context_get_type ())
-
-typedef struct _ScoreContext	ScoreContext;
-typedef struct _ScoreContextClass	ScoreContextClass;
-
-struct _ScoreContext {
-	RuleContext parent;
-};
-
-struct _ScoreContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_context_get_type	(void);
-ScoreContext	*score_context_new	(void);
-
-/* methods */
-
-#endif /* ! _SCORE_CONTEXT_H */
-
diff --git a/filter/score-editor.c b/filter/score-editor.c
deleted file mode 100644
index 57dbb434f3..0000000000
--- a/filter/score-editor.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "score-editor.h"
-#include "score-context.h"
-#include "score-rule.h"
-
-#define d(x)
-
-#if 0
-static void score_editor_class_init	(ScoreEditorClass *class);
-static void score_editor_init	(ScoreEditor *gspaper);
-
-static GnomeDialogClass *parent_class;
-
-guint
-score_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreEditor",
-			sizeof(ScoreEditor),
-			sizeof(ScoreEditorClass),
-			(GtkClassInitFunc)score_editor_class_init,
-			(GtkObjectInitFunc)score_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_editor_class_init (ScoreEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(gnome_dialog_get_type ());
-
-	/* override methods */
-
-}
-
-static void
-score_editor_init (ScoreEditor *o)
-{
-}
-
-/**
- * score_editor_new:
- *
- * Create a new ScoreEditor object.
- * 
- * Return value: A new #ScoreEditor object.
- **/
-ScoreEditor *
-score_editor_new(void)
-{
-	ScoreEditor *o = (ScoreEditor *)gtk_type_new(score_editor_get_type ());
-	return o;
-}
-#endif
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void set_sensitive(struct _editor_data *data);
-
-static void rule_add(GtkWidget *widget, struct _editor_data *data)
-{
-	ScoreRule *rule;
-	int result;
-	GnomeDialog *gd;
-	GtkWidget *w;
-	FilterPart *part;
-
-	d(printf("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = score_rule_new();
-
-	part = rule_context_next_part(data->f, NULL);
-	filter_rule_add_part((FilterRule *)rule, filter_part_clone(part));
-
-	w = filter_rule_get_widget((FilterRule *)rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
-					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-					     NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	result = gnome_dialog_run_and_close(gd);
-	if (result == 0) {
-		GtkListItem *item;
-		GList *l = NULL;
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, ((FilterRule *) rule)->name);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "rule", rule);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-		gtk_list_append_items(data->list, l);
-		gtk_list_select_child(data->list, (GtkWidget *)item);
-		data->current = (FilterRule *)rule;
-		rule_context_add_rule(data->f, (FilterRule *)rule);
-		set_sensitive(data);
-	} else {
-		gtk_object_unref((GtkObject *)rule);
-	}
-}
-
-static void rule_edit(GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GnomeDialog *gd;
-	FilterRule *rule;
-	int pos;
-
-	d(printf("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new(_("Edit Score Rule"), GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	result = gnome_dialog_run_and_close(gd);
-
-	if (result == 0) {
-		pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-		if (pos != -1) {
-			GtkListItem *item = g_list_nth_data(data->list->children, pos);
-			gchar *s = e_utf8_to_gtk_string ((GtkWidget *) data->list, data->current->name);
-			gtk_label_set_text((GtkLabel *)(((GtkBin *)item)->child), s);
-			g_free (s);
-		}
-	 }
-}
-
-static void rule_delete(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-
-	d(printf("ddelete rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	if (pos != -1) {
-		rule_context_remove_rule(data->f, data->current);
-
-		item = g_list_nth_data(data->list->children, pos);
-		l = g_list_append(NULL, item);
-		gtk_list_remove_items(data->list, l);
-		g_list_free(l);
-
-		gtk_object_unref((GtkObject *)data->current);
-		data->current = NULL;
-	}
-	set_sensitive(data);
-}
-
-static void rule_move(struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-
-	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule(data->f, data->current, to);
-	
-	item = g_list_nth_data(data->list->children, from);
-	l = g_list_append(NULL, item);
-	gtk_list_remove_items_no_unref(data->list, l);
-	gtk_list_insert_items(data->list, l, to);			      
-	gtk_list_select_child(data->list, (GtkWidget *)item);
-	set_sensitive(data);
-}
-
-static void rule_up(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-
-	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	if (pos>0) {
-		rule_move(data, pos, pos-1);
-	}
-}
-
-static void rule_down(GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-
-	d(printf("down rule\n"));
-	pos = rule_context_get_rank_rule(data->f, data->current, NULL);
-	rule_move(data, pos, pos+1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive(struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index=-1, count=0;
-
-	while ((rule = rule_context_next_rule(data->f, rule, NULL))) {
-		if (rule == data->current)
-			index=count;
-		count++;
-	}
-	d(printf("index = %d count=%d\n", index, count));
-	count--;
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_EDIT], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DELETE], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_UP], index > 0);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DOWN], index >=0 && index<count);
-}
-
-static void
-select_rule(GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data((GtkObject *)child, "rule");
-	if (data->current)
-		d(printf("seledct rule: %s\n", data->current->name));
-	else
-		d(printf("bad data?\n"));
-	set_sensitive(data);
-}
-
-GtkWidget	*score_editor_construct	(struct _ScoreContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w;
-	GList *l;
-	FilterRule *rule = NULL;
-	struct _editor_data *data;
-	int i;
-
-	g_assert(IS_SCORE_CONTEXT(f));
-
-	data = g_malloc0(sizeof(*data));
-	data->f = (RuleContext *)f;
-
-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "edit_vfolder");
-        d = glade_xml_get_widget (gui, "edit_vfolder");
-	gtk_object_set_data_full((GtkObject *)d, "data", data, g_free);
-
-	gtk_window_set_title((GtkWindow *)d, "Edit Score List");
-	for (i=0;i<BUTTON_LAST;i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect((GtkObject *)w, "clicked", edit_buttons[i].func, data);
-	}
-
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = (GtkList *)w;
-	l = NULL;
-	while ((rule = rule_context_next_rule((RuleContext *)f, rule, NULL))) {
-		GtkListItem *item;
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, rule->name);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "rule", rule);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-	}
-	gtk_list_append_items(data->list, l);
-	gtk_signal_connect((GtkObject *)w, "select_child", select_rule, data);
-
-	set_sensitive(data);
-	gtk_object_unref((GtkObject *)gui);
-
-	return d;
-}
diff --git a/filter/score-editor.h b/filter/score-editor.h
deleted file mode 100644
index cb78d465f0..0000000000
--- a/filter/score-editor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_EDITOR_H
-#define _SCORE_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define SCORE_EDITOR(obj)	GTK_CHECK_CAST (obj, score_editor_get_type (), ScoreEditor)
-#define SCORE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_editor_get_type (), ScoreEditorClass)
-#define IS_SCORE_EDITOR(obj)      GTK_CHECK_TYPE (obj, score_editor_get_type ())
-
-typedef struct _ScoreEditor	ScoreEditor;
-typedef struct _ScoreEditorClass	ScoreEditorClass;
-
-struct _ScoreEditor {
-	GnomeDialog parent;
-};
-
-struct _ScoreEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_editor_get_type	(void);
-ScoreEditor	*score_editor_new	(void);
-#endif
-
-struct _ScoreContext;
-
-/* methods */
-GtkWidget	*score_editor_construct	(struct _ScoreContext *f);
-
-#endif /* ! _SCORE_EDITOR_H */
-
diff --git a/filter/score-rule.c b/filter/score-rule.c
deleted file mode 100644
index f34f46081d..0000000000
--- a/filter/score-rule.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "score-rule.h"
-
-static xmlNodePtr xml_encode(FilterRule *);
-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);
-
-static void score_rule_class_init	(ScoreRuleClass *class);
-static void score_rule_init	(ScoreRule *gspaper);
-static void score_rule_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((ScoreRule *)(x))->priv)
-
-struct _ScoreRulePrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-score_rule_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"ScoreRule",
-			sizeof(ScoreRule),
-			sizeof(ScoreRuleClass),
-			(GtkClassInitFunc)score_rule_class_init,
-			(GtkObjectInitFunc)score_rule_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-score_rule_class_init (ScoreRuleClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *rule_class = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (filter_rule_get_type ());
-	
-	object_class->finalize = score_rule_finalise;
-	
-	/* override methods */
-	rule_class->xml_encode = xml_encode;
-	rule_class->xml_decode = xml_decode;
-/*	rule_class->build_code = build_code;*/
-	rule_class->get_widget = get_widget;
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-score_rule_init (ScoreRule *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-score_rule_finalise (GtkObject *obj)
-{
-	ScoreRule *o = (ScoreRule *)obj;
-	
-	o = o;
-	
-        ((GtkObjectClass *)(parent_class))->finalize (obj);
-}
-
-/**
- * score_rule_new:
- *
- * Create a new ScoreRule object.
- * 
- * Return value: A new #ScoreRule object.
- **/
-ScoreRule *
-score_rule_new (void)
-{
-	ScoreRule *o = (ScoreRule *)gtk_type_new (score_rule_get_type ());
-	return o;
-}
-
-static xmlNodePtr
-xml_encode (FilterRule *fr)
-{
-	ScoreRule *sr = (ScoreRule *)fr;
-	xmlNodePtr node, value;
-	char number[16];
-	
-	node = ((FilterRuleClass *)(parent_class))->xml_encode (fr);
-	sprintf (number, "%d", sr->score);
-	value = xmlNewNode (NULL, "score");
-	xmlSetProp (value, "value", number);
-	xmlAddChild (node, value);
-	
-	return node;
-}
-
-static int
-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	ScoreRule *sr = (ScoreRule *)fr;
-	xmlNodePtr value;
-	int result;
-	char *str;
-	
-	result = ((FilterRuleClass *)(parent_class))->xml_decode (fr, node, f);
-	if (result != 0)
-		return result;
-	
-	value = node->childs;
-	while (value) {
-		if (!strcmp (value->name, "score")) {
-			str = xmlGetProp (value, "value");
-			sscanf (str, "%d", &sr->score);
-			
-			/* score range is -3 to +3 */
-			if (sr->score > 3)
-				sr->score = 3;
-			else if (sr->score < -3)
-				sr->score = -3;
-		}
-		value = value->next;
-	}
-	
-	return 0;
-}
-
-/*static void build_code(FilterRule *fr, GString *out)
-{
-}*/
-
-static void
-spin_changed (GtkAdjustment *adj, ScoreRule *sr)
-{
-	sr->score = adj->value;
-}
-
-static GtkWidget *
-get_widget (FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget;
-	GtkWidget *frame;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkAdjustment *adj;
-	ScoreRule *sr = (ScoreRule *)fr;
-	GtkWidget *spin;
-	
-        widget = ((FilterRuleClass *)(parent_class))->get_widget (fr, f);
-	
-	frame = gtk_frame_new (_("Score"));
-	hbox = gtk_hbox_new (FALSE, 3);
-	label = gtk_label_new (_("Score"));
-	
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);
-	adj = (GtkAdjustment *)gtk_adjustment_new ((float) sr->score, -3.0, 3.0, 1.0, 1.0, 1.0);
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed", spin_changed, sr);
-	
-	spin = gtk_spin_button_new (adj, 1.0, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), hbox);
-	
-	gtk_widget_show_all (frame);
-	
-	gtk_box_pack_start (GTK_BOX (widget), frame, FALSE, FALSE, 3);
-	
-	return widget;
-}
diff --git a/filter/score-rule.h b/filter/score-rule.h
deleted file mode 100644
index 25607fd7c4..0000000000
--- a/filter/score-rule.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SCORE_RULE_H
-#define _SCORE_RULE_H
-
-#include <gtk/gtk.h>
-
-#include "filter-rule.h"
-
-#define SCORE_RULE(obj)	GTK_CHECK_CAST (obj, score_rule_get_type (), ScoreRule)
-#define SCORE_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_rule_get_type (), ScoreRuleClass)
-#define IS_SCORE_RULE(obj)      GTK_CHECK_TYPE (obj, score_rule_get_type ())
-
-typedef struct _ScoreRule	ScoreRule;
-typedef struct _ScoreRuleClass	ScoreRuleClass;
-
-struct _ScoreRule {
-	FilterRule parent;
-	struct _ScoreRulePrivate *priv;
-
-	int score;
-};
-
-struct _ScoreRuleClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		score_rule_get_type	(void);
-ScoreRule	*score_rule_new	(void);
-
-/* methods */
-
-#endif /* ! _SCORE_RULE_H */
-
diff --git a/filter/vfolder-context.c b/filter/vfolder-context.c
deleted file mode 100644
index 41453ea310..0000000000
--- a/filter/vfolder-context.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gnome.h>
-
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-
-static void vfolder_context_class_init	(VfolderContextClass *class);
-static void vfolder_context_init	(VfolderContext *gspaper);
-static void vfolder_context_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderContext *)(x))->priv)
-
-struct _VfolderContextPrivate {
-};
-
-static RuleContextClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-vfolder_context_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderContext",
-			sizeof(VfolderContext),
-			sizeof(VfolderContextClass),
-			(GtkClassInitFunc)vfolder_context_class_init,
-			(GtkObjectInitFunc)vfolder_context_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(rule_context_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_context_class_init (VfolderContextClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(rule_context_get_type ());
-
-	object_class->finalize = vfolder_context_finalise;
-	/* override methods */
-
-	/* signals */
-
-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
-}
-
-static void
-vfolder_context_init (VfolderContext *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-
-	rule_context_add_rule_set((RuleContext *)o, "ruleset", vfolder_rule_get_type(),
-				  rule_context_add_rule, rule_context_next_rule);
-}
-
-static void
-vfolder_context_finalise(GtkObject *obj)
-{
-	VfolderContext *o = (VfolderContext *)obj;
-
-	o = o;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_context_new:
- *
- * Create a new VfolderContext object.
- * 
- * Return value: A new #VfolderContext object.
- **/
-VfolderContext *
-vfolder_context_new(void)
-{
-	VfolderContext *o = (VfolderContext *)gtk_type_new(vfolder_context_get_type ());
-	return o;
-}
diff --git a/filter/vfolder-context.h b/filter/vfolder-context.h
deleted file mode 100644
index 0bf1b5aaf2..0000000000
--- a/filter/vfolder-context.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_CONTEXT_H
-#define _VFOLDER_CONTEXT_H
-
-#include <gtk/gtk.h>
-
-#include "rule-context.h"
-
-#define VFOLDER_CONTEXT(obj)	GTK_CHECK_CAST (obj, vfolder_context_get_type (), VfolderContext)
-#define VFOLDER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_context_get_type (), VfolderContextClass)
-#define IS_VFOLDER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, vfolder_context_get_type ())
-
-typedef struct _VfolderContext	VfolderContext;
-typedef struct _VfolderContextClass	VfolderContextClass;
-
-struct _VfolderContext {
-	RuleContext parent;
-	struct _VfolderContextPrivate *priv;
-
-};
-
-struct _VfolderContextClass {
-	RuleContextClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_context_get_type	(void);
-VfolderContext	*vfolder_context_new	(void);
-
-/* methods */
-
-#endif /* ! _VFOLDER_CONTEXT_H */
-
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
deleted file mode 100644
index 0f17005e6e..0000000000
--- a/filter/vfolder-editor.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "vfolder-editor.h"
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-
-#define d(x)
-
-#if 0
-static void vfolder_editor_class_init (VfolderEditorClass *class);
-static void vfolder_editor_init	(VfolderEditor *gspaper);
-static void vfolder_editor_finalise (GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderEditor *)(x))->priv)
-
-struct _VfolderEditorPrivate {
-};
-
-static GnomeDialogClass *parent_class;
-
-enum {
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-guint
-vfolder_editor_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderEditor",
-			sizeof(VfolderEditor),
-			sizeof(VfolderEditorClass),
-			(GtkClassInitFunc)vfolder_editor_class_init,
-			(GtkObjectInitFunc)vfolder_editor_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_editor_class_init (VfolderEditorClass *class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->finalize = vfolder_editor_finalise;
-	/* override methods */
-	
-	/* signals */
-	
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-vfolder_editor_init (VfolderEditor *o)
-{
-	o->priv = g_malloc0 (sizeof (*o->priv));
-}
-
-static void
-vfolder_editor_finalise(GtkObject *obj)
-{
-	VfolderEditor *o = (VfolderEditor *)obj;
-
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_editor_new:
- *
- * Create a new VfolderEditor object.
- * 
- * Return value: A new #VfolderEditor object.
- **/
-VfolderEditor *
-vfolder_editor_new(void)
-{
-	VfolderEditor *o = (VfolderEditor *)gtk_type_new (vfolder_editor_get_type ());
-	return o;
-}
-#endif
-
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void set_sensitive (struct _editor_data *data);
-
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterRule *rule;
-	int result;
-	GtkWidget *gd;
-	GtkWidget *w;
-	FilterPart *part;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = (FilterRule *) vfolder_rule_new ();
-	
-	part = rule_context_next_part (data->f, NULL);
-	filter_rule_add_part (rule, filter_part_clone (part));
-	
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Add VFolder Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		GtkWidget *item;
-		GList *l = NULL;
-		gchar *s;
-		
-		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (rule->name);
-		g_free (s);
-		
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (item);
-		
-		l = g_list_append (l, GTK_LIST_ITEM (item));
-		
-		gtk_list_append_items (data->list, l);
-		gtk_list_select_child (data->list, item);
-		
-		data->current = rule;
-		rule_context_add_rule (data->f, rule);
-		
-		set_sensitive (data);
-	} else {
-		gtk_object_unref (GTK_OBJECT (rule));
-	}
-}
-
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit VFolder Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-		if (pos != -1) {
-			GtkListItem *item = g_list_nth_data (data->list->children, pos);
-			gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
-			gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
-			g_free (s);
-		}
-	 }
-}
-
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf ("delete rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	if (pos != -1) {
-		rule_context_remove_rule (data->f, data->current);
-		
-		item = g_list_nth_data (data->list->children, pos);
-		l = g_list_append (NULL, item);
-		gtk_list_remove_items (data->list, l);
-		g_list_free (l);
-		
-		gtk_object_unref (GTK_OBJECT (data->current));
-		data->current = NULL;
-	}
-	
-	set_sensitive (data);
-}
-
-static void
-rule_move (struct _editor_data *data, int from, int to)
-{
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf ("moving %d to %d\n", from, to));
-	rule_context_rank_rule (data->f, data->current, to);
-	
-	item = g_list_nth_data (data->list->children, from);
-	l = g_list_append (NULL, item);
-	gtk_list_remove_items_no_unref (data->list, l);
-	gtk_list_insert_items (data->list, l, to);			      
-	gtk_list_select_child (data->list, GTK_WIDGET (item));
-	set_sensitive (data);
-}
-
-static void
-rule_up (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
-}
-
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	rule_move (data, pos, pos + 1);
-}
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
-
-static void
-set_sensitive (struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index = -1, count = 0;
-	
-	while ((rule = rule_context_next_rule (data->f, rule, NULL))) {
-		if (rule == data->current)
-			index = count;
-		count++;
-	}
-	
-	d(printf ("index = %d count=%d\n", index, count));
-	
-	count--;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DOWN]), index >= 0 && index < count);
-}
-
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
-	
-	if (data->current)
-		d(printf ("selected rule: %s\n", data->current->name));
-	else
-		d(printf ("bad data?\n"));
-	
-	set_sensitive (data);
-}
-
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
-{
-	if (event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, user_data);
-}
-
-GtkWidget *
-vfolder_editor_construct (struct _VfolderContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w;
-	GList *l;
-	FilterRule *rule = NULL;
-	struct _editor_data *data;
-	int i;
-	
-	g_assert (IS_VFOLDER_CONTEXT (f));
-	
-	data = g_malloc0 (sizeof (*data));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_vfolder");
-        d = glade_xml_get_widget (gui, "edit_vfolder");
-	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
-	
-	gtk_window_set_title (GTK_WINDOW (d), "Edit VFolders");
-	for (i = 0; i < BUTTON_LAST; i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
-	}
-	
-        w = glade_xml_get_widget (gui, "rule_list");
-	data->list = GTK_LIST (w);
-	l = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *)f, rule, NULL))) {
-		GtkWidget *item;
-		
-		gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
-		gtk_widget_show (GTK_WIDGET (item));
-		l = g_list_append (l, GTK_LIST_ITEM (item));
-	}
-	
-	gtk_list_append_items (data->list, l);
-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
-}
diff --git a/filter/vfolder-editor.h b/filter/vfolder-editor.h
deleted file mode 100644
index 2ff2b261dc..0000000000
--- a/filter/vfolder-editor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_EDITOR_H
-#define _VFOLDER_EDITOR_H
-
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
-
-#define VFOLDER_EDITOR(obj)	GTK_CHECK_CAST (obj, vfolder_editor_get_type (), VfolderEditor)
-#define VFOLDER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_editor_get_type (), VfolderEditorClass)
-#define IS_VFOLDER_EDITOR(obj)      GTK_CHECK_TYPE (obj, vfolder_editor_get_type ())
-
-typedef struct _VfolderEditor	VfolderEditor;
-typedef struct _VfolderEditorClass	VfolderEditorClass;
-
-struct _VfolderEditor {
-	GnomeDialog parent;
-	struct _VfolderEditorPrivate *priv;
-
-};
-
-struct _VfolderEditorClass {
-	GnomeDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_editor_get_type	(void);
-VfolderEditor	*vfolder_editor_new	(void);
-#endif
-
-struct _VfolderContext;
-
-/* methods */
-GtkWidget	*vfolder_editor_construct	(struct _VfolderContext *f);
-
-#endif /* ! _VFOLDER_EDITOR_H */
-
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
deleted file mode 100644
index 322e3eabb7..0000000000
--- a/filter/vfolder-rule.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-
-#include <gal/widgets/e-unicode.h>
-#include "vfolder-context.h"
-#include "vfolder-rule.h"
-#include "shell/evolution-shell-client.h"
-
-#define d(x) x
-
-static xmlNodePtr xml_encode(FilterRule *);
-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);
-/*static void build_code(FilterRule *, GString *out);*/
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);
-
-extern EvolutionShellClient *global_shell_client;
-
-static void vfolder_rule_class_init	(VfolderRuleClass *class);
-static void vfolder_rule_init	(VfolderRule *gspaper);
-static void vfolder_rule_finalise	(GtkObject *obj);
-
-#define _PRIVATE(x) (((VfolderRule *)(x))->priv)
-
-struct _VfolderRulePrivate {
-};
-
-static FilterRuleClass *parent_class;
-
-guint
-vfolder_rule_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"VfolderRule",
-			sizeof(VfolderRule),
-			sizeof(VfolderRuleClass),
-			(GtkClassInitFunc)vfolder_rule_class_init,
-			(GtkObjectInitFunc)vfolder_rule_init,
-			(GtkArgSetFunc)NULL,
-			(GtkArgGetFunc)NULL
-		};
-		
-		type = gtk_type_unique(filter_rule_get_type (), &type_info);
-	}
-	
-	return type;
-}
-
-static void
-vfolder_rule_class_init (VfolderRuleClass *class)
-{
-	GtkObjectClass *object_class;
-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class(filter_rule_get_type ());
-
-	object_class->finalize = vfolder_rule_finalise;
-
-	/* override methods */
-	filter_rule->xml_encode = xml_encode;
-	filter_rule->xml_decode = xml_decode;
-	/*filter_rule->build_code = build_code;*/
-	filter_rule->get_widget = get_widget;
-}
-
-static void
-vfolder_rule_init (VfolderRule *o)
-{
-	o->priv = g_malloc0(sizeof(*o->priv));
-}
-
-static void
-vfolder_rule_finalise(GtkObject *obj)
-{
-	VfolderRule *o = (VfolderRule *)obj;
-	o = o;
-        ((GtkObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * vfolder_rule_new:
- *
- * Create a new VfolderRule object.
- * 
- * Return value: A new #VfolderRule object.
- **/
-VfolderRule *
-vfolder_rule_new(void)
-{
-	VfolderRule *o = (VfolderRule *)gtk_type_new(vfolder_rule_get_type ());
-	return o;
-}
-
-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri)
-{
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	vr->sources = g_list_append(vr->sources, g_strdup(uri));
-}
-
-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri)
-{
-	GList *l;
-
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	/* only does a simple string or address comparison, should
-	   probably do a decoded url comparison */
-	l = vr->sources;
-	while (l) {
-		if (l->data == uri || !strcmp(l->data, uri))
-			return l->data;
-		l = g_list_next(l);
-	}
-	return NULL;
-}
-
-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri)
-{
-	char *found;
-
-	g_assert(IS_VFOLDER_RULE(vr));
-
-	found = (char *)vfolder_rule_find_source(vr, uri);
-	if (found) {
-		vr->sources = g_list_remove(vr->sources, found);
-		g_free(found);
-	}
-}
-
-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last)
-{
-	GList *node;
-
-	if (last == NULL) {
-		node = vr->sources;
-	} else {
-		node = g_list_find(vr->sources, (char *)last);
-		if (node == NULL)
-			node = vr->sources;
-		else
-			node = g_list_next(node);
-	}
-	if (node)
-		return (const char *)node->data;
-	return NULL;
-}
-
-static xmlNodePtr xml_encode(FilterRule *fr)
-{
-	xmlNodePtr node, set, work;
-	GList *l;
-	VfolderRule *vr = (VfolderRule *)fr;
-
-        node = ((FilterRuleClass *)(parent_class))->xml_encode(fr);
-	g_assert(node != NULL);
-	set = xmlNewNode(NULL, "sources");
-	xmlAddChild(node, set);
-	l = vr->sources;
-	while (l) {
-		work = xmlNewNode(NULL, "folder");
-		xmlSetProp(work, "uri", l->data);
-		xmlAddChild(set, work);
-		l = g_list_next(l);
-	}
-	return node;
-}
-
-static int xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)
-{
-	xmlNodePtr set, work;
-	int result;
-	VfolderRule *vr = (VfolderRule *)fr;
-	char *uri;
-	
-        result = ((FilterRuleClass *)(parent_class))->xml_decode(fr, node, f);
-	if (result != 0)
-		return result;
-
-	set = node->childs;
-	while (set) {
-		if (!strcmp(set->name, "sources")) {
-			work = set->childs;
-			while (work) {
-				if (!strcmp(work->name, "folder")) {
-					uri = xmlGetProp(work, "uri");
-					if (uri)
-						vr->sources = g_list_append(vr->sources, uri);
-				}
-				work = work->next;
-			}
-		}
-		set = set->next;
-	}
-	return 0;
-}
-
-enum {
-	BUTTON_ADD,
-	BUTTON_REMOVE,
-	BUTTON_LAST,
-};
-
-struct _source_data {
-	RuleContext *f;
-	VfolderRule *vr;
-	const char *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-};
-
-static void source_add(GtkWidget *widget, struct _source_data *data);
-static void source_remove(GtkWidget *widget, struct _source_data *data);
-
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "source_add", source_add },
-	{ "source_remove", source_remove },
-};
-
-static void
-set_sensitive(struct _source_data *data)
-{
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_ADD], TRUE);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_REMOVE], data->current != NULL);
-}
-
-static void
-select_source(GtkWidget *w, GtkWidget *child, struct _source_data *data)
-{
-	data->current = gtk_object_get_data((GtkObject *)child, "source");
-	set_sensitive(data);
-}
-
-static void source_add(GtkWidget *widget, struct _source_data *data)
-{
-	const char *allowed_types[] = { "mail", NULL };
-	char *def, *uri;
-	GtkListItem *item;
-	GList *l;
-	gchar *s;
-
-	def = "";
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   _("Select Folder"),
-						   def, allowed_types, NULL, &uri);
-
-	if (uri != NULL && uri[0] != '\0') {
-		data->vr->sources = g_list_append(data->vr->sources, uri);
-
-		l = NULL;
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, uri);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "source", uri);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(NULL, item);
-		gtk_list_append_items(data->list, l);
-		gtk_list_select_child(data->list, (GtkWidget *)item);
-		data->current = uri;
-	} else {
-		g_free(uri);
-	}
-	set_sensitive(data);
-}
-
-static void source_remove(GtkWidget *widget, struct _source_data *data)
-{
-	const char *source;
-	int index = 0;
-	GList *l;
-	GtkListItem *item;
-
-	source = NULL;
-	while ((source = vfolder_rule_next_source(data->vr, source))) {
-		if (data->current == source) {
-			vfolder_rule_remove_source(data->vr, source);
-			item = g_list_nth_data(data->list->children, index);
-			l = g_list_append(NULL, item);
-			gtk_list_remove_items(data->list, l);
-			g_list_free(l);
-			data->current = NULL;
-			break;
-		}
-		index++;
-	}
-	set_sensitive(data);
-}
-
-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f)
-{
-	GtkWidget *widget, *frame, *w;
-	GladeXML *gui;
-	const char *source;
-	VfolderRule *vr = (VfolderRule *)fr;
-	struct _source_data *data;
-	int i;
-	GList *l;
-
-        widget = ((FilterRuleClass *)(parent_class))->get_widget(fr, f);
-
-	data = g_malloc0(sizeof(*data));
-	data->f = f;
-	data->vr = vr;
-
-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "vfolder_source_frame");
-        frame = glade_xml_get_widget (gui, "vfolder_source_frame");
-
-	gtk_object_set_data_full((GtkObject *)frame, "data", data, g_free);
-
-	for (i=0;i<BUTTON_LAST;i++) {
-		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect((GtkObject *)w, "clicked", edit_buttons[i].func, data);
-	}
-
-        w = glade_xml_get_widget (gui, "source_list");
-	data->list = (GtkList *)w;
-	l = NULL;
-	source = NULL;
-	while ((source = vfolder_rule_next_source(vr, source))) {
-		GtkListItem *item;
-		gchar *s = e_utf8_to_gtk_string ((GtkWidget *) data->list, source);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
-		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "source", (void *)source);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-	}
-	gtk_list_append_items(data->list, l);
-	gtk_signal_connect((GtkObject *)w, "select_child", select_source, data);
-	set_sensitive(data);
-
-	gtk_box_pack_start(GTK_BOX(widget), frame, TRUE, TRUE, 3);
-	return widget;
-}
diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h
deleted file mode 100644
index c3fa130c84..0000000000
--- a/filter/vfolder-rule.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _VFOLDER_RULE_H
-#define _VFOLDER_RULE_H
-
-#include <gtk/gtk.h>
-#include "filter-rule.h"
-
-#define VFOLDER_RULE(obj)	GTK_CHECK_CAST (obj, vfolder_rule_get_type (), VfolderRule)
-#define VFOLDER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_rule_get_type (), VfolderRuleClass)
-#define IS_VFOLDER_RULE(obj)      GTK_CHECK_TYPE (obj, vfolder_rule_get_type ())
-
-typedef struct _VfolderRule	VfolderRule;
-typedef struct _VfolderRuleClass	VfolderRuleClass;
-
-struct _VfolderRule {
-	FilterRule parent;
-	struct _VfolderRulePrivate *priv;
-
-	GList *sources;		/* uri's of the source folders */
-};
-
-struct _VfolderRuleClass {
-	FilterRuleClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-guint		vfolder_rule_get_type	(void);
-VfolderRule	*vfolder_rule_new	(void);
-
-/* methods */
-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri);
-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri);
-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last);
-
-#endif /* ! _VFOLDER_RULE_H */
-
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
deleted file mode 100644
index 52c2c0e8ca..0000000000
--- a/filter/vfoldertypes.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="sender">
-  <title>Sender</title>
-   <input type="optionlist" name="sender-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(match-all (header-contains "From" ${sender}))</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-        <code>(match-all (not (header-contains "From" ${sender})))</code>
-    </option>
-   </input>
-   <input type="string" name="sender"/>
- </part>
- <part name="to">
-   <title>Recipients</title>
-   <input type="optionlist" name="recipient-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (or (header-contains "To" ${recipient})
-	               (header-contains "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (or
-                          (header-contains "To" ${recipient})
-	                  (header-contains "Cc" ${recipient}))))
-     </code>
-    </option>
-   </input>
-   <input type="address" name="recipient"/>
- </part>
- <part name="subject">
-   <title>Subject</title>
-   <input type="optionlist" name="subject-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(match-all (header-contains "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(match-all (not (header-contains "Subject" ${subject})))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="subject"/>
- </part>
- <part name="body">
-   <title>Message Body</title>
-   <input type="optionlist" name="body-type">
-    <option value="contains">
-     <title>contains</title>
-     <code>
-	(body-contains ${word})
-     </code>
-    </option>
-    <option value="not contains">
-     <title>does not contain</title>
-     <code>
-	(not (body-contains "Subject" ${word}))
-     </code>
-    </option>
-   </input>
-   <input type="string" name="word"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-
- <part name="sent-date">
-  <title>Message was sent</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="before">
-    <title>before</title>
-    <code>
-       (match-all (&lt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-sent-date) ${versus})))
-    </code>
-   </option>
-   <option value="after">
-    <title>after</title>
-    <code>
-       (match-all (&gt; (get-sent-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-sent-date) ${versus})))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus">
-  </input>
- </part>
-
- <part name="recv-date">
-  <title>Message was received</title>
-  <input type="optionlist" name="date-spec-type">
-   <option value="before">
-    <title>before</title>
-    <code>
-       (match-all (&lt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-before">
-    <title>on or before</title>
-    <code>
-       (match-all (not (&gt; (get-received-date) ${versus})))
-    </code>
-   </option>
-   <option value="after">
-    <title>after</title>
-    <code>
-       (match-all (&gt; (get-received-date) ${versus}))
-    </code>
-   </option>
-   <option value="on-or-after">
-    <title>on or after</title>
-    <code>
-       (match-all (not (&lt; (get-received-date) ${versus})))
-    </code>
-   </option>
-  </input>    
-  <input type="datespec" name="versus">
-  </input>
- </part>
-</partset>
-</filterdescription>
diff --git a/help/.cvsignore b/help/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/C/.cvsignore b/help/C/.cvsignore
deleted file mode 100644
index 2f4c48adbf..0000000000
--- a/help/C/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-evolution-guide
-evolution-guide.junk
-evolution-guide.log
-evolution-guide.ps
-evolution-guide.dvi
-evolution-guide.tex
-fig/*.eps
\ No newline at end of file
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
deleted file mode 100644
index 15f1e047b6..0000000000
--- a/help/C/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-SGML_FILES =			\
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-fdl.sgml		\
-	apx-gloss.sgml		\
-	config-prefs.sgml	\
-	config-setupassist.sgml	\
-	config-sync.sgml	\
-	evolution-guide.sgml	\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-sync.sgml
-
-
-EXTRA_DIST = \
-	$(SGML_FILES)
-
-all: evolution-guide
-
-evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
-
-dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
-	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
-
-install-data-local: evolution-guide
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
deleted file mode 100644
index 89f0dd6bc5..0000000000
--- a/help/C/apx-authors.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@helixcode.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
-     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@helixcode.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@helixcode.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@helixcode.com</email></member>     
-     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@helixcode.com</email></member>
-     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
-</simplelist>
-and other dedicated GNOME programmers. 
-</para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.helixcode.com/apps/evolution.php3"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugs.gnome.org" type="http">GNOME bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. You can also use
-      command <command>bug-buddy</command> for submitting bug reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@helixcode.com</email>) and Kevin Breit
-      (<email>battery841@mypad.com</email>) with the help of the
-      application programmers and the GNOME Documentation Project.
-      Please send all comments and suggestions regarding the manual to
-      the GNOME Documentation Project at
-      <email>docs@gnome.org</email>. You can also add your comments
-      online by using <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
-    </para>
-    <!-- For translations: uncomment this: <para> Latin translation
-      was done by ME (<email>MYNAME@MYADDRESS</email>). Please send
-      all comments and suggestions regarding this translation to
-      SOMEWHERE.  </para> -->
-    </appendix>
-
-
-
-
-
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
deleted file mode 100644
index e4a96a8155..0000000000
--- a/help/C/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Known bugs and limitations</title>
-    <abstract>
-    <para>
-     This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
-    </para>
-  </appendix>
-
diff --git a/help/C/apx-fdl.sgml b/help/C/apx-fdl.sgml
deleted file mode 100644
index 17a3bf3070..0000000000
--- a/help/C/apx-fdl.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-<appendix id="fdl">
-<title>GNU Free Documentation License</title>
-<!-- - GNU Project - Free Software Foundation (FSF) -->
-<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
-
-
-  <sect1 id="fdl-version">
-    <title>GNU Free Documentation License</title>
-
-    <para>Version 1.1, March 2000</para>
-
-    <blockquote>
-      <para>Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</para>
-    </blockquote>
-    </sect1>
-  <sect1 id="fdl-preamble" label="0">
-    <title>PREAMBLE</title>
-
-    <para>The purpose of this License is to make a manual, textbook,
-    or other written document "free" in the sense of freedom: to
-    assure everyone the effective freedom to copy and redistribute it,
-    with or without modifying it, either commercially or
-    noncommercially.  Secondarily, this License preserves for the
-    author and publisher a way to get credit for their work, while not
-    being considered responsible for modifications made by
-    others.</para>
-
-    <para>This License is a kind of "copyleft", which means that
-    derivative works of the document must themselves be free in the
-    same sense.  It complements the GNU General Public License, which
-    is a copyleft license designed for free software.</para>
-
-    <para>We have designed this License in order to use it for manuals
-    for free software, because free software needs free documentation:
-    a free program should come with manuals providing the same
-    freedoms that the software does.  But this License is not limited
-    to software manuals; it can be used for any textual work,
-    regardless of subject matter or whether it is published as a
-    printed book.  We recommend this License principally for works
-    whose purpose is instruction or reference.</para>
-  </sect1>
-
-  <sect1 id="fdl-applicability" label="1">
-    <title>APPLICABILITY AND DEFINITIONS</title>
-
-    <para>This License applies to any manual or other work that
-    contains a notice placed by the copyright holder saying it can be
-    distributed under the terms of this License.  The "Document",
-    below, refers to any such manual or work.  Any member of the
-    public is a licensee, and is addressed as "you".</para>
-
-    <para>A "Modified Version" of the Document means any work
-    containing the Document or a portion of it, either copied
-    verbatim, or with modifications and/or translated into another
-    language.</para>
-
-    <para>A "Secondary Section" is a named appendix or a front-matter
-    section of the Document that deals exclusively with the
-    relationship of the publishers or authors of the Document to the
-    Document's overall subject (or to related matters) and contains
-    nothing that could fall directly within that overall subject.
-    (For example, if the Document is in part a textbook of
-    mathematics, a Secondary Section may not explain any mathematics.)
-    The relationship could be a matter of historical connection with
-    the subject or with related matters, or of legal, commercial,
-    philosophical, ethical or political position regarding
-    them.</para>
-
-    <para>The "Invariant Sections" are certain Secondary Sections
-    whose titles are designated, as being those of Invariant Sections,
-    in the notice that says that the Document is released under this
-    License.</para>
-
-    <para>The "Cover Texts" are certain short passages of text that
-    are listed, as Front-Cover Texts or Back-Cover Texts, in the
-    notice that says that the Document is released under this
-    License.</para>
-
-    <para>A "Transparent" copy of the Document means a
-    machine-readable copy, represented in a format whose specification
-    is available to the general public, whose contents can be viewed
-    and edited directly and straightforwardly with generic text
-    editors or (for images composed of pixels) generic paint programs
-    or (for drawings) some widely available drawing editor, and that
-    is suitable for input to text formatters or for automatic
-    translation to a variety of formats suitable for input to text
-    formatters.  A copy made in an otherwise Transparent file format
-    whose markup has been designed to thwart or discourage subsequent
-    modification by readers is not Transparent.  A copy that is not
-    "Transparent" is called "Opaque".</para>
-
-    <para>Examples of suitable formats for Transparent copies include
-    plain ASCII without markup, Texinfo input format, LaTeX input
-    format, SGML or XML using a publicly available DTD, and
-    standard-conforming simple HTML designed for human modification.
-    Opaque formats include PostScript, PDF, proprietary formats that
-    can be read and edited only by proprietary word processors, SGML
-    or XML for which the DTD and/or processing tools are not generally
-    available, and the machine-generated HTML produced by some word
-    processors for output purposes only.</para>
-
-    <para>The "Title Page" means, for a printed book, the title page
-    itself, plus such following pages as are needed to hold, legibly,
-    the material this License requires to appear in the title page.
-    For works in formats which do not have any title page as such,
-    "Title Page" means the text near the most prominent appearance of
-    the work's title, preceding the beginning of the body of the
-    text.</para>
-  </sect1>
-
-  <sect1 label="2">
-    <title>VERBATIM COPYING</title>
-
-    <para>You may copy and distribute the Document in any medium,
-    either commercially or noncommercially, provided that this
-    License, the copyright notices, and the license notice saying this
-    License applies to the Document are reproduced in all copies, and
-    that you add no other conditions whatsoever to those of this
-    License.  You may not use technical measures to obstruct or
-    control the reading or further copying of the copies you make or
-    distribute.  However, you may accept compensation in exchange for
-    copies.  If you distribute a large enough number of copies you
-    must also follow the conditions in section 3.</para>
-
-    <para>You may also lend copies, under the same conditions stated
-    above, and you may publicly display copies.</para>
-  </sect1>
-
-  <sect1 label="3">
-    <title>COPYING IN QUANTITY</title>
-
-    <para>If you publish printed copies of the Document numbering more
-    than 100, and the Document's license notice requires Cover Texts,
-    you must enclose the copies in covers that carry, clearly and
-    legibly, all these Cover Texts: Front-Cover Texts on the front
-    cover, and Back-Cover Texts on the back cover.  Both covers must
-    also clearly and legibly identify you as the publisher of these
-    copies.  The front cover must present the full title with all
-    words of the title equally prominent and visible.  You may add
-    other material on the covers in addition.  Copying with changes
-    limited to the covers, as long as they preserve the title of the
-    Document and satisfy these conditions, can be treated as verbatim
-    copying in other respects.</para>
-
-    <para>If the required texts for either cover are too voluminous to
-    fit legibly, you should put the first ones listed (as many as fit
-    reasonably) on the actual cover, and continue the rest onto
-    adjacent pages.</para>
-
-    <para>If you publish or distribute Opaque copies of the Document
-    numbering more than 100, you must either include a
-    machine-readable Transparent copy along with each Opaque copy, or
-    state in or with each Opaque copy a publicly-accessible
-    computer-network location containing a complete Transparent copy
-    of the Document, free of added material, which the general
-    network-using public has access to download anonymously at no
-    charge using public-standard network protocols.  If you use the
-    latter option, you must take reasonably prudent steps, when you
-    begin distribution of Opaque copies in quantity, to ensure that
-    this Transparent copy will remain thus accessible at the stated
-    location until at least one year after the last time you
-    distribute an Opaque copy (directly or through your agents or
-    retailers) of that edition to the public.</para>
-
-    <para>It is requested, but not required, that you contact the
-    authors of the Document well before redistributing any large
-    number of copies, to give them a chance to provide you with an
-    updated version of the Document.</para>
-  </sect1>
-
-  <sect1 label="4">
-    <title>MODIFICATIONS</title>
-
-    <para>You may copy and distribute a Modified Version of the
-    Document under the conditions of sections 2 and 3 above, provided
-    that you release the Modified Version under precisely this
-    License, with the Modified Version filling the role of the
-    Document, thus licensing distribution and modification of the
-    Modified Version to whoever possesses a copy of it.  In addition,
-    you must do these things in the Modified Version:</para>
-
-    <orderedlist numeration="upperalpha">
-      <listitem><para>Use in the Title Page
-      (and on the covers, if any) a title distinct from that of the
-      Document, and from those of previous versions (which should, if
-      there were any, be listed in the History section of the
-      Document).  You may use the same title as a previous version if
-      the original publisher of that version gives permission.</para>
-      </listitem>
-
-      <listitem><para>List on the Title Page,
-      as authors, one or more persons or entities responsible for
-      authorship of the modifications in the Modified Version,
-      together with at least five of the principal authors of the
-      Document (all of its principal authors, if it has less than
-      five).</para>
-      </listitem>
-
-      <listitem><para>State on the Title page
-      the name of the publisher of the Modified Version, as the
-      publisher.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      copyright notices of the Document.</para>
-      </listitem>
-
-      <listitem><para>Add an appropriate
-      copyright notice for your modifications adjacent to the other
-      copyright notices.</para>
-      </listitem>
-
-      <listitem><para>Include, immediately
-      after the copyright notices, a license notice giving the public
-      permission to use the Modified Version under the terms of this
-      License, in the form shown in the Addendum below.</para>
-      </listitem>
-
-      <listitem><para>Preserve in that license
-      notice the full lists of Invariant Sections and required Cover
-      Texts given in the Document's license notice.</para>
-      </listitem>
-
-      <listitem><para>Include an unaltered
-      copy of this License.</para>
-      </listitem>
-
-      <listitem><para>Preserve the section
-      entitled "History", and its title, and add to it an item stating
-      at least the title, year, new authors, and publisher of the
-      Modified Version as given on the Title Page.  If there is no
-      section entitled "History" in the Document, create one stating
-      the title, year, authors, and publisher of the Document as given
-      on its Title Page, then add an item describing the Modified
-      Version as stated in the previous sentence.</para>
-      </listitem>
-
-      <listitem><para>Preserve the network
-      location, if any, given in the Document for public access to a
-      Transparent copy of the Document, and likewise the network
-      locations given in the Document for previous versions it was
-      based on.  These may be placed in the "History" section.  You
-      may omit a network location for a work that was published at
-      least four years before the Document itself, or if the original
-      publisher of the version it refers to gives permission.</para>
-      </listitem>
-
-      <listitem><para>In any section entitled
-      "Acknowledgements" or "Dedications", preserve the section's
-      title, and preserve in the section all the substance and tone of
-      each of the contributor acknowledgements and/or dedications
-      given therein.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      Invariant Sections of the Document, unaltered in their text and
-      in their titles.  Section numbers or the equivalent are not
-      considered part of the section titles.</para>
-      </listitem>
-
-      <listitem><para>Delete any section
-      entitled "Endorsements".  Such a section may not be included in
-      the Modified Version.</para>
-      </listitem>
-
-      <listitem><para>Do not retitle any
-      existing section as "Endorsements" or to conflict in title with
-      any Invariant Section.</para>
-      </listitem>
-    </orderedlist>
-    
-    <para>If the Modified Version includes new front-matter sections
-    or appendices that qualify as Secondary Sections and contain no
-    material copied from the Document, you may at your option
-    designate some or all of these sections as invariant.  To do this,
-    add their titles to the list of Invariant Sections in the Modified
-    Version's license notice.  These titles must be distinct from any
-    other section titles.</para>
-
-    <para>You may add a section entitled "Endorsements", provided it
-    contains nothing but endorsements of your Modified Version by
-    various parties--for example, statements of peer review or that
-    the text has been approved by an organization as the authoritative
-    definition of a standard.</para>
-
-    <para>You may add a passage of up to five words as a Front-Cover
-    Text, and a passage of up to 25 words as a Back-Cover Text, to the
-    end of the list of Cover Texts in the Modified Version.  Only one
-    passage of Front-Cover Text and one of Back-Cover Text may be
-    added by (or through arrangements made by) any one entity.  If the
-    Document already includes a cover text for the same cover,
-    previously added by you or by arrangement made by the same entity
-    you are acting on behalf of, you may not add another; but you may
-    replace the old one, on explicit permission from the previous
-    publisher that added the old one.</para>
-
-    <para>The author(s) and publisher(s) of the Document do not by
-    this License give permission to use their names for publicity for
-    or to assert or imply endorsement of any Modified Version.</para>
-  </sect1>
-
-  <sect1 label="5">
-    <title>COMBINING DOCUMENTS</title>
-
-    <para>You may combine the Document with other documents released
-    under this License, under the terms defined in section 4 above for
-    modified versions, provided that you include in the combination
-    all of the Invariant Sections of all of the original documents,
-    unmodified, and list them all as Invariant Sections of your
-    combined work in its license notice.</para>
-
-    <para>The combined work need only contain one copy of this
-    License, and multiple identical Invariant Sections may be replaced
-    with a single copy.  If there are multiple Invariant Sections with
-    the same name but different contents, make the title of each such
-    section unique by adding at the end of it, in parentheses, the
-    name of the original author or publisher of that section if known,
-    or else a unique number.  Make the same adjustment to the section
-    titles in the list of Invariant Sections in the license notice of
-    the combined work.</para>
-
-    <para>In the combination, you must combine any sections entitled
-    "History" in the various original documents, forming one section
-    entitled "History"; likewise combine any sections entitled
-    "Acknowledgements", and any sections entitled "Dedications".  You
-    must delete all sections entitled "Endorsements."</para>
-  </sect1>
-
-  <sect1 label="6">
-    <title>COLLECTIONS OF DOCUMENTS</title>
-
-    <para>You may make a collection consisting of the Document and
-    other documents released under this License, and replace the
-    individual copies of this License in the various documents with a
-    single copy that is included in the collection, provided that you
-    follow the rules of this License for verbatim copying of each of
-    the documents in all other respects.</para>
-
-    <para>You may extract a single document from such a collection,
-    and distribute it individually under this License, provided you
-    insert a copy of this License into the extracted document, and
-    follow this License in all other respects regarding verbatim
-    copying of that document.</para>
-  </sect1>
-
-  <sect1 label="7">
-    <title>AGGREGATION WITH INDEPENDENT WORKS</title>
-    
-    <para>A compilation of the Document or its derivatives with other
-    separate and independent documents or works, in or on a volume of
-    a storage or distribution medium, does not as a whole count as a
-    Modified Version of the Document, provided no compilation
-    copyright is claimed for the compilation.  Such a compilation is
-    called an "aggregate", and this License does not apply to the
-    other self-contained works thus compiled with the Document, on
-    account of their being thus compiled, if they are not themselves
-    derivative works of the Document.</para>
-
-    <para>If the Cover Text requirement of section 3 is applicable to
-    these copies of the Document, then if the Document is less than
-    one quarter of the entire aggregate, the Document's Cover Texts
-    may be placed on covers that surround only the Document within the
-    aggregate.  Otherwise they must appear on covers around the whole
-    aggregate.</para>
-  </sect1>
-
-  <sect1 label="8">
-    <title>TRANSLATION</title>
-
-    <para>Translation is considered a kind of modification, so you may
-    distribute translations of the Document under the terms of section
-    4.  Replacing Invariant Sections with translations requires
-    special permission from their copyright holders, but you may
-    include translations of some or all Invariant Sections in addition
-    to the original versions of these Invariant Sections.  You may
-    include a translation of this License provided that you also
-    include the original English version of this License.  In case of
-    a disagreement between the translation and the original English
-    version of this License, the original English version will
-    prevail.</para>
-  </sect1>
-
-  <sect1 label="9">
-    <title>TERMINATION</title>
-    
-    <para>You may not copy, modify, sublicense, or distribute the
-    Document except as expressly provided for under this License.  Any
-    other attempt to copy, modify, sublicense or distribute the
-    Document is void, and will automatically terminate your rights
-    under this License.  However, parties who have received copies, or
-    rights, from you under this License will not have their licenses
-    terminated so long as such parties remain in full
-    compliance.</para>
-  </sect1>
-
-  <sect1 label="10">
-    <title>FUTURE REVISIONS OF THIS LICENSE</title>
-
-    <para>The Free Software Foundation may publish new, revised
-    versions of the GNU Free Documentation License from time to time.
-    Such new versions will be similar in spirit to the present
-    version, but may differ in detail to address new problems or
-    concerns.  See <ulink
-    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
-
-    <para>Each version of the License is given a distinguishing
-    version number.  If the Document specifies that a particular
-    numbered version of this License "or any later version" applies to
-    it, you have the option of following the terms and conditions
-    either of that specified version or of any later version that has
-    been published (not as a draft) by the Free Software Foundation.
-    If the Document does not specify a version number of this License,
-    you may choose any version ever published (not as a draft) by the
-    Free Software Foundation.</para>
-  </sect1>
-
-  <sect1 label="">
-    <title>How to use this License for your documents</title>
-
-    <para>To use this License in a document you have written, include
-    a copy of the License in the document and put the following
-    copyright and license notices just after the title page:</para>
-
-<blockquote><para>
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-</para></blockquote>
-
-    <para>If you have no Invariant Sections, write "with no Invariant
-    Sections" instead of saying which ones are invariant.  If you have
-    no Front-Cover Texts, write "no Front-Cover Texts" instead of
-    "Front-Cover Texts being LIST"; likewise for Back-Cover
-    Texts.</para>
-
-    <para>If your document contains nontrivial examples of program
-    code, we recommend releasing these examples in parallel under your
-    choice of free software license, such as the GNU General Public
-    License, to permit their use in free software.</para>
-  </sect1>
-
-</appendix>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-parent-document: ("referenz.sgml" "appendix")
-sgml-exposed-tags:nil
-sgml-local-ecat-files:nil
-sgml-local-catalogs: CATALOG
-sgml-validate-command: "nsgmls -s referenz.sgml"
-ispell-skip-sgml: t
-End:
--->
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
deleted file mode 100644
index f04b381d19..0000000000
--- a/help/C/apx-gloss.sgml
+++ /dev/null
@@ -1,432 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glossary</title>
-
- <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing</glossterm>
-  <glossdef>
-   <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy)</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="druid">
-  <glossterm>Druid</glossterm>
-  <glossdef>
-   <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="filetree">
-  <glossterm>File Tree</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
-     The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
-     account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward</glossterm>
-  <glossdef>
-   <para>
-       the user can send a third party a message
-    which was sent to the user originally.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
-    for describing page layout in electronic documents like web pages,
-    help files, and email messages.  HTML can be used in email and
-    news posts to insert images and apply text treatments.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
-  <glossdef>
-   <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, it allows access to email which is typically (although
-    not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP</glossterm>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Inline</glossterm>
-  <glossdef>
-   <para>
-     Displayed as part of a message or other document, rather than
-     attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Mail Client</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly*so[a|u]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
-  <glossdef>
-   <para>
-      As its name implies, <application>sendmail</application> is a
-      program which sends mail.  <application>Evolution</application>
-      can use it instead of <glossterm>SMTP</glossterm>; some people
-      prefer it because it offers more flexibility, but is more
-      difficult to set up.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Shortcut Bar</glossterm>
-  <glossdef>
-   <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signature</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unwanted e-mail.  Spam normally comes in forms of
-    chain-letters and advertisements for unscrupulous web sites or
-    services.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
-  <glossdef>
-   <para>
-    A file format for the exchange of contact information. When you
-    get an address card attached to an email, it's probably in vCard
-    format.  Not to be confused with <glossterm
-    linkend="vfolder">vFolder</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
-  <glossdef>
-   <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/apx-gpl.sgml b/help/C/apx-gpl.sgml
deleted file mode 100644
index 7c7e4cd0f7..0000000000
--- a/help/C/apx-gpl.sgml
+++ /dev/null
@@ -1,414 +0,0 @@
-<appendix id="gpl">
-  <title>GNU GENERAL PUBLIC LICENSE</title>
-  <subtitle>Version 2, June 1991</subtitle>
-
-
-<para>
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-</para>
-<sect1>
-<title>Preamble</title>
-<para>
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-</para>
-<para>
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</para>
-<para>
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</para>
-<para>
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</para>
-<para>
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</para>
-<para>
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</para>
-<para>
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</para>
-<para>
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</para>
-	   
-</sect1>
-
-<sect1>
-<title> GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-<para>	
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</para>
-<para>	 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</para>
-<para>	 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</para>
-<para>	 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</para>
-<para>	 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</para>
-<para>	 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-</para>
-<para>	 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-</para>
-<para>	 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-</para>
-<para>	 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</para>
-<para>	 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</para>
-<para>	 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</para>
-<para>	 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</para>
-<para>	 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-</para>
-<para>	 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-</para>
-<para>	 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-</para>
-<para>	 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</para>
-<para>	 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</para>
-<para>	 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</para>
-<para>	 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</para>
-<para>	 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</para>
-<para>	 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</para>
-<para>	 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</para>
-<para>	 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</para>
-<para>	 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</para>
-<para>	 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</para>
-<para>	 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</para>
-<para>	 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</para>
-<para>	 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</para>
-</sect1>
-<sect1>
-<title>NO WARRANTY</title>
-<para>
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</para>
-<para>
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</para>
-<para>
-		     END OF TERMS AND CONDITIONS
-</para>
-</sect1>
-  <sect1>
-	 <title>How to Apply These Terms to Your New Programs</title>
-<para>
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-</para>
-<para>
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-</para>
-<para>
-    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-Copyright (C) &lt; year&gt;  &lt;name of author&gt;
-</para>
-<para>
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-</para>
-<para>
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-</para>
-<para>
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-</para>
-<para>
-
-Also add information on how to contact you by electronic and paper mail.
-</para>
-<para>
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-</para>
-<para>
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</para>
-<para>
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-</para>
-<para>
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-</para>
-<para>
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-</para>
-<para>
-  &lt;signature of Ty Coon&gt;, 1 April 1989
-  Ty Coon, President of Vice
-</para>
-<para>
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-</para>
-</sect1>
-</appendix>
-
-
-
-
-
-
-
-
-
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
deleted file mode 100644
index 27c1ac57db..0000000000
--- a/help/C/config-prefs.sgml
+++ /dev/null
@@ -1,647 +0,0 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Mail
-        configuration</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	<varlistentry>
-          <term><guilabel>Identities</guilabel></term>
-          <listitem>
-	    <para>
-               This allows you to create and alter one or more
-               identities for your email.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Sources</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> where to get the
-               mail sent to you, and how to get it.
-            </para>
-          </listitem>
-	</varlistentry>
-	<varlistentry>
-
-	  <term><guilabel>Mail Transport</guilabel></term>
-	  <listitem>
-	    <para>
-               This tab lets you tell
-               <application>Evolution</application> how to send mail.
-            </para>
-          </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>News Servers</guilabel></term>
-	  <listitem>
-	    <para>
-              If you would like to use
-              <application>Evolution</application> to read newsgroups,
-              you can specify your news server preferences here.
-           </para>
-	  </listitem>
-	</varlistentry>
-
-
-
-	<varlistentry>
-	  <term><guilabel>Other</guilabel></term>
-	  <listitem>
-	    <para>
-              Miscellaneous mail and news settings, such as HTML
-              handling preferences, and how long
-              <application>Evolution</application> should wait before
-              marking message read.
-           </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
-      <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
-       </para>
-       <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
-      <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          edit, add, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from IMAP or POP servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. If you use an  may or may not be the same as your
-                  <glossterm>SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server-- this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.
-          </para>
-      </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
-	<para>
-           The <interface>Mail Transports</interface> tab lets you set
-           how you will send mail.  Evolution currently supports two
-           mail transport options: <guilabel>SMTP</guilabel>, which
-           uses a remote mail server, and
-           <guilabel>sendmail</guilabel>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <systemitem>SMTP</systemitem>.
-        </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many mail servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-                <term> 
-                   <guilabel>Send messages in HTML format</guilabel>
-                </term>
-                <listitem><para>
-                    If you check this box, you will send
-                    messages as HTML by default.  If you leave it unchecked, your
-                    messages will be sent without HTML formatting unless you select 
-                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-                    </menuchoice> in the message composer.
-                    See <xref linkend="usage-mail-getnsend-send-html">
-                    for more information about HTML mail.
-                </para></listitem>
-              </varlistentry>
-             <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Seen After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as seen. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>Time display</guilabel>,
-          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
-          and <guilabel>Alarms</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Weeks start on</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day range</term>
-	    <listitem>
-               <para>
-                 When does your work day start, and when does it end?
-                 In the day and week views,
-                 <application>Evolution</application> displays all the
-                 hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, you can
-                 still schedule an appointment outside of these hours,
-                 and if you do, the display will be extended to show
-                 it.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Calendar Colors</title>
-      <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can choose to alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements whose color you can set are:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due.  (Or maybe background color? find out!)
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
-       <variablelist>
-	 <varlistentry>
-	   <term>Show on To Do List</term>
-	    <listitem>
-	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Style Options</term>
-	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set.  If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. These beeps
-	    are distinct from full-fledged audio alarms.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Contact Manager</title>
-	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
-	<para>
-          You can set the following options: <!--insert variable list
-          here-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
deleted file mode 100644
index d9649f1adc..0000000000
--- a/help/C/config-setupassist.sgml
+++ /dev/null
@@ -1,214 +0,0 @@
-    <chapter id="config-setupassist">
-      <title>Easy Setup with the Setup Assistant</title>
-      <para>
-        The first time you try to use email, the mail setup assistant
-        will ask you for some basic information, so
-        <application>Evolution</application> can let you use email. If
-        you prefer more detailed configuration, or if you want to make
-        changes to an existing email setup, see <xref
-        linkend="config-prefs">.
-      </para>
-
-   <sect1 id="config-setupassist-mail">
-      <title>Mail Setup</title>
-      <para>
-        The first time you try to send or receive mail with
-	<application>Evolution</application>, the <interface>mail
-	setup assistant</interface> will pop up to help you with your
-	email preferences.  If you don't plan to use email, or if
-	you'd rather deal with your email preferences later, click
-	<guibutton>Cancel</guibutton>.
-      </para>
-
-<!--  
-
-
-
-Before you get it, though, you should decide where you want to
-	keep it.  Your options will vary a little depending on your
-	network setup, but they come down to storing the mail on your
-	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
-	storing it on the network (using <glossterm
-	linkend="imap">IMAP</glossterm>).  If you store your mail on
-	your local hard disk, you can read it whether you're online or
-	not, but you can only read it from one computer.  If you store
-	it on the network, you can only read it when you're online,
-	but you can access it from almost any computer with a network
-	connection, even if it doesn't have
-	<application>Evolution</application>.
-
-
-        If you choose POP, you'll be putting mail in the
-        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
-        folder.  If you choose IMAP, it's the
-        <guilabel>Inbox</guilabel> of a folder with the same name as
-        your mail server.  That's so you can maintain several distinct
-        IMAP servers if you want.  See <xref
-        linkend="config-prefs-mail"> for more information about mail
-        servers.
--->
-
-      <para>
-         The setup assistant (sometimes called a
-	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
-	 that some other programs use) will guide you through the
-	 network configuration process.  It will ask you for some
-	 basic information; your system administrator or ISP should
-	 have the answers you'll need.  The mail setup assistant is
-	 pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
-	<figure id="usage-setup-fig">
-	<title>Mail Setup Assistant</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
-	    </graphic>
-	</screenshot>
-	</figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
-  The assistant will ask you for the following information:
-        <variablelist>
-
-          <varlistentry>
-               <term> <guilabel>Name:</guilabel> </term> <listitem>
-	  <para>Your full name. </para></listitem>
-         </varlistentry>
-
-       <varlistentry>
-          <term><guilabel>Email address:</guilabel></term>
-	  <listitem><para>
-                 Your complete email address.
-                 </para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-          <term> <guilabel>Organization:</guilabel></term>
-	  <listitem>
-	    <para>
-              Any organization you represent, or the company where you
-              work.  Leave this blank if you wish, or type "My own bad
-              self" so people know your opinions are yours alone.
-            </para>
-	  </listitem>
-      </varlistentry>
-
-      <varlistentry>
-	 <term><guilabel>Signature File:</guilabel></term>
-          <listitem>
-            <para>
-             A text file appended to any email you send.  A signature
-             file typically consists of your name and email address,
-             or a quotation you like.  It's good form to keep your
-             "sig" on the short side: four lines is plenty. Remember,
-             this is attached to every email you send.
-            </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-           <term> <guilabel>Mail source type:</guilabel></term>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> supports several
-              mail sources: <glossterm>POP</glossterm> and
-              <glossterm>IMAP</glossterm> servers, and UNIX-style
-              <systemitem><filename>mbox</filename></systemitem> and
-              <systemitem><filename>mh</filename></systemitem> files.
-              POP servers retrieve your mail and store it on your
-              local system so you can refer to it even when not
-              connected to a network; <glossterm>IMAP</glossterm>
-              servers store the mail on the server so you can access
-              it from multiple locations;
-              <systemitem><filename>mbox</filename>></systemitem>
-              files are used by your computer for internal mail, and
-              may be useful if you want to switch from another email
-              client such as <application>Spruce</application> or
-              <application>Netscape Communicator</application>.  Ask
-              your system administrator which you should use, or keep
-              guessing until one works.  You may use multiple sources
-              if you wish; see <xref
-              linkend="config-prefs-mail-network"> for more
-              information.
-            </para>
-            <para>
-              If you decide not to have
-              <application>Evolution</application> use any servers,
-              the remaining items are not relevant; you only need to
-              point to the location of the files you wish to access.
-            </para>
-	  </listitem>
-	  </varlistentry>
-          
-       <varlistentry>
-          <term> <guilabel>Server:</guilabel></term>
-	  <listitem>
-	    <para>
-              This should be the name of the server where you check
-              your mail, if you use one.  It may be the same as the
-              server where you send your outgoing mail, if you use
-              one.
-            </para>
-	  </listitem>
-	</varlistentry>
-
-     <varlistentry>
-	  <term><guilabel>Username:</guilabel></term>
-	<listitem>
-             <para>
-              Enter the username for your mail server account, if you
-              have one. Normally, this is the part of your email
-              address before the @ character, and
-              <application>Evolution</application> has selected that
-              value as the default.  If you have a different username,
-              you can enter it here.
-            </para>
-	  </listitem>
-      </varlistentry>
-     
-       <varlistentry>
-            <term><guilabel>Authentication:</guilabel></term> 
-	    <listitem>
-	    <para>
-              Select the type of authentication you will use.  You can
-              click <guibutton>Detect supported types</guibutton> to
-              find out which authentication protocols your network
-              allows.
-            </para>
-	  </listitem>
-       </varlistentry>
-
-      <varlistentry> 
-         <term><guilabel>Mail Transport:</guilabel></term>
-	  <listitem>
-	    <para>
-              This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both SMTP
-              and <application>sendmail</application>.
-            </para>
-	  </listitem>
-      </varlistentry>
-     </variablelist>
-      </para>
-      <para>
-        To learn how to configure <application>Evolution</application>
-        in greater detail, or to change preferences once you have set
-        them, see <xref linkend="config-prefs">.
-      </para>
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
deleted file mode 100644
index 8fcf94e3af..0000000000
--- a/help/C/config-sync.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        deal with.  The first one is pretty simple: you'll need to get
-        the data to move among the various devices you're using.  If
-        you've already got <application>Gnome-Pilot</application>
-        working, then all you have to do is tell it to use the
-        <application>Evolution</application>
-        <glossterm>conduit</glossterm>.  If you haven't used
-        <application>Gnome-Pilot</application> before, you'll need to
-        run the GNOME <application>Control Center</application> and go
-        through the hand-held device setup assistant.  Then you can
-        select the Evolution conduit and press the hotsync button.
-      </para>
-      <para>
-        If that doesn't work, jump up and down several times and swear
-        loudly.  Then make sure you've got
-        <application>Gnome-Pilot</application> going to the right
-        device (for my serial port, it's /dev/ttys0, not the default
-        /dev/pilot) and that you have read and write permission on
-        that device.  If you don't, you'll need to be added to whatever
-        group has those permissions (probably tty).
-     </para>
-     <para>
-        Once <application>Evolution</application> knows how to get the
-        mail, address, and calendar data, it needs to know what to do
-        with it.  When you synchronize your local data with the data
-        on a server or handheld device, you may run into conflicts:
-        perhaps you have ended up with two cards with the same name
-        and different addresses, or old mail that has been deleted
-        from one device but not the other.  What if you want to keep
-        only the a few contacts or messages on your hand-held or your
-        laptop, but keep all the data server or your desktop machine?
-        Select the <guibutton>Synchronization</guibutton> tab from the
-        <interface>Preferences</interface> window to set up the
-        conflict resolution preferences.
-     </para>
-      <para> 
-         You can set <application>Evolution</application>'s
-         synchronization behavior in the following ways: 
-         <!-- LIST HERE -->
-      </para>
-      <para> 
-         <warning> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  If you set your
-	    synchronization behaviors wrong, you could end up deleting
-	    the messages and cards you want to keep, and keeping the
-	    ones you want to delete.  Before you change these
-	    preferences, make a backup of your the
-	    <systemitem><filename>evolution</filename></systemitem>
-	    directory.
-          </para>
-	</warning>
-       </para>
-    </chapter>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
deleted file mode 100644
index 064bb0d305..0000000000
--- a/help/C/evolution-guide.sgml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000</year>
-      <holder> Helix Code, Inc., </holder>
-      <holder> Kevin Breit </holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation
-         License</citetitle></ulink>, Version 1.1 or any later version
-         published by the Free Software Foundation with no Invariant
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
-         may obtain a copy of the <citetitle>GNU Free Documentation
-         License</citetitle> from the Free Software Foundation by
-         visiting <ulink type="http" url="http://www.fsf.org">their
-         Web site</ulink> or by writing to: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and those trademarks
-         are made aware to the members of the GNOME Documentation
-         Project, the names have been printed in caps or initial caps.
-       </para>
-    </legalnotice>
-
-    <releaseinfo>
-       This is version 0.6 of the Evolution manual, describing version 
-       0.6 of Evolution.  
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Using Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application>
-        for email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that, as with most of
-        Linux, there's more than one way to do things, and you can
-        pick whichever method you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-MAIL;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system.  But in the case
-        of <application>Evolution</application>, you can expect that
-        it will work perfectly well with minimal setup hassle, and
-        that you can alter its behavior to fit your needs with just a
-        little more work.  This part of the book will describe that
-        process, from the quickest glimpse of the Setup Assistant to
-        an in-depth tour of the preferences dialogs.
-      </para>
-    </partintro>
-
-    &CONFIG-SETUPASSIST;
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  <part>  
-    <title>Comprehensive Menu reference</title>
-    <partintro>
-      <para>
-        The following reference covers all, or nearly all, of the
-        menus and menu commands that
-        <application>Evolution</application> has to offer you.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
- 
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/fig/calendar.png b/help/C/fig/calendar.png
deleted file mode 100644
index c9703f4903..0000000000
--- a/help/C/fig/calendar.png
+++ /dev/null
diff --git a/help/C/fig/config-cal.png b/help/C/fig/config-cal.png
deleted file mode 100644
index 25b5b68621..0000000000
--- a/help/C/fig/config-cal.png
+++ /dev/null
diff --git a/help/C/fig/config-mail.png b/help/C/fig/config-mail.png
deleted file mode 100644
index cd8543d94e..0000000000
--- a/help/C/fig/config-mail.png
+++ /dev/null
diff --git a/help/C/fig/contact-editor.png b/help/C/fig/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/help/C/fig/contact-editor.png
+++ /dev/null
diff --git a/help/C/fig/contact.png b/help/C/fig/contact.png
deleted file mode 100644
index a9ed02251a..0000000000
--- a/help/C/fig/contact.png
+++ /dev/null
diff --git a/help/C/fig/filter-assist-fig.png b/help/C/fig/filter-assist-fig.png
deleted file mode 100644
index 5248e0effe..0000000000
--- a/help/C/fig/filter-assist-fig.png
+++ /dev/null
diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png
deleted file mode 100644
index a8b41ca678..0000000000
--- a/help/C/fig/filter-new-fig.png
+++ /dev/null
diff --git a/help/C/fig/mail-composer.png b/help/C/fig/mail-composer.png
deleted file mode 100644
index 22c16365b5..0000000000
--- a/help/C/fig/mail-composer.png
+++ /dev/null
diff --git a/help/C/fig/mail-druid-pic.png b/help/C/fig/mail-druid-pic.png
deleted file mode 100644
index f29f3e77be..0000000000
--- a/help/C/fig/mail-druid-pic.png
+++ /dev/null
diff --git a/help/C/fig/mail-inbox.png b/help/C/fig/mail-inbox.png
deleted file mode 100644
index b4f18640b4..0000000000
--- a/help/C/fig/mail-inbox.png
+++ /dev/null
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
deleted file mode 100644
index 28bf487bf9..0000000000
--- a/help/C/fig/mainwindow-pic.png
+++ /dev/null
diff --git a/help/C/fig/print-dest.png b/help/C/fig/print-dest.png
deleted file mode 100644
index 464705711e..0000000000
--- a/help/C/fig/print-dest.png
+++ /dev/null
diff --git a/help/C/fig/print-preview.png b/help/C/fig/print-preview.png
deleted file mode 100644
index 7f9a8d661a..0000000000
--- a/help/C/fig/print-preview.png
+++ /dev/null
diff --git a/help/C/fig/vfolder-createrule-fig.png b/help/C/fig/vfolder-createrule-fig.png
deleted file mode 100644
index 162bebf48c..0000000000
--- a/help/C/fig/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
deleted file mode 100644
index 036b663b23..0000000000
--- a/help/C/menuref.sgml
+++ /dev/null
@@ -1,1315 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Menu Reference</title>
-  <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-
-
-  <sect1 id="menuref-universal">
-    <title>Menus that are the same everywhere</title>
-    <para>
-      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in
-      the main <application>Evolution</application> window do not
-      change, because they refer to universal items.  Other menus have
-      contents that change depending on context.
-    </para>
-   
- <sect2 id="menuref-universal-file">
-      <title>File Menu</title>
-      <para>
-	<variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>New...</guisubmenu> Submenu</term>
-	    <listitem><para>
-		<itemizedlist>
-		  <listitem><para>
-		      <guimenuitem>Folder</guimenuitem> &mdash;
-		       Create a new folder. See <xref 
-		       linkend="usage-mainwindow-folderbar">
-		       for more information about folders.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Shortcut</guimenuitem> &mdash;
-		       Create a new Shortcut in the Shortcut Bar.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Mail Message</guimenuitem> &mdash;
-		       Compose a new mail message. Covered in
-		       <xref linkend="usage-mail-getnsend-send">.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Appointment</guimenuitem> &mdash;
-		       Enter a new appointment in your calendar. See <xref
-			linkend="usage-calendar-apts-basic"> for more information.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Task</guimenuitem> &mdash;
-		       Enter a new to-do item in your taskpad. Covered in 
-		       <xref linkend="usage-calendar-todo">.
-		    </para></listitem>
-		</itemizedlist>
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Go to Folder</guimenuitem></term>
-	    <listitem><para>
-               View the items in a particular folder.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Create New Folder</guimenuitem></term>
-	    <listitem><para>
-		 This item doesn't belong here any more.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-		 Print the current message.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Exit</guimenuitem></term>
-	    <listitem><para>
-		 Quit using <application>Evolution</application>.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-universal-help">
-      <title>The Help Menu</title>
-      <para>
-      <variablelist>
-	<varlistentry>
-	  <term><guimenuitem>Help Index</guimenuitem></term>
-	  <listitem><para>
-             Displays the table of contents for this document.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Getting Started</guimenuitem></term>
-	  <listitem><para>
-              A quick look around, and a summary of the things
-              <application>Evolution</application> can do for you.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Mailer</guimenuitem></term>
-	  <listitem><para>
-              An in-depth tour of <application>Evolution</application> Mail.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Calendar</guimenuitem></term>
-	  <listitem><para>
-             A step-by-step guide to using the Calendar.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>
-	  <listitem><para>
-            Find your way around the Contact Manager.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Submit Bug Report</guimenuitem></term>
-	  <listitem><para>
-             If you don't report them, they can't fix them.  Select this item to let the 
-             developers know what's wrong.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>About Evolution</guimenuitem></term>
-	  <listitem><para>
-              Displays a window with information about the application and its authors.
-              This has the same information as <xref linkend="authors">.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-
-  <sect1 id="menuref-mail">
-    <title>Mail Menus</title>
-    <para>
-       <application>Evolution</application> Mail has more specialized
-       menus, and more specialized menu items, than any other part of
-       the application.
-    </para>
-   
-    <sect2 id="menuref-mail-edit">
-      <title>The Edit Menu</title>
-      <para>
-        This menu is currently empty.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-view">
-      <title>The Mail View Menu</title>
-      <para>
-        This menu lets you control the way
-        <application>Evolution</application> displays your information
-        for you.
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the shortcut bar on and off with this item.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.             
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Threaded Message List</guimenuitem></term>
-	    <listitem><para>
-               This item controls whether your message list is displayed by thread 
-               or by other criteria.  The default order is by date; see
-               <xref linkend="usage-mail-listorder"> for information about the
-               order of the message list.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-tools">
-      <title>The Mail Settings Menu</title>
-      <para>
-      <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mail Filters</guimenuitem></term>
-	    <listitem><para>
-             Edit your mail filters here.  
-             See <xref linkend="usage-mail-organize-filters">
-             for more information about mail filtering.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>
-	    <listitem><para>
-              Create, edit, and delete Virtual Folders (<glossterm>vFolders</glossterm>)
-               with this tool. 
-              To learn about using vFolders with mail, see 
-              <xref linkend="usage-mail-organize-vfolders">.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Mail Configuration</guimenuitem></term>
-	    <listitem><para> 
-               Tools for setting up all your mail account preferences.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
-	    <listitem><para>
-               Tools for newsgroup and IMAP folder subscriptions.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forget Passwords</guimenuitem></term>
-	    <listitem><para>
-              This item will cause <application>Evolution</application>
-	      to forget what your password is.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>The Mail Folder Menu</title>
-      <para>
-          The items in this menu relate to 
-          <application>Evolution</application> mail folders.
-      </para>
-      <para>
-          You can:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mark all as Read</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> keeps track of which messages 
-	      you've seen;  to mark everything in a folder as read, choose this item.
-	      You can mark a single message as read by right-clicking it in the message bar.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete All</guimenuitem></term>
-	    <listitem><para>
-	      This is a favorite item of everyone with too much junk-mail: one click, and it 
-	      deletes every message in the current folder. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-                 Empties the trash folder, erasing messages permanently. 
-                 Once you've done this, they're gone for good.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configure Folder</guimenuitem></term>
-	    <listitem><para>
-              Use this item to set the file format in which
-              <application>Evolution</application> stores mail. You
-              can choose from standard UNIX-style
-              <systemitem><filename>mbox</filename></systemitem>
-              files, or the
-              <systemitem><filename>mh</filename></systemitem> format.
-              Converting large mailboxes may take a long time, and
-              it's a good idea to have a backup copy beforehand.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>The Mail Message Menu</title>
-      <para>
-          The items in this menu relate to
-          <application>Evolution</application> mail messages. Most of
-          them require you to have a message selected, and are also
-          available by right-clicking on a message in the message
-          list.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Open in New Window</guimenuitem></term>
-	    <listitem><para>
-	       Displays the selected message in a new window.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-	      Open the selected message in the message composer.  You
-              can only edit a message you have written: drafts and messages in 
-              the <guilabel>Sent</guilabel> box. 
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Message</guimenuitem></term>
-	    <listitem><para>
-	       Displays the <interface>Print Preview</interface> window, 
-               ready for printing.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
-	    <listitem><para>
-	       Opens a message composition window addressed to the
-               author of the  message.  Covered in detail in 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reply to All</guimenuitem></term>
-	    <listitem><para>
-	        Opens a message composition window addressed to the
-                author of the  message and all known recipients.
-                Covered in detail in <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward</guimenuitem></term>
-	    <listitem><para>
-	       Appends the body of the selected message to a new message.
-               Covered in detail in  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete Message</guimenuitem></term>
-	    <listitem><para>
-	       Marks a message for deletion.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move Message</guimenuitem></term>
-	    <listitem><para>
-	       Choose a folder in which to place this message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy Message</guimenuitem></term>
-	    <listitem><para>
-	       Copy the selected  message to another folder.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create vFolders 
-               which you may customize further or save as-is. This one will
-               create a vFolder which will display all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a vFolder to hold all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a VFolder to hold all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Subject</guimenuitem></term>
-	    <listitem><para>
-	       This item, and the three that follow it, will create Filters 
-               for which you must select actions.  You may keep the criteria as 
-               they are, or alter them as you wish. This one will
-               create a filter which will affect all messages that contain the 
-               subject line of the selected message.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Sender</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which affects all messages from the sender of
-               the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filter on Recipients</guimenuitem></term>
-	    <listitem><para>
-	       Creates a filter which will affect all messages addressed to the 
-               recipient of the selected message.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
-      <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
-      <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a <guisubmenu>New</guisubmenu> submenu
-         that is identical to that in the 
-         <link linkend="menuref-universal-file">main window's file menu</link>.
-         Its other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
deleted file mode 100644
index 2987dd7988..0000000000
--- a/help/C/preface.sgml
+++ /dev/null
@@ -1,427 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.
-        <application>Evolution</application>'s goal is to make the
-        tasks of storing, organizing, and retrieving information
-        easier, so you can work and communicate with others.  That is,
-        it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop. On the inside, it's a
-        powerful database; on the outside, it's a tool to help you get
-        your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>Evolution</application> is free software.  The
-        program and its source code are released under the terms of
-        the <ulink type="help" url="gnome-help:gpl"><citetitle>GNU
-        Public License (GPL)</citetitle></ulink>, and the
-        documentation falls under the <ulink type="help"
-        url="gnome-help:fdl"><citetitle>Free Documentation
-        License</citetitle></ulink> (FDL). For more information about
-        the GPL and the FDL, visit the Free Software Foundation's
-        website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>This is a preview release</title>
-           <para>
-             <application>Evolution</application> is not complete, and
-             still has a lot of flaws.  Please help improve it by
-             letting us know about them.  You should do this by
-             submitting bug reports with the GNOME <application>Bug
-             Report Tool</application> (known as
-             <command>bug-buddy</command> at the command line).
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> can help you work in a
-        group, by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-        <application>Evolution</application> can handle almost all
-        your communications and information management tasks with the
-        power and flexibility of the GNOME desktop environment.
-      </para>
-      <para>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. That means a familiar and intuitive
-             interface that users can customize to their liking, and
-             the development of shortcuts for complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Data must be safe: <application>Evolution</application>
-               must not lose mail, corrupt mailbox files or other
-               data, execute arbitrary <glossterm linkend="script">scripts</glossterm>,
-               or delete files from your hard disk.
-            </para>
-          </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        <application>Evolution</application> is designed to make most
-        daily tasks faster.  For example, it takes only one or two
-        clicks to enter an appointment or an address card sent to you
-        by email, or to send email to a contact or appointment.
-        <application>Evolution</application> makes displays faster and
-        more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate advanced
-        features like <link
-        linkend="usage-mail-organize-vFolders">vFolders</link>, which
-        let you save searches as though they were ordinary mail
-        folders.
-      </para>
-
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>About This Book</title>
-    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
-      <para>
-        This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.6 of the software.  It is missing huge
-        chunks of information, and many of the features it describes
-        are unimplemented.  All the content is subject to change,
-        especially if you help.  Please send comments on the guide to
-        <email>aaron@helixcode.com</email>. If you would like to work
-        on the guide please contact me or see the GNOME Documentation
-        project <ulink
-        url="http://developer.gnome.org/projects/gdp">web
-        site</ulink>.  This paragraph will be removed in later
-        versions of the manual.
-      </para>
-    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
-
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this is the section for you. The second section,
-        covering <link linkend="config">configuration</link>, is
-        targeted at more advanced users, but anyone who wants to
-        change the way <application>Evolution</application> looks or
-        acts can benefit from reading it.  In addition, there is a
-        comprehensive <link linkend="menuref">menu
-        reference</link> which describes nearly every capability that
-        <application>Evolution</application> has to offer.
-      </para>
-      <formalpara>
-        <title>Typographical conventions</title>
-	<para>
-          Some kinds of words are marked off with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-        </para>
-      </formalpara>
-  </sect1>
-  <sect1 id="commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-        You might want to get a copy of this section and tape it to
-        the wall next to your computer: it's a very short summary of
-        most of the things you'll want to do with
-        <application>Evolution</application>, and pointers to the
-        sections of the book where you'll find more in-depth
-        description of those tasks.
-    </para>
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-         Here are the keyboard shortcuts and menu items you're most
-         likely to use: (Please note that the shortcuts listed are
-         probably wrong at this point).
-         
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:
-         <variablelist>
-	  <varlistentry>
-	    <term>Check Mail</term>
-	    <listitem>
-	      <para>
-                Click <guibutton>Get Mail</guibutton> in the toolbar, or press 
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                Select the message to which you want to reply, and
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message you want to forward, and
-                click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-		  <keycap>FIXME</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Create Filters and vFolders</term>
-	    <listitem>
-	      <para>
-                You can create filters and vFolders based on specific
-                message attributes by right-clicking on a message or
-                by selecting <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>Mail Filters</guimenuitem> </menuchoice>
-                or <menuchoice> <guimenu>Tools</guimenu>
-                <guimenuitem>vFolder Editor</guimenuitem>
-                </menuchoice>.  Filters are discussed in <xref
-                linkend="usage-mail-organize-filters">, and vFolders
-                in <xref linkend="usage-mail-organize-vfolders">.
-            </para>
-	    </listitem>
-	</varlistentry>
-	</variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-cal">
-        <title>Calendar</title>
-        <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-
-
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
deleted file mode 100644
index 72f278a424..0000000000
--- a/help/C/usage-calendar.sgml
+++ /dev/null
@@ -1,367 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>The Evolution Calendar</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a grey and white ruled background.  At the upper
-    right, there's a monthly calendar you can use to switch days.
-    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
-    keep a sort of glorified to-do list that's not linked to your
-    calendar.  The calendar's daily view is shown in <xref
-    linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-
-    <para>
-       You can view your calendar by the day, by the week, by the
-       month, or by the year; press the calendar-shaped buttons on the
-       right side of the toolbar to switch between views.
-    </para>
-    <para>
-       To view yesterday's appointments, &mdash;last week's, if you're in
-       the weekly view, and last month's for the monthly view&mdash; click
-       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,
-       or next month, click <guibutton>Next</guibutton>, and of course,
-       click <guibutton>Today</guibutton> for today.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-       The <application>Evolution</application> calendar allows you to
-       schedule events for yourself or a group of people.  It can
-       handle events that repeat, event lengths from ten minutes to
-       multiple days, and events that have a date but no specific
-       time.  Of course, you can also set event reminders and alarms
-       so that you don't forget about everything you've just put into
-       your calendar. From office or family to office
-       <emphasis>and</emphasis> family,
-       <application>Evolution</application> can handle the schedule.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
-      <para>
-	To create a new calendar event, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your event must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <note>
-       <title>Doing Two Things At Once</title>
-         <para>
-           If you create calendar events that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
-         you've scheduled.  You can have one alarm of each type:
-         <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your event.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like some additional application
-	        to run as a reminder.  You can enter its name in the
-	        text field, or find it with the
-	        <guibutton>Browse</guibutton> button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> is a little more
-         complicated, and only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and implementations of
-         this feature have yet to be determined. <!-- FIXME -->
-      </para>
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
-        every 100 years.  You can then choose a time when repetition
-        will stop, and, under <guilabel>Exceptions</guilabel>, pick
-        individual days when the event will <emphasis>not</emphasis>
-        recur.
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event in
-	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization with a hand-held device.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
-	  <listitem>
-	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of the
-       calendar window.  To view or edit a detailed description of an
-       item, double-click on it, or select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Keelyn. the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
-      </menuchoice>.
-       You can place the calendar in any calendar folder and access it
-       from the folder view.  Alarms, configuration, and display for
-       each calendar are separate from each other.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
deleted file mode 100644
index 21630cacb3..0000000000
--- a/help/C/usage-contact.sgml
+++ /dev/null
@@ -1,617 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>The Evolution Contact Manager</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> contact manager can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held and remote devices.
-      Since <application>Evolution</application> supports most major
-      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
-      fit into almost any existing network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  That means that when you look for someone's
-      address, you can also see a history of appointments with that
-      person.  Or, you can get an e-mail with contact information in
-      it and create a new address card on the spot.  In addition,
-      searches and folders and all work in the same way they do in the
-      other components, so you don't have to learn another system for
-      similar tasks.
-    </para>
-    <para>
-      This chapter will cover using the
-      <application>Evolution</application> contact manager to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks.  To
-      learn about configuring the contact manager, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Contact Manager</title>	
-    
-    <para>
-       To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the Contact Manager in all
-       its organizational glory.  By default, the contact manager
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-
-    <figure id="usage-contact-fig">
-      <title>Evolution Contact Manager</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-       The toolbar for the address book is quite simple:
-       <itemizedlist>
-	<listitem><para>
-           Press <guibutton>New</guibutton> for a new contact.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    Press <guibutton>Print</guibutton> to print one or more cards.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> Displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> Stop loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       The rest of the contact manager is taken up by the display of
-       your contact information.  You can view that display as a table
-       or as a list of cards&mdash; switch views in the
-       <guimenu>View</guimenu> menu &mdash; and move through them
-       alphabetically with the buttons and the scrollbar at the right
-       of the window. Of course, if you have more than a few people
-       listed, you'll want some way of finding them more quickly,
-       which is why there's a search feature.
-    </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is <guilabel>Quick Search</guilabel>. To use
-    	   it, just type in one or more words you're looking for and
-    	   hit <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. That means that you can refine searches by doing several in
-    	   succession.
-	</para>
-      <para>
-	   If there are no matches, the card display will be blank. When
-	   you'd like to see all the cards again, press <guilabel>Show
-	   All</guilabel>.
-      </para>
-      <example id="contact-quicksearch-ex">
-	<title>Refining a Quick Search</title>
-	<para>
-	    Tom comes back from lunch and finds a note on his keyboard:
-	    "Curtis in sales called for you, but he didn't leave a number,
-	    and I forgot to write down the name of the company he works
-	    for. He said it was important, though." Tom is not at all
-	    annoyed.
-         </para>
-	 <para>
-	    He opens his contacts folder, and runs a quick search for
-	    "Curtis;" there are eighteen different people with that name
-	    in the file. He then enters "Sales," and
-	    <application>Evolution</application> narrows it down to the
-	    right Curtis. He only becomes annoyed when he discovers that
-	    the call was not actually important.
-          </para>
-      </example>
-    
-      <para>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the in-depth search window, which
-        lets you use multiple search criteria in the same way that
-        email filters and <glossterm linkend="vfolder">vFolders</glossterm> do..
-      </para>    
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a searchs within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select all
-        the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
-  </sect1>
-  <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
-    <para>
-       To delete a card, click on it once to select it, then press the
-       <guibutton>Delete Card</guibutton> button.  If you have
-       multiple cards selected, you'll delete multiple cards.
-    </para>
-    <para>
-       Adding or changing cards is slightly more complicated.  Any
-       time you add information to the contact manager, whether it's
-       an old card you're editing or a new card you're just adding to
-       your address book, you'll use the contact editor.  To change a
-       card that already exists, just double click it to open the
-       contact editor window with all the current information already
-       filled in.  If you want to create a new one, clicking the
-       <guibutton>New Card</guibutton> button will open up that same
-       window, but with empty fields instead of full ones.  Either
-       way, it's the same tool for quite similar tasks, and you'll
-       find that it's pretty flexible and can store quite a lot more
-       than you'd think would fit onto a file card.
-    </para>
-
-      <para>
-	The contact editor window has two tabs,
-    	<guilabel>General</guilabel>, for basic contact information,
-    	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, covered in <xref
-    	linkend="menuref-contact-editor">, and a toolbar with three
-    	items: <guilabel>Save and Close</guilabel>,
-    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-    	After that, however, it gets slightly more complicated, as you
-    	can see in <xref linkend="usage-contact-editor-fig">.
-      </para>
-      
-      <figure id="usage-contact-editor-fig">
-	  <title>Evolution Contact Editor</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
-		</graphic>
-	</screenshot>
-      </figure>
-      
-      <para> The <guilabel>General</guilabel> tab contains no less
-        than seven sections, each with an icon: a face, for name and
-        company; a telephone for phone numbers; an envelope for email
-        address; a globe for web page address; a house for postal
-        address; a file folder for contacts, and a briefcase for
-        categories.  You can guess what sort of information belongs in
-        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
-        page address</guilabel>, but there are several parts of the
-        window that are a little more interesting.
-    </para>
-    <para>
-     <variablelist>
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		             The person's first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  The middle name or initial, if any, goes here.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   The last name (surname) belongs here.
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Suffixes such as "Jr." or "III" can go here. 
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Eva Lucianne Tester</userinput>.
-                    You'll notice that the <guilabel>File
-                    As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Eva</computeroutput>.
-                    You can pick <computeroutput>Eva
-                    Tester</computeroutput> from the drop-down, or
-                    type in your own, such as <userinput>Lucianne
-                    Tester, Eva</userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employee."
-                    </para>
-		  </tip>
-		</listitem>
-	      </itemizedlist>
-             </para>
-           </listitem>
-	</varlistentry>
-	<varlistentry>
-            <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                remember them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool.  That's
-       really its own topic; for information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is, fortunately, much more
-       simple: three sections, all of which are more or less obvious:
-       the briefcase next to the details about the contact's
-       professional life; the face next to the details about their
-       personal life; the globe next to a big blank space you can use
-       for anything and everything else you'd like to note about them.
-       If you ever wanted to have that uncanny knack for remembering
-       obscure details like the date of someone's anniversary (perhaps
-       your own) this is the answer.
-     </para>
-
-
-
-
-<!--- ############# This section isn't implemented yet either:
-    <sect2>
-      <title></title>
-      <para>
-        <tip>
-	  <title>Contact Shortcuts</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-            right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change!  unimplemented!)
-          </para>
-	</tip>
-      </para>
-      <para>
-        You can move cards around just as you would move email
-        messages: dragging and dropping works, as does right-clicking
-        and choosing <guimenuitem>Move</guimenuitem> from the menu
-        that appears.
-      </para>
-    </sect2>
-############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Contact Manager</title>
-    <para>
-       Organizing your contact manager is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the contact manager does not allow vFolders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!--
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your contact manager share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way that mail folders do.  For more
-         flexibility, you can also mark contacts as members of
-         different categories.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  The difference between folders
-           and categories is that folders contain cards, but category
-           membership is a property of each card.  That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
-
-       <!-- FIXME: Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <para>
-       If you keep your cards on a network using an
-       <glossterm linkend="ldap">LDAP</glossterm> server, you can share access to
-       them.  Actually, the server software takes care of that, and
-       also determines who is allowed to see and change them.  This is
-       the sort of feature you'll want to use if your company has a
-       list of vendors and clients that needs constant updating.  If
-       you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their work-group
-       or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X.
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters, or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar, and will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem><para>
-              They are only available when you are connected to the network.  If 
-              you use a laptop or have a modem connection, you may wish to copy or cache
-              the network directory and then synchronize your copy with the networked version
-              periodically.
-          </para></listitem>
-          <listitem><para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para></listitem>
-	  <listitem><para>
-              Your ability to view, change, add or delete
-              contacts depends on the settings of the LDAP server.
-              For example, you may read all the entries in the public
-              Netcenter directory (available by default in the
-              <guilabel>External Directories</guilabel> folder), but
-              you may not change or delete any of them.
-           </para></listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Contact Manager Tools</title>
-    <para>
-       The contact manager works with
-       <application>Evolution</application> mail and the calendar to
-       help you add new address cards quickly.  However, it can also
-       manage mailing lists.  There are more tools planned, and when
-       they arrive, <!-- FIXME --> they will be described in this
-       section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> also adds cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your contact manager's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group.
-      </para>
- <!-- FIXME this feature not yet implemented  -->
-      <para>
-         Future versions of <application>Evolution</application> will
-	 allow you to you export a group of cards to a spreadsheet,
-	 database, or word processor so you can print address labels
-	 or prepare large postal mailings.
-      </para>
-    </sect2>
-<!--
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-  </sect1>
-
-</chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
deleted file mode 100644
index 6aafdaa492..0000000000
--- a/help/C/usage-mail.sgml
+++ /dev/null
@@ -1,1382 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-mail"> 
-  <title>Evolution Mail</title>
-  <abstract>
-    <title> An Overview of the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   It can sort and organize your mail in a wide variety of ways with
-	   folders, searches, and filters.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	  It can send and receive mail in HTML or as plain text, and
-	  supports file attachments.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   It supports multiple mail sources, including <glossterm
-	   linkend="imap">IMAP</glossterm>, <glossterm
-	   linkend="pop">POP3</glossterm>, local
-	   <systemitem><filename>mbox</filename></systemitem> and
-	   <systemitem><filename>mh</filename></systemitem> files, and
-	   even NNTP messages (newsgroups), which aren't technically
-	   email.
-	 </para>
-       </listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan mail
-      volumes. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in other mail clients.
-      If you get a lot of mail, or if you keep every message you get
-      in case you need to refer to it later, you'll find that feature
-      especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar.  By
-       default, the <interface>Inbox</interface> is open when you
-       start <application>Evolution</application>, and the first
-       time you see your Inbox, there's a message in it from Helix
-       Code welcoming you to the application.
-      </para>
-      <para>
-	The <application>Evolution</application>
-	<guilabel>Inbox</guilabel>, should look like the one in <xref
-	linkend="usage-mail-intro-fig">, which has a message from
-	Helix Code. The message summary appears at the top, in the
-	<interface>message list</interface>.  The message itself is
-	displayed below that, in the <interface>view pane</interface>.
-	If you find the <interface>view pane</interface> too small,
-	you can double-click on the message in the <interface>message
-	list</interface> to have it open in a new window.  Just like
-	with folders, you can right-click on messages in the message
-	list and get a menu of possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="usage-mail-intro-fig">
-	  <title>Evolution Mail</title>
-	  <screenshot>
-	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-      <para>
-         Most of the mail-related actions you'll want to perform are
-         listed in the <guimenu>Message</guimenu> menu in the menu
-         bar.  The most frequently used ones, like
-         <guimenuitem>Reply</guimenuitem> and
-         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-         right-click menu and as keyboard shortcuts, which tend to be
-         faster once you get the hang of them.  You can choose
-         whichever way you like best; the idea is that the software
-         should work the way you want, rather than making you work the
-         way the it does.
-       </para>
-
-      <sect3 id="usage-mail-listorder">
-	<title>Sorting the message list</title>
-	<para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list.  If you click twice, you'll sort them in reverse
-          order.
-        </para>
-	<para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  If the option selected,
-          <application>Evolution</application> will attempt to
-          associate related messages by using message ID numbers and
-          the <systemitem>References</systemitem>,
-          <systemitem>In-Reply-To</systemitem>, and
-          <systemitem>Subject</systemitem> message headers.  Messages
-          which are related are then placed next to each other, so
-          that it's easier to follow the thread of a conversation from
-          message to message.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar.  The message now has a line through it,
-          because you've marked it for deletion.
-        </para>
-        <para>
-          If you really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently. If you want to keep it, click
-          <guibutton>Delete</guibutton> again, and it will no longer
-          be marked as deleted.  At some point in the future, this
-          feature will change to something a little less
-          counter-intuitive.
-        </para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-	Now that you've had a look around the
-	<interface>Inbox</interface>, it's time to check for new mail.
-	Click <guibutton>Get mail</guibutton> in the toolbar to check
-	your mail.  If it's the first time you've done so, the
-	<interface>mail setup assistant</interface> will ask you for
-	the information it needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). 
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        the password until you quit the application or until you
-        select <menuchoice> <guimenu>Settings</guimenu>
-        <guimenuitem>Forget Passwords</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-        Once it's validated the password,
-	<application>Evolution</application> will check your mail.
-	New mail will appear in the local <interface>Inbox</interface>
-	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.
-      </para>
-   
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title> 
-     <para>
-	If you get an error message instead of mail, you probably need
-	to change your network settings.  To learn how to do that,
-	have a look at <xref linkend="config-prefs-mail-network">, or
-	ask your system administrator.
-      </para>
-    </note>
-
-      <sect3 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email there's no reason not to
-         read them side by side.  If you want to do that, add a news
-         source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
-       </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Attachments and HTML Mail</title>
-	<para>
-	  If someone sends you an <glossterm>attachment</glossterm>, a
-	  file attached to an email,
-	  <application>Evolution</application> will display the file
-	  at the bottom of the message to which it's attached.  Text,
-	  HTML, and most images will be displayed within the message
-	  itself.  For other files,
-	  <application>Evolution</application> will provide a link and
-	  icon at the end of the message.  Click on that, and
-	  <application>Evolution</application> will ask you where you
-	  want to put the file.  Once you've chosen a location and
-	  saved the file, you can open, move, copy, or execute it just
-	  like any other, using <application>Nautilus</application> or
-	  your favorite shell or file manager.
-        </para>
-        <para>
-          As usual, there's a shortcut here: right-click on the link,
-	  and choose an application for the file: you can send an
-	  image straight to the <application>GIMP</application>, or a
-	  spredsheet straight to <application>Gnumeric</application>.
-	</para>
-
-	<para>
-	   <application>Evolution</application> can also display
-	   HTML-formatted mail, complete with graphics.  HTML
-	   formatting will display automatically, although you can
-	   turn it off if you prefer.
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
-      <para>
-	 You can start writing a new email message by selecting
-	 <menuchoice> <guimenu>File</guimenu>
-	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail</guimenuitem></menuchoice>, or by pressing the
-	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
-	 When you do so, the <interface>New Message</interface> window
-	 will open, as shown in <xref
-	 linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-	<title>New Message Window</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
- <!-- Check the alignment of the following paragraph in the PS and
- HTML output: it's indented for no good reason -->
-      <para>
-	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 subject in the <guilabel>Subject:</guilabel> and a message in
-	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.  That's easy, although it can
-	 get a little more complicated if you want.
-       </para>
-
-      <sect3 id="usage-mail-getnsend-send-delay">
-	<title>Saving Messages for Later</title>
-	<para>
-	   Evolution will send mail immediately unless you tell it to
-	   do otherwise by selecting <menuchoice>
-	   <guimenu>File</guimenu> <guimenuitem>Send
-	   Later</guimenuitem></menuchoice>.  That will add messages
-	   to the <guilabel>Outbox</guilabel> queue.  Then, when you
-	   press <guibutton>Send</guibutton> in another message, or
-	   <guibutton>Get Mail</guibutton> in the main mail window,
-	   all your unsent messages will go out at once.  I like to
-	   use "Send Later" because it gives me a chance to change my
-	   mind about a message before it goes out.  That way, I don't
-	   send anything I'll regret the next day.
-	</para>
-	<para>
-	   To learn more about how you can specify message queue and
-	   filter behavior, see <xref linkend="config-prefs-mail">.
-	</para>
-
-	<para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
-	  </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-	  You can probably guess the purpose of the buttons labelled
-	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton>, but there's a bit more to
-	  sending mail that's less obvious.  In the next few sections,
-	  you'll see how <application>Evolution</application> handles
-	  additional features, including large recipient lists,
-	  attachments, and forwarding.
-        </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
-	<title>Attachments</title>
-	<para>
-	    If you want to attach a file to your email message, you
-	    can drag it from your desktop into the message window, or
-	    click the button in the toolbar with a paper clip on it,
-	    labelled <guibutton>Attach</guibutton>.  If you click the
-	    <guibutton>Attach</guibutton> button,
-	    <application>Evolution</application> will open a file
-	    selection dialog box, to ask you which file you want to
-	    send.  Select the file and click <guilabel>OK</guilabel>.
-        </para>
-	<para>
-            To see what files you've attached to the message you're
-            composing, select <menuchoice> <guimenu>View</guimenu>
-            <guimenuitem>Show Attachments</guimenuitem> </menuchoice>;
-            to hide them again, choose <guimenuitem>Hide
-            Attachments</guimenuitem>.
-        </para>
-	<para>
-            When you send the message, a copy of the attached file
-	    will go with it.  Be aware that big attachments can take a
-	    long time to download.
-          </para>
-	</sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
-        <para>
-	    <application>Evolution</application>, like all email
-	    programs (at least, all the ones in current use)
-	    recognizes three types of addressee: primary recipients,
-	    secondary recipients, and hidden ("blind") recipients.
-         </para>
-         <para>
-	    The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  However, it's
-            considered bad form to have more than a few email
-            addresses in this section.  If you are sending mail to
-            more than one or two people, consider the
-            <guilabel>Cc:</guilabel> field.
-	  </para>
-	  <para>
-	    Hearkening back to the dark ages when people used
-	    typewriters and there were no copy machines, "Cc" stands
-	    for "Carbon Copy."  Use it whenever you want to share a
-	    message you've written to someone else.
-	    <example id="ex-mail-cc">
-	      <title>Using the Cc: field</title>
-	      <para>
-	         When Susan sends an email to a client, she puts her
-	         co-worker, Tim, in the in the
-	         <guilabel>Cc:</guilabel> field, so that he know
-	         what's going on.  The client can see that Tim also
-	         received the message, and knows that he can talk to
-	         Tim about the message as well.
-	      </para>
-	    </example>
-	  </para>
-	  <para>
-	    If you have a large number of recipients, or if you want
-	    to send mail to several people without sharing the
-	    recipient list, you should use
-	    <guilabel>Bcc:</guilabel>. "Bcc" stands for "Blind Carbon
-	    Copy", and means that people you put in the
-	    <guilabel>Bcc:</guilabel> field get the message, but
-	    nobody else sees their email address.  They will still see
-	    the list of addresses from the <guilabel>To:</guilabel>
-	    and <guilabel>Cc:</guilabel> fields, though.
-
-	    <example id="ex-mail-bcc">
-	      <title>Using the Bcc: field</title>
-	      <para>
-	         Tim is sending an email announcement to all of his
-	         company's clients, some of whom are in competition
-	         with each other, and all of whom value their
-	         privacy. He needs to use the
-	         <guilabel>Bcc:</guilabel> field here.  If he puts
-	         every address from his address book's "Clients"
-	         category into the <guilabel>To:</guilabel> or
-	         <guilabel>Cc:</guilabel> fields, he'll make the
-	         company's <emphasis>entire</emphasis> client list
-	         public.  Don't assume it won't happen to you!
-	     </para>
-	    </example>
-	  </para>
-	</sect4>
-
-        <sect4 id="usage-mail-getnsend-send-to">
-	<title>Choosing Recipients Quickly</title>
-	<para>
-	  If you have created address cards in the contact manager,
-	  you can also enter nicknames or other portions of address
-	  data, and <application>Evolution</application> will complete
-	  the address for you. <!-- (INSERT description of UI for this
-	  feature, once it is decided upon). --> If you enter a name
-	  or nickname that can go with more than one card, Evolution
-	  will open a dialog box to ask you which person you meant.
-	  <!-- (NOT YET) Also, <application>Evolution</application>
-	  will add a domain to any unqualified addresses.  By default,
-	  this is your domain, but you can choose which one mail
-	  preferences dialog. -->
-          </para>
-	  <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-	  <para>
-            For more information about using email together with the
-	    contact manager and the calendar, see <xref
-	    linkend="usage-contact-automate"> and <xref
-	    linkend="usage-calendar-apts">.
-	  </para>
-        </sect4>
-      </sect3>
-      
-      <sect3 id="usage-mail-getnsend-send-reply">
-	<title>Replying to Messages</title>
-	<para>
-	   To reply to a message, press the
-	   <guibutton>Reply</guibutton> button while it is selected,
-	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
-	   the message's right-click menu.  That will open
-	   <interface>message composer</interface>.  The
-	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
-	   fields will already be filled, although you can alter them
-	   if you wish.  In addition, the full text of the old message
-	   is inserted into the new message, either in italics (for
-	   HTML display) or with the &gt; character (in plain text
-	   mode) before each line, to indicate that it's part of the
-	   previous message.  People often intersperse their message
-	   with the quoted material as shown in <xref
-	   linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note that this figure should have a reply mail ready to send,
-with quoted materials and the relevant replies interspersed-->
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-	 <title>Reply Message Window</title>
-	 <screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-	</para>
-
-	<para>
-	  If you're reading a message with several recipients, you may
-	   wish to use <guibutton>Reply to All</guibutton> instead of
-	   <guibutton>Reply</guibutton>.  If there are large numbers
-	   of people in the <guilabel>Cc:</guilabel> or
-	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  But be careful, and always make sure you
-	   know who is getting a message: one address could be a
-	   mailing list with thousands of subscribers.
-	  <example>
-	    <title>Using the Reply to All feature</title>
-	    <para>
-	      Susan sends an email to a client, and sends copies to
-	      Tim and to an internal company mailing list of
-	      co-workers.  If Tim wants to make a comment to all of
-	      them, he uses <guibutton>Reply to All</guibutton>, but
-	      if he just wants to tell Susan that he agrees with her,
-              he uses <guibutton>Reply</guibutton>.
-	    </para>
-	  </example>
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-	<para>
-           You're probably familiar with search and replace features,
-           and if you come from a Linux or Unix background, you
-           probably know what <guimenuitem>Find Regex</guimenuitem>
-           does.  If you aren't among the lucky who already know,
-           here's a quick rundown of an important section of the
-           <guimenu>Edit</guimenu> menu.
-        </para>
-	<para>
-           <variablelist>
-	    <varlistentry>
-	      <term><guimenuitem>Find</guimenuitem></term>
-	      <listitem><para> Enter a word or phrase, and
-	      <application>Evolution</application> will find it
-              in your message.
-	      </para></listitem>
-	    </varlistentry>
-	    
-	    <varlistentry>
-	      <term><guimenuitem>Find Regex</guimenuitem></term>
-	      <listitem>
-		<para>
-                  Perform a search for a <glossterm
-                  linkend="regular-expression">regular
-                  expression</glossterm>, or "regex."
-               </para>
-             </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenuitem>Find Again</guimenuitem></term>
-	      <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	       <term><guimenuitem>Replace</guimenuitem></term>
-	       <listitem><para> 
-                 Find a word or phrase, and replace it with
-	         something else.  
-               </para></listitem>
-	    </varlistentry>
-
-	  </variablelist>
-        </para>  
-	<para>
-            For all of these items, you have two additional choices.
-            First, you can choose whether to <guilabel>Search
-            Backwards</guilabel>, which will perform the search
-            starting wherever your cursor is, and moving back towards
-            the beginning of the document (normally, it goes the other
-            way).  Then, you can decide whether to have your search be
-            <guilabel>Case Sensitive</guilabel>, meaning should it pay
-            attention to the case of letters when locating a match.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
-	<title>Embellish your email with HTML</title>
-	<para>
-            You can't normally use text treatments or pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis or use <glossterm
-            linkend="emoticon">emoticons</glossterm> to convey their
-            feelings.  However, most of the newer email programs can
-            include and display images and text treatments as well as
-            basic alignment and paragraph formatting. They do this
-            with <glossterm linkend="html">HTML</glossterm>, just like
-            web sites do.
-        </para>
-	<note>
-	  <title>HTML Mail is not a Default Setting</title>
-	  <para>
-	    Some people do not have HTML-capable mail clients, or
-	    prefer not to receive HTML-enhanced mail because it is
-	    slower to download and display.  <emphasis>Some</emphasis>
-	    people refer to HTML mail as "the root of all evil" and
-	    get very angry if you send them HTML mail, which is why
-	    <application>Evolution</application> sends plain text
-	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <menuchoice>
-	    <guimenu>Format</guimenu> <guimenuitem>
-	    HTML</guimenuitem></menuchoice>.  Alternately, you can set
-	    your default mail format preferences in the mail
-	    configuration dialog.  See <xref
-	    linkend="config-prefs-mail-other"> for more information.
-          </para>
-	</note>
-	<para>
-           HTML formatting tools are located just above the
-	   composition frame, and in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  Your message text will
-	   appear formatted in the composer window, and the message
-	   will be sent as HTML.
-	  </para>
-	  <para>
-            The icons in the toolbar are explained in tool-tips, which
-            appear when you hold your mouse over the buttons.  The
-            buttons fall into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-	      <listitem>
-		<para>
-                  Choose <guilabel>Normal</guilabel> for a default
-                  text style, or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6).  You can also
-                  select <guilabel>pre</guilabel> for preformatted
-                  text blocks, and three types of <guilabel>List
-                  Item</guilabel>.
-                </para>
-	      </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-	      <listitem>
-		<para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">      
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>   
-                  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                 </itemizedlist>
-               </para>               
-	      </listitem>    
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Alignment</term>
-	      <listitem>
-		<para>
-                   Located next to the text style buttons,
-                   these three paragraph icons should be familiar to
-                   users of most word processing software.  The
-                   leftmost button will make your text left-justified,
-                   the center button, centered, and the right hand
-                   button, right-justified.
-                </para>
-	      </listitem>
-	      </varlistentry>
-
-	    <varlistentry>
-	      <term>Indentation rules</term>
-	      <listitem>
-		<para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	    <varlistentry>
-	      <term>Color Selection</term>
-	      <listitem>
-		<para>
-                  At the far right is the color section tool.  You can
-                  choose from several colors by clicking on the arrow,
-                  or create your own custom color by clicking on the
-                  color box itself.  If you have text selected, the
-                  color will apply to the selected text.  If you do
-                  not have text selected, the color will apply to
-                  whatever you type next.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  </variablelist>
-        </para>
-	<para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-	       <listitem>
-	        <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL).
-              </para>
-	    </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-	    <listitem>
-	      <para>
-               <guimenuitem>Insert Image</guimenuitem>: Select this item to
-               embed an image into your email, as was done in the welcome
-               message.  Images will appear at the location of the
-               cursor.
-              </para>
-	    </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-	</varlistentry>
-
-	  </variablelist>
-          </para>
-	  <note>
-	    <title>A Technical note on HTML Tags</title>
-	    <para>
-	      The composer is a WYSIWYG (What You See Is What You Get)
-	      editor for HTML. That means that if you enter HTML
-	      directly into the composer&mdash; say, <markup
-	      role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	      the composer will assume you meant exactly that string
-	      of characters, and not "make this text bold," as an HTML
-	      composition tool or text editor would.
-	    </para>
-	</note>
-      </sect3>
-   
-
-<!-- Function not implemented, 
-possibly never will be due to security evil. -->
-<!--
-	<sect3 id="usage-mail-getnsend-send-live">
-	  <title>Live Documents</title>
-	  <para>
-	    Later versions of <application>Evolution</application>
-	    will allow you to enliven your email with almost any
-	    sort of document, and even with entire
-	    applications. At this point, however, this feature has not 
-	    yet been implemented.
-	  </para>
-	</sect3>
--->
-
-      <sect3 id="usage-mail-getnsend-fwd">
-	<title>Forwarding Mail</title>      
-	<para>
-	  The post office forwards your mail for you when you change
-	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> button
-	  works in much the same way.  It's particularly useful if you
-	  have received a message and you think someone else would
-	  like to see it.  You can forward a message as an attachment
-	  to a new message (this is the default) or
-	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-	  portion of the message you are sending.  Attachment
-	  forwarding is best if you want to send the full, unaltered
-	  message on to someone else.  Inline forwarding is best if
-	  you want to send portions of a message, or if you have a
-	  large number of comments on different sections of the
-	  message you are forwarding.  Remember to note from whom the
-	  message came, and where, if at all, you have removed or
-	  altered content.
-	</para>
-	<para>
-	  To forward a message you are reading, press
-	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <menuchoice> <guimenu>Message</guimenu>
-	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-	  instead of attached, select <menuchoice>
-	  <guimenu>Message</guimenu> <guimenuitem>Forward
-	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-	  addressee as you would when sending a new message; the
-	  subject will already be entered, but you can alter it.
-	  Enter your comments on the message in the
-	  <interface>composition frame</interface>, and press
-	  <guibutton>Send</guibutton>.
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Seven Tips for Email Usage</title>
-	<para>
-	  I started with ten, but four were "Don't send
-	  <glossterm linkend="spam">spam</glossterm>."
-	  <itemizedlist>
-
-	    <listitem>
-	      <para>
-		 Don't send spam or forward chain mail.  If you must,
-		 watch out for hoaxes and urban legends, and make sure
-		 the message doesn't have multiple layers of
-		 greater-than signs, (&gt;) indicating multiple layers
-		 of careless inline forwarding.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Always begin and close with a salutation. Say
-		"please" and "thank you", just like you do in real
-		life. You can keep your pleasantries short, but be pleasant!
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-		message in capital letters.  It hurts people's ears.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Never write anything in email you wouldn't say in
-		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	       Check your spelling and use complete sentences.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Don't send nasty emails (flames).  If you get one,
-		don't write back.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 When you reply or forward, include just enough of
-		 the previous message to provide context: not too
-		 much, not too little.
-	       </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-	<para> Happy mailing! </para>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-organize">
-    <title>Organizing Your Mail</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-
-    <sect2 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the toolbar.
-	If you create a filter with the <interface>filter
-	assistant</interface>, you can have mail moved to your folder
-	automatically.
-      </para>
-    </sect2>    
-
-    <sect2 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster.  You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains:</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains:</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        Then, press <keycap>Enter</keycap>.
-        <application>Evolution</application> will show your search
-        results in the message list.
-
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
-      <para>
-        I once worked in the mail room of a large company, where my
-        job was to bundle, sort, and distribute mail to the various
-        mail boxes and desks throughout the building.  Filters do that
-        same job with email, but they lose much less mail than I did.
-        In addition, you can have multiple filters performing multiple
-        actions that may effect the same message in several ways.  For
-        example, your filters could put copies of one message into
-        multiple folders, or keep a copy and send one to another
-        person as well.  Which is to say, it's quite a bit more
-        flexible than an actual person with a pile of envelopes.
-      </para>
-      <para>
-        Most often, you'll want to have
-        <application>Evolution</application> put mail into different
-        folders, but you can have it do almost anything you like.
-        People who subscribe to multiple mailing lists, or who often
-        need to refer to messages they have sent, find filters
-        especially helpful to separate personal from list-related
-        mail, but they're good for anybody who gets more than a few
-        messages a day.  To create a filter, open the
-        <interface>filter assistant</interface> by selecting
-	<menuchoice>
-	  <guimenu>Tools</guimenu> 
-          <guimenuitem>Mail Filters</guimenuitem>
-        </menuchoice>.
-      </para>
-            
-       <figure id="usage-mail-filters-fig-assist">
-	 <title>The Filter Assistant</title>
-	 <screenshot>
-	  <screeninfo>The Filter Assistant</screeninfo>
-	  <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-
-      <para>
-        The <interface>filter assistant</interface> window contains a
-        list of your current filters, sorted by the order in which
-        they will be performed.  From the drop-down box at the top of
-        the window, choose <guilabel>Incoming</guilabel> to display
-        those filters which are performed on incoming mail, and
-        <guilabel>On Demand</guilabel> for those which are performed
-        only when you want.
-      </para>
-      <para>
-         The <interface>filter assistant</interface> also has a set of
-         buttons:
-        <itemizedlist>
-
-           <listitem><para>
-            <guibutton>Add</guibutton> &mdash; Create a new filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
-           </para></listitem>
-
-           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the
-            selected filter up in the list, so it will be performed
-            sooner.  </para></listitem>
-
-           <listitem><para>
-            <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list, so it will be performed later.
-           </para></listitem>
-        </itemizedlist>
-
-        If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>.  When you
-        do that, (or when you click <guibutton>Edit</guibutton> with a
-        filter selected), the <interface>Add Rule</interface> window
-        appears.
-      </para>
-      <para>
-        That window, shown in <xref
-        linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.  
-
-       <figure id="usage-mail-filters-fig-new">
-	 <title>Creating a new Filter</title>
-	 <screenshot>
-	  <screeninfo>Creating a new Filter</screeninfo>
-	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-      <para>
-        Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing criteria.
-        Choose how many criteria you'd like by pressing <guibutton>Add
-        Criterion</guibutton> and <guibutton>Remove
-        Criterion</guibutton>.  If you have multiple criteria, you
-        should then decide whether to have the filter do its job only
-        <guilabel>if all criteria are met</guilabel>, or <guilabel>if
-        any criteria are met</guilabel>.
-     </para>
-     <para>
-        For each of your filter criteria, you must first select what
-        part of the message you want the filter to look at:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Sender</guilabel></term>
-	    <listitem><para>
-                The author of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Recipients</guilabel></term>
-	    <listitem><para>
-               The recipients of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Subject</guilabel></term>
-	    <listitem><para>
-                The subject line of the message.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Specific Header</guilabel></term>
-	    <listitem><para> The filter can look at any header you
-	    want, even obscure or custom ones like X-Bonus or
-	    X-Archive. Enter the header name, and what you'd like to
-	    match inside it.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Message Body</guilabel></term>
-	    <listitem><para>
-                The actual text of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Expression</guilabel></term>
-	    <listitem><para> Enter a <glossterm
-	    linkend="regular-expression">regular
-	    expression</glossterm>, and
-	    <application>Evolution</application> will search the
-	    entire message, headers and all, to match it for you.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para>
-                You can filter messages by when they were sent: First,
-                choose how you'd like to match the time&mdash;
-                <guilabel>before</guilabel>,
-                <guilabel>after</guilabel> and so forth.  Then, choose
-                the time. The filter compare the message's time-stamp
-                to the system clock when the filter is run, or to a
-                specific time and date you choose from a calendar.
-                You can even have it look for messages within a range
-                of time relative to the filter.  For example, you could have
-                the filter catch all messages sent less
-                than a week before the filter is run.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Recieved</guilabel></term>
-	    <listitem><para>
-                This works the same way as the <guilabel>Date Sent</guilabel> 
-                option, except that it compares the time you got the message 
-                with the dates you specify.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Priority</guilabel></term>
-	    <listitem><para>
-               Emails have a standard priority range from -3 (least
-               important) to 3 (most important). If you can persuade
-               your friends and co-workers to use the priority levels  
-               honestly, you can filter with them as well.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-        <para>
-        Now, tell it what to do with those messages.  If you want multiple
-        actions, click <guibutton>Add Action</guibutton>; if you want fewer,
-        click <guibutton>Remove Action</guibutton>.  And choose again:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Move to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Forward to Address</guilabel></term>
-	    <listitem><para>
-                Select this, enter an address, and the addressee will
-                get a copy of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Delete</guilabel></term>
-	    <listitem><para>
-                Marks the message for deletion.  You can still get the message
-                back, at least until you <guimenuitem>Expunge</guimenuitem> your
-                mail yourself.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para> Select this if you want to tell all other
-	    filters to ignore this message.  If multiple filters copy
-	    the message to a different folders, you'll have multiple
-	    copies of the message.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Color</guilabel></term>
-	    <listitem><para>
-                Select this item, and <application>Evolution</application>
-                will mark the message with whatever color you please.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Score</guilabel></term>
-	    <listitem><para> Priority numbers alone don't work, so you
-	    can score emails on the same scale. Then, you can tell
-	    which ones you want to read, or have scored messages
-	    moved, copied, or colored in a subsequent filter.
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-      <para>
-        You're done.  Click <guibutton>OK</guibutton> to use this
-        filter, or <guibutton>Cancel</guibutton> to close the window
-        without saving any changes.
-      </para>
-
-
-
-   <!-- FIXME: This needs to be in there.  But the feature is temporarily
-         disabled and I don't know how it will be reimplemented.
-
-	  <itemizedlist>
-	    <listitem>
-	       <para>
-		 <guilabel>When mail arrives:</guilabel> Select
-		 this option to have messages filtered as they
-		 arrive.
-	       </para>
-	     </listitem>
-	     <listitem>
-	       <para>
-		 <guilabel>When mail is sent:</guilabel> Select
-		 this option to filter your outgoing mail.  You
-		 can use this feature to keep your
-		 <interface>Outbox</interface> as organized as
-		 your <interface>Inbox</interface>.
-	     </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-
-    -->
-
-      <note>
-	<title>Two Notable Filter Features</title>
-	<para>
-	  <itemizedlist>
-	    <listitem><para>
-              Incoming email that your filters don't move goes into the Inbox; 
-              outgoing mail that they don't move ends up in the Sent folder.
-             </para>
-	    </listitem>
-
-	    <listitem><para>If you move a folder, your filters
-	    will follow it.  </para></listitem>
-	  </itemizedlist>
-	</para>
-      </note>
-    </sect2>
-
-
-
-    <sect2 id="usage-mail-organize-vFolders">
-      <title>Getting Really Organized with Virtual Folders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, vFolders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A vFolder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a vFolder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the vFolder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and and remove them from the
-	vFolder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any vFolders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  vFolders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-      <example id="usage-mail-organize-vFolders-ex">
-	<title>Using Folders, Searches, and vFolders</title>
-	<para>
-	   To organize my mail box, I set up a vFolder for emails from
-	   my friend and co-worker Anna.  I have another one for
-	   messages from anybody at work that have "Evolution" in the
-	   subject line, so I can keep a record of what people from
-	   work send me about <application>Evolution</application>.
-	   If Anna sends a message about a picnic on Saturday, it only
-	   shows up in the "Anna" folder. When Anna sends me mail
-	   about the user interface for
-	   <application>Evolution</application>, I can see that
-	   message both in the "Anna" vFolder and in the "Internal
-	   Evolution Discussion" vFolder.
-	</para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
-
-      <para>
-	 To create a vFolder, select <menuchoice>
-	 <guimenu>Tools</guimenu> <guimenuitem>vFolder
-	 Editor</guimenuitem> </menuchoice>.  This will bring up a
-	 dialog box that looks suspiciously like the filter window
-	 (for more information on filters, see <xref
-	 linkend="usage-mail-organize-filters">), and which
-	 presents you with a list of vFolders you have previously
-	 created. If you have created any vFolders, they are listed
-	 here, and you can select, edit or remove them if you wish.
-	 If you have not created any, there will be only one available
-	 option: click <guibutton>Add</guibutton> to add a new
-	 vFolder.
-      </para>
-      <para>
-	 You can enter a name for your vFolder in the
-	 <guilabel>Name</guilabel>.  Then, tell
-	 <application>Evolution</application> what messages to look
-	 for.  This process is exactly like filter creation: decide
-	 between <guilabel>Match all parts</guilabel> and
-	 <guilabel>Match any part</guilabel>, then choose what part of
-	 the message to look in, what sort of matching to perform, and
-	 specify exactly what it is that you want to find, be it a
-	 line of text, a score, a regular expression, or a particular date or
-	 range of dates.
-       </para>
-       <para>
-         The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>vFolder Sources
-         </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the
-         contents of your vFolder.  Click <guibutton>Add</guibutton>
-         to add a folder, or <guibutton>Remove</guibutton> to remove
-         one.  That way, you can have your vFolder search in
-         newsgroups, or just in one of your mailboxes, or just in a
-         select few folders you've already screened with filters.
-       </para>
-       <para>
-        The vFolder creation window is shown in <xref
-	linkend="usage-mail-vfolder-fig-createrule">
-
-       <figure id="usage-mail-vfolder-fig-createrule">
-	 <title>Selecting a vFolder Rule</title>
-	 <screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-    <sect2 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
-
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
deleted file mode 100644
index c6a252ac78..0000000000
--- a/help/C/usage-mainwindow.sgml
+++ /dev/null
@@ -1,424 +0,0 @@
-<!--
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>The Main Window: Evolution Basics</title>
-  <para>
-     Start <application>Evolution</application> by selecting
-     <menuchoice><guimenu>Main Panel Menu</guimenu>
-     <guisubmenu>Applications</guisubmenu>
-     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing
-     <command>evolution</command> at the command line.  The first time
-     you run the program, it will create a directory called
-     <filename>evolution</filename> in your home directory, where it
-     will keep all your <application>Evolution</application>-related
-     files.
-   </para>
-   <para>
-     After <application>Evolution</application> starts
-     up, you will see the <interface>main window</interface>, with the
-     <interface>Inbox</interface> open.  It should look a lot like the
-     picture in <xref linkend="usage-mainwindow-fig">. On the left of
-     the <interface>main window</interface> is the <interface>shortcut
-     bar</interface>, with several buttons in it.  Just underneath the
-     title bar is a series of menus in the <interface>menu
-     bar</interface>, and below that, the <interface>tool
-     bar</interface> with buttons for different functions. The largest
-     part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, where messages are listed
-     and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Helix Code.
-
-
-<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
-</para>
-
-   <para>
-    <note>
-      <title>The Way Evolution Looks</title>
-      <para>
-	The appearance of both <application>Evolution</application>
-	and <application>GNOME</application> is very easy to
-	customize, so your screen might not look like this picture.
-	You might decide to have <application>Evolution</application>
-	start with the calendar and a folder bar, or with the contact
-	manager occupying the entire window.
-      </para>
-    </note>
-  </para>
-  
-  <sect1 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       The shortcut group buttons are <guibutton>Evolution
-       Shortcuts</guibutton> and <guibutton>Internet
-       Directories</guibutton>.  When you click on them, they'll slide
-       up and down to give you access to different sorts of shortcuts.
-       When you first start <application>Evolution</application>, you
-       are looking at the <guilabel>Evolution Shortcuts</guilabel>
-       category.  If you click <guilabel>Internet
-       Directories</guilabel>, it will slide up and you'll see buttons
-       for the <guilabel>Bigfoot</guilabel> and
-       <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator might have added. You
-       can add more groups by right-clicking on the background of the
-       shortcut bar and selecting <guimenuitem>Menu
-       Group</guimenuitem>.  Internet directories behave a lot like
-       the local contact manager, which is covered in <xref
-       linkend="usage-contact">.
-       </para>
-    <para>
-       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
-       again.  The shortcut buttons in that category are:
-
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-
-	<varlistentry>
-	  <term> <guibutton>Inbox:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Inbox will show you all of your email.  Your Inbox
-	      is also where you can access Evolution's tools to
-	      filter, sort, organize, and search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-       <varlistentry>
-	<listitem>
-	  <para>
-	     The <guibutton>Tasks:</guibutton> tool combines a "to
-	     do" list with reminders to help you keep track of
-	     daily events.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the menu bar, or
-      keyboard shortcuts, also called <glossterm linkend="hot-key">hot keys</glossterm>.
-      They're shown next to their equivalent menu items in the menu
-      bar. You can also set your own hot keys for functions that don't
-      have any; this is covered in <xref linkend="config">.  If you're
-      using the keyboard shortcuts you may also want to hide the
-      <interface>shortcut bar</interface> by selecting <menuchoice>
-      <guimenu>View</guimenu> <guimenuitem>Show Shortcut
-      Bar</guimenuitem> </menuchoice>.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>. </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three folders at the
-      base.  At the top are your <guilabel>vFolders</guilabel>, or
-      virtual folders, discussed in <xref
-      linkend="usage-mail-organize-vfolders">.  After that come any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you
-      might have available to you over your network.  The next folder
-      is called <guilabel>External Directories</guilabel>, and holds
-      <glossterm linkend="ldap">LDAP</glossterm> contact directories
-      stored on a network.  The most important one is probably
-      <guilabel>Local</guilabel>, which you can use to access all the
-      data that's stored on your computer.  If you click on the plus
-      sign plus sign next to the <guilabel>Local</guilabel> folder,
-      you'll see the contents:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	  <guilabel>Directories</guilabel>, for Internet contact directories.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Outbox</guilabel>, which is for drafts of
-	    messages and mail that's already been sent.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
-         to move about the folder tree.
-       </para>
-     </tip>
-
-    <para>
-       To create a new folder, select <menuchoice>
-       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
-       put it, and what kind of folder it should be.  You can choose
-       from three types: <guilabel>Mail</guilabel>, for storing mail,
-       <guilabel>Calendar</guilabel> for storing calendars, and
-       <guilabel>Contacts</guilabel> for storing contacts.
-    </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-	      You can always place a folder inside other folders,
-	      regardless of folder type.  However, calendars,
-	      contacts, and mail can't go into the same
-	      folder. Calendars have to go in calendar folders, mail
-	      in mail folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-      </itemizedlist>.
-    </para>
-
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 will support context-sensitive help, which means you
-	can almost always get help on an item by right-clicking it.
-	If you're not sure what something is, or don't know what you
-	can do with it, choosing <guimenuitem>Help</guimenuitem> from
-	the right-click menu is a good way to find out.
-      </para>
-    </tip>
-
-    <para>
-      Any time new information arrives in a folder, that folder label
-      is displayed in bold text.
-    </para>
-    <para>
-      To delete a folder, right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
-      To change the order of folders, or put one inside another, use
-      drag-and-drop.  To move individual
-      messages, appointments, and address cards between folders, you
-      can do the same thing: drag them where you want them, and
-      they'll go.
-    </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu> Menu</term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu> Menu </term>
-          <listitem><para>
-              Although it doesn't contain anything at first,
-              the <guimenu>Edit</guimenu> menu fills up with 
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu> Menu </term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Settings</guimenu> Menu </term>
-          <listitem><para> Tools for configuring, changing, and
-          setting up go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>vFolder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration. </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu> Menu</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-   <para>
-     Other menus, like <guilabel>Folder</guilabel>,
-     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
-     appear only occasionally.  <guilabel>Message</guilabel> and
-     <guilabel>Folder</guilabel>, for example, have commands that only
-     relate to email, so they're only available when you're looking at
-     email.
-   </para>
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with your email inbox, since you've got a letter waiting
-      for you already.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/help/C/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
deleted file mode 100644
index 1af298eb42..0000000000
--- a/help/C/usage-print.sgml
+++ /dev/null
@@ -1,92 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  This is a very short chapter, because printing with
-  <application>Evolution</application> is not a complex task.  Like
-  most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton>, appears both as a button
-      in the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that displays an image of the current
-      message, calendar, appointment, or address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (<guibutton>Fit</guibutton>) or match the
-      width of the page and the window (<guibutton>Fit
-      Width</guibutton>).  If you're satisfied with the way it looks,
-      click <guibutton>Print</guibutton> to send your document on its way.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; at this time, only <guilabel>Generic
-       Postscript</guilabel> is available&mdash; and whether to print
-       to a file or to an actual printer.  If you choose a printer,
-       you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
deleted file mode 100644
index a6b53e9526..0000000000
--- a/help/C/usage-sync.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Synchronizing with a Hand-held Device</title>
-      <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device on its cradle and press the
-          HotSync button.
-        </para>
-        <para>
-         No, really.  That's all there is to it.
-        </para>
-       </sect1>
-    </chapter>
\ No newline at end of file
diff --git a/help/COPYING-DOCS b/help/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/help/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/help/Camel-Classes b/help/Camel-Classes
deleted file mode 100644
index 93aec087dd..0000000000
--- a/help/Camel-Classes
+++ /dev/null
@@ -1,35 +0,0 @@
-CamelException
-CamelProvider
-CamelThreadProxy
-CamelURL
-GtkObject
- + CamelObject
-   + CamelAddress
-   |  + CamelInternetAddress
-   |  ` CamelNewsAddress
-   + CamelDataWrapper
-   | + CamelMedium
-   | |  ` CamelMimePart
-   | |     ` CamelMimeMessage
-   | ` CamelMultipart
-   + CamelFolder
-   |  ` CamelFolderPtProxy
-   + CamelFolderSearch
-   + CamelFolderSummary
-   + CamelMimeFilter
-   |  + CamelMimeFilterBasic
-   |  + CamelMimeFilterCharset
-   |  + CamelMimeFilterIndex
-   |  ` CamelMimeFilterSave
-   + CamelService
-   |  + CamelStore
-   |  ` CamelTransport
-   + CamelSession
-   + CamelStream
-   |  + CamelSeekableStream
-   |  |  + CamelSeekableSubstream
-   |  |  + CamelStreamFs
-   |  |  ` CamelStreamMem
-   |  + CamelStreamBuffer
-   |  ` CamelStreamFilter
-   ` CamelThreadProxy
\ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
deleted file mode 100644
index 3b2a5968d3..0000000000
--- a/help/ChangeLog
+++ /dev/null
@@ -1,587 +0,0 @@
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.	
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml:  Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml:  Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to
-	bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-        description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml:  Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.	
-
-	* C/config-prefs.sgml: Revision to reflect current options labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-=======
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
->>>>>>> 1.26
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.	
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
-	but marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release. 
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/help/Design b/help/Design
deleted file mode 100644
index 7b7cf6f821..0000000000
--- a/help/Design
+++ /dev/null
@@ -1,201 +0,0 @@
-
-The Evolution Project specification
-Miguel de Icaza.
-
-
-* Introduction
-
-	Evolution is a project aiming at providing the free software
-	community with a professional, high-quality tool for managing
-	mail, appointments, tasks and other personal information
-	tools.  
-
-	We want to make Evolution a system that addresses our needs
-	(the free software development community) and we believe that
-	by addressing our needs, we will provide a system that will
-	scale in the years to come for other users that are just
-	starting to use computers and the internet.
-
-	The main objectives of Evolution are to provide these powerful
-	features, and to make the user interface as pretty and
-	polished as possible.
-
-	Evolution is a GNOME application and a number of auxiliary
-	CORBA servers that act as the storage backends. 
-
-	Evolution will copy the best user interface bits and the best
-	ideas and features found on contemporary groupware systems.
-
-* Evolution internals.
-
-	Evolution can store its information locally (files for mail,
-	calendar and address book) or on a remote server (imap/pop,
-	cap, ldap).  
-
-	Given the importance of syncing in this modern PDA world,
-	the Evolution GUI acts as a client to the data repository.
-	The data repository is a GUI-less CORBA server called Wombat.
-
-	Wombat provides a unified access system to the calendar and
-	addressbook data (doing mail is a bit hard, so we are leaving
-	this as a TODO item for now).
-
-	Wombat's CORBA interfaces are notifier-based.  This means that
-	CORBA requests sent to Wombat do not return values
-	inmediately, but rather than for Wombat requests the user has
-	to provide a CORBA object that will be notified of what
-	happened.
-
-	Yes, that sounds hairy.  It is actually pretty simple.  It
-	basically means that you submit requests to Wombat, and a
-	callback is invoked in your code when the request has been
-	carried away. 
-
-	This enables a Palm to sync to the repository without having
-	the GUI for Evolution running.  It also means that volunteers
-	will be able to write text-based and web-based versions of
-	Evolution (not me though :-).
-
-* Evolution as a platform
-
-	Evolution is more than a client for managing the above
-	information: Evolution is a platform for building groupware
-	applications that use the above components to get their work done.
-
-	To achieve this Evolution is designed to be scriptable, and it
-	exports its internals trough CORBA/Bonobo.  It is implemented
-	as a collection of Bonobo containers and Bonobo components.
-
-	There is a clean separation between the views (the user
-	interface) and the model (the view).  The views that we are
-	writing are GNOME based, and they talk to the Wombat CORBA
-	server.
-
-	Wombat takes care of notifications to the various clients for
-	the data. 
-
-* The overall organization
-
-	A bar similar to outlook provides shortcuts for accessing the
-	various resources managed by Evolution: mail folders,
-	contacts, tasks, journal entries, notes, messages and other
-	user-defined destinations. 
-
-* User interface widgets
-
-** The ETable package
-
-	This package provides a way of displaying and editing tables.
-
-	Tables are displayed based on a TableColumn definition that
-	defines the layout used for the display.  Table Columns can be
-	nested, and the package does grouping of information displayed
-	according to the criteria defined there.
-
-	This is used in multiple places troughout evolution: it is
-	used for the Mail summary display, for the TODO display and
-	TODO new data entry and for the address book.
-
-	Nesting in the address book can be performed on various
-	fields.  For example, a first level of nesting could be
-	"Company" and a second level would be "Country" the result is
-	a 2-level tree that can be collapsed expanded and contains the
-	information sorted/grouped by those two criteria.
-
-	The user interface for this will be copied from Outlook: the
-	possibility of adding and removing fields with drag and drop
-	as well as grouping using drag and drop.
-
-* The Mail system
-
-** The Mail sources
-
-	The mail system will support 4 sources of mail:
-
-		POP3 (transfer to a local file).
-		IMAP
-		Local mbox format in $MAIL.
-		Local mbox format that have other delivery points.
-
-	On top of that, it will be possible to browse existing mbox
-	archives (and possibly other formats in the future, like
-	Mailbox and Maildir).
-
-** Storing the mail
-
-	Mail that gets incorporated into the system is stored in mbox
-	format, and summary files are provided for quick access to the
-	files.  No modifications to the file on disk is performed (I
-	am not quite sure about this, perhaps we want to add the
-	status flags and some method for adding metadata to the mail).
-
-	Summary files are rebuilt on demand or rebuild if the mbox
-	file and the summary file have got out of sync.
-
-	A Metadata system that will enable us to attach information to
-	a message will have to be designed and implemented (enabling
-	users to add annotations to mails, and special keywords and
-	flags in a per-message fashion).
-
-** Folders
-
-	Michael Zucchi is working on a system that will let users
-	easily define rules for splitting their incoming mail into
-	physical folders.  
-
-	A further refinement to Folders are Virtual Folders.  This
-	basically provides a powerful search and viewing facility for
-	mail.  It works like this: when a mail is "incorporated" into
-	Evolution it is scanned and indexed.
-
-	Then users can enter queries into Evolution that will search
-	the entire database of messages.	
-
-** Virtual folders
-
-	Virtual folders will enable users to read/browse their mail in
-	new ways: by specifying search criterias, these folders will
-	contain messages that match the criteria given.  
-
-	There is more information about this in the libcamel
-	directory. 
-
-	We will index all headers from a message, and possible the
-	contents of messages and keep those on a separate file, to
-	enable users to query their mail database.
-
-** Mail summary display
-
-	The summary will be displayed using the ETable package, to
-	enable users to add a number of sorting criteria and various
-	display methods for the summary view.
-
-	The Outlook methods for displaying will be present on the
-	system.
-
-	Message threading will be supported in Evolution.
-
-** Message display engine
-
-	We are going to be using a combination of
-	libcamel/limime/libjamie to parse messages and render them
-	into an HTML buffer.
-
-* The HTML engine
-
-	The GtkHTML engine will be used to display messages, and will
-	be extended to support a number of features that we require:
-	internal handling of characters will be based on Unicode
-
-* The message composer
-
-	Regular features found in composers will be added: connecting
-	the composer to the address book, support for drag and drop
-	for including attachments, editing the message, archiving
-	drafts and archiving messages sent.
-
-	Ettore has been working on adding editing support to the
-	GtkHTML and he is working currently on a Bonobo component that
-	will provide a ready-to-use Bonobo control for embedding into
-	other applications.
-
diff --git a/help/Keybindings b/help/Keybindings
deleted file mode 100644
index f232802110..0000000000
--- a/help/Keybindings
+++ /dev/null
@@ -1,13 +0,0 @@
-* Keybindings for the mailer
-
-	Delete key: 	Deletes message, moves forward.
-	
-* Keybindings for the composer
-
-	Control-s:		Saves message to file.
-	Control-w:		Closes composer window.
-	Control-Return: 	Sends message now.
-
-	F6:			Opens find dialog.
-	F7:			Opens replace dialog.
-
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 7b5420fee8..0000000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = C devel
diff --git a/help/devel/.cvsignore b/help/devel/.cvsignore
deleted file mode 100644
index c24a54fbcc..0000000000
--- a/help/devel/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-html
-evolution-devel-guide.html
diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog
deleted file mode 100644
index 555db7d161..0000000000
--- a/help/devel/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2000-09-15  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-devel-guide.sgml: Made the toplevel <book> id be
-	"index".
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-util/*: Integrated the cal-util library into the
-	documentation framework.
-
-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.
-
-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.
-	Added entity for libical.
-
-	* calendar/reference.sgml: Added the cal-util reference entries.
-
-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated
-	for new API.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (maintainer-clean-local): Don't depend
-	on 'clean'; this messes up maintainer-clean.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.
-
-	* evolution-devel-guide.sgml: New <book> toplevel for the
-	Evolution Developer's Guide.
-
-	* calendar/evolution-calendar.sgml: New <part> for the calendar
-	developer's documentation.
-
-	* calendar/architecture.sgml: New <chapter> for the calendar
-	architecture.
-
-	* calendar/reference.sgml: New <reference> for the calendar API
-	reference.
diff --git a/help/devel/Makefile.am b/help/devel/Makefile.am
deleted file mode 100644
index 0d3cec5a1c..0000000000
--- a/help/devel/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-SUBDIRS = calendar
-
-# The name of the module.
-DOC_MODULE=evolution-devel-guide
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-evolution_devel_guidedir = $(HTML_DIR)
-evolution_devel_guide_DATA =			\
-	evolution-devel-guide.html
-
-content_files =					\
-	evolution-devel-guide.sgml
-
-EXTRA_DIST = 					\
-	$(evolution_devel_guide_DATA)		\
-	$(content_files)
-
-if ENABLE_GTK_DOC
-evolution-devel-guide.html: html/book1.html
-	-cd $(srcdir) && cp html/book1.html evolution-devel-guide.html
-else
-evolution-devel-guide.html:
-endif
-
-html/book1.html: $(content-files)
-	$(MAKE) html
-
-html:
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
-	-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local:
-	cd $(srcdir) && rm -rf html
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	  echo '-- Fixing Crossreferences' ; \
-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
-	fi)
-
-dist-hook:
-	mkdir $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-.PHONY: html
diff --git a/help/devel/calendar/.cvsignore b/help/devel/calendar/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/devel/calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/Makefile.am b/help/devel/calendar/Makefile.am
deleted file mode 100644
index 2220e1d59b..0000000000
--- a/help/devel/calendar/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = cal-client cal-util
-
-EXTRA_DIST =				\
-	architecture.sgml		\
-	evolution-calendar.sgml		\
-	reference.sgml
diff --git a/help/devel/calendar/architecture.sgml b/help/devel/calendar/architecture.sgml
deleted file mode 100644
index 08e4c82b35..0000000000
--- a/help/devel/calendar/architecture.sgml
+++ /dev/null
@@ -1,94 +0,0 @@
-  <chapter id="calendar-architecture">
-    <title>Architecture of the Calendar</title>
-
-    <para>
-      This chapter gives an overview of the Evolution Calendar
-      architecture.  It describes the model/view split of the calendar
-      into a personal calendar server, or PCS, and the GUI clients
-      that appear inside the Evolution shell.
-    </para>
-
-    <!-- Model/View Separation -->
-
-    <sect1 id="calendar-model-view">
-      <title>Model/View Separation</title>
-
-      <para>
-	Like other base components in Evolution, the calendar
-	separates the data model from the views or clients.  This is
-	done so that multiple clients can access the same calendar
-	data in an orderly fashion and without clashes.  For example,
-	the user may be running a graphical calendar client.  If he
-	then wants to synchronize his calendar with a handheld device,
-	then the corresponding synchronization program (e.g. a conduit
-	for the <application>gnome-pilot</application> package) will
-	also need to access the calendar storage.  It is important
-	that both the GUI client and the synchronization program keep
-	a consistent view of the calendar at all times, otherwise one
-	of them will be left in an inconsistent state if the
-	calendar's data changes unexpectedly.
-      </para>
-
-      <para>
-	Evolution puts the calendar storage in a daemon called the
-	Wombat and completely separates it from clients who wants to
-	access calendar data.  This part of the Wombat is called the
-	personal calendar server, or &PCS;.  Clients must contact the
-	&PCS; and ask it to open an existing calendar or create a new
-	one.  When a calendar component object (e.g. an appointment or
-	to-do item) changes in the &PCS; it will notify all the
-	clients that are using the component's parent calendar.
-      </para>
-    </sect1>
-
-    <!-- Personal Calendar Server -->
-
-    <sect1>
-      <title>Personal Calendar Server</title>
-
-      <para>
-	The personal calendar server, or &PCS;, provides centralized
-	management and storage of a user's personal calendar.
-	Multiple clients can connect to the &PCS; simultaneously to
-	query and modify the user's calendar in a synchronized
-	fashion.  The main features of the &PCS; are as follows:
-      </para>
-
-      <formalpara>
-	<title>Storage</title>
-
-	<para>
-	  The &PCS; is responsible for loading and saving calendars.
-	  Centralizing the loading and saving functionality allows
-	  multiple clients to use the same calendar at the same time
-	  without having to worry about each other.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Basic Queries</title>
-
-	<para>
-	  The &PCS; provides functions to do basic queries on a
-	  calendar, for example, a client can ask the server for a
-	  list of all the appointments in the calendar, or for all the
-	  data for a specific appointment.
-	</para>
-      </formalpara>
-
-      <formalpara>
-	<title>Recurrence and Alarm Queries</title>
-
-	<para>
-	  
-	</para>
-      </formalpara>
-    </sect1>
-  </chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/calendar/cal-client/.cvsignore b/help/devel/calendar/cal-client/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/help/devel/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
deleted file mode 100644
index 44d43639a8..0000000000
--- a/help/devel/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=evolution-cal-client
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-cal-client.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-client
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-client/.libs/libcal-client.a	\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/libical.a			\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/cal-client.sgml			\
-	tmpl/evolution-cal-client-unused.sgml
-
-evolution_cal_client_docdir = $(HTML_DIR)
-evolution_cal_client_doc_DATA =			\
-	evolution-cal-client.hierarchy		\
-	evolution-cal-client.types		\
-	evolution-cal-client-decl.txt		\
-	evolution-cal-client-sections.txt
-
-EXTRA_DIST = 					\
-	$(evolution_cal_client_doc_DATA)
-
-sgml/evolution-cal-client-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-scan:
-	-(cd $(srcdir) \
-	&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
-		 gtkdoc-scanobj --module=$(DOC_MODULE) \
-	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="cal-listener.h evolution-calendar.h" )
-
-templates: scan
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml:
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY : sgml templates scan
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
deleted file mode 100644
index 0574d70678..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-<MACRO>
-<NAME>CAL_CLIENT_TYPE</NAME>
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT</NAME>
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-</MACRO>
-<MACRO>
-<NAME>CAL_CLIENT_CLASS</NAME>
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT</NAME>
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_CLIENT_CLASS</NAME>
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-</MACRO>
-<STRUCT>
-<NAME>CalClient</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalClientClass</NAME>
-</STRUCT>
-<ENUM>
-<NAME>CalClientLoadStatus</NAME>
-typedef enum {
-	CAL_CLIENT_LOAD_SUCCESS,
-	CAL_CLIENT_LOAD_ERROR,
-	CAL_CLIENT_LOAD_IN_USE,
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED
-} CalClientLoadStatus;
-</ENUM>
-<ENUM>
-<NAME>CalClientGetStatus</NAME>
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-</ENUM>
-<STRUCT>
-<NAME>CalClient</NAME>
-struct CalClient {
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_client_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_construct</NAME>
-<RETURNS>CalClient  *</RETURNS>
-CalClient *client
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_new</NAME>
-<RETURNS>CalClient  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_load_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_create_calendar</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *str_uri
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_n_objects</NAME>
-<RETURNS>int  </RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_object</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,const char *uid,CalComponent **comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uid_by_pilot_id</NAME>
-<RETURNS>CalClientGetStatus  </RETURNS>
-CalClient *client,unsigned long pilot_id,char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, char *uid,unsigned long pilot_id,unsigned long pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_uids</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_objects_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_generate_instances</NAME>
-<RETURNS>void  </RETURNS>
-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_in_range</NAME>
-<RETURNS>GList  *</RETURNS>
-CalClient *client, time_t start, time_t end
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_get_alarms_for_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid,time_t start, time_t end,GList **alarms
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_update_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_client_remove_object</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalClient *client, const char *uid
-</FUNCTION>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt b/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
deleted file mode 100644
index c37b223247..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<INCLUDE>cal-client/cal-client.h</INCLUDE>
-
-<SECTION>
-<FILE>cal-client</FILE>
-CAL_CLIENT
-<TITLE>CalClient</TITLE>
-
-CalClientLoadStatus
-CalClientGetStatus
-cal_client_new
-cal_client_load_calendar
-cal_client_create_calendar
-cal_client_get_n_objects
-cal_client_get_object
-cal_client_get_objects_in_range
-cal_client_generate_instances
-cal_client_get_uid_by_pilot_id
-cal_client_update_pilot_id
-cal_client_get_uids
-cal_client_get_alarms_in_range
-cal_client_get_alarms_for_object
-cal_client_update_object
-cal_client_remove_object
-
-<SUBSECTION Standard>
-
-CAL_CLIENT_TYPE
-IS_CAL_CLIENT
-CAL_CLIENT_CLASS
-IS_CAL_CLIENT_CLASS
-cal_client_get_type
-cal_client_construct
-
-<SUBSECTION Private>
-CalClient
-
-</SECTION>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.args b/help/devel/calendar/cal-client/evolution-cal-client.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.args
+++ /dev/null
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy b/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
deleted file mode 100644
index 88efa3e673..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalClient
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.signals b/help/devel/calendar/cal-client/evolution-cal-client.signals
deleted file mode 100644
index 97e360b6a2..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.signals
+++ /dev/null
@@ -1,21 +0,0 @@
-<SIGNAL>
-<NAME>CalClient::cal-loaded</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkEnum  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-updated</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkString  arg1
-</SIGNAL>
-
-<SIGNAL>
-<NAME>CalClient::obj-removed</NAME>
-<RETURNS>void</RETURNS>
-CalClient *calclient
-GtkString  arg1
-</SIGNAL>
-
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.types b/help/devel/calendar/cal-client/evolution-cal-client.types
deleted file mode 100644
index 84d65a6637..0000000000
--- a/help/devel/calendar/cal-client/evolution-cal-client.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-cal_client_get_type
diff --git a/help/devel/calendar/cal-client/tmpl/cal-client.sgml b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
deleted file mode 100644
index 06469ff3ee..0000000000
--- a/help/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ /dev/null
@@ -1,294 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalClient
-
-<!-- ##### SECTION Short_Description ##### -->
-GTK+ object for communication with personal calendar server.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalClient object provides a nice GTK+ wrapper for the CORBA
-    interfaces that are used to communicate between calendar clients
-    and the personal calendar server in the user's Wombat daemon.  The
-    CORBA interfaces transfer calendar components in RFC 2445 text
-    format; the #CalClient object automatically converts these into
-    #CalComponent structures that are easier to handle.
-  </para>
-
-  <para>
-    After a #CalClient object is created with cal_client_new(), it
-    should be asked to send a request to the personal calendar server
-    to load or create a calendar based on its URI.  The server will
-    asynchronously notify the client about completion of the request,
-    and will return an appropriate result code; this should be noted
-    by the client with the <link
-    linkend="CalClient--cal-loaded">cal_loaded</link> signal.
-  </para>
-
-  <para>
-    When a client asks the server to update or delete a calendar
-    component from the storage, the server will do so and then notify
-    all the clients about the update or removal.  This is the core of
-    the model/view split between calendar clients and the storage in
-    the personal calendar server.  Clients should watch the <link
-    linkend="calclient-obj-updated">obj_updated</link> and <link
-    linkend="calclient-obj-removed">obj_removed</link> signals on the
-    CalClient objects they create so that they can be notified about
-    changes in the storage.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-    #CalComponent
-  </para>
-
-<!-- ##### MACRO CAL_CLIENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalClient.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
-@CAL_CLIENT_LOAD_SUCCESS: Indicates a successful load or create
-  operation; the corresponding calendar is ready for use.
-@CAL_CLIENT_LOAD_ERROR: Indicates an error while loading or creating
-  the calendar.
-@CAL_CLIENT_LOAD_IN_USE: Indicates that a create request failed
-  because the specified calendar was already being used by another
-  client.
-@CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED: Indicates an error due to
-  trying to load a calendar for which a backend type is not present.
-
-<!-- ##### ENUM CalClientGetStatus ##### -->
-  <para>
-    These values describe the result of the cal_client_get_object()
-    function.
-  </para>
-
-@CAL_CLIENT_GET_SUCCESS: Indicates a successful get operation.
-@CAL_CLIENT_GET_NOT_FOUND: Indicates that the requested object was
-  not found.
-@CAL_CLIENT_GET_SYNTAX_ERROR: Indicates a syntax error when parsing
-  the requested object.  This could indicate a bug in the calendar
-  client libraries or in the Wombat server.
-
-<!-- ##### FUNCTION cal_client_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_create_calendar ##### -->
-<para>
-
-</para>
-
-@client: 
-@str_uri: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_n_objects ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_get_objects_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_generate_instances ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@pilot_id: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_client_get_uids ##### -->
-<para>
-
-</para>
-
-@client: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_get_alarms_for_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@start: 
-@end: 
-@alarms: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_client_update_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@comp: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@ico: 
-
-
-<!-- ##### FUNCTION cal_client_remove_object ##### -->
-<para>
-
-</para>
-
-@client: 
-@uid: 
-@Returns: 
-
-
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
-
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-<!-- # Unused Parameters # -->
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
-
diff --git a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
deleted file mode 100644
index 5576dbd57f..0000000000
--- a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
-<para>
-
-</para>
-
-@client: 
-@start: 
-@end: 
-@Returns: 
-
diff --git a/help/devel/calendar/cal-util/.cvsignore b/help/devel/calendar/cal-util/.cvsignore
deleted file mode 100644
index 0842a93f7a..0000000000
--- a/help/devel/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sgml
-Makefile
-Makefile.in
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
deleted file mode 100644
index 8861aa03cb..0000000000
--- a/help/devel/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# The name of the module.
-DOC_MODULE=evolution-cal-util
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=evolution-cal-util.sgml
-
-# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-util
-
-CFLAGS ="						\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	"
-
-LDFLAGS="								\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\
-	$(top_builddir)/libical/src/libical/libical.a			\
-	$(top_builddir)/libversit/.libs/libversit.al			\
-	"
-
-HTML_DIR=$(datadir)/gnome/html
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-tmpl_sources =					\
-	tmpl/cal-util.sgml			\
-	tmpl/evolution-cal-util-unused.sgml
-
-evolution_cal_util_docdir = $(HTML_DIR)
-evolution_cal_util_doc_DATA =			\
-	evolution-cal-util.hierarchy		\
-	evolution-cal-util.types		\
-	evolution-cal-util-decl.txt		\
-	evolution-cal-util-sections.txt
-
-EXTRA_DIST = 					\
-	$(evolution_cal_util_doc_DATA)
-
-sgml/evolution-cal-util-doc.bottom: $(tmpl_sources)
-	$(MAKE) sgml
-
-scan:
-	-(cd $(srcdir) \
-	&& env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
-		 gtkdoc-scanobj --module=$(DOC_MODULE) \
-	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="calobj.h icalendar-save.h icalendar.h" )
-
-templates: scan
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-
-sgml:
-	cd $(srcdir) \
-	&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
-
-clean-local:
-	rm -f *~ *.bak *.signals *-unused.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-dist-hook:
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-
-.PHONY : sgml templates scan
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
deleted file mode 100644
index eb108b868f..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ /dev/null
@@ -1,852 +0,0 @@
-<MACRO>
-<NAME>CAL_COMPONENT_TYPE</NAME>
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT</NAME>
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-</MACRO>
-<MACRO>
-<NAME>CAL_COMPONENT_CLASS</NAME>
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT</NAME>
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-</MACRO>
-<MACRO>
-<NAME>IS_CAL_COMPONENT_CLASS</NAME>
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-</MACRO>
-<ENUM>
-<NAME>CalComponentVType</NAME>
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentField</NAME>
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-</ENUM>
-<ENUM>
-<NAME>CalComponentClassification</NAME>
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentDateTime</NAME>
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentPeriodType</NAME>
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentPeriod</NAME>
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-</TYPEDEF>
-<TYPEDEF>
-<NAME>CalComponentText</NAME>
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-</TYPEDEF>
-<ENUM>
-<NAME>CalComponentTransparency</NAME>
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-</ENUM>
-<STRUCT>
-<NAME>CalComponentAlarm</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponentPrivate</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalComponent</NAME>
-struct CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>cal_component_get_type</NAME>
-<RETURNS>GtkType  </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_gen_uid</NAME>
-<RETURNS>char  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_new</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_clone</NAME>
-<RETURNS>CalComponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_new_vtype</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentVType type
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_icalcomponent</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp, icalcomponent *icalcomp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_icalcomponent</NAME>
-<RETURNS>icalcomponent  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_vtype</NAME>
-<RETURNS>CalComponentVType  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_as_string</NAME>
-<RETURNS>char  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_commit_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_uid</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *uid
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification *classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_classification</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentClassification classif
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_comment_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_completed</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_created</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_description_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *text_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtend</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstamp</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_dtstart</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_due</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_exrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype **geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_geo</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype **t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_last_modified</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_percent</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_priority</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rdate_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rdates</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList **recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_rrule_list</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_has_rrules</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int **sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_sequence</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_summary</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentText *summary
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency *transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_transparency</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentTransparency transp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char **url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_url</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, const char *url
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long *pilot_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_pilot_id</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long pilot_id
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_pilot_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long *pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_set_pilot_status</NAME>
-<RETURNS>void  </RETURNS>
-CalComponent *comp, unsigned long pilot_status
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_categories_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *categ_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_datetime</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentDateTime *dt
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_exdate_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *exdate_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_geo</NAME>
-<RETURNS>void  </RETURNS>
-struct icalgeotype *geo
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_icaltimetype</NAME>
-<RETURNS>void  </RETURNS>
-struct icaltimetype *t
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_percent</NAME>
-<RETURNS>void  </RETURNS>
-int *percent
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_priority</NAME>
-<RETURNS>void  </RETURNS>
-int *priority
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_period_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *period_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_recur_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *recur_list
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_sequence</NAME>
-<RETURNS>void  </RETURNS>
-int *sequence
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_free_text_list</NAME>
-<RETURNS>void  </RETURNS>
-GSList *text_list
-</FUNCTION>
-<ENUM>
-<NAME>CalComponentAlarmAction</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_NONE,
-	CAL_COMPONENT_ALARM_AUDIO,
-	CAL_COMPONENT_ALARM_DISPLAY,
-	CAL_COMPONENT_ALARM_EMAIL,
-	CAL_COMPONENT_ALARM_PROCEDURE,
-	CAL_COMPONENT_ALARM_UNKNOWN
-} CalComponentAlarmAction;
-</ENUM>
-<ENUM>
-<NAME>CalComponentAlarmTriggerType</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,
-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE
-} CalComponentAlarmTriggerType;
-</ENUM>
-<ENUM>
-<NAME>CalComponentAlarmTriggerRelated</NAME>
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END
-} CalComponentAlarmTriggerRelated;
-</ENUM>
-<TYPEDEF>
-<NAME>CalComponentAlarmTrigger</NAME>
-typedef struct {
-	CalComponentAlarmTriggerType type;
-
-	union {
-		struct {
-			struct icaldurationtype duration;
-			CalComponentAlarmTriggerRelated related;
-		} relative;
-
-		struct icaltimetype absolute;
-	} u;
-} CalComponentAlarmTrigger;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_component_get_first_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_get_next_alarm</NAME>
-<RETURNS>CalComponentAlarm  *</RETURNS>
-CalComponent *comp
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmAction *action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_action</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmAction action
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_get_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_set_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free_trigger</NAME>
-<RETURNS>void  </RETURNS>
-CalComponentAlarmTrigger *trigger
-</FUNCTION>
-<ENUM>
-<NAME>CalRecurType</NAME>
-typedef enum {
-	CAL_RECUR_YEARLY,
-	CAL_RECUR_MONTHLY,
-	CAL_RECUR_WEEKLY,
-	CAL_RECUR_DAILY,
-	CAL_RECUR_HOURLY,
-	CAL_RECUR_MINUTELY,
-	CAL_RECUR_SECONDLY
-} CalRecurType;
-</ENUM>
-<TYPEDEF>
-<NAME>CalRecurrence</NAME>
-typedef struct {
-	CalRecurType   type;
-
-	int            interval;
-
-	/* Specifies the end of the recurrence. No occurrences are generated
-	   after this date. If it is 0, the event recurs forever. */
-	time_t         enddate;
-
-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
-	gint	       week_start_day;
-
-
-	/* NOTE: I've used GList's here, but it doesn't matter if we use
-	   other data structures like arrays. The code should be easy to
-	   change. So long as it is easy to see if the modifier is set. */
-
-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */
-	GList	      *bymonth;
-
-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */
-	GList	      *byweekno;
-
-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */
-	GList	      *byyearday;
-
-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */
-	GList	      *bymonthday;
-
-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
-	   The second of each pair is the week number [+-]0-53. */
-	GList	      *byday;
-
-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
-	GList	      *byhour;
-
-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */
-	GList	      *byminute;
-
-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */
-	GList	      *bysecond;
-
-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */
-	GList	      *bysetpos;
-} CalRecurrence;
-</TYPEDEF>
-<STRUCT>
-<NAME>CalObjTime</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>CalObjTime</NAME>
-struct CalObjTime {
-	guint16 year;
-	guint8 month;		/* 0 - 11 */
-	guint8 day;		/* 1 - 31 */
-	guint8 hour;		/* 0 - 23 */
-	guint8 minute;		/* 0 - 59 */
-	guint8 second;		/* 0 - 59 (maybe 60 for leap second) */
-};
-</STRUCT>
-<USER_FUNCTION>
-<NAME>CalRecurInstanceFn</NAME>
-<RETURNS>gboolean </RETURNS>
-CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instace_end,
-					 gpointer      data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_generate_instances</NAME>
-<RETURNS>void 	</RETURNS>
-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_from_icalrecurrencetype</NAME>
-<RETURNS>CalRecurrence  *</RETURNS>
-struct icalrecurrencetype *ir
-</FUNCTION>
-<FUNCTION>
-<NAME>cal_recur_free</NAME>
-<RETURNS>void  </RETURNS>
-CalRecurrence *r
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalObjInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_obj_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<TYPEDEF>
-<NAME>CalAlarmInstance</NAME>
-typedef struct {
-	char *uid;			/* UID of object */
-#if 0
-	enum AlarmType type;		/* Type of alarm */
-#endif
-	time_t trigger;			/* Alarm trigger time */
-	time_t occur;			/* Occurrence time */
-} CalAlarmInstance;
-</TYPEDEF>
-<FUNCTION>
-<NAME>cal_alarm_instance_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<ENUM>
-<NAME>CalObjType</NAME>
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_obj_uid_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_icaltimetype</NAME>
-<RETURNS>time_t  </RETURNS>
-struct icaltimetype itt
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_isodate</NAME>
-<RETURNS>time_t  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_start_duration</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t start, char *duration
-</FUNCTION>
-<FUNCTION>
-<NAME>isodate_from_time_t</NAME>
-<RETURNS>char    *</RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>get_time_t_hour</NAME>
-<RETURNS>int  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>isodiff_to_secs</NAME>
-<RETURNS>int  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>isodiff_from_secs</NAME>
-<RETURNS>char    *</RETURNS>
-int secs
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_day</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int days
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_week</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int weeks
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_month</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int months
-</FUNCTION>
-<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t time, int years
-</FUNCTION>
-<FUNCTION>
-<NAME>format_simple_hour</NAME>
-<RETURNS>char  *</RETURNS>
-int hour, int use_am_pm
-</FUNCTION>
-<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int  </RETURNS>
-int year, int month
-</FUNCTION>
-<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t  </RETURNS>
-int year, int month, int day
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_hour</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t, int hour
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t  </RETURNS>
-time_t t
-</FUNCTION>
-<FUNCTION>
-<NAME>parse_date</NAME>
-<RETURNS>time_t  </RETURNS>
-char *str
-</FUNCTION>
-<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void  </RETURNS>
-time_t t
-</FUNCTION>
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-sections.txt b/help/devel/calendar/cal-util/evolution-cal-util-sections.txt
deleted file mode 100644
index cd928fc7e3..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util-sections.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-<SECTION>
-<FILE>cal-component</FILE>
-CAL_COMPONENT
-<TITLE>CalComponent</TITLE>
-
-CalComponentVType
-CalComponentField
-CalComponentClassification
-CalComponentDateTime
-CalComponentPeriodType
-CalComponentPeriod
-CalComponentText
-CalComponentTransparency
-CalComponentAlarm
-CalComponentPrivate
-
-cal_component_gen_uid
-cal_component_new
-cal_component_clone
-cal_component_set_new_vtype
-cal_component_set_icalcomponent
-cal_component_get_icalcomponent
-cal_component_get_vtype
-cal_component_get_as_string
-cal_component_commit_sequence
-cal_component_get_uid
-cal_component_set_uid
-cal_component_get_categories_list
-cal_component_set_categories_list
-cal_component_get_classification
-cal_component_set_classification
-cal_component_get_comment_list
-cal_component_set_comment_list
-cal_component_get_completed
-cal_component_set_completed
-cal_component_get_created
-cal_component_set_created
-cal_component_get_description_list
-cal_component_set_description_list
-cal_component_get_dtend
-cal_component_set_dtend
-cal_component_get_dtstamp
-cal_component_set_dtstamp
-cal_component_get_dtstart
-cal_component_set_dtstart
-cal_component_get_due
-cal_component_set_due
-cal_component_get_exdate_list
-cal_component_set_exdate_list
-cal_component_get_exrule_list
-cal_component_set_exrule_list
-cal_component_get_geo
-cal_component_set_geo
-cal_component_get_last_modified
-cal_component_set_last_modified
-cal_component_get_percent
-cal_component_set_percent
-cal_component_get_priority
-cal_component_set_priority
-cal_component_get_rdate_list
-cal_component_set_rdate_list
-cal_component_has_rdates
-cal_component_get_rrule_list
-cal_component_set_rrule_list
-cal_component_has_rrules
-cal_component_get_sequence
-cal_component_set_sequence
-cal_component_get_summary
-cal_component_set_summary
-cal_component_get_transparency
-cal_component_set_transparency
-cal_component_get_url
-cal_component_set_url
-cal_component_get_pilot_id
-cal_component_set_pilot_id
-cal_component_get_pilot_status
-cal_component_set_pilot_status
-
-cal_component_free_categories_list
-cal_component_free_datetime
-cal_component_free_exdate_list
-cal_component_free_geo
-cal_component_free_icaltimetype
-cal_component_free_percent
-cal_component_free_priority
-cal_component_free_period_list
-cal_component_free_recur_list
-cal_component_free_sequence
-cal_component_free_text_list
-
-CalComponentAlarmAction
-CalComponentAlarmTriggerType
-CalComponentAlarmTriggerRelated
-CalComponentAlarmTrigger
-
-cal_component_get_first_alarm
-cal_component_get_next_alarm
-cal_component_alarm_free
-cal_component_alarm_get_action
-cal_component_alarm_set_action
-cal_component_alarm_get_trigger
-cal_component_alarm_set_trigger
-cal_component_alarm_free_trigger
-
-<SUBSECTION Standard>
-CAL_COMPONENT_TYPE
-CAL_COMPONENT_CLASS
-IS_CAL_COMPONENT
-IS_CAL_COMPONENT_CLASS
-cal_component_get_type
-
-<SUBSECTION Private>
-CalComponent
-
-</SECTION>
-
-<SECTION>
-<FILE>cal-recur</FILE>
-CalRecurType
-CalRecurrence
-CalObjTime
-CalRecurInstanceFn
-cal_recur_generate_instances
-cal_recur_from_icalrecurrencetype
-cal_recur_free
-</SECTION>
-
-<SECTION>
-<FILE>cal-util</FILE>
-CalObjInstance
-cal_obj_instance_list_free
-CalAlarmInstance
-cal_alarm_instance_list_free
-CalObjType
-cal_obj_uid_list_free
-</SECTION>
-
-<SECTION>
-<FILE>timeutil</FILE>
-time_from_icaltimetype
-time_from_isodate
-time_from_start_duration
-isodate_from_time_t
-get_time_t_hour
-isodiff_to_secs
-isodiff_from_secs
-time_add_minutes
-time_add_day
-time_add_week
-time_add_month
-time_add_year
-format_simple_hour
-time_days_in_month
-time_from_day
-time_day_hour
-time_year_begin
-time_year_end
-time_month_begin
-time_month_end
-time_week_begin
-time_week_end
-time_day_begin
-time_day_end
-parse_date
-print_time_t
-</SECTION>
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.args b/help/devel/calendar/cal-util/evolution-cal-util.args
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.args
+++ /dev/null
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.hierarchy b/help/devel/calendar/cal-util/evolution-cal-util.hierarchy
deleted file mode 100644
index cc235653f2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.hierarchy
+++ /dev/null
@@ -1,2 +0,0 @@
-GtkObject
-  CalComponent
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.signals b/help/devel/calendar/cal-util/evolution-cal-util.signals
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.signals
+++ /dev/null
diff --git a/help/devel/calendar/cal-util/evolution-cal-util.types b/help/devel/calendar/cal-util/evolution-cal-util.types
deleted file mode 100644
index 52b2d9bf90..0000000000
--- a/help/devel/calendar/cal-util/evolution-cal-util.types
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <gnome.h>
-#include <cal-util/cal-component.h>
-
-cal_component_get_type
diff --git a/help/devel/calendar/cal-util/tmpl/cal-component.sgml b/help/devel/calendar/cal-util/tmpl/cal-component.sgml
deleted file mode 100644
index 2f800e583f..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ /dev/null
@@ -1,934 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-CalComponent
-
-<!-- ##### SECTION Short_Description ##### -->
-RFC 2445 iCalendar component object.
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #CalComponent object provides a wrapper over the &libical;
-    functions for manipulating calendar components.  #CalComponent
-    presents a GTK+-like interface to calendar components according to
-    RFC 2445.
-  </para>
-
-  <para>
-    While &libical; supports almost all of the features of the
-    iCalendar RFCs, applications are normally not interested in all
-    the mindless gunk that is there.  Still, applications should do
-    their best not to drop extension fields from calendar components
-    or any other extra information they do not support (including
-    standard fields they are not interested in).  The #CalComponent
-    object provides a wrapper over
-    <structname>icalcomponent</structname> structures from &libical;
-    so that no information in them will be lost even if the
-    application is not designed to handle it.  Also, #CalComponent
-    provides a higher-level API to many of the &libical; operations so
-    as to make it less painful to deal with iCalendar components.
-  </para>
-
-  <para>
-    A #CalComponent object starts out empty.  It must be initialized
-    from an existing <structname>icalcomponent</structname> structure
-    by using the cal_component_set_icalcomponent() function, or from a
-    completely new data by specifying the desired component type to
-    the cal_component_set_new_vtype() function.
-  </para>
-
-  <para>
-    #CalComponent will create an internal map of the properties in the
-    <structname>icalcomponent</structname> structure and then allow
-    random access to them via the #CalComponent API functions;
-    normally the &libical; API would have to be used by creating many
-    iterators and other unpleasant constructs.  #CalComponent keeps
-    handles to the properties it scanned from the
-    <structname>icalcomponent</structname> and will let the parent
-    application modify them at any time without having to do any
-    iteration.
-  </para>
-
-  <para>
-    Eventually a #CalComponent may be turned into the RFC 2445 string
-    representation of an iCalendar component by using the
-    cal_component_get_as_string() function.  Applications can then
-    transfer this interoperable
-    <footnote>
-      <para>
-	&ldquo;Interoperable.&rdquo;  Heavens, I love that word.
-      </para>
-    </footnote>
-    string to other programs that deal with iCalendar.
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-  <para>
-
-  </para>
-
-<!-- ##### MACRO CAL_COMPONENT ##### -->
-  <para>
-    Casts a #GtkObject to a #CalComponent.
-  </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ENUM CalComponentVType ##### -->
-  <para>
-    Calendar component types as defined by RFC 2445.  These values can
-    be used to create a new calendar component by passing them to the
-    cal_component_set_new_vtype() function.  They are also the return
-    value of the cal_component_get_vtype() function.  The only time
-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the
-    vtype of an uninitialized #CalComponent.
-  </para>
-
-@CAL_COMPONENT_NO_TYPE: Returned from cal_component_get_vtype() to
-  indicate an uninitialized #CalComponent object.
-
-@CAL_COMPONENT_EVENT: Indicates a VEVENT component.
-@CAL_COMPONENT_TODO: Indicates a VTODO component.
-@CAL_COMPONENT_JOURNAL: Indicates a VJOURNAL component.
-@CAL_COMPONENT_FREEBUSY: Indicates a VFREEBUSY component.
-@CAL_COMPONENT_TIMEZONE: Indicates a VTIMEZOME component.
-
-<!-- ##### ENUM CalComponentField ##### -->
-  <para>
-    These values are used as identifiers for #ETable columns.  These
-    are used by the calendar GUI code in Evolution.
-  </para>
-
-@CAL_COMPONENT_FIELD_CATEGORIES: Component's list of categories.
-@CAL_COMPONENT_FIELD_CLASSIFICATION: Component's classification.
-@CAL_COMPONENT_FIELD_COMPLETED: Component's completion date.
-@CAL_COMPONENT_FIELD_DTEND: Component's ending date.
-@CAL_COMPONENT_FIELD_DTSTART: Component's starting date.
-@CAL_COMPONENT_FIELD_DUE: Component's due date.
-@CAL_COMPONENT_FIELD_GEO: Component's geographical position.
-@CAL_COMPONENT_FIELD_PERCENT: Component's percent completed value.
-@CAL_COMPONENT_FIELD_PRIORITY: Component's priority.
-@CAL_COMPONENT_FIELD_SUMMARY: Component's summary.
-@CAL_COMPONENT_FIELD_TRANSPARENCY: Component's transparency value.
-@CAL_COMPONENT_FIELD_URL: Component's URL.
-@CAL_COMPONENT_FIELD_HAS_ALARMS: Whether the component has any alarms.
-@CAL_COMPONENT_FIELD_ICON: Which icon to use for the component.
-@CAL_COMPONENT_FIELD_COMPLETE: Whether the component has been completed.
-@CAL_COMPONENT_FIELD_RECURRING: Whether the component has any recurrences.
-@CAL_COMPONENT_FIELD_OVERDUE: Whether the component is overdue.
-@CAL_COMPONENT_FIELD_COLOR: Which color to use for the component.
-@CAL_COMPONENT_FIELD_NUM_FIELDS: Total number of enumerated fields.
-
-<!-- ##### ENUM CalComponentClassification ##### -->
-  <para>
-    Values for the access classification property of a calendar
-    component.
-  </para>
-
-@CAL_COMPONENT_CLASS_NONE: Indicates that no access classification has
-    been set for the corresponding component.
-
-@CAL_COMPONENT_CLASS_PUBLIC: Public access.
-@CAL_COMPONENT_CLASS_PRIVATE: Private access.
-@CAL_COMPONENT_CLASS_CONFIDENTIAL: Confidential access.
-
-@CAL_COMPONENT_CLASS_UNKNOWN: Unknown access classification value,
-  used when &libical; returns something #CalComponent does not know
-  about.
-
-<!-- ##### TYPEDEF CalComponentDateTime ##### -->
-  <para>
-    This structure defines a date and time value.
-  </para>
-
-
-<!-- ##### ENUM CalComponentPeriodType ##### -->
-  <para>
-    Defines how a period of time is specified.
-  </para>
-
-@CAL_COMPONENT_PERIOD_DATETIME: Indicates that the period is specified
-  by starting and ending date/time values.
-
-@CAL_COMPONENT_PERIOD_DURATION: Indicates that the period is specified
-  as a starding date/time and a duration value.
-
-<!-- ##### TYPEDEF CalComponentPeriod ##### -->
-  <para>
-    This structure defines a period of time.
-  </para>
-
-
-<!-- ##### TYPEDEF CalComponentText ##### -->
-  <para>
-    This structure defines the value of a text property that may have
-    an alternate representation parameter.
-  </para>
-
-
-<!-- ##### ENUM CalComponentTransparency ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_TRANSP_NONE: 
-@CAL_COMPONENT_TRANSP_TRANSPARENT: 
-@CAL_COMPONENT_TRANSP_OPAQUE: 
-@CAL_COMPONENT_TRANSP_UNKNOWN: 
-
-<!-- ##### STRUCT CalComponentAlarm ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT CalComponentPrivate ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_gen_uid ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_clone ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_set_new_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@type: 
-
-
-<!-- ##### FUNCTION cal_component_set_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@icalcomp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_icalcomponent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_vtype ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_as_string ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_commit_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-
-
-<!-- ##### FUNCTION cal_component_get_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_set_uid ##### -->
-<para>
-
-</para>
-
-@comp: 
-@uid: 
-
-
-<!-- ##### FUNCTION cal_component_get_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_categories_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_set_classification ##### -->
-<para>
-
-</para>
-
-@comp: 
-@classif: 
-
-
-<!-- ##### FUNCTION cal_component_get_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_comment_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_completed ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_created ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_description_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@text_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtend ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstamp ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_dtstart ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_set_due ##### -->
-<para>
-
-</para>
-
-@comp: 
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_get_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_exrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_get_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_set_geo ##### -->
-<para>
-
-</para>
-
-@comp: 
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_get_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_set_last_modified ##### -->
-<para>
-
-</para>
-
-@comp: 
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_get_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_set_percent ##### -->
-<para>
-
-</para>
-
-@comp: 
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_get_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_set_priority ##### -->
-<para>
-
-</para>
-
-@comp: 
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_get_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rdate_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rdates ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_set_rrule_list ##### -->
-<para>
-
-</para>
-
-@comp: 
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_has_rrules ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_set_sequence ##### -->
-<para>
-
-</para>
-
-@comp: 
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_get_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_set_summary ##### -->
-<para>
-
-</para>
-
-@comp: 
-@summary: 
-
-
-<!-- ##### FUNCTION cal_component_get_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_set_transparency ##### -->
-<para>
-
-</para>
-
-@comp: 
-@transp: 
-
-
-<!-- ##### FUNCTION cal_component_get_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_set_url ##### -->
-<para>
-
-</para>
-
-@comp: 
-@url: 
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-
-<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_id: 
-
-
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
-<para>
-
-</para>
-
-@comp: 
-@pilot_status: 
-
-
-<!-- ##### FUNCTION cal_component_free_categories_list ##### -->
-<para>
-
-</para>
-
-@categ_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_datetime ##### -->
-<para>
-
-</para>
-
-@dt: 
-
-
-<!-- ##### FUNCTION cal_component_free_exdate_list ##### -->
-<para>
-
-</para>
-
-@exdate_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_geo ##### -->
-<para>
-
-</para>
-
-@geo: 
-
-
-<!-- ##### FUNCTION cal_component_free_icaltimetype ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
-<!-- ##### FUNCTION cal_component_free_percent ##### -->
-<para>
-
-</para>
-
-@percent: 
-
-
-<!-- ##### FUNCTION cal_component_free_priority ##### -->
-<para>
-
-</para>
-
-@priority: 
-
-
-<!-- ##### FUNCTION cal_component_free_period_list ##### -->
-<para>
-
-</para>
-
-@period_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_recur_list ##### -->
-<para>
-
-</para>
-
-@recur_list: 
-
-
-<!-- ##### FUNCTION cal_component_free_sequence ##### -->
-<para>
-
-</para>
-
-@sequence: 
-
-
-<!-- ##### FUNCTION cal_component_free_text_list ##### -->
-<para>
-
-</para>
-
-@text_list: 
-
-
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_NONE: 
-@CAL_COMPONENT_ALARM_AUDIO: 
-@CAL_COMPONENT_ALARM_DISPLAY: 
-@CAL_COMPONENT_ALARM_EMAIL: 
-@CAL_COMPONENT_ALARM_PROCEDURE: 
-@CAL_COMPONENT_ALARM_UNKNOWN: 
-
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
-
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
-
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
-<para>
-
-</para>
-
-@comp: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free ##### -->
-<para>
-
-</para>
-
-@alarm: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_action ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@action: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_get_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_set_trigger ##### -->
-<para>
-
-</para>
-
-@alarm: 
-@trigger: 
-
-
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
-<para>
-
-</para>
-
-@trigger: 
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
diff --git a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml b/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
deleted file mode 100644
index 703f8b2b85..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-cal-recur
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM CalRecurType ##### -->
-<para>
-
-</para>
-
-@CAL_RECUR_YEARLY: 
-@CAL_RECUR_MONTHLY: 
-@CAL_RECUR_WEEKLY: 
-@CAL_RECUR_DAILY: 
-@CAL_RECUR_HOURLY: 
-@CAL_RECUR_MINUTELY: 
-@CAL_RECUR_SECONDLY: 
-
-<!-- ##### TYPEDEF CalRecurrence ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT CalObjTime ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@hour: 
-@minute: 
-@second: 
-
-<!-- ##### USER_FUNCTION CalRecurInstanceFn ##### -->
-<para>
-
-</para>
-
-@comp: 
-@instance_start: 
-@instace_end: 
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_recur_generate_instances ##### -->
-<para>
-
-</para>
-
-@comp: 
-@start: 
-@end: 
-@cb: 
-@cb_data: 
-
-
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
-<para>
-
-</para>
-
-@ir: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
-<para>
-
-</para>
-
-@r: 
-
-
diff --git a/help/devel/calendar/cal-util/tmpl/cal-util.sgml b/help/devel/calendar/cal-util/tmpl/cal-util.sgml
deleted file mode 100644
index bc349a377f..0000000000
--- a/help/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Miscellaneous utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### TYPEDEF CalObjInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### TYPEDEF CalAlarmInstance ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
-<!-- ##### ENUM CalObjType ##### -->
-<para>
-
-</para>
-
-@CALOBJ_TYPE_EVENT: 
-@CALOBJ_TYPE_TODO: 
-@CALOBJ_TYPE_JOURNAL: 
-@CALOBJ_TYPE_ANY: 
-
-<!-- ##### FUNCTION cal_obj_uid_list_free ##### -->
-<para>
-
-</para>
-
-@list: 
-
-
diff --git a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ /dev/null
diff --git a/help/devel/calendar/cal-util/tmpl/timeutil.sgml b/help/devel/calendar/cal-util/tmpl/timeutil.sgml
deleted file mode 100644
index 3b62fbba3f..0000000000
--- a/help/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ /dev/null
@@ -1,260 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-timeutil
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
-<para>
-
-</para>
-
-@itt: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_isodate ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_start_duration ##### -->
-<para>
-
-</para>
-
-@start: 
-@duration: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodate_from_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION get_time_t_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
-<para>
-
-</para>
-
-@secs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time: 
-@minutes: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_day ##### -->
-<para>
-
-</para>
-
-@time: 
-@days: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_week ##### -->
-<para>
-
-</para>
-
-@time: 
-@weeks: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_month ##### -->
-<para>
-
-</para>
-
-@time: 
-@months: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time: 
-@years: 
-@Returns: 
-
-
-<!-- ##### FUNCTION format_simple_hour ##### -->
-<para>
-
-</para>
-
-@hour: 
-@use_am_pm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_days_in_month ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year: 
-@month: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_hour ##### -->
-<para>
-
-</para>
-
-@t: 
-@hour: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_begin ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION time_day_end ##### -->
-<para>
-
-</para>
-
-@t: 
-@Returns: 
-
-
-<!-- ##### FUNCTION parse_date ##### -->
-<para>
-
-</para>
-
-@str: 
-@Returns: 
-
-
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t: 
-
-
diff --git a/help/devel/calendar/evolution-calendar.sgml b/help/devel/calendar/evolution-calendar.sgml
deleted file mode 100644
index f3936d9bbc..0000000000
--- a/help/devel/calendar/evolution-calendar.sgml
+++ /dev/null
@@ -1,51 +0,0 @@
-  <part>
-    <docinfo>
-      <authorgroup>
-	<author>
-	  <firstname>Federico</firstname>
-	  <surname>Mena Quintero</surname>
-	  <affiliation>
-	    <address>
-	      <email>federico@helixcode.com</email>
-	    </address>
-	  </affiliation>
-	</author>
-      </authorgroup>
-    </docinfo>
-
-    <title>Developing Applications for the Evolution Calendar</title>
-
-    <partintro>
-      <para>
-	This part of the Evolution Developer's Guide describes how to
-	write applications for the Evolution Calendar by using its
-	public interfaces.  The Evolution Calendar exports its
-	functionality through a number of interfaces, including CORBA,
-	GTK+ wrappers for Bonobo objects, and other utility libraries.
-      </para>
-
-      <para>
-	You should read this part of the Evolution Developer's guide
-	if you intend to write client applications that use the
-	functionality of the Evolution Calendar.
-      </para>
-
-      <para>
-	This part does not describe the internal interfaces of the
-	Evolution Calendar; for that you should read the Evolution
-	Internals Guide.  You should only need to read that guide if
-	you are interested in the way the calendar works internally or
-	if you want to make changes directly to the Evolution Calendar
-	code.
-      </para>
-    </partintro>
-
-    &calendar-architecture;
-  </part>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")
-End:
--->
diff --git a/help/devel/calendar/public-reference.sgml b/help/devel/calendar/public-reference.sgml
deleted file mode 100644
index f8aa6e848d..0000000000
--- a/help/devel/calendar/public-reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference>
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/calendar/reference.sgml b/help/devel/calendar/reference.sgml
deleted file mode 100644
index f8aa6e848d..0000000000
--- a/help/devel/calendar/reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference>
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->
diff --git a/help/devel/evolution-devel-guide.sgml b/help/devel/evolution-devel-guide.sgml
deleted file mode 100644
index 9db8f1bdf0..0000000000
--- a/help/devel/evolution-devel-guide.sgml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity evolution-calendar SYSTEM "calendar/evolution-calendar.sgml">
-<!entity calendar-architecture SYSTEM "calendar/architecture.sgml">
-<!entity calendar-reference SYSTEM "calendar/reference.sgml">
-<!entity CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml">
-<!entity CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml">
-<!entity cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
-<!entity cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml">
-<!entity timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity libical "<application>libical</application>">
-]>
-
-<book id="index">
-  <bookinfo>
-    <title>Evolution Developer's Guide</title>
-
-    <authorgroup>
-      <corpauthor>
-	Helix Code, Inc.
-      </corpauthor>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-  </bookinfo>
-
-  <!-- DocBook parts for each individual component -->
-
-  &evolution-calendar;
-
-  <!-- API Reference part -->
-
-  <part>
-    <title>Evolution Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	different libraries and interfaces that Evolution provides.
-	Classes are described together with their methods; individual
-	functions are grouped by functional group.
-      </para>
-    </partintro>
-
-    &calendar-reference;
-  </part>
-</book>
diff --git a/help/white-papers/calendar/calendar.sgml b/help/white-papers/calendar/calendar.sgml
deleted file mode 100644
index 2cb3132e2b..0000000000
--- a/help/white-papers/calendar/calendar.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity CUA "<acronym>CUA</acronym>">
-<!entity PCS "<acronym>PCS</acronym>">
-<!entity Bonobo "<application>Bonobo</application>">
-<!entity CORBA "<acronym>CORBA</acronym>">
-<!entity GTK "<acronym>GTK+</acronym>">
-]>
-
-<article class="whitepaper" id="calendar">
-
-  <artheader>
-    <title>&Evolution; Calendaring Framework</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Federico</firstname>
-	<surname>Mena Quintero</surname>
-	<affiliation>
-	  <address>
-	    <email>federico@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-    <abstract>
-      <para>
-	The &Evolution; groupware suite provides a framework for
-	developing calendaring applications, as well as a graphical
-	calendar client and a personal calendar server.  This white
-	paper describes the architecture of the &Evolution;
-	calendaring framework.
-      </para>
-    </abstract>
-  </artheader>
-
-  <!-- Introduction -->
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      Calendaring is an important part of a groupware suite.  A
-      calendaring framework will allow a user to keep a personal
-      calendar and have several applications use it.  Such
-      applications could be a graphical calendar client that the user
-      employs to schedule appointments and keep track of his time, a
-      <productname>Palm Pilot</productname> synchronization client, or
-      a simple alarm or reminder utility.  A comprehensive calendaring
-      framework will also allow multiple users to schedule
-      appointments between each other; for example, a project director
-      may want to schedule a weekly meeting with the rest of the
-      project members, or a person who owns a large house may want to
-      schedule a big party with his friends.  The attendees will then
-      want to reply with messages such as, &ldquo;I will
-      attend&rdquo;, or &ldquo;I will attend only if the proposed time
-      is changed&rdquo;.
-    </para>
-
-    <para>
-      The &Evolution; groupware suite provides a framework for
-      developing calendaring applications, as well as a graphical
-      calendar client or calendar user agent (&CUA;) and a personal
-      calendar server (&PCS;).
-    </para>
-
-    <para>
-      The following sections explain the basic calendaring framework,
-      the functions of the calendar user agent and the personal
-      calendar server, and the relationship between the two.
-    </para>
-  </sect1>
-
-  <!-- Personal Calendar Server -->
-
-  <sect1 id="pcs">
-    <title>Personal Calendar Server</title>
-
-    <para>
-      The personal calendar server (&PCS;) provides centralized
-      management and storage of a user's personal calendar.  Multiple
-      clients can connect to the &PCS; simultaneously to query and
-      modify the user's calendar in a synchronized fashion.  The main
-      features of the &PCS; are as follows:
-    </para>
-
-    <formalpara>
-      <title>Storage</title>
-
-      <para>
-	The &PCS; is responsible for loading and saving calendars.
-	Centralizing the loading and saving functionality allows
-	multiple clients to use the same calendar at the same time
-	without having to worry about each other.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Basic Queries</title>
-
-      <para>
-	The &PCS; provides functions to do basic queries on a
-	calendar, for example, a client can ask the server for a list
-	of all the appointments in the calendar, or for all the data
-	for a specific appointment.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Recurrence and Alarm Queries</title>
-
-      <para>
-	Clients can ask the &PCS; for a list of the appointments that
-	occur within a specified time range; for example a graphical
-	client that has a per-week view could ask the &PCS; for all
-	the appointments that occur in a particular week.  This
-	includes multiple occurrences of a single recurring event; for
-	example, the object for &ldquo;a 1-hour meeting that occurs on
-	every Tuesday and Thursday&rdquo; is represented inside the
-	&PCS; as a single event with a recurrence rule.  Similarly,
-	clients can ask the &PCS; for a list of events that have
-	alarms that trigger within a specified time range.
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title>Notification of Changes</title>
-
-      <para>
-	This is the most important function of the &PCS;, as it allows
-	multiple calendar clients to maintain a unified view of the
-	calendar between the server and themselves.  When a client
-	asks the &PCS; to modify or remove an event, the &PCS;
-	notifies all the clients that are connected to it about the
-	change.  The policy is that &ldquo;the server is always
-	right&rdquo;; clients can act as dumb views onto the
-	calendar's data and they will be notified by the &PCS; when
-	something changes.
-      </para>
-    </formalpara>
-  </sect1>
-
-  <!-- Calenar User Agent -->
-
-  <sect1 id="cua">
-    <title>Calendar User Agent</title>
-
-    <para>
-      A calendar user agent (&CUA;) is a program that lets a user
-      manipulate a calendar.  &Evolution; provides an attractive,
-      graphical calendar client that communicates with the &Evolution;
-      personal calendar server.
-    </para>
-
-    <para>
-      The &Evolution; calendar client just provides a view onto the
-      data that is stored and managed by the personal calendar server.
-      The calendar client does not perform direct manipulations on a
-      calendar's data; instead it offloads those requests to the
-      calendar server, which takes care of making the appropriate
-      modifications in the calendar and then notifies all the clients
-      about the changes.
-    </para>
-  </sect1>
-
-  <!-- Calendar Client Library -->
-
-  <sect1 id="client-lib">
-    <title>Calendar Client Library</title>
-
-    <para>
-      Communication between the personal calendar server and calendar
-      clients is defined by a set of &Bonobo; &CORBA; interfaces.
-      Clients can be written by implementing the client-side
-      <classname>Listener</classname> interface, which defines the
-      notification callbacks that the PCS uses to inform clients about
-      changes to the calendar.
-    </para>
-
-    <para>
-      As a convenience for &GTK; programmers, &Evolution; also
-      includes a library which provides a
-      <classname>CalClient</classname> class which can be used for
-      communication with the personal calendar server.  Objects of
-      this class automatically contact the PCS when they are created.
-      <classname>CalClient</classname> provides functions to request
-      changes in the calendar, and it also emits signals when it gets
-      notification about changes from the PCS.  This makes it easy and
-      convenient to write calendar clients for &Evolution; using
-      &GTK;.
-    </para>
-
-    <para>
-      The implementation of the <classname>CalClient</classname> class
-      simply wraps the &Evolution; &CORBA; interfaces for calendaring
-      with a familiar-looking &GTK; object.  Calls to the
-      <classname>Listener</classname> interface get translated to
-      signal emissions from the <classname>CalClient</classname>, thus
-      shielding programmers from the details of the &CORBA;
-      interfaces.
-    </para>
-  </sect1>
-</article>
diff --git a/help/white-papers/mail/camel.sgml b/help/white-papers/mail/camel.sgml
deleted file mode 100644
index a339909f54..0000000000
--- a/help/white-papers/mail/camel.sgml
+++ /dev/null
@@ -1,339 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-]>
-
-<article class="whitepaper" id="camel">
-
-  <artheader>
-    <title>The &Camel; Messaging Library</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-
-      <author>
-	<firstname>Bertrand</firstname>
-	<surname>Guiheneuf</surname>
-	<affiliation>
-	  <address>
-	    <email>bertrand@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Camel; is a generic messaging library. It is being used as the
-      back end for the mail component of &Evolution;. The name
-      "&Camel;" is an acronym; it refers to the fact that the
-      library is capable of going several days without food or water.
-      It means : Camel's Acronym Makes Everyone Laugh.
-    </para>
-
-    <para>
-      &Camel;'s initial design is heavily based on Sun's
-      <trademark>JavaMail</trademark> API. It uses the Gtk+ object
-      system, and many of its classes are direct analags of JavaMail
-      classes. Its design has also been influenced by the features of
-      IMAP, and the limitations of the standard UNIX mbox mail store,
-      which set some of the boundaries on its requirements and
-      extensibility.
-    </para>
-
-    <para>
-      &Camel; sees all message repositories as stores containing
-      folders. These folders in turn contain the messages the client
-      actually accesses. The use of such a unified interface allows
-      the client applications to be very extensible. &Camel; includes
-      an external provider mechanism which allows applications to
-      dynamically load and use protocols which were not available when
-      the application was initially written.
-    </para>
-
-    <para>
-      The abstract store/folder mechanism is a powerful and versatile
-      way of accessing messages. No particular asumptions are made on
-      the client side, thus allowing new ways of managing the
-      messages. For example, the messages stored in the folders don't
-      necessarily have to share some common physical location. The
-      folder can be a purely virtual folder, containing only
-      references to the actual messages. This is used by the "vFolder"
-      provider, which allows you select messages meeting particular
-      criteria and deal with them as a group.
-    </para>
-
-    <para>
-      In addition to these possibilities, &Camel; has full MIME
-      support. &Camel; MIME messages are lightweight objects
-      representing the MIME skeleton of the actual message. The data
-      contained in the subparts are never stored in memory except when
-      they are actually needed. The application, when accessing the
-      various MIME objects contained in the message (text parts,
-      attachments, embedded binary objects ...) asks &Camel; for a
-      stream that it can read data from. This scheme is particularly
-      useful with the IMAP provider. IMAP has strong MIME support
-      built-in, which allows &Camel; to download only the parts of
-      messages that it actually needs: attachments need not be
-      downloaded until they are viewed, and unnecessary
-      "multipart/alternative" parts will never be read off the server.
-    </para>
-  </sect1>
-
-  <sect1 id="overview">
-    <title>Overview</title>
-
-    <graphic format="gif" fileref="camel"></graphic>
-
-    <para>
-      To begin using &Camel;, an application first creates a
-      <classname>CamelSession</classname> object. This object is used
-      to store application defaults, and to coordinate communication
-      between providers and the application.
-    </para>
-
-    <para>
-      A <classname>CamelProvider</classname> is a dynamically-loadable
-      module that provides functionality associated with a specific
-      service. Examples of providers are IMAP and SMTP. Providers
-      include subclasses of the various other &Camel; classes for
-      accessing and manipulating messages.
-    </para>
-
-    <para>
-      <classname>CamelService</classname> is an abstract class for
-      describing a connection to a local or remote service. It
-      currently has two subclasses: <classname>CamelStore</classname>,
-      for services that store messages (such as IMAP servers and mbox
-      files), and <classname>CamelTransport</classname>, for services
-      that deliver messages (such as SMTP, or a local MTA). A provider
-      could also be both a store and a transport, as in the case of
-      NNTP.
-    </para>
-
-    <para>
-      A <classname>CamelStore</classname> contains some number of
-      <classname>CamelFolder</classname> objects, which in turn
-      contain messages. A <classname>CamelFolder</classname> provides
-      a <classname>CamelFolderSummary</classname> object, which
-      includes details about the subject, date, and sender of each
-      message in the folder. The folder also includes the messages
-      themselves, as subclasses of <classname>CamelMedium</classname>.
-    </para>
-
-    <para>
-      Email messages are represented by the
-      <classname>CamelMimeMessage</classname> class, a subclass of
-      <classname>CamelMedium</classname>. This class includes
-      operations for accessing RFC822 and MIME headers, accessing
-      subparts of MIME messages, encoding and decoding Base64 and
-      Quoted-Printable, etc.
-    </para>
-
-    <para>
-      <classname>CamelTransport</classname> includes methods for
-      delivering messages. While the abstract
-      <function>CamelTransport::send</function> method takes a
-      <classname>CamelMedium</classname>, its subclasses may only be
-      able to deliver messages of specific
-      <classname>CamelMedium</classname> subclasses. For instance,
-      <classname>CamelSendmailTransport</classname> requires a
-      <classname>CamelMimeMessage</classname>, because it needs a
-      message that includes a "To:" header. A hypothetical
-      <classname>CamelNNTPTransport</classname> would need a
-      <classname>CamelNewsMessage</classname>, which would have a
-      "Newsgroups:" header.
-    </para>
-
-    <para>
-      The content of messages are referred to using
-      <classname>CamelStream</classname> and its subclasses. In the
-      case of an mbox-based store, the
-      <classname>CamelStream</classname> would abstract the operation
-      of reading the correct section of the mbox file. For IMAP,
-      reading off the <classname>CamelStream</classname> might result
-      in commands being issued to the remote IMAP server and data
-      being read off a socket.
-    </para>
-
-    <para>
-      The final major class in &Camel; is
-      <classname>CamelException</classname>, which is used to
-      propagate information about errors. Many methods take a
-      <classname>CamelException</classname> as an argument, which the
-      caller can then check if an error occurs. It includes both a
-      numeric error code which can be interpreted by the program, and
-      a text error message that can be displayed to the user.
-    </para>
-  </sect1>
-
-  <sect1 id="classes">
-    <title>Major Subcomponents</title>
-
-    <sect2 id="store">
-      <title>The Message Store</title>
-
-      <para>
-        A <classname>CamelStore</classname> inherits the ability to
-        connect and authenticate to a service from its parent class,
-        <classname>CamelService</classname>. It then adds the ability
-        to retrieve folders. A store must contain at least one folder,
-        which can be retrieved with
-        <function>CamelStore::get_default_folder</function>. There are
-        also methods to retrieve the "top-level" folder (for
-        hieararchical stores), and to retrieve an arbitrary folder by
-        name.
-      </para>
-
-      <para>
-        All <classname>CamelFolder</classname>s must implement certain
-        core operations, most notably generating a summary and
-        retrieving and deleting messages. A
-        <classname>CamelFolder</classname> must assign a permanently
-        unique identifier to each message it contains. Messages can
-        then be retrieved via
-        <function>CamelFolder::get_message_by_uid</function>. Alternately,
-        within a single mail-reading session, messages can be referred
-        to by their linear position within the store using
-        <function>CamelFolder::get_message_by_number</function>.
-      </para>
-
-      <para>
-        Folders must also implement the
-        <function>get_parent_folder</function> and
-        <function>list_subfolders</function> methods. For stores that
-        don't allow multiple folders, they would return NULL and an
-        empty list, respectively. Stores that do allow multiple
-        folders will also define methods for creating and deleting
-        folders, and for moving messages between them (assuming the
-        folders are writable).
-      </para>
-
-      <para>
-        Folders that support searching can define the
-        <function>search_by_expression</function> method. For mbox
-        folders, this is implemented by indexing the messages with the
-        ibex library and using that to search them later. For IMAP
-        folders, this uses the IMAP SEARCH command. Other folder types
-        might not be able to implement this functionality, in which
-        case users would not be able to do full-content searches on
-        them.
-      </para>
-    </sect2>
-
-    <sect2 id="messages">
-      <title>Messages</title>
-
-      <para>
-        As mentioned before, messages are represented by subclasses of
-        <classname>CamelMedium</classname>.
-        <classname>CamelMedium</classname> itself is a subclass of
-        <classname>CamelDataWrapper</classname>, a generic class for
-        connecting a typed data source to a data sink.
-        <classname>CamelMedium</classname> adds the concept of message
-        headers versus message body.
-        (<classname>CamelDataWrapper</classname> has one other
-        important subclass, <classname>CamelMultipart</classname>,
-        which is used to provide separate access to the multiple
-        independent parts of a multipart MIME type.)
-        <classname>CamelMedium</classname>'s subclasses provide more
-        specialized handling of various headers:
-        <classname>CamelMimePart</classname> adds special handling for
-        the &ldquot;Content-*&rdquot; headers in MIME messages, and
-        its subclass <classname>CamelMimeMessage</classname> adds
-        handling for the RFC822 headers.
-      </para>
-
-      <graphic format="gif" fileref="mimemessage"></graphic>
-
-      <para>
-        Consider a message with two parts: a text part (in both plain
-        text and HTML), and an attached image:
-
-	<programlisting>
-
-	  From: Dan Winship &lt;danw@helixcode.com&gt;
-	  To: Matt Loper &lt;matt@helixcode.com&gt;
-	  Subject: the Camel white paper
-	  MIME-Version: 1.0
-	  Content-Type: multipart/mixed;
-		boundary="jhTYrnsRrdhDFGa"
-
-	  This is a multi-part message in MIME format.
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: multipart/alternative;
-		boundary="sFSenbAFDSgDfg"
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/plain
-
-	  Hey, Matt
-
-	  Check out this graphic...
-
-	  -- Dan
-
-	  --sFSenbAFDSgDfg
-	  Content-Type: text/html
-
-	  Hey, Matt&lt;br&gt;
-	  &lt;br&gt;
-	  Check out this graphic...&lt;br&gt;
-	  &lt;br&gt;
-	  -- Dan&lt;br&gt;
-	  &lt;br&gt;
-	  --sFSenbAFDSgDfg--
-
-	  --jhTYrnsRrdhDFGa
-	  Content-Type: image/png
-	  Content-Transfer-Encoding: base64
-
-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...
-	  --jhTYrnsRrdhDFGa--
-	</programlisting>
-
-	<para>
-	  In &Camel;, this would be represented as follows:
-	</para>
-
-        <graphic fileref="samplemsg"></graphic>
-      </sect2>
-
-      <sect2 id="streams">
-        <title>Streams</title>
-
-	<para>
-	  Streams are a generic data transport layer. Two basic stream
-	  classes are <classname>CamelStreamFs</classname>, for
-	  reading and writing files, and
-	  <classname>CamelStreamMem</classname>, for reading from and
-	  writing to objects that are already in memory.
-	</para>
-
-	<para>
-	  Streams can also be chained together. So a CamelMimePart
-	  containing base64-encoded data can filter its output through
-	  a CamelStreamB64. Other parts of the application that want
-	  to read its data will never need to even realize that the
-	  original data was encoded.
-	</para>
-      </sect2>
-
-</article>
diff --git a/help/white-papers/mail/ibex.sgml b/help/white-papers/mail/ibex.sgml
deleted file mode 100644
index dcb8f5ca4b..0000000000
--- a/help/white-papers/mail/ibex.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity Camel "Camel">
-<!entity Ibex "Ibex">
-]>
-
-<article class="whitepaper" id="ibex">
-
-  <artheader>
-    <title>Ibex: an Indexing System</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Dan</firstname>
-	<surname>Winship</surname>
-	<affiliation>
-	  <address>
-	    <email>danw@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &Ibex; is a library for text indexing. It is being used by
-      &Camel; to allow it to quickly search locally-stored messages,
-      either because the user is looking for a specific piece of text,
-      or because the application is contructing a vFolder or filtering
-      incoming mail.
-    </para>
-  </sect1>
-
-  <sect1 id="goals">
-    <title>Design Goals and Requirements for Ibex</title>
-
-    <para>
-      The design of &Ibex; is based on a number of requirements.
-
-    <itemizedlist>
-      <listitem>
-        <para>
-	  First, obviously, it must be fast. In particular, searching
-	  the index must be appreciably faster than searching through
-	  the messages themselves, and constructing and maintaining
-	  the index must not take a noticeable amount of time.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexes must not take up too much space. Many users have
-	  limited filesystem quotas on the systems where they read
-	  their mail, and even users who read mail on private machines
-	  have to worry about running out of space on their disks. The
-	  indexes should be able to do their job without taking up so
-	  much space that the user decides he would be better off
-	  without them.
-	</para>
-
-	<para>
-	  Another aspect of this problem is that the system as a whole
-	  must be clever about what it does and does not index:
-	  accidentally indexing a "text" mail message containing
-	  uuencoded, BinHexed, or PGP-encrypted data will drastically
-	  affect the size of the index file. Either the caller or the
-	  indexer itself has to avoid trying to index these sorts of
-	  things.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  The indexing system must allow data to be added to the index
-	  incrementally, so that new messages can be added to the
-	  index (and deleted messages can be removed from it) without
-	  having to re-scan all existing messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must allow the calling application to explain the
-	  structure of the data however it wants to, rather than
-	  requiring that the unit of indexing be individual files.
-	  This way, &Camel; can index a single mbox-format file and
-	  treat it as multiple messages.
-	</para>
-      </listitem>
-
-      <listitem>
-        <para>
-	  It must support non-ASCII text, given that many people send
-	  and receive non-English email, and even people who only
-	  speak English may receive email from people whose names
-	  cannot be written in the US-ASCII character set.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      While there are a number of existing indexing systems, none of
-      them met all (or even most) of our requirements.
-    </para>
-  </sect1>
-
-  <sect1 id="implementation">
-    <title>The Implementation</title>
-
-    <para>
-      &Ibex; is still young, and many of the details of the current
-      implementation are not yet finalized.
-    </para>
-
-    <para>
-      With the current index file format, 13 megabytes of Info files
-      can be indexed into a 371 kilobyte index file&mdash;a bit under
-      3% of the original size. This is reasonable, but making it
-      smaller would be nice. (The file format includes some simple
-      compression, but <application>gzip</application> can compress an
-      index file to about half its size, so we can clearly do better.)
-    </para>
-
-    <para>
-      The implementation has been profiled and optimized for speed to
-      some degree. But, it has so far only been run on a 500MHz
-      Pentium III system with very fast disks, so we have no solid
-      benchmarks.
-    </para>
-
-    <para>
-      Further optimization (of both the file format and the in-memory
-      data structures) awaits seeing how the library is most easily
-      used by &Evolution;: if the indexes are likely to be kept in
-      memory for long periods of time, the in-memory data structures
-      need to be kept small, but the reading and writing operations
-      can be slow. On the other hand, if the indexes will only be
-      opened when they are needed, reading and writing must be fast,
-      and memory usage is less critical.
-    </para>
-
-    <para>
-      Of course, to be useful for other applications that have
-      indexing needs, the library should provide several options, so
-      that each application can use the library in the way that is
-      most suited for its needs.
-    </para>
-  </sect1>
-</article>
diff --git a/help/white-papers/widgets/e-table.sgml b/help/white-papers/widgets/e-table.sgml
deleted file mode 100644
index 5ff4faf2ae..0000000000
--- a/help/white-papers/widgets/e-table.sgml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity Evolution "<application>Evolution</application>">
-<!entity ETable "<classname>ETable</classname>">
-<!entity ETableModel "<classname>ETableModel</classname>">
-<!entity ETableSimple "<classname>ETableSimple</classname>">
-<!entity ETableHeader "<classname>ETableHeader</classname>">
-<!entity ETableSpecification "<classname>ETableSpecification</classname>">
-<!entity ETableCol "<classname>ETableCol</classname>">
-]>
-
-<article class="whitepaper" id="e-table">
-
-  <artheader>
-    <title>The ETable Widget</title>
-
-    <authorgroup>
-      <author>
-	<firstname>Chris</firstname>
-	<surname>Lahey</surname>
-	<affiliation>
-	  <address>
-	    <email>clahey@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Miguel</firstname>
-	<surname>de Icaza</surname>
-	<affiliation>
-	  <address>
-	    <email>miguel@helixcode.com</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2000</year>
-      <holder>Helix Code, Inc.</holder>
-    </copyright>
-
-  </artheader>
-
-  <sect1 id="introduction">
-    <title>Introduction</title>
-
-    <para>
-      &ETable; is a table widget on steroids. It is intended to provide
-      all the table functionality needed throughout &Evolution;, and
-      hopefully be general purpose enough to be used in other projects.
-    </para>
-
-    <para>
-      &ETable; provides a lot of interactive control over the data in the
-      table.  Without any work from the programmer, &ETable; provides
-      rearrangeable columns and editable data.  When finished, &ETable; will
-      also provide, again with no programmer intervention, easy interactive
-      sorting and grouping.  
-    </para>
-
-    <para>
-      &ETable; gives you a great deal of functionality, flexibility, and
-      power. Most of this power is internal to the widget, but some of
-      the flexibility requires a bit of work by the programmer.
-      However, once you learn it, &ETable; is not very hard at all to
-      use.
-    </para>
-
-    <para>
-      &ETable;'s power comes from the fact that it is fully
-      model/view/controller based.  Various models are involved into
-      the process of rendering the information, and various views are
-      provided.  The programmer has a wide range of options: from the
-      most finely hand-tuned table to a generic all-encompasing widget
-      that takes over most of tasks.  It is up to the programmer: he
-      can use the simple to use &ETable; widget that takes care of
-      everything in a generic way, or he can use the various
-      components to roll his own tabular display.
-    </para>
-
-    <para>
-      &ETable; ships with a standard set of information renderers:
-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line
-      strings.  But the programmer can write and implement his own
-      renderer for his information.  This means that by default
-      &ETable; provides the basic display facilities that programmers
-      required, but they offer the programmer a complete freedom to
-      incorporate new cell renderers.
-    </para>
-    
-  </sect1>
-
-  <sect1 id="model">
-    <title>ETableModel</title>
-
-    <para>
-      The data back end for the &ETable; is an &ETableModel;. The
-      &ETableModel is an abstract interface that acts as the
-      information repository for the various &ETable components.
-    </para>
-    
-    <para>
-      To use &ETable; you have to create a subclass of the abstract
-      &ETableModel; class.  However, to save you the work of defining
-      a new <classname>GtkClass</classname> every time you use
-      &ETable, there is a predefined subclass of &ETableModel; called
-      &ETableSimple; which simply takes a list of function callbacks
-      to perform the various operations.
-    </para>
-
-  </sect1>
-    
-  <sect1 id="columns">
-    <title>Columns</title>
-
-    <para>
-      There are two different meanings to the word "column". The first
-      is the model column (defined by the &ETableCol: object). A model
-      column describes how it maps to the column in the &ETableModel;
-      as well as containing information about its properties (name,
-      resizability, resize dimensions, and a renderer for this
-      specific columns). 
-    </para>
-
-    <para>
-      &ETable; distinguishes between a model column index, and a view
-      column index.  The former reflects the column in which the data
-      is stored in the &ETableModel;  The later represents the actual
-      location at which the column is being displayed in the screen.
-    </para>
-
-    <para>
-      Each view column index corresponds to a specific model column,
-      though a model column may have any number of view columns
-      associated with it (including zero).  For example the same
-      column might be rendered twice, or the data from one column
-      could be used to display different bits of information
-    </para>
-
-    <para>
-      The view column does not necessarily depend on only one model
-      column. In some cases, the view column renderer can be given a
-      reference to another model column to get extra information about
-      its display. For example, a mail program could display deleted
-      messages with a line through them by creating a model column
-      with no corresponding view column that told whether or not the
-      message is deleted, and then having the text column
-      strikethrough the display if the invisible column had a value
-      corresponding to "deleted".
-    </para>
-
-    <para>
-      The view column also specifies a few other pieces of
-      information. One piece of information is the renderer. &ETable;
-      provides a number of renderers to choose from, or you can write
-      your own. Currently, there are renderers for text, image sets,
-      and checkboxes.
-    </para>
-
-    <para>
-      The view column also includes information about the header.
-      There are two types of headers: text, and pixbuf. The first
-      allows you to specify a string which is rendered in the header.
-      The second allows you to specify an image to copy into the
-      header.
-    </para>
-  </sect1>
-
-  <sect1 id="header">
-    <title>Header</title>
-
-    <para>
-      The &ETableHeader; represents the header information for the
-      table. The &ETableHeader; is used in two different ways. The
-      first is the in the <structfield>full_header</structfield>
-      element of an &ETable;. This is the list of possible columns in
-      the view. You add each of your columns to this &ETableHeader;
-      and then pass it into the &ETable;.
-    </para>
-
-    <para>
-      The second use is completely internal. &ETable; uses another
-      &ETableHeader; to store the actual displayed columns. Many of
-      the &ETableHeader; functions are for this purpose. The only
-      functions that users of the library should need to use are
-      <function>e_table_header_new</function> and
-      <function>e_table_header_add_col</function>.
-    </para>
-  </sect1>
-
-  <sect1 id="layout">
-    <title>Layout Specification</title>
-
-    <para>
-      &ETable; uses an &ETableSpecification; to layout the columns of
-      the widget. The &ETableSpecification; is specified as XML data
-      passed into the &ETable; as a string.
-    </para>
-
-    <para>
-      The most powerful part of the &ETableSpecification; is that when
-      finished, &ETable; will allow you to get a copy of an
-      &ETableSpecification; that describes the current view of the
-      tree. This allows the developer to save the current view so that
-      next time the user opens this table, they find it in exactly the
-      state that they left it.
-    </para>
-
-    <para>
-      The XML specification allows for a number of things. First, it
-      allows you to pick a set of default columns to be shown. Thus,
-      even if you had hundreds of pieces of data, you could choose to
-      only display a few that fit on the screen by default.
-    </para>
-
-    <para>
-      The second major thing that the &ETableSpecification; allows you
-      to specify is the column grouping and sorting. &ETable; has a
-      powerful mechanism for allowing the user to choose columns to
-      group by, thus allowing multiple columns of sorting, as well as
-      visual grouping of similar elements and interactive selection of
-      what data to display.
-    </para>
-
-    <para>
-      The grouping in &ETableSpecification; is specified as a
-      hierarchy of columns to group by. Each level of the hierarchy
-      lets you sort by a particular column, either ascending or
-      descending. All levels except the last cause the canvas to group
-      by the given column.
-    </para>
-
-    <para>
-      An example &ETableSpecification; follows.
-    </para>
-
-    <programlisting>
-      &lt;ETableSpecification&gt;
-        &lt;columns-shown frozen_columns="2"&gt;
-	  &lt;column&gt; 0 &lt;/column&gt;
-	  &lt;column&gt; 1 &lt;/column&gt;
-	  &lt;column&gt; 2 &lt;/column&gt;
-	  &lt;column&gt; 3 &lt;/column&gt;
-	  &lt;column&gt; 4 &lt;/column&gt;
-	&lt;/columns-shown&gt;
-	&lt;grouping&gt;
-	  &lt;group column="3" ascending="1"&gt;
-	    &lt;group column="4" ascending="0"&gt;
-	      &lt;leaf column="2" ascending="1"/&gt;
-	    &lt;/group&gt;
-	  &lt;/group&gt;
-	&lt;/grouping&gt;
-      &lt;/ETableSpecification&gt;
-    </programlisting>
-
-    <para>
-      This example has 5 columns which are initially in order. It has
-      2 levels of grouping. The first is grouped by the 4th column
-      (all indexes are 0 based) and sorts those groups in ascending
-      order. Inside those groups, the data is grouped by the fifth
-      column and sorted in descending order of the fifth column.
-      Finally, the data in those groups is sorted by the third column
-      in ascending order. Due to the "frozen_columns" attribute on the
-      columns-shown element, the user will not be
-      able to rearrange the first two columns. They will always be the
-      first two.
-    </para>
-  </sect1>
-
-  <sect1 id="conclusion">
-    <title>Conclusion</title>
-
-    <para>
-      All in all, &ETable; is a very powerful widget. Once you learn
-      to use it, you have access to a vast amount of power requiring a
-      comparatively small amount of work.
-    </para>
-  </sect1>
-</article>
diff --git a/libibex/.cvsignore b/libibex/.cvsignore
deleted file mode 100644
index 0623d39af7..0000000000
--- a/libibex/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-lookup
-mkindex
-dumpindex
\ No newline at end of file
diff --git a/libibex/COPYING.LIB b/libibex/COPYING.LIB
deleted file mode 100644
index eb685a5ec9..0000000000
--- a/libibex/COPYING.LIB
+++ /dev/null
@@ -1,481 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/libibex/ChangeLog b/libibex/ChangeLog
deleted file mode 100644
index f4ed9f5f28..0000000000
--- a/libibex/ChangeLog
+++ /dev/null
@@ -1,312 +0,0 @@
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* hash.c: #include <stdlib.h> to remove warning.
-	* wordindex.c: #include <stdlib.h> and <string.h>.
-	
-2000-10-26  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_cache_open): Use IBEX_VERSION rather than
-	hardcoded version string.
-
-	* ibex_internal.h (IBEX_VERSION): Bumped version again.  This time
-	I did change the index format.
-	(IBEX_VERSION): moved into block.h
-
-	* hash.c (struct _hashroot): Add a linked list of keys to the table.
-	(struct _hashblock): Added a next pointer as a block number.
-	(hash_insert): Link new key blocks into the key block list.
-	(struct _HASHCursor): Renamed block to key and added a block item.
-	(hash_cursor_next): Changed to go through the linked list of all
-	hash items rather than through each hash chain separately.  >>
-	faster.
-	(ibex_hash_dump_rec): Remove a warning.
-
-2000-10-25    <jpr@helixcode.com>
-
-	* ibex_block.c: No longer include <db.h>
-
-2000-10-25  Not Zed  <NotZed@HelixCode.com>
-
-	* ibex_internal.h (IBEX_VERSION): Bumped to another version.  The
-	file format hasn't changed, but earlier bugs may create invalid
-	files.
-
-	* block.c (ibex_block_read): Use the root data directly.
-	(ibex_block_cache_open): As well.
-	(ibex_block_get): And here too.
-	(ibex_block_cache_sync): Sync the root block directly here.
-
-	* block.h: Pad root block out to 1024 bytes.
-	Added root block to struct _memcache.
-
-	* disktail.c (tail_get): Dirty the root block.
-	(tail_get): Fix for changes to root access.
-	(disk_remove): And here too.
-
-	* wordindexmem.c (sync_cache_entry): Handle the case of not having
-	any files in the list, which can happen now.
-	(word_index_pre): Make sure we set the wordid on the new cache
-	entry.
-
-	* ibex_block.c (ibex_save): Sigh.  Pass the right argument to
-	index_post.
-
-2000-10-24  JP Rosevear  <jpr@helixcode.com>
-
-	* .cvsignore: Shush
-
-2000-10-24  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_cache_open): Create a word_index_mem for
-	indexing the words, rather than a word_index.
-
-	* ibex_block.c (ibex_index_buffer): If we haven't called index_pre
-	yet, do it before indexing anything.
-	(ibex_save): If wehave called index_pre previously, call
-	index_post.
-	(ibex_close): And same for here.
-
-	* index.h: Added a cursor class, and cursor retrieval function for
-	iterating through an index's keys.
-
-	* wordindexmem.c (ibex_create_word_index_mem): New word class,
-	similar to wordindex, but meant to be faster for updates.
-	(word_index_pre): Implement.  We load all keys into memory.
-	(word_index_post): Implement.  We sync and free all keys.
-	(find): Remove lru code, its no longer a cache, but a lookup
-	table.
-	(add_index_cache): Remove lru code here too.
-	(find_name): And here.
-	(word_flush): Flush the hashtable direct.
-	(word_close): Call flush to flush, rather than doing it ourselves.
-	(add_index_cache): If we are in an index state, we can assume a
-	cache miss == a new word.
-	(word_index_post): Maintain whether or not we are in an index
-	state, and the depth of the state.
-	(word_index_pre): Likewise.  Dont reread the index if we have
-	already.
-	(cache_sanity): Fixed for struct changes.
-
-	* wordindex.h (IBEXWordClass): Added functions to prepare/cleanup
-	for lots of indexing.  i.e. can be used to optimise indexing speed
-	at the cost of extra memory usage during the indexing process.
-
-	* dumpindex.c: Dumps the contents of indexs.
-
-	* hash.c (ibex_hash_dump_rec): Also print the word count.
-	(hash_cursor_create): Create a new cursor for iterating through a
-	hashtable.
-	(hash_cursor_close): 'close' the cursor. It is upto the
-	application to close any cursors it creates.
-	(hash_cursor_next): Goto the next key id.
-	(hash_cursor_next_key): Goto the next key, reutrn the key.
-	(hash_get_cursor): Return a cursor object.
-
-	* wordindex.c (unindex_name): Cross-check the cache as well.
-	(word_index_post): 
-	(word_index_pre): Added (empty) callbacks for pre/post functions.
-
-2000-10-12  Not Zed  <NotZed@HelixCode.com>
-
-	* ibex_internal.h (struct ibex): Bumped ibex rev.
-
-	* block.c (ibex_block_cache_open): Bumped the ibex file revision
-	because of the hash table size change.
-
-	* index.h: Added some stat stuff.
-
-	* wordindex.c (struct _wordcache): Changed files[] to be a pointer
-	to an allocated block/or an individual item.
-	(find): Fix for changes to struct.
-	(find_name):  "
-	(sync_cache_entry): "
-	(add): "
-	(add_list): "
-	(add_index_cache): Free the cache file array if it was created.
-	(word_flush): And here.
-	(word_close): And here too.
-	(ibex_create_word_index): Double the size of the hashtables.
-	(word_flush): Make sure we reset the wordcount to 0 if we remove
-	the list items.  DOH.
-	(add_index_cache): Use a slightly more sohpisticated aging
-	algorithm to remove expired nodes.
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* hash.c (hash_find):
-	(hash_remove): 
-	(hash_insert):  Truncate key if it is too big to fit in a
-	single block to MAX_KEYLEN bytes.
-
-2000-09-28  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (ibex_block_free): Make sure we map the 'free' block to
-	a block number when unlinking a block (fixes a lot of assertion
-	failures).
-	(ibex_block_cache_open): Initialise sync flag on root block.  If
-	it is not set on open then the index could be in an invalid state,
-	and should be rescanned.
-	(ibex_block_cache_sync): Sync root block last, and set the sync
-	flag.
-	(ibex_block_cache_open): Mirror root block flags in block_cache
-	struct.
-	(ibex_block_cache_sync): Likewise.
-	(ibex_block_read): If we write a dirty block, then we clear the
-	sync flag if its still set; we are no longer synced.
-
-2000-09-19  Not Zed  <NotZed@HelixCode.com>
-
-	** Merged from IBEX_DISK branch to head.
-	
-	* file.c:
-	* find.c:
-	* words.c:
-	* index.c: Removed unused files.
-
-	* block.h: Changed block to use only 24 bits for next and 8 for
-	used, and fixed all relevant code.  Some cleanup.
-	
-	* disktail.c (tail_get): If we use an empty tail node, then make
-	sure we make it dirty.
-
-2000-09-15  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (word_close): Free hashtable on exit too.
-
-	* disktail.c: Implemented tail-node storage for the end of long
-	lists, or for short lists.  Should save significant disk space
-	(5x?).
-	Implemented special case for 1-item lists, where the tailnode
-	pointer is used to store the index entry.
-
-2000-09-14  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (add_index_key): Keys also handle tails.
-
-	* hash.c (hash_set_data_block): Added new parameter to keys - a
-	tail block (a full 32 bit block pointer).
-	(hash_get_data_block): And same here.
-
-2000-09-12  Not Zed  <NotZed@HelixCode.com>
-
-	* wordindex.c (word_close): Dont close namestore twice.
-
-2000-09-11  Not Zed  <NotZed@HelixCode.com>
-
-	** Redid almost everything, on-disk hash table to store an index
-	to index records, mroe on the way to modularisation (more to go),
-	now stores reverse indexes for deleting.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* block.c (add_key_mem): Initialise a memory based array for newly
-	added index entries.
-	(add_record): Changed to cache updates in memory until we hit a
-	limit, and then flush them to disk.
-	(get_record): Merge in-memory records with disk records.
-	(remove_record): Remove from memory first, and if that fails, goto
-	disk.
-	(find_record): Check memory first, then disk if that fails.
-	(add_datum_list): oops, copy size * sizeof(blockid_t)
-	(add_indexed): Make sure we link in the head node when we create a
-	new one.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* file.c, find.c: Fixed some warnings.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* index.c (ibex_unindex): Make sure we mark the ibex as dirty.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* file.c (ibex_save): New function, only write out the ibex if it
-	has changed.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* file.c (ibex_open): Also close the fd after we're done.
-
-	* find.c (ibex_contains_name): New function to find out if a file
-	is indexed.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-
-2000-04-12  NotZed  <NotZed@HelixCode.com>
-
-	* find.c (ibex_dump_all): Debug function to dump the whole index
-	to stdout.
-
-	* words.c (get_ibex_file): Use g_strdup(), not strdup().
-
-2000-04-11  NotZed  <NotZed@HelixCode.com>
-
-	* file.c (write_word): Always write out all words we have (even if
-	its 0 ... the file expects it).  No longer check for removed files.	
-	(store_word): Check for removed files here, and only add to the
-	ordered tree if we have references left to this word.
-	(ibex_write): First insert into the tree, to determine the
-	wordcount to be saved in the output file, and then write that.
-	(ibex_open): Remove some debug.
-
-	* words.c (ibex_index_buffer): Always set 'unread', if it is a
-	valid pointer (dont rely on caller to initialise it).
-
-2000-03-26  NotZed  <NotZed@HelixCode.com>
-
-	* lookup.c (main): Fixed call to ibex_open.
-
-	* mkindex.c (main): Fixed call to ibex_open.
-
-	* file.c (ibex_open): Changed to accept flags and mode equivalent
-	to open(2).
-
-2000-02-25  Dan Winship  <danw@helixcode.com>
-
-	* *.c: add gtk-doc-style comments
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added mkindex.
-
-2000-02-21  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am: change noinst_LIBRARIES to noinst_LTLIBRARIES, and
-	supply -static to LDFLAGS.  Duh, and changed LDADD back to
-	libibex.la.
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: changed mkindex_LDADD to libibex.a instead of
-	libibex.la.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added lookup.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (lookup_LDADD): For now. make a libibex.a library so
-	we can link it with the camel provider.  I hate libtool
-
-2000-02-16  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: automakify
-
-2000-02-16  NotZed  <NotZed@HelixCode.com>
-
-	* find.[ch] (ibex_find_name): Finds if a word is indexed under a
-	given name.
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* Makefile: Hack together a build using libtool.  This should all
-	be auto*'d at some point I guess.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* Added ChangeLog file.
-
diff --git a/libibex/Makefile.am b/libibex/Makefile.am
deleted file mode 100644
index 6cc88186d6..0000000000
--- a/libibex/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-noinst_LTLIBRARIES = libibex.la
-
-libibex_la_SOURCES = \
-	wordindex.c wordindexmem.c \
-	block.c ibex.h \
-	hash.c \
-	disktail.c \
-	ibex_block.c
-
-libibex_la_LDFLAGS = -static
-
-noinst_HEADERS = \
-	ibex_internal.h \
-	block.h \
-	wordindex.h \
-	index.h
-
-INCLUDES = -I$(srcdir) $(GLIB_CFLAGS) $(UNICODE_CFLAGS) \
-		-DG_LOG_DOMAIN=\"libibex\"
-
-
-noinst_PROGRAMS = dumpindex
-
-dumpindex_SOURCES = dumpindex.c
-dumpindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS)
-
-#noinst_PROGRAMS = mkindex lookup
-#
-#mkindex_SOURCES = mkindex.c
-#mkindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS)
-#
-#lookup_SOURCES = lookup.c
-#lookup_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS)
-
diff --git a/libibex/TODO b/libibex/TODO
deleted file mode 100644
index a087c8d1f3..0000000000
--- a/libibex/TODO
+++ /dev/null
@@ -1,61 +0,0 @@
-Stability
----------
-* ibex_open should never crash, and should never return NULL without
-errno being set. Should check for errors when reading.
-
-
-Performance
------------
-* Profiling, keep thinking about data structures, etc.
-
-* Check memory usage
-
-* See if writing the "inverse image" of long ref streams helps
-compression without hurting performance now. (ie, if a word appears in
-more than half of the files, write out the list of files it _doesn't_
-appear in). (I tried this before, and it wasn't working well, but the
-file format and data structures have changed a lot.)
-
-* We could save a noticeable chunk of time if normalize_word computed
-the hash of the word and then we could pass that into
-g_hash_table_insert somehow.
-
-* Make a copy of the buffer to be indexed (or provide interface for
-caller to say ibex can munge the provided data) and then use that
-rather than constantly copying things. ?
-
-
-Functionality
--------------
-* ibex file locking
-
-* specify file mode in ibex_open
-
-* ibex_find* need to normalize the search words... should this be done
-by the caller or by ibex_find?
-
-* Needs to be some way to do a secondary search after getting results
-back from ibex_find* (ie, for "foo near bar"). This either has to be
-done by ibex, or requires us to export the normalize interface.
-
-* Does there need to be an ibex_find_any, or is that easy enough for the
-caller to do?
-
-* utf8_trans needs to cover at least two more code pages. This is
-tricky because it's not clear whether some of the letters there should
-be translated to ASCII or left as UTF8. This requires some
-investigation.
-
-* ibex_index_* need to ignore HTML tags.
-  NAME = [A-Za-z][A-Za-z0-9.-]*
-  </?{NAME}(\s*{NAME}(\s*=\s*({NAME}|"[^"]*"|'[^']*')))*>
-  <!(--([^-]*|-[^-])--\s*)*>
-
-  ugh. ok, simplifying, we get:
-  <[^!](([^"'>]*("[^"]*"|'[^']*'))*> or
-  <!(--([^-]*|-[^-])--\s*)*>
-
-  which is still not simple. sigh.
-
-* ibex_index_* need to recognize and ignore "non-text". Particularly
-BinHex and uuencoding.
diff --git a/libibex/block.c b/libibex/block.c
deleted file mode 100644
index 3f637d4422..0000000000
--- a/libibex/block.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
-  block file/cache/utility functions
-*/
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <glib.h>
-
-#include "block.h"
-
-/*#define MALLOC_CHECK*/
-
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-#define d(x)
-/*#define DEBUG*/
-
-int block_log;
-
-#ifdef IBEX_STATS
-static void
-init_stats(struct _memcache *index)
-{
-	index->stats = g_hash_table_new(g_direct_hash, g_direct_equal);
-}
-
-static void
-dump_1_stat(int id, struct _stat_info *info, struct _memcache *index)
-{
-	printf("%d %d %d %d %d\n", id, info->read, info->write, info->cache_hit, info->cache_miss);
-}
-
-static void
-dump_stats(struct _memcache *index)
-{
-	printf("Block reads writes hits misses\n");
-	g_hash_table_foreach(index->stats, dump_1_stat, index);
-}
-
-static void
-add_read(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->read++;
-}
-
-static void
-add_write(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->write++;
-}
-
-static void
-add_hit(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->cache_hit++;
-}
-
-static void
-add_miss(struct _memcache *index, int id)
-{
-	struct _stat_info *info;
-
-	info = g_hash_table_lookup(index->stats, (void *)id);
-	if (info == NULL) {
-		info = g_malloc0(sizeof(*info));
-		g_hash_table_insert(index->stats, (void *)id, info);
-	}
-	info->cache_miss++;
-}
-#endif /* IBEX_STATS */
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-/* simple list routines (for simplified memory management of cache/lists) */
-
-/**
- * ibex_list_new:
- * @v: 
- * 
- * Initialise a list header.  A list header must always be initialised
- * before use.
- **/
-void ibex_list_new(struct _list *v)
-{
-	v->head = (struct _listnode *)&v->tail;
-	v->tail = 0;
-	v->tailpred = (struct _listnode *)&v->head;
-}
-
-/**
- * ibex_list_addhead:
- * @l: List.
- * @n: Node to append.
- * 
- * Prepend a listnode to the head of the list @l.
- * 
- * Return value: Always @n.
- **/
-struct _listnode *ibex_list_addhead(struct _list *l, struct _listnode *n)
-{
-	n->next = l->head;
-	n->prev = (struct _listnode *)&l->head;
-	l->head->prev = n;
-	l->head = n;
-	return n;
-}
-
-/**
- * ibex_list_addtail:
- * @l: 
- * @n: 
- * 
- * Append a listnode to the end of the list @l.
- * 
- * Return value: Always the same as @n.
- **/
-struct _listnode *ibex_list_addtail(struct _list *l, struct _listnode *n)
-{
-	n->next = (struct _listnode *)&l->tail;
-	n->prev = l->tailpred;
-	l->tailpred->next = n;
-	l->tailpred = n;
-	return n;
-}
-
-/**
- * ibex_list_remove:
- * @n: The node to remove.
- * 
- * Remove a listnode from a list.
- * 
- * Return value: Always the same as @n.
- **/
-struct _listnode *ibex_list_remove(struct _listnode *n)
-{
-	n->next->prev = n->prev;
-	n->prev->next = n->next;
-	return n;
-}
-
-static struct _memblock *
-memblock_addr(struct _block *block)
-{
-	return (struct _memblock *)(((char *)block) - G_STRUCT_OFFSET(struct _memblock, data));
-}
-
-/* read/sync the rootblock into the block_cache structure */
-static int
-ibex_block_read_root(struct _memcache *block_cache)
-{
-	lseek(block_cache->fd, 0, SEEK_SET);
-	if (read(block_cache->fd, &block_cache->root, sizeof(block_cache->root)) != sizeof(block_cache->root)) {
-		
-		return -1;
-	}
-	return 0;
-}
-
-static int
-ibex_block_sync_root(struct _memcache *block_cache)
-{
-	lseek(block_cache->fd, 0, SEEK_SET);
-	if (write(block_cache->fd, &block_cache->root, sizeof(block_cache->root)) != sizeof(block_cache->root)) {
-		return -1;
-	}
-	return fsync(block_cache->fd);
-}
-
-
-/**
- * ibex_block_dirty:
- * @block: 
- * 
- * Dirty a block.  This will cause it to be written to disk on
- * a cache sync, or when the block is flushed from the cache.
- **/
-void
-ibex_block_dirty(struct _block *block)
-{
-	memblock_addr(block)->flags |= BLOCK_DIRTY;
-}
-
-static void
-sync_block(struct _memcache *block_cache, struct _memblock *memblock)
-{
-	if (block_log)
-		printf("writing block %d\n", memblock->block);
-
-	lseek(block_cache->fd, memblock->block, SEEK_SET);
-	if (write(block_cache->fd, &memblock->data, sizeof(memblock->data)) != -1) {
-		memblock->flags &= ~BLOCK_DIRTY;
-	}
-#ifdef IBEX_STATS
-	add_write(block_cache, memblock->block);
-#endif
-}
-
-/**
- * ibex_block_cache_sync:
- * @block_cache: 
- * 
- * Ensure the block cache is fully synced to disk.
- **/
-void
-ibex_block_cache_sync(struct _memcache *block_cache)
-{
-	struct _memblock *memblock;
-
-	memblock = (struct _memblock *)block_cache->nodes.head;
-	while (memblock->next) {
-#ifdef MALLOC_CHECK
-		checkmem(memblock);
-#endif
-		if (memblock->flags & BLOCK_DIRTY) {
-			sync_block(block_cache, memblock);
-		}
-		memblock = memblock->next;
-	}
-
-	block_cache->root.flags |= IBEX_ROOT_SYNCF;
-	if (ibex_block_sync_root(block_cache) != 0) {
-		block_cache->root.flags &= ~IBEX_ROOT_SYNCF;
-	}
-
-#ifdef IBEX_STATS
-	dump_stats(block_cache);
-#endif
-
-}
-
-#ifdef MALLOC_CHECK
-static void
-check_cache(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	checkmem(block_cache);
-	checkmem(block_cache->index);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		checkmem(mw);
-		mw = mn;
-		mn = mn->next;
-	}
-}
-#endif
-
-/**
- * ibex_block_cache_flush:
- * @block_cache: 
- * 
- * Ensure the block cache is fully synced to disk, and then flush
- * its contents from memory.
- **/
-void
-ibex_block_cache_flush(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	ibex_block_cache_sync(block_cache);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		g_hash_table_remove(block_cache->index, (void *)mw->block);
-		g_free(mw);
-		mw = mn;
-		mn = mn->next;
-	}
-	ibex_list_new(&block_cache->nodes);
-}
-
-/**
- * ibex_block_read:
- * @block_cache: 
- * @blockid: 
- * 
- * Read the data of a block by blockid.  The data contents is backed by
- * the block cache, and should be considered static.
- *
- * TODO; should this return a NULL block on error?
- *
- * Return value: The address of the block data (which may be cached).
- **/
-struct _block *
-ibex_block_read(struct _memcache *block_cache, blockid_t blockid)
-{
-	struct _memblock *memblock;
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-
-	/* nothing can read the root block directly */
-	g_assert(blockid != 0);
-	g_assert(blockid < block_cache->root.roof);
-
-	memblock = g_hash_table_lookup(block_cache->index, (void *)blockid);
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-
-	if (memblock) {
-		d(printf("foudn blockid in cache %d = %p\n", blockid, &memblock->data));
-
-		/* 'access' page */
-		ibex_list_remove((struct _listnode *)memblock);
-		ibex_list_addtail(&block_cache->nodes, (struct _listnode *)memblock);
-
-#ifdef MALLOC_CHECK
-		check_cache(block_cache);
-#endif
-
-#ifdef IBEX_STATS
-		add_hit(block_cache, memblock->block);
-#endif
-
-#ifdef MALLOC_CHECK
-		check_cache(block_cache);
-#endif
-
-		return &memblock->data;
-	}
-#ifdef IBEX_STATS
-	add_miss(block_cache, blockid);
-	add_read(block_cache, blockid);
-#endif
-	if (block_log)
-		printf("miss block %d\n", blockid);
-
-	d(printf("loading blockid from disk %d\n", blockid));
-	memblock = g_malloc(sizeof(*memblock));
-	memblock->block = blockid;
-	memblock->flags = 0;
-	lseek(block_cache->fd, blockid, SEEK_SET);
-	memset(&memblock->data, 0, sizeof(memblock->data));
-	read(block_cache->fd, &memblock->data, sizeof(memblock->data));
-
-	ibex_list_addtail(&block_cache->nodes, (struct _listnode *)memblock);
-	g_hash_table_insert(block_cache->index, (void *)blockid, memblock);
-	if (block_cache->count >= CACHE_SIZE) {
-		struct _memblock *old = (struct _memblock *)block_cache->nodes.head;
-		d(printf("discaring cache block %d\n", old->block));
-		g_hash_table_remove(block_cache->index, (void *)old->block);
-		ibex_list_remove((struct _listnode *)old);
-		if (old->flags & BLOCK_DIRTY) {
-			/* are we about to un-sync the file?  update root and sync it */
-			if (block_cache->root.flags & IBEX_ROOT_SYNCF) {
-				printf("Unsyncing root block\n");
-
-				block_cache->root.flags &= ~IBEX_ROOT_SYNCF;
-				if (ibex_block_sync_root(block_cache) != 0) {
-					/* what do we do?  i dont know! */
-					g_warning("Could not sync root block of index: %s", strerror(errno));
-				}
-			}
-			sync_block(block_cache, old);
-		}
-		g_free(old);
-	} else {
-		block_cache->count++;
-	}
-
-	d(printf("  --- cached blocks : %d\n", block_cache->count));
-
-#ifdef MALLOC_CHECK
-	check_cache(block_cache);
-#endif
-	return &memblock->data;
-}
-
-/**
- * ibex_block_cache_open:
- * @name: 
- * @flags: Flags as to open(2), should use O_RDWR and optionally O_CREAT.
- * @mode: Mose as to open(2)
- * 
- * Open a block file.
- * 
- * FIXME; this currently also initialises the word and name indexes
- * because their pointers are stored in the root block.  Should be
- * upto the caller to manage these pointers/data.
- *
- * Return value: NULL if the backing file could not be opened.
- **/
-struct _memcache *
-ibex_block_cache_open(const char *name, int flags, int mode)
-{
-	struct _memcache *block_cache = g_malloc0(sizeof(*block_cache));
-
-	d(printf("opening ibex file: %s", name));
-
-	/* setup cache */
-	ibex_list_new(&block_cache->nodes);
-	block_cache->count = 0;
-	block_cache->index = g_hash_table_new(g_direct_hash, g_direct_equal);
-	block_cache->fd = open(name, flags, mode);
-
-	if (block_cache->fd == -1) {
-		g_hash_table_destroy(block_cache->index);
-		g_free(block_cache);
-		return NULL;
-	}
-
-	ibex_block_read_root(block_cache);
-	if (block_cache->root.roof == 0
-	    || memcmp(block_cache->root.version, IBEX_VERSION, 4)
-	    || ((block_cache->root.flags & IBEX_ROOT_SYNCF) == 0)) {
-		(printf("Initialising superblock\n"));
-		/* reset root data */
-		memcpy(block_cache->root.version, IBEX_VERSION, 4);
-		block_cache->root.roof = 1024;
-		block_cache->root.free = 0;
-		block_cache->root.words = 0;
-		block_cache->root.names = 0;
-		block_cache->root.tail = 0;	/* list of tail blocks */
-		block_cache->root.flags = 0;
-		ibex_block_sync_root(block_cache);
-		/* reset the file contents */
-		ftruncate(block_cache->fd, 1024);
-	} else {
-		(printf("superblock already initialised:\n"
-			" roof = %d\n free = %d\n words = %d\n names = %d\n tail = %d\n",
-			block_cache->root.roof, block_cache->root.free,
-			block_cache->root.words, block_cache->root.names, block_cache->root.tail));
-	}
-	/* FIXME: this should be moved higher up in the object tree */
-	{
-		struct _IBEXWord *ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-		block_cache->words = ibex_create_word_index_mem(block_cache, &block_cache->root.words,&block_cache->root.names);
-	}
-
-#ifdef IBEX_STATS
-	init_stats(block_cache);
-#endif
-
-	return block_cache;
-}
-
-/**
- * ibex_block_cache_close:
- * @block_cache: 
- * 
- * Close the block file, sync any remaining cached data
- * to disk, and free all resources.
- **/
-void
-ibex_block_cache_close(struct _memcache *block_cache)
-{
-	struct _memblock *mw, *mn;
-
-	ibex_block_cache_sync(block_cache);
-	close(block_cache->fd);
-
-	mw = (struct _memblock *)block_cache->nodes.head;
-	mn = mw->next;
-	while (mn) {
-		g_free(mw);
-		mw = mn;
-		mn = mw->next;
-	}
-
-	g_hash_table_destroy(block_cache->index);
-
-	g_free(block_cache);
-}
-
-/**
- * ibex_block_free:
- * @block_cache: 
- * @blockid: 
- * 
- * Return a block to the free pool.
- **/
-void
-ibex_block_free(struct _memcache *block_cache, blockid_t blockid)
-{
-	struct _block *block = ibex_block_read(block_cache, blockid);
-
-	block->next = block_number(block_cache->root.free);
-	block_cache->root.free = blockid;
-	ibex_block_dirty((struct _block *)block);
-}
-
-/**
- * ibex_block_get:
- * @block_cache: 
- * 
- * Allocate a new block, or access a previously freed block and return
- * its block id.  The block will have zeroed contents.
- * 
- * Return value: 0 if there are no blocks left (disk full/read only
- * file, etc).
- **/
-blockid_t
-ibex_block_get(struct _memcache *block_cache)
-{
-	struct _block *block;
-	blockid_t head;
-
-	if (block_cache->root.free) {
-		head = block_cache->root.free;
-		block = ibex_block_read(block_cache, head);
-		block_cache->root.free = block_location(block->next);
-	} else {
-		/* TODO: check the block will fit first */
-		/* TODO: no need to read this block, can allocate it manually (saves a syscall/read) */
-		head = block_cache->root.roof;
-		block_cache->root.roof += BLOCK_SIZE;
-		block = ibex_block_read(block_cache, head);
-	}
-
-	g_assert(head != 0);
-
-	d(printf("new block = %d\n", head));
-	block->next = 0;
-	block->used = 0;
-	ibex_block_dirty(block);
-	return head;
-}
diff --git a/libibex/block.h b/libibex/block.h
deleted file mode 100644
index dbc8fd5ad8..0000000000
--- a/libibex/block.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-/* public interfaces for block io routines */
-
-#ifndef _BLOCK_H
-#define _BLOCK_H
-
-/*#define IBEX_STATS*/		/* define to get/dump block access stats */
-
-#include <glib.h>
-
-/* version of file format */
-#define IBEX_VERSION "ibx6"
-
-typedef guint32 nameid_t;
-typedef guint32 blockid_t;
-
-#define BLOCK_BITS (8)
-#define BLOCK_SIZE (1<<BLOCK_BITS)
-#define CACHE_SIZE 256		/* blocks in disk cache */
-
-/* root block */
-struct _root {
-	char version[4];
-
-	blockid_t free;		/* list of free blocks */
-	blockid_t roof;		/* top of allocated space, everything below is in a free or used list */
-	blockid_t tail;		/* list of 'tail' blocks */
-
-	blockid_t words;	/* root of words index */
-	blockid_t names;	/* root of names index */
-
-	char flags;		/* state flags */
-
-	/* makes structure fill up to 1024 bytes */
-	char dummy[1024 - (sizeof(char)*5) - (sizeof(blockid_t)*5)];
-};
-
-#define IBEX_ROOT_SYNCF (1<<0)	/* file is synced */
-
-/* basic disk structure for (data) blocks */
-struct _block {
-	unsigned int next:32-BLOCK_BITS;	/* next block */
-	unsigned int used:BLOCK_BITS;		/* number of elements used */
-
-	nameid_t bl_data[(BLOCK_SIZE-4)/4];	/* references */
-};
-
-/* custom list structure, for a simple/efficient cache */
-struct _listnode {
-	struct _listnode *next;
-	struct _listnode *prev;
-};
-struct _list {
-	struct _listnode *head;
-	struct _listnode *tail;
-	struct _listnode *tailpred;
-};
-
-void ibex_list_new(struct _list *v);
-struct _listnode *ibex_list_addhead(struct _list *l, struct _listnode *n);
-struct _listnode *ibex_list_addtail(struct _list *l, struct _listnode *n);
-struct _listnode *ibex_list_remove(struct _listnode *n);
-
-/* in-memory structure for block cache */
-struct _memblock {
-	struct _memblock *next;
-	struct _memblock *prev;
-
-	blockid_t block;
-	int flags;
-
-	struct _block data;
-};
-#define BLOCK_DIRTY (1<<0)
-
-struct _memcache {
-	struct _list nodes;
-	int count;		/* nodes in cache */
-
-	GHashTable *index;	/* blockid->memblock mapping */
-	int fd;			/* file fd */
-
-#ifdef IBEX_STATS
-	GHashTable *stats;
-#endif
-	struct _root root;	/* root block */
-
-	/* temporary here */
-	struct _IBEXWord *words; /* word index */
-};
-
-#ifdef IBEX_STATS
-struct _stat_info {
-	int read;
-	int write;
-	int cache_hit;
-	int cache_miss;
-};
-#endif /* IBEX_STATS */
-
-struct _memcache *ibex_block_cache_open(const char *name, int flags, int mode);
-void ibex_block_cache_close(struct _memcache *block_cache);
-void ibex_block_cache_sync(struct _memcache *block_cache);
-void ibex_block_cache_flush(struct _memcache *block_cache);
-
-blockid_t ibex_block_get(struct _memcache *block_cache);
-void ibex_block_free(struct _memcache *block_cache, blockid_t blockid);
-void ibex_block_dirty(struct _block *block);
-struct _block *ibex_block_read(struct _memcache *block_cache, blockid_t blockid);
-
-#define block_number(x) ((x)>>BLOCK_BITS)
-#define block_location(x) ((x)<<BLOCK_BITS)
-
-#endif /* ! _BLOCK_H */
diff --git a/libibex/diskarray.c b/libibex/diskarray.c
deleted file mode 100644
index 2664e0f6b5..0000000000
--- a/libibex/diskarray.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a disk based array storage class */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-/*#define DEBUG*/
-
-static struct _IBEXStore *disk_create(struct _memcache *bc);
-static int disk_sync(struct _IBEXStore *store);
-static int disk_close(struct _IBEXStore *store);
-
-static blockid_t disk_add(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static blockid_t disk_add_list(struct _IBEXStore *store, blockid_t head, GArray *data);
-static blockid_t disk_remove(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static void disk_free(struct _IBEXStore *store, blockid_t head);
-
-static gboolean disk_find(struct _IBEXStore *store, blockid_t head, nameid_t data);
-static GArray *disk_get(struct _IBEXStore *store, blockid_t head);
-
-struct _IBEXStoreClass ibex_diskarray_class = {
-	disk_create, disk_sync, disk_close,
-	disk_add, disk_add_list,
-	disk_remove, disk_free,
-	disk_find, disk_get
-};
-
-static struct _IBEXStore *disk_create(struct _memcache *bc)
-{
-	struct _IBEXStore *store;
-
-	store = g_malloc0(sizeof(*store));
-	store->klass = &ibex_diskarray_class;
-	store->blocks = bc;
-
-	return store;
-}
-
-static int disk_sync(struct _IBEXStore *store)
-{
-	/* no cache, nop */
-	return 0;
-}
-
-static int disk_close(struct _IBEXStore *store)
-{
-	g_free(store);
-	return 0;
-}
-
-static blockid_t
-disk_add(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new;
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	d(printf("adding record %d to block %d (next = %d)\n", data, head, block->next));
-
-	if (block->used < sizeof(block->bl_data)/sizeof(block->bl_data[0])) {
-		d(printf("adding record into block %d  %d\n", head, data));
-		block->bl_data[block->used] = data;
-		block->used++;
-		ibex_block_dirty(block);
-		return head;
-	} else {
-		new = ibex_block_get(store->blocks);
-		newblock = ibex_block_read(store->blocks, new);
-		newblock->next = head;
-		newblock->bl_data[0] = data;
-		newblock->used = 1;
-		d(printf("adding record into new %d  %d, next =%d\n", new, data, newblock->next));
-		ibex_block_dirty(newblock);
-		return new;
-	}
-}
-
-static blockid_t
-disk_add_list(struct _IBEXStore *store, blockid_t head, GArray *data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new;
-	int copied = 0;
-	int left, space, tocopy;
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	while (copied < data->len) {
-		left = data->len - copied;
-		space = sizeof(block->bl_data)/sizeof(block->bl_data[0]) - block->used;
-		if (space) {
-			tocopy = MIN(left, space);
-			memcpy(block->bl_data+block->used, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			block->used += tocopy;
-			ibex_block_dirty(block);
-		} else {
-			new = ibex_block_get(store->blocks);
-			newblock = ibex_block_read(store->blocks, new);
-			newblock->next = head;
-			tocopy = MIN(left, sizeof(block->bl_data)/sizeof(block->bl_data[0]));
-			memcpy(newblock->bl_data, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			newblock->used = tocopy;
-			block = newblock;
-			head = new;
-			ibex_block_dirty(newblock);
-		}
-		copied += tocopy;
-	}
-	return head;
-}
-
-static blockid_t
-disk_remove(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	blockid_t node = head;
-
-	d(printf("removing %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-		int i;
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				struct _block *start = ibex_block_read(store->blocks, head);
-
-				start->used--;
-				block->bl_data[i] = start->bl_data[start->used];
-				if (start->used == 0) {
-					struct _root *root = (struct _root *)ibex_block_read(store->blocks, 0);
-					blockid_t new;
-
-					d(printf("dropping block %d, new head = %d\n", head, start->next));
-					new = start->next;
-					start->next = root->free;
-					root->free = head;
-					head = new;
-					ibex_block_dirty((struct _block *)root);
-				}
-				ibex_block_dirty(block);
-				ibex_block_dirty(start);
-				return head;
-			}
-		}
-		node = block->next;
-	}
-	return head;
-}
-
-static void disk_free(struct _IBEXStore *store, blockid_t head)
-{
-	blockid_t next;
-	struct _block *block;
-
-	while (head) {
-		block = ibex_block_read(store->blocks, head);
-		next = block->next;
-		ibex_block_free(store->blocks, head);
-		head = next;
-	}
-}
-
-static gboolean
-disk_find(struct _IBEXStore *store, blockid_t head, nameid_t data)
-{
-	blockid_t node = head;
-
-	d(printf("finding %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-		int i;
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				return TRUE;
-			}
-		}
-		node = block->next;
-	}
-	return FALSE;
-}
-
-static GArray *
-disk_get(struct _IBEXStore *store, blockid_t head)
-{
-	GArray *result = g_array_new(0, 0, sizeof(nameid_t));
-
-	while (head) {
-		struct _block *block = ibex_block_read(store->blocks, head);
-
-		d(printf("getting data from block %d\n", head));
-
-		g_array_append_vals(result, block->bl_data, block->used);
-		head = block->next;
-		d(printf("next = %d\n", head));
-	}
-	return result;
-}
-
-void
-ibex_diskarray_dump(struct _memcache *blocks, blockid_t head)
-{
-	blockid_t node = head;
-
-	printf("dumping list %d\n", node);
-	while (node) {
-		struct _block *block = ibex_block_read(blocks, node);
-		int i;
-
-		printf(" block %d used %d\n ", node, block->used);
-		for (i=0;i<block->used;i++) {
-			printf(" %d", block->bl_data[i]);
-		}
-		printf("\n");
-		node = block->next;
-	}
-}
diff --git a/libibex/disktail.c b/libibex/disktail.c
deleted file mode 100644
index 9f5a0dbea2..0000000000
--- a/libibex/disktail.c
+++ /dev/null
@@ -1,814 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a disk based array storage class that stores the tails of data lists
-   in common blocks */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <string.h>
-
-#include <stdio.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-/*#define DEBUG*/
-
-/* marker to define which root keys indicate a single length key */
-#define BLOCK_ONE (1<<BLOCK_BITS)
-
-/* tail blocks only contain tail data ... */
-/* and we pack it in, similar to the key data, only more compact */
-struct _tailblock {
-	unsigned int next:32-BLOCK_BITS; /* only needs to point to block numbers */
-	unsigned int used:BLOCK_BITS; /* how many entries are used */
-	union {
-		unsigned char offset[BLOCK_SIZE-4]; /* works upto blocksize of 1024 bytes */
-		nameid_t data[(BLOCK_SIZE-4)/4];
-	} tailblock_u;
-};
-#define tb_offset tailblock_u.offset
-#define tb_data tailblock_u.data
-
-/* map a tail index to a block index */
-#define TAIL_INDEX(b) ((b) & (BLOCK_SIZE-1))
-/* map a tail index to a block number */
-#define TAIL_BLOCK(b) ((b) & ~(BLOCK_SIZE-1))
-/* map a block + index to a tailid */
-#define TAIL_KEY(b, i) (((b) & ~(BLOCK_SIZE-1)) | ((i) & (BLOCK_SIZE-1)))
-
-#define TAIL_THRESHOLD ((BLOCK_SIZE-8)/6)
-
-static struct _IBEXStore *disk_create(struct _memcache *bc);
-static int disk_sync(struct _IBEXStore *store);
-static int disk_close(struct _IBEXStore *store);
-
-static blockid_t disk_add(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-static blockid_t disk_add_list(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, GArray *data);
-static blockid_t disk_remove(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-static void disk_free(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-static gboolean disk_find(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data);
-static GArray *disk_get(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-struct _IBEXStoreClass ibex_diskarray_class = {
-	disk_create, disk_sync, disk_close,
-	disk_add, disk_add_list,
-	disk_remove, disk_free,
-	disk_find, disk_get
-};
-
-
-static int
-tail_info(struct _tailblock *bucket, nameid_t tailid, blockid_t **startptr)
-{
-	blockid_t *start, *end;
-	int index;
-
-	/* get start/end of area to zap */
-	index = TAIL_INDEX(tailid);
-	start = &bucket->tb_data[bucket->tb_offset[index]];
-	if (index == 0) {
-		end = &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])];
-	} else {
-		end = &bucket->tb_data[bucket->tb_offset[index-1]];
-	}
-	if (startptr)
-		*startptr = start;
-	return end-start;
-}
-
-/* compresses (or expand) the bucket entry, to the new size */
-static void
-tail_compress(struct _tailblock *bucket, int index, int newsize)
-{
-	int i;
-	blockid_t *start, *end, *newstart;
-
-	/* get start/end of area to zap */
-	start = &bucket->tb_data[bucket->tb_offset[index]];
-	if (index == 0) {
-		end = &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])];
-	} else {
-		end = &bucket->tb_data[bucket->tb_offset[index-1]];
-	}
-
-	if (end-start == newsize)
-		return;
-
-	/*
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyyyyy
-	     0                           20   25
-
-	     newsize = 0
-	     end = 25
-	     newstart = 0
-	     start = 20
-
-	     newstart+(end-start)-newsize = 5
-	     i = start-newstart
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyyyyy
-	     0                           20   25
-
-	     newsize = 2
-	     end = 25
-	     newstart = 0
-	     start = 20
-
-	     newstart+(end-start)-newsize = 3
-	     i = start-newstart + MIN(end-start, newsize)) = 22
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	     5 	                         25
-	     newsize = 5
-	     end = 25
-	     start = 25
-	     newstart = 5
-
-	     newstart+(end-start)-newsize = 0
-	     i = start-newstart = 20
-
-	     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXyy
-	     3 	                         23 25
-	     newsize = 5
-	     end = 25
-	     start = 23
-	     newstart = 3
-
-	     newstart+(end-start)-newsize = 0
-	     i = start-newstart + MIN(end-start, newsize) = 22
-
-	*/
-
-
-	/* fixup data */
-	newstart = &bucket->tb_data[bucket->tb_offset[bucket->used-1]];
-
-	g_assert(newstart+(end-start)-newsize <= &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])]);
-	g_assert(newstart + (start-newstart) + MIN(end-start, newsize) <= &bucket->tb_data[sizeof(bucket->tb_data)/sizeof(bucket->tb_data[0])]);
-	g_assert(newstart+(end-start)-newsize >= &bucket->tb_offset[bucket->used]);
-	g_assert(newstart + (start-newstart) + MIN(end-start, newsize) >= &bucket->tb_offset[bucket->used]);
-
-	memmove(newstart+(end-start)-newsize, newstart, ((start-newstart)+MIN(end-start, newsize)) * sizeof(blockid_t));
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->tb_offset[i] += (end-start)-newsize;
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-/*
-  returns the number of blockid's free
-*/
-static int
-tail_space(struct _tailblock *tail)
-{
-	if (tail->used == 0)
-		return sizeof(tail->tb_data)/sizeof(tail->tb_data[0])-1;
-
-	return  &tail->tb_data[tail->tb_offset[tail->used-1]]
-		- (blockid_t *)&tail->tb_offset[tail->used];
-}
-
-static void
-tail_dump(struct _memcache *blocks, blockid_t tailid)
-{
-	int i;
-	struct _tailblock *tail = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tailid));
-
-	printf("Block %d, used %d\n", tailid, tail->used);
-	for (i=0;i<sizeof(struct _tailblock)/sizeof(unsigned int);i++) {
-		printf(" %08x", ((unsigned int *)tail)[i]);
-	}
-	printf("\n");
-}
-
-static blockid_t
-tail_get(struct _memcache *blocks, int size)
-{
-	blockid_t tailid;
-	struct _tailblock *tail;
-	int freeindex;
-	blockid_t *end;
-	int i, count = 0;
-
-	d(printf("looking for a tail node with %d items in it\n", size));
-
-	/* look for a node with enough space, if we dont find it fairly
-	   quickly, just quit.  needs a better free algorithm i think ... */
-	tailid = blocks->root.tail;
-	while (tailid && count<5) {
-		int space;
-
-		d(printf(" checking tail node %d\n", tailid));
-
-		tail = (struct _tailblock *)ibex_block_read(blocks, tailid);
-
-		if (tail->used == 0) {
-			/* assume its big enough ... */
-			tail->used = 1;
-			tail->tb_offset[0] = sizeof(tail->tb_data)/sizeof(tail->tb_data[0]) - size;
-			d(printf("allocated %d (%d), used %d\n", tailid, tailid, tail->used));
-			ibex_block_dirty((struct _block *)tail);
-
-			g_assert(&tail->tb_offset[tail->used-1]
-				 < &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-			return tailid;
-		}
-
-		g_assert(&tail->tb_offset[tail->used-1]
-			 < &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-		/* see if we have a free slot first */
-		freeindex = -1;
-		end = &tail->tb_data[sizeof(tail->tb_data)/sizeof(tail->tb_data[0])];
-		for (i=0;i<tail->used;i++) {
-			if (end == &tail->tb_data[tail->tb_offset[i]]) {
-				freeindex = i;
-				break;
-			}
-			end = &tail->tb_data[tail->tb_offset[i]];
-		}
-
-		/* determine how much space we have available - incl any extra header we might need */
-		space =  ((char *)&tail->tb_data[tail->tb_offset[tail->used-1]])
-			- ((char *)&tail->tb_offset[tail->used])
-			/* FIXMEL work out why this is out a little bit */
-			- 8;
-		if (freeindex == -1)
-			space -= sizeof(tail->tb_offset[0]);
-
-		/* if we have enough, set it up, creating a new entry if necessary */
-		/* for some really odd reason the compiler promotes this expression to unsigned, hence
-		   the requirement for the space>0 check ... */
-		if (space>0 && space > size*sizeof(blockid_t)) {
-			d(printf("space = %d, size = %d size*sizeof() = %d truth = %d\n", space, size, size*sizeof(blockid_t), space>size*sizeof(blockid_t)));
-			if (freeindex == -1) {
-				freeindex = tail->used;
-				tail->tb_offset[tail->used] = tail->tb_offset[tail->used-1];
-				tail->used++;
-			}
-			tail_compress(tail, freeindex, size);
-			ibex_block_dirty((struct _block *)tail);
-			d(printf("allocated %d (%d), used %d\n", tailid, TAIL_KEY(tailid, freeindex), tail->used));
-			return TAIL_KEY(tailid, freeindex);
-		}
-		count++;
-		tailid = block_location(tail->next);
-	}
-
-	d(printf("allocating new data node for tail data\n"));
-	tailid = ibex_block_get(blocks);
-	tail = (struct _tailblock *)ibex_block_read(blocks, tailid);
-	tail->next = block_number(blocks->root.tail);
-	blocks->root.tail = tailid;
-	tail->used = 1;
-	tail->tb_offset[0] = sizeof(tail->tb_data)/sizeof(tail->tb_data[0]) - size;
-	ibex_block_dirty((struct _block *)tail);
-	d(printf("allocated %d (%d), used %d\n", tailid, TAIL_KEY(tailid, 0), tail->used));
-
-	g_assert(&tail->tb_offset[tail->used-1]
-		 < &tail->tb_data[tail->tb_offset[tail->used-1]]);
-
-	return TAIL_KEY(tailid, 0);
-}
-
-static void
-tail_free(struct _memcache *blocks, blockid_t tailid)
-{
-	struct _tailblock *tail;
-
-	d(printf("freeing tail id %d\n", tailid));
-
-	if (tailid == 0)
-		return;
-
-	tail = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tailid));
-	d(printf("  tail %d used %d\n", tailid, tail->used));
-	g_assert(tail->used);
-	if (TAIL_INDEX(tailid)  == tail->used - 1) {
-		tail->used --;
-	} else {
-		tail_compress(tail, TAIL_INDEX(tailid), 0);
-	}
-	ibex_block_dirty((struct _block *)tail);
-}
-
-static struct _IBEXStore *disk_create(struct _memcache *bc)
-{
-	struct _IBEXStore *store;
-
-	store = g_malloc0(sizeof(*store));
-	store->klass = &ibex_diskarray_class;
-	store->blocks = bc;
-
-	return store;
-}
-
-static int disk_sync(struct _IBEXStore *store)
-{
-	/* no cache, nop */
-	return 0;
-}
-
-static int disk_close(struct _IBEXStore *store)
-{
-	g_free(store);
-	return 0;
-}
-
-static blockid_t
-disk_add(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, nameid_t data)
-{
-	struct _block *block;
-	struct _block *newblock;
-	blockid_t new, head = *headptr /*, tail = *tailptr*/;
-
-	g_error("Inbimplemented");
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	d(printf("adding record %d to block %d (next = %d)\n", data, head, block->next));
-
-	if (block->used < sizeof(block->bl_data)/sizeof(block->bl_data[0])) {
-		(printf("adding record into block %d  %d\n", head, data));
-		block->bl_data[block->used] = data;
-		block->used++;
-		ibex_block_dirty(block);
-		return head;
-	} else {
-		new = ibex_block_get(store->blocks);
-		newblock = ibex_block_read(store->blocks, new);
-		newblock->next = block_number(head);
-		newblock->bl_data[0] = data;
-		newblock->used = 1;
-		d(printf("adding record into new %d  %d, next =%d\n", new, data, newblock->next));
-		ibex_block_dirty(newblock);
-		return new;
-	}
-}
-
-static blockid_t
-disk_add_blocks_internal(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, GArray *data)
-{
-	blockid_t head = *headptr, tail = *tailptr, new;
-	int tocopy;
-	struct _tailblock *tailblock;
-	struct _block *block, *newblock;
-	int space, copied = 0, left;
-
-	/* assumes this funciton is in control of any tail creation */ 
-	g_assert(tail == 0);
-
-	d(printf("Adding %d items to block list\n", data->len));
-
-	if (head == 0) {
-		head = ibex_block_get(store->blocks);
-		d(printf("allocating new head %d\n", head));
-	}
-	block = ibex_block_read(store->blocks, head);
-
-	/* ensure the first block is full before proceeding */
-	space = sizeof(block->bl_data)/sizeof(block->bl_data[0]) - block->used;
-	if (space) {
-		tocopy = MIN(data->len, space);
-		memcpy(block->bl_data+block->used, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-		block->used += tocopy;
-		ibex_block_dirty(block);
-		copied = tocopy;
-		d(printf("copied %d items to left over last node\n", tocopy));
-	}
-
-	while (copied < data->len) {
-		left = data->len - copied;
-		/* do we drop the rest in a tail? */
-		if (left < TAIL_THRESHOLD) {
-			d(printf("Storing remaining %d items in tail\n", left));
-			tocopy = left;
-			new = tail_get(store->blocks, tocopy);
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-			memcpy(&tailblock->tb_data[tailblock->tb_offset[TAIL_INDEX(new)]],
-			       &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			*tailptr = new;
-		} else {
-			new = ibex_block_get(store->blocks);
-			newblock = (struct _block *)ibex_block_read(store->blocks, new);
-			newblock->next = block_number(head);
-			tocopy = MIN(left, sizeof(block->bl_data)/sizeof(block->bl_data[0]));
-			d(printf("storing %d items in own block\n", tocopy));
-			memcpy(newblock->bl_data, &g_array_index(data, blockid_t, copied), tocopy*sizeof(blockid_t));
-			newblock->used = tocopy;
-			block = newblock;
-			head = new;
-			ibex_block_dirty(newblock);
-		}
-		copied += tocopy;
-	}
-
-	*headptr = head;
-	return head;
-}
-/*
-  case 1:
-    no head, no tail, adding a lot of data
-      add blocks until the last, which goes in a tail node
-  case 2:
-    no head, no tail, adding a little data
-      just add a tail node
-  case 3:
-    no head, tail, total exceeds a block
-      merge as much as possible into new full blocks, then the remainder in the tail
-  case 4:
-    no head, tail, room in existing tail for data
-      add new data to tail node
-  case 5:
-    no head, tail, no room in existing tail for data
-      add a new tail node, copy data across, free old tail node
-*/
-
-static blockid_t
-disk_add_list(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, GArray *data)
-{
-	blockid_t new, head = *headptr, tail = *tailptr, *start;
-	struct _tailblock *tailblock, *tailnew;
-	int len;
-	GArray *tmpdata = NULL;
-
-	d(printf("adding %d items head=%d tail=%d\n", data->len, head, tail));
-	if (data->len == 0)
-		return head;
-
-	/* store length=1 data in the tail pointer */
-	if (head == 0 && tail == 0 && data->len == 1) {
-		*headptr = BLOCK_ONE;
-		*tailptr = g_array_index(data, blockid_t, 0);
-		return BLOCK_ONE;
-	}
-	/* if we got length=1 data to append to, upgrade it to a real block list */
-	if (head == BLOCK_ONE) {
-		tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-		g_array_append_vals(tmpdata, data->data, data->len);
-		g_array_append_val(tmpdata, tail);
-		head = *headptr = 0;
-		tail = *tailptr = 0;
-	}
-
-	/* if we have no head, then check the tail */
-	if (head == 0) {
-		if (tail == 0) {
-			if (data->len >= TAIL_THRESHOLD) {
-				/* add normally */
-				head = disk_add_blocks_internal(store, headptr, tailptr, data);
-			} else {
-				/* else add to a tail block */
-				new = tail_get(store->blocks, data->len);
-				d(printf("adding %d items to a tail block %d\n", data->len, new));
-				tailnew = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]],
-				       data->data, data->len*sizeof(blockid_t));
-				*tailptr = new;
-				ibex_block_dirty((struct _block *)tailnew);
-			}
-		} else {
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-			len = tail_info(tailblock, tail, &start);
-			/* case 3 */
-			if (len + data->len >= TAIL_THRESHOLD) {
-				/* this is suboptimal, but should work - merge the tail data with
-				   our new data, and write it out */
-				if (tmpdata == NULL) {
-					tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-					g_array_append_vals(tmpdata, data->data, data->len);
-				}
-				g_array_append_vals(tmpdata, start, len);
-				*tailptr = 0;
-				tail_free(store->blocks, tail);
-				head = disk_add_blocks_internal(store, headptr, tailptr, tmpdata);
-			} else if (tail_space(tailblock) >= data->len) {
-				/* can we just expand this in our node, or do we need a new one? */
-				tail_compress(tailblock, TAIL_INDEX(tail), data->len + len);
-				memcpy(&tailblock->tb_data[tailblock->tb_offset[TAIL_INDEX(tail)] + len],
-				       data->data, data->len * sizeof(blockid_t));
-				ibex_block_dirty((struct _block *)tailblock);
-			} else {
-				/* we need to allocate a new tail node */
-				new = tail_get(store->blocks, data->len + len);
-				/* and copy the data across */
-				tailnew = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(new));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]],
-				       start, len*sizeof(blockid_t));
-				memcpy(&tailnew->tb_data[tailnew->tb_offset[TAIL_INDEX(new)]+len],
-				       data->data, data->len*sizeof(blockid_t));
-				tail_free(store->blocks, tail);
-				ibex_block_dirty((struct _block *)tailnew);
-				*tailptr = new;
-			}
-		}
-	} else {
-		if (tail) {
-			/* read/merge the tail with the new data, rewrite out.
-			   suboptimal, but it should be 'ok' ? */
-			tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-			len = tail_info(tailblock, tail, &start);
-			tmpdata = g_array_new(0, 0, sizeof(blockid_t));
-			g_array_append_vals(tmpdata, start, len);
-			g_array_append_vals(tmpdata, data->data, data->len);
-			*tailptr = 0;
-			tail_free(store->blocks, tail);
-			head = disk_add_blocks_internal(store, headptr, tailptr, tmpdata);
-		} else {
-			head = disk_add_blocks_internal(store, headptr, tailptr, data);
-		}
-	}
-	if (tmpdata)
-		g_array_free(tmpdata, TRUE);
-
-	return head;
-}
-
-static blockid_t
-disk_remove(struct _IBEXStore *store, blockid_t *headptr, blockid_t *tailptr, nameid_t data)
-{
-	blockid_t head = *headptr, node = *headptr, tail = *tailptr;
-	int i;
-
-	/* special case for 1-item nodes */
-	if (head == BLOCK_ONE) {
-		if (tail == data) {
-			*tailptr = 0;
-			*headptr = 0;
-			head = 0;
-		}
-		return head;
-	}
-
-	d(printf("removing %d from %d\n", data, head));
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				struct _block *start = ibex_block_read(store->blocks, head);
-
-				d(printf("removing data from block %d\n ", head));
-
-				start->used--;
-				block->bl_data[i] = start->bl_data[start->used];
-				if (start->used == 0) {
-					blockid_t new;
-
-					d(printf("dropping block %d, new head = %d\n", head, start->next));
-					new = block_location(start->next);
-					start->next = block_number(store->blocks->root.free);
-					store->blocks->root.free = head;
-					head = new;
-				}
-				ibex_block_dirty(block);
-				ibex_block_dirty(start);
-				*headptr = head;
-				return head;
-			}
-		}
-		node = block_location(block->next);
-	}
-
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		int len;
-		blockid_t *start;
-
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++) {
-			if (start[i] == data) {
-				for (;i<len-1;i++)
-					start[i] = start[i+1];
-				if (len == 1)
-					*tailptr = 0;
-				if (len == 1 && (tailblock->used-1) == TAIL_INDEX(tail)) {
-					d(printf("dropping/unlinking tailblock %d (%d) used = %d\n",
-						 TAIL_BLOCK(tail), tail, tailblock->used));
-					tailblock->used--;
-					/* drop/unlink block? */
-					ibex_block_dirty((struct _block *)tailblock);
-					*tailptr = 0;
-				} else {
-					tail_compress(tailblock, TAIL_INDEX(tail), len-1);
-					ibex_block_dirty((struct _block *)tailblock);
-				}
-			}
-		}
-		
-	}
-
-	return head;
-}
-
-static void disk_free(struct _IBEXStore *store, blockid_t head, blockid_t tail)
-{
-	blockid_t next;
-	struct _block *block;
-
-	if (head == BLOCK_ONE)
-		return;
-
-	while (head) {
-		d(printf("freeing block %d\n", head));
-		block = ibex_block_read(store->blocks, head);
-		next = block_location(block->next);
-		ibex_block_free(store->blocks, head);
-		head = next;
-	}
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		d(printf("freeing tail block %d (%d)\n", TAIL_BLOCK(tail), tail));
-		tail_compress(tailblock, TAIL_INDEX(tail), 0);
-		ibex_block_dirty((struct _block *)tailblock);
-	}
-}
-
-static gboolean
-disk_find(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data)
-{
-	blockid_t node = head;
-	int i;
-
-	d(printf("finding %d from %d\n", data, head));
-
-	if (head == BLOCK_ONE)
-		return data == tail;
-
-	/* first check full blocks */
-	while (node) {
-		struct _block *block = ibex_block_read(store->blocks, node);
-
-		for (i=0;i<block->used;i++) {
-			if (block->bl_data[i] == data) {
-				return TRUE;
-			}
-		}
-		node = block_location(block->next);
-	}
-
-	/* then check tail */
-	if (tail) {
-		struct _tailblock *tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		int len;
-		blockid_t *start;
-
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++) {
-			if (start[i] == data)
-				return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static GArray *
-disk_get(struct _IBEXStore *store, blockid_t head, blockid_t tail)
-{
-	GArray *result = g_array_new(0, 0, sizeof(nameid_t));
-
-	if (head == BLOCK_ONE) {
-		g_array_append_val(result, tail);
-		return result;
-	}
-
-	while (head) {
-		struct _block *block = ibex_block_read(store->blocks, head);
-
-		d(printf("getting data from block %d\n", head));
-
-		g_array_append_vals(result, block->bl_data, block->used);
-		head = block_location(block->next);
-		d(printf("next = %d\n", head));
-	}
-
-	/* chuck on any tail data as well */
-	if (tail) {
-		struct _tailblock *tailblock;
-		int len;
-		blockid_t *start;
-		
-		tailblock = (struct _tailblock *)ibex_block_read(store->blocks, TAIL_BLOCK(tail));
-		len = tail_info(tailblock, tail, &start);
-		g_array_append_vals(result, start, len);
-	}
-	return result;
-}
-
-void
-ibex_diskarray_dump(struct _memcache *blocks, blockid_t head, blockid_t tail)
-{
-	blockid_t node = head;
-
-	printf("dumping list %d tail %d\n", node, tail);
-	if (head == BLOCK_ONE) {
-		printf(" 1 length index: %d\n", tail);
-		return;
-	}
-       
-	while (node) {
-		struct _block *block = ibex_block_read(blocks, node);
-		int i;
-
-		printf(" block %d used %d\n ", node, block->used);
-		for (i=0;i<block->used;i++) {
-			printf(" %d", block->bl_data[i]);
-		}
-		printf("\n");
-		node = block_location(block->next);
-	}
-
-	printf("tail: ");
-	if (tail) {
-		struct _tailblock *tailblock;
-		int len;
-		blockid_t *start;
-		int i;
-
-		tailblock = (struct _tailblock *)ibex_block_read(blocks, TAIL_BLOCK(tail));
-		len = tail_info(tailblock, tail, &start);
-		for (i=0;i<len;i++)
-			printf(" %d", start[i]);
-	}
-	printf("\n");
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	struct _memcache *bc;
-	struct _IBEXStore *disk;
-	int i;
-	blockid_t data[100];
-	GArray adata;
-	blockid_t head=0, tail=0;
-
-	for (i=0;i<100;i++) {
-		data[i] = i;
-	}
-
-	bc = ibex_block_cache_open("index.db", O_CREAT|O_RDWR, 0600);
-	disk = ibex_diskarray_class.create(bc);
-
-	head = 0;
-	tail = 0;
-	adata.data = data;
-	adata.len = 70;
-	for (i=0;i<100;i++) {
-		printf("Loop %d\n", i);
-		ibex_diskarray_class.add_list(disk, &head, &tail, &adata);
-		ibex_diskarray_dump(bc, head, tail);
-	}
-	
-#if 0
-	for (i=1;i<100;i++) {
-		printf("inserting %d items\n", i);
-		adata.data = data;
-		adata.len = i;
-		head=0;
-		tail=0;
-		ibex_diskarray_class.add_list(disk, &head, &tail, &adata);
-		ibex_diskarray_dump(bc, head, tail);
-	}
-#endif
-	ibex_diskarray_class.close(disk);
-	ibex_block_cache_close(bc);
-	return 0;
-}
-
-#endif
diff --git a/libibex/dumpindex.c b/libibex/dumpindex.c
deleted file mode 100644
index cf4f02cc8a..0000000000
--- a/libibex/dumpindex.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-  Dump the hash tables from an ibex file.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ibex_internal.h"
-
-extern void ibex_hash_dump(struct _IBEXIndex *index);
-
-static void
-index_iterate(struct _IBEXIndex *index)
-{
-	struct _IBEXCursor *idc;
-	int len;
-	char *key;
-	int total = 0, totallen = 0;
-
-	idc = index->klass->get_cursor(index);
-	key = idc->klass->next_key(idc, &len);
-	while (len) {
-		total++;
-		totallen += len;
-		printf("%s\n", key);
-		g_free(key);
-		key = idc->klass->next_key(idc, &len);
-	}
-	g_free(key);
-
-	idc->klass->close(idc);
-
-	printf("Iterate Totals: %d items, total bytes %d\n", total, totallen);
-}
-
-int main(int argc, char **argv)
-{
-	ibex *ib;
-
-	if (argc != 2) {
-		printf("Usage: %s ibexfile\n", argv[0]);
-		return 1;
-	}
-	ib = ibex_open(argv[1], O_RDONLY, 0);
-	if (ib == NULL) {
-		perror("Opening ibex file\n");
-		return 1;
-	}
-
-	ibex_hash_dump(ib->words->wordindex);
-	ibex_hash_dump(ib->words->nameindex);
-
-	index_iterate(ib->words->wordindex);
-	index_iterate(ib->words->nameindex);
-
-	ibex_close(ib);
-
-	return 0;
-}
diff --git a/libibex/hash.c b/libibex/hash.c
deleted file mode 100644
index f79ee8f55e..0000000000
--- a/libibex/hash.c
+++ /dev/null
@@ -1,859 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* hash based index mechanism */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "block.h"
-#include "index.h"
-
-#define d(x)
-
-#define HASH_SIZE (1024)
-#define KEY_THRESHOLD (sizeof(struct _hashkey) + 4) /* minimum number of free bytes we worry about
-						      maintaining free blocks for */
-#define ARRAY_LEN(a) (sizeof(a)/sizeof(a[0]))
-
-typedef guint32 hashid_t;
-
-struct _HASHCursor {
-	struct _IBEXCursor cursor;
-
-	hashid_t key;
-	hashid_t block;
-	unsigned int index;
-	unsigned int size;
-};
-
-static struct _IBEXIndex *hash_create(struct _memcache *bc, int size);
-static struct _IBEXIndex *hash_open(struct _memcache *bc, blockid_t root);
-static int hash_sync(struct _IBEXIndex *index);
-static int hash_close(struct _IBEXIndex *index);
-
-static hashid_t hash_find(struct _IBEXIndex *index, const char *key, int keylen);
-static void hash_remove(struct _IBEXIndex *index, const char *key, int keylen);
-static hashid_t hash_insert(struct _IBEXIndex *index, const char *key, int keylen);
-static char *hash_get_key(struct _IBEXIndex *index, hashid_t hashbucket, int *len);
-static void hash_set_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t blockid, blockid_t tail);
-static blockid_t hash_get_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t *tail);
-static struct _IBEXCursor *hash_get_cursor(struct _IBEXIndex *index);
-
-static struct _IBEXCursor *hash_cursor_create(struct _IBEXIndex *);
-static void hash_cursor_close(struct _IBEXCursor *);
-static guint32 hash_cursor_next(struct _IBEXCursor *);
-static char *hash_cursor_next_key(struct _IBEXCursor *, int *keylenptr);
-
-struct _IBEXIndexClass ibex_hash_class = {
-	hash_create, hash_open,
-	hash_sync, hash_close,
-	hash_find,
-	hash_remove,
-	hash_insert,
-	hash_get_key,
-	hash_set_data_block,
-	hash_get_data_block,
-	hash_get_cursor,
-};
-
-struct _IBEXCursorClass ibex_hash_cursor_class = {
-	hash_cursor_close,
-	hash_cursor_next,
-	hash_cursor_next_key
-};
-
-/* the reason we have the tail here is that otherwise we need to
-   have a 32 bit blockid for the root node; which would make this
-   structure the same size anyway, with about 24 wasted bits */
-struct _hashkey {
-	blockid_t next;		/* next in hash chain */
-	blockid_t tail;
-	unsigned int root:32-BLOCK_BITS;
-	unsigned int keyoffset:BLOCK_BITS;
-};
-
-struct _hashblock {
-	unsigned int next:32-BLOCK_BITS;	/* next block, linked list of all key blocks: block number */
-	unsigned int used:BLOCK_BITS;		/* number of elements used */
-	union {
-		struct _hashkey keys[(BLOCK_SIZE-4)/sizeof(struct _hashkey)];
-		char keydata[BLOCK_SIZE-4];
-	} hashblock_u;
-};
-#define hb_keys hashblock_u.keys
-#define hb_keydata hashblock_u.keydata
-
-/* size of block overhead + 2 key block overhead */
-#define MAX_KEYLEN (BLOCK_SIZE - 4 - 12 - 12)
-
-/* root block for a hash index */
-struct _hashroot {
-	hashid_t free;		/* free list */
-	guint32 size;		/* how big the hash table is */
-	hashid_t keys;		/* linked list of blocks */
-	hashid_t table[(BLOCK_SIZE-8)/sizeof(hashid_t)]; /* pointers to blocks of pointers */
-};
-
-struct _hashtableblock {
-	hashid_t buckets[BLOCK_SIZE/sizeof(hashid_t)];
-};
-
-/* map a hash index to a block index */
-#define HASH_INDEX(b) ((b) & (BLOCK_SIZE-1))
-/* map a hash index to a block number */
-#define HASH_BLOCK(b) ((b) & ~(BLOCK_SIZE-1))
-/* map a block + index to a hash key */
-#define HASH_KEY(b, i) (((b) & ~(BLOCK_SIZE-1)) | ((i) & (BLOCK_SIZE-1)))
-
-/* taken from tdb/gdbm */
-static unsigned int hash_key(const unsigned char *key, int keylen)
-{
-	char *newkey;
-	newkey = alloca(keylen+1);
-	memcpy(newkey, key, keylen);
-	newkey[keylen]=0;
-	return g_str_hash(newkey);
-#if 0
-	unsigned int value;	/* Used to compute the hash value.  */
-	unsigned int  i;	/* Used to cycle through random values. */
-
-	/* Set the initial value from the key size. */
-	value = 0x238F13AF * keylen;
-	for (i=0; i < keylen; i++) {
-		value = (value + (key[i] << (i*5 % 24)));
-	}
-
-	value = (1103515243 * value + 12345);  
-
-	return value;
-#endif
-}
-
-/* create a new hash table, return a pointer to its root block */
-static struct _IBEXIndex *
-hash_create(struct _memcache *bc, int size)
-{
-	blockid_t root, block;
-	struct _hashroot *hashroot;
-	int i;
-	struct _hashtableblock *table;
-	struct _IBEXIndex *index;
-
-	g_assert(size<=10240);
-
-	d(printf("initialising hash table, size = %d\n", size));
-
-	index = g_malloc0(sizeof(*index));
-	index->blocks = bc;
-	index->klass = &ibex_hash_class;
-	root = ibex_block_get(bc);
-	index->root = root;
-	d(printf(" root = %d\n", root));
-	hashroot = (struct _hashroot *)ibex_block_read(bc, root);
-	hashroot->free = 0;
-	hashroot->size = size;
-	ibex_block_dirty((struct _block *)hashroot);
-	for (i=0;i<size/(BLOCK_SIZE/sizeof(blockid_t));i++) {
-		d(printf("initialising hash table index block %d\n", i));
-		block = hashroot->table[i] = ibex_block_get(bc);
-		table = (struct _hashtableblock *)ibex_block_read(bc, block);
-		memset(table, 0, sizeof(table));
-		ibex_block_dirty((struct _block *)table);
-	}
-
-	return index;
-}
-
-static struct _IBEXIndex *
-hash_open(struct _memcache *bc, blockid_t root)
-{
-	struct _IBEXIndex *index;
-
-	/* FIXME: check a 'magic', and the root for validity */
-
-	index = g_malloc0(sizeof(*index));
-	index->blocks = bc;
-	index->root = root;
-	index->klass = &ibex_hash_class;
-
-	return index;
-}
-
-
-static int hash_sync(struct _IBEXIndex *index)
-{
-	/* nop, index always synced on disk (at least, to blocks) */
-	return 0;
-}
-
-static int hash_close(struct _IBEXIndex *index)
-{
-#ifdef INDEX_STAT
-	printf("Performed %d lookups, average %f depth\n", index->lookups, (double)index->lookup_total/index->lookups);
-#endif
-	g_free(index);
-	return 0;
-}
-
-/* get an iterator class */
-static struct _IBEXCursor *hash_get_cursor(struct _IBEXIndex *index)
-{
-	return hash_cursor_create(index);
-}
-
-/* convert a hashbucket id into a name */
-static char *
-hash_get_key(struct _IBEXIndex *index, hashid_t hashbucket, int *len)
-{
-	struct _hashblock *bucket;
-	int ind;
-	char *ret, *start, *end;
-
-	if (hashbucket == 0) {
-		if (len)
-			*len = 0;
-		return g_strdup("");
-	}
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-	ind = HASH_INDEX(hashbucket);
-
-	g_assert(ind < bucket->used);
-
-	start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-	if (ind == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-	}
-	
-	ret = g_malloc(end-start+1);
-	memcpy(ret, start, end-start);
-	ret[end-start]=0;
-	if (len)
-		*len = end-start;
-	return ret;
-}
-
-/* sigh, this is fnugly code ... */
-static hashid_t
-hash_find(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket;
-	struct _hashtableblock *table;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	d(printf("finding hash %.*s\n", keylen, key));
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	g_assert(hashtable != 0);
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-#ifdef INDEX_STAT
-	index->lookups++;
-#endif
-	/* go down the bucket chain, reading each entry till we are done ... */
-	while (hashbucket != 0) {
-		struct _hashblock *bucket;
-		char *start, *end;
-		int ind;
-
-#ifdef INDEX_STAT
-		index->lookup_total++;
-#endif
-
-		d(printf(" checking bucket %d\n", hashbucket));
-
-		/* get the real bucket id from the hashbucket id */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		/* and get the key number within the block */
-		ind = HASH_INDEX(hashbucket);
-
-		g_assert(ind < bucket->used);
-
-		start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-		if (ind == 0) {
-			end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-		} else {
-			end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-		}
-		if ( (end-start) == keylen
-		     && memcmp(start, key, keylen) == 0) {
-			return hashbucket;
-		}
-		hashbucket = bucket->hb_keys[ind].next;
-	}
-	return 0;
-}
-
-static int
-hash_info(struct _hashblock *bucket, int index)
-{
-	char *start, *end;
-
-	g_assert(index < bucket->used);
-
-	start = &bucket->hb_keydata[bucket->hb_keys[index].keyoffset];
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	return end-start;
-}
-
-
-/* TODO: get rid of hash_compress/remove and just have one a-la the disktail code */
-
-/* compresses the bucket 'bucket', removing data
-   at index 'index' */
-static void
-hash_compress(struct _hashblock *bucket, int index)
-{
-	int i;
-	char *start, *end, *newstart;
-
-	/* get start/end of area to zap */
-	start = &bucket->hb_keydata[bucket->hb_keys[index].keyoffset];
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	if (start == end)
-		return;
-
-	/* fixup data */
-	newstart = &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset];
-	memmove(newstart+(end-start), newstart, start-newstart);
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->hb_keys[i].keyoffset += (end-start);
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-/* make room 'len' for the key 'index' */
-/* assumes key 'index' is already empty (0 length) */
-static void
-hash_expand(struct _hashblock *bucket, int index, int len)
-{
-	int i;
-	char *end, *newstart;
-
-	/* get start/end of area to zap */
-	if (index == 0) {
-		end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-	} else {
-		end = &bucket->hb_keydata[bucket->hb_keys[index-1].keyoffset];
-	}
-
-	/* fixup data */
-	newstart = &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset];
-	memmove(newstart-len, newstart, end-newstart);
-
-	/* fixup key pointers */
-	for (i=index;i<bucket->used;i++) {
-		bucket->hb_keys[i].keyoffset -= len;
-	}
-	ibex_block_dirty((struct _block *)bucket);
-}
-
-static void
-hash_remove(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket, hashprev;
-	struct _hashtableblock *table;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	d(printf("removing hash %.*s\n", keylen, key));
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-	/* go down the bucket chain, reading each entry till we are done ... */
-	hashprev = 0;
-	while (hashbucket != 0) {
-		struct _hashblock *bucket;
-		char *start, *end;
-		int ind;
-
-		d(printf(" checking bucket %d\n", hashbucket));
-
-		/* get the real bucket id from the hashbucket id */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		/* and get the key number within the block */
-		ind = HASH_INDEX(hashbucket);
-
-		g_assert(ind < bucket->used);
-
-		start = &bucket->hb_keydata[bucket->hb_keys[ind].keyoffset];
-		if (ind == 0) {
-			end = &bucket->hb_keydata[sizeof(bucket->hb_keydata)/sizeof(bucket->hb_keydata[0])];
-		} else {
-			end = &bucket->hb_keydata[bucket->hb_keys[ind-1].keyoffset];
-		}
-		if ( (end-start) == keylen
-		     && memcmp(start, key, keylen) == 0) {
-			struct _hashblock *prevbucket;
-
-			if (hashprev == 0) {
-				/* unlink from hash chain */
-				table->buckets[hashentry] = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-				/* link into free list */
-				bucket->hb_keys[HASH_INDEX(hashbucket)].next = hashroot->free;
-				hashroot->free = hashbucket;
-				/* compress away data */
-				hash_compress(bucket, HASH_INDEX(hashbucket));
-				ibex_block_dirty((struct _block *)bucket);
-				ibex_block_dirty((struct _block *)table);
-				ibex_block_dirty((struct _block *)hashroot);
-			} else {
-				prevbucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashprev));
-				prevbucket->hb_keys[HASH_INDEX(hashprev)].next =
-					bucket->hb_keys[ind].next;
-				/* link into free list */
-				bucket->hb_keys[ind].next = hashroot->free;
-				hashroot->free = hashbucket;
-				/* compress entry */
-				hash_compress(bucket, ind);
-				ibex_block_dirty((struct _block *)bucket);
-				ibex_block_dirty((struct _block *)prevbucket);
-				ibex_block_dirty((struct _block *)hashroot);
-			}
-			return;
-		}
-		hashprev = hashbucket;
-		hashbucket = bucket->hb_keys[ind].next;
-	}
-}
-
-/* set where the datablock is located */
-static void
-hash_set_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t blockid, blockid_t tail)
-{
-	struct _hashblock *bucket;
-
-	d(printf("setting data block hash %d to %d tail %d\n", keyid, blockid, tail));
-
-	/* map to a block number */
-	g_assert((blockid & (BLOCK_SIZE-1)) == 0);
-	blockid >>= BLOCK_BITS;
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyid));
-	if (bucket->hb_keys[HASH_INDEX(keyid)].root != blockid
-	    || bucket->hb_keys[HASH_INDEX(keyid)].tail != tail) {
-		bucket->hb_keys[HASH_INDEX(keyid)].tail = tail;
-		bucket->hb_keys[HASH_INDEX(keyid)].root = blockid;
-		ibex_block_dirty((struct _block *)bucket);
-	}
-}
-
-static blockid_t
-hash_get_data_block(struct _IBEXIndex *index, hashid_t keyid, blockid_t *tail)
-{
-	struct _hashblock *bucket;
-
-	d(printf("getting data block hash %d\n", keyid));
-
-	if (keyid == 0) {
-		if (tail)
-			*tail = 0;
-		return 0;
-	}
-
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyid));
-	if (tail)
-		*tail = bucket->hb_keys[HASH_INDEX(keyid)].tail;
-	return bucket->hb_keys[HASH_INDEX(keyid)].root << BLOCK_BITS;
-}
-
-static hashid_t
-hash_insert(struct _IBEXIndex *index, const char *key, int keylen)
-{
-	struct _hashroot *hashroot;
-	guint32 hash;
-	int hashentry;
-	blockid_t hashtable;
-	hashid_t hashbucket, keybucket, keyprev, keyfree;
-	struct _hashtableblock *table;
-	struct _hashblock *bucket;
-	int count;
-
-	g_assert(index != 0);
-	g_assert(index->root != 0);
-
-	/* truncate the key to the maximum size */
-	if (keylen > MAX_KEYLEN)
-		keylen = MAX_KEYLEN;
-
-	d(printf("inserting hash %.*s\n", keylen, key));
-
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-
-	/* find the table containing this entry */
-	hash = hash_key(key, keylen) % hashroot->size;
-	hashtable = hashroot->table[hash / (BLOCK_SIZE/sizeof(blockid_t))];
-	table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-	hashentry = hash % (BLOCK_SIZE/sizeof(blockid_t));
-	/* and its bucket */
-	hashbucket = table->buckets[hashentry];
-
-	/* now look for a free slot, first try the free list */
-	/* but dont try too hard if our key is just too long ... so just scan upto
-	   4 blocks, but if we dont find a space, tough ... */
-	keybucket = hashroot->free;
-	keyprev = 0;
-	count = 0;
-	while (keybucket && count<4) {
-		int space;
-		
-		d(printf(" checking free %d\n", keybucket));
-
-		/* read the bucket containing this free key */
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keybucket));
-
-		/* check if there is enough space for the key */
-		space =  &bucket->hb_keydata[bucket->hb_keys[bucket->used-1].keyoffset]
-			- (char *)&bucket->hb_keys[bucket->used];
-		if (space >= keylen) {
-			hash_expand(bucket, HASH_INDEX(keybucket), keylen);
-			memcpy(&bucket->hb_keydata[bucket->hb_keys[HASH_INDEX(keybucket)].keyoffset],
-			       key, keylen);
-
-			/* check if there is free space still in this node, and there are no other empty blocks */
-			keyfree = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-			if ((space-keylen) >= KEY_THRESHOLD) {
-				int i;
-				int head = ARRAY_LEN(bucket->hb_keydata);
-				int found = FALSE;
-
-				for (i=0;i<bucket->used;i++) {
-					if (bucket->hb_keys[i].keyoffset == head) {
-						/* already have a free slot in this block, leave it */
-						found = TRUE;
-						break;
-					}
-					head = bucket->hb_keys[i].keyoffset;
-				}
-				if (!found) {
-					/* we should link in a new free slot for this node */
-					bucket->hb_keys[bucket->used].next = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-					bucket->hb_keys[bucket->used].keyoffset = bucket->hb_keys[bucket->used-1].keyoffset;
-					keyfree = HASH_KEY(HASH_BLOCK(keybucket), bucket->used);
-					bucket->used++;
-				}
-			}
-			/* link 'keyfree' back to the parent ... */
-			if (keyprev == 0) {
-				hashroot->free = keyfree;
-				ibex_block_dirty((struct _block *)hashroot);
-			} else {
-				struct _hashblock *prevbucket;
-				prevbucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(keyprev));
-				prevbucket->hb_keys[HASH_INDEX(keyprev)].next = keyfree;
-				ibex_block_dirty((struct _block *)prevbucket);
-			}
-
-			/* link into the hash chain */
-			bucket->hb_keys[HASH_INDEX(keybucket)].next = hashbucket;
-			bucket->hb_keys[HASH_INDEX(keybucket)].root = 0;
-			bucket->hb_keys[HASH_INDEX(keybucket)].tail = 0;
-			table->buckets[hashentry] = keybucket;
-			ibex_block_dirty((struct _block *)table);
-			ibex_block_dirty((struct _block *)bucket);
-
-			d(printf(" new key id %d\n", keybucket));
-			d(printf(" new free id %d\n", hashroot->free));
-
-			return keybucket;
-		}
-
-		count++;
-		keyprev = keybucket;
-		keybucket = bucket->hb_keys[HASH_INDEX(keybucket)].next;
-	}
-
-	/* else create a new block ... */
-	keybucket = ibex_block_get(index->blocks);
-	bucket = (struct _hashblock *)ibex_block_read(index->blocks, keybucket);
-
-	d(printf("creating new key bucket %d\n", keybucket));
-
-	memset(bucket, 0, sizeof(*bucket));
-
-	bucket->used = 2;
-	/* first block, is the new key */
-	bucket->hb_keys[0].keyoffset = ARRAY_LEN(bucket->hb_keydata) - keylen;
-	memcpy(&bucket->hb_keydata[bucket->hb_keys[0].keyoffset], key, keylen);
-	bucket->hb_keys[0].next = hashbucket;
-	bucket->hb_keys[0].root = 0;
-	bucket->hb_keys[0].tail = 0;
-
-	table->buckets[hashentry] = HASH_KEY(keybucket, 0);
-
-	/* next block is a free block, link into free list */
-	bucket->hb_keys[1].keyoffset = bucket->hb_keys[0].keyoffset;
-	bucket->hb_keys[1].next = hashroot->free;
-	hashroot->free = HASH_KEY(keybucket, 1);
-
-	/* link new block into keys list */
-	bucket->next = block_number(hashroot->keys);
-	hashroot->keys = keybucket;
-
-	ibex_block_dirty((struct _block *)hashroot);
-	ibex_block_dirty((struct _block *)table);
-	ibex_block_dirty((struct _block *)bucket);
-
-	d(printf(" new key id %d\n", HASH_KEY(keybucket, 0)));
-	d(printf(" new free id %d\n", hashroot->free));
-
-	return HASH_KEY(keybucket, 0);
-}
-
-/* hash cursor functions */
-static struct _IBEXCursor *
-hash_cursor_create(struct _IBEXIndex *idx)
-{
-	struct _HASHCursor *idc;
-	struct _hashroot *hashroot;
-
-	idc = g_malloc(sizeof(*idc));
-	idc->cursor.klass = &ibex_hash_cursor_class;
-	idc->cursor.index = idx;
-	idc->key = 0;
-	idc->index = 0;
-
-	hashroot = (struct _hashroot *)ibex_block_read(idx->blocks, idx->root);
-	idc->size = hashroot->size;
-	idc->block = hashroot->keys;
-	
-	return &idc->cursor;
-}
-
-static void
-hash_cursor_close(struct _IBEXCursor *idc)
-{
-	g_free(idc);
-}
-
-static guint32
-hash_cursor_next(struct _IBEXCursor *idc)
-{
-	struct _HASHCursor *hc = (struct _HASHCursor *)idc;
-	struct _hashblock *bucket;
-
-	while (hc->block != 0) {
-		bucket = (struct _hashblock *)ibex_block_read(idc->index->blocks, hc->block);
-		while (hc->index < bucket->used) {
-			if (hash_info(bucket, hc->index) > 0) {
-				hc->key = HASH_KEY(hc->block, hc->index);
-				hc->index++;
-				if (hc->index == bucket->used) {
-					hc->index = 0;
-					hc->block = block_location(bucket->next);
-				}
-				return hc->key;
-			}
-			hc->index++;
-		}
-		hc->index = 0;
-		hc->block = block_location(bucket->next);
-	}
-
-	return hc->block;
-}
-
-static char *
-hash_cursor_next_key(struct _IBEXCursor *idc, int *keylenptr)
-{
-	/* TODO: this could be made slightly mroe efficient going to the structs direct.
-	   but i'm lazy today */
-	return idc->index->klass->get_key(idc->index, idc->klass->next(idc), keylenptr);
-}
-
-/* debug */
-void ibex_hash_dump(struct _IBEXIndex *index);
-static void ibex_hash_dump_rec(struct _IBEXIndex *index, int *words, int *wordslen);
-
-void ibex_hash_dump(struct _IBEXIndex *index)
-{
-	int words = 0, wordslen=0;
-
-	ibex_hash_dump_rec(index, &words, &wordslen);
-
-	printf("Total words = %d, bytes = %d, ave length = %f\n", words, wordslen, (double)wordslen/(double)words);
-}
-
-
-static void
-ibex_hash_dump_rec(struct _IBEXIndex *index, int *words, int *wordslen)
-{
-	int i;
-	struct _hashtableblock *table;
-	struct _hashblock *bucket;
-	struct _hashroot *hashroot;
-	blockid_t hashtable;
-	hashid_t hashbucket;
-	extern void ibex_diskarray_dump(struct _memcache *blocks, blockid_t head, blockid_t tail);
-
-
-	printf("Walking hash tree:\n");
-	hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-	for (i=0;i<hashroot->size;i++) {
-		printf("Hash table chain: %d\n", i);
-		hashtable = hashroot->table[i / (BLOCK_SIZE/sizeof(blockid_t))];
-		table = (struct _hashtableblock *)ibex_block_read(index->blocks, hashtable);
-		hashbucket = table->buckets[i % (BLOCK_SIZE/sizeof(blockid_t))];
-		while (hashbucket) {
-			int len;
-
-			*words = *words + 1;
-
-			bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-			printf(" bucket %d: [used %d]", hashbucket, bucket->used);
-			if (HASH_INDEX(hashbucket) == 0) {
-				len = ARRAY_LEN(bucket->hb_keydata) -
-					bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset;
-			} else {
-				len = bucket->hb_keys[HASH_INDEX(hashbucket)-1].keyoffset -
-					bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset;
-			}
-			printf("'%.*s' = %d next=%d\n", len, &bucket->hb_keydata[bucket->hb_keys[HASH_INDEX(hashbucket)].keyoffset],
-			       bucket->hb_keys[HASH_INDEX(hashbucket)].root,
-			       bucket->hb_keys[HASH_INDEX(hashbucket)].next);
-
-			*wordslen = *wordslen + len;
-
-			ibex_diskarray_dump(index->blocks,
-					    bucket->hb_keys[HASH_INDEX(hashbucket)].root << BLOCK_BITS,
-					    bucket->hb_keys[HASH_INDEX(hashbucket)].tail);
-
-			hashbucket = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-		}
-		/* make sure its still in the cache */
-		hashroot = (struct _hashroot *)ibex_block_read(index->blocks, index->root);
-	}
-
-	hashbucket = hashroot->free;
-	printf("Dumping free lists ..\n");
-	while (hashbucket) {
-		printf(" %d", hashbucket);
-		bucket = (struct _hashblock *)ibex_block_read(index->blocks, HASH_BLOCK(hashbucket));
-		hashbucket = bucket->hb_keys[HASH_INDEX(hashbucket)].next;
-	}
-	printf("\n");
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	struct _memcache *bc;
-	struct _IBEXIndex *hash;
-	int i;
-
-	bc = ibex_block_cache_open("index.db", O_CREAT|O_RDWR, 0600);
-	hash = ibex_hash_class.create(bc, 1024);
-	for (i=0;i<10000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.insert(hash, key, strlen(key));
-	}
-
-	for (i=500;i<1000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.remove(hash, key, strlen(key));
-	}
-
-	for (i=500;i<1000;i++) {
-		char key[16];
-		sprintf(key, "key %d", i);
-		ibex_hash_class.insert(hash, key, strlen(key));
-	}
-
-
-	ibex_hash_dump(hash);
-
-	for (i=0;i<2000;i++) {
-		char key[16], *lookup;
-		hashid_t keyid;
-		blockid_t root, tail;
-
-		sprintf(key, "key %d", i);
-		keyid = ibex_hash_class.find(hash, key, strlen(key));
-		lookup = ibex_hash_class.get_key(hash, keyid, 0);
-		root = ibex_hash_class.get_data(hash, keyid, &tail);
-		printf("key %s = %d = '%s' root:%d tail:%d \n", key, keyid, lookup, root, tail);
-		g_free(lookup);
-	}
-
-	ibex_hash_class.close(hash);
-	ibex_block_cache_close(bc);
-	return 0;
-}
-
-#endif
diff --git a/libibex/ibex.h b/libibex/ibex.h
deleted file mode 100644
index 03635e275d..0000000000
--- a/libibex/ibex.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef IBEX_H
-#define IBEX_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <glib.h>
-
-struct ibex;
-typedef struct ibex ibex;
-
-/* All functions that can fail set errno and return NULL or -1 on
- * failure.
- */
-
-/* Open the named ibex index file. If CREATE is true, create the file
- * if it doesn't already exist.
- */
-ibex *ibex_open (char *file, int flags, int mode);
-
-/* Write the ibex to disk. */
-int ibex_write (ibex *ib);
-
-/* only save if ibex has changed. */
-int ibex_save (ibex *ib);
-
-/* Write the ibex to disk if it has changed, and free all memory
- * associated with it.
- */
-int ibex_close (ibex *ib);
-
-
-
-/* Index the named file. (If the FILENAME is already in the index,
- * remove the old copy.
- */
-int ibex_index_file (ibex *ib, char *filename);
-
-/* Index LEN bytes off FD, using NAME as the filename in the index.
- * (If NAME already exists in the index, this adds more data to it.)
- */
-int ibex_index_fd (ibex *ib, char *name, int fd, size_t len);
-
-/* Like ibex_index_fd, but with a buffer rather than a file descriptor.
- * The buffer does not need to be '\0'-terminated. If UNREAD is not
- * NULL, then the indexer won't assume that the buffer ends on a word
- * boundary, and will return (in UNREAD) the number of bytes from the
- * end of the buffer that it didn't use, if any.
- */
-int ibex_index_buffer (ibex *ib, char *name, char *buffer,
-		       size_t len, size_t *unread);
-
-/* Remove entries for a given file from the index. (Most of the removal
- * isn't actually done until the file is written out to disk, so this
- * is very fast.)
- */
-void ibex_unindex (ibex *ib, char *name);
-
-/* Rename a file in the index. (This is also fast.) */
-void ibex_rename (ibex *ib, char *oldfilename, char *newfilename);
-
-
-
-/* Find a word in the index. Returns an array of strings: the caller
- * should free the array, but should not free or modify the strings.
- */
-GPtrArray *ibex_find (ibex *ib, char *word);
-
-/* Find if a word is contained in a specific name reference.
- */
-gboolean ibex_find_name (ibex *ib, char *name, char *word);
-
-/* has a file been indexed?
- */
-gboolean ibex_contains_name(ibex *ib, char *name);
-
-/* Return all the files containing all of the words in the given
- * array. Returned data is like with ibex_find.
- */
-GPtrArray *ibex_find_all (ibex *ib, GPtrArray *words);
-
-/* Debug function, dumps the whole index tree, showing removed files as well */
-void ibex_dump_all (ibex *ib);
-
-#endif /* ! IBEX_H */
-
diff --git a/libibex/ibex_block.c b/libibex/ibex_block.c
deleted file mode 100644
index 7a5864ea32..0000000000
--- a/libibex/ibex_block.c
+++ /dev/null
@@ -1,313 +0,0 @@
-
-#include <glib.h>
-
-#include <stdio.h>
-#include <unicode.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-
-#include "ibex_internal.h"
-
-#define d(x)
-
-static signed char utf8_trans[] = {
-	'A', 'A', 'A', 'A', 'A', 'A', -1, 'C', 'E', 'E', 'E', 'E', 'I', 'I',
-	'I', 'I', -2, 'N', 'O', 'O', 'O', 'O', 'O', '*', 'O', 'U', 'U', 'U',
-	'U', 'Y', -3, -4, 'a', 'a', 'a', 'a', 'a', 'a', -5, 'c', 'e', 'e',
-	'e', 'e', 'i', 'i', 'i', 'i', -6, 'n', 'o', 'o', 'o', 'o', 'o', '/',
-	'o', 'u', 'u', 'u', 'u', 'y', -7, 'y', 'A', 'a', 'A', 'a', 'A', 'a',
-	'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd', 'D', 'd', 'E', 'e',
-	'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g', 'G', 'g',
-	'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
-	'I', 'i', -8, -9, 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L',
-	'l', 'L', 'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', 'n', -10, -11,
-	'O', 'o', 'O', 'o', 'O', 'o', -12, -13, 'R', 'r', 'R', 'r', 'R', 'r',
-	'S', 'r', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
-	'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'W', 'w',
-	'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's'
-};
-
-static char *utf8_long_trans[] = {
-	"AE", "TH", "TH", "ss", "ae", "th", "th", "IJ", "ij",
-	"NG", "ng", "OE", "oe"
-};
-
-/* This is a bit weird. It takes pointers to the start and end (actually
- * just past the end) of a UTF-8-encoded word, and a buffer at least 1
- * byte longer than the length of the word. It copies the word into the
- * buffer in all lowercase without accents, and splits up ligatures.
- * (Since any ligature would be a multi-byte character in UTF-8, splitting
- * them into two US-ASCII characters won't overrun the buffer.)
- *
- * It is not safe to call this routine with bad UTF-8.
- */
-static void
-ibex_normalise_word(char *start, char *end, char *buf)
-{
-	unsigned char *s, *d;
-	unicode_char_t uc;
-
-	s = (unsigned char *)start;
-	d = (unsigned char *)buf;
-	while (s < (unsigned char *)end) {
-		if (*s < 0x80) {
-			/* US-ASCII character: copy unless it's
-			 * an apostrophe.
-			 */
-			if (*s != '\'')
-				*d++ = tolower (*s);
-			s++;
-		} else {
-			char *next = unicode_get_utf8 (s, &uc);
-			if (uc >= 0xc0 && uc < 0xc0 + sizeof (utf8_trans)) {
-				signed char ch = utf8_trans[uc - 0xc0];
-				if (ch > 0)
-					*d++ = tolower (ch);
-				else {
-					*d++ = tolower (utf8_long_trans[-ch - 1][0]);
-					*d++ = tolower (utf8_long_trans[-ch - 1][1]);
-				}
-				s = next;
-			} else {
-				while (s < (unsigned char *)next)
-					*d++ = *s++;
-			}
-		}
-	}
-	*d = '\0';
-}
-
-enum { IBEX_ALPHA, IBEX_NONALPHA, IBEX_INVALID, IBEX_INCOMPLETE };
-
-/* This incorporates parts of libunicode, because there's no way to
- * force libunicode to not read past a certain point.
- */
-static int
-utf8_category (char *sp, char **snp, char *send)
-{
-	unsigned char *p = (unsigned char *)sp, **np = (unsigned char **)snp;
-	unsigned char *end = (unsigned char *)send;
-
-	if (isascii (*p)) {
-		*np = p + 1;
-		if (isalpha (*p) || *p == '\'')
-			return IBEX_ALPHA;
-		return IBEX_NONALPHA;
-	} else {
-		unicode_char_t uc;
-		int more;
-
-		if ((*p & 0xe0) == 0xc0) {
-			more = 1;
-			uc = *p & 0x1f;
-		} else if ((*p & 0xf0) == 0xe0) {
-			more = 2;
-			uc = *p & 0x0f;
-		} else if ((*p & 0xf8) == 0xf0) {
-			more = 3;
-			uc = *p & 0x07;
-		} else if ((*p & 0xfc) == 0xf8) {
-			more = 4;
-			uc = *p & 0x03;
-		} else if ((*p & 0xfe) == 0xfc) {
-			more = 5;
-			uc = *p & 0x01;
-		} else
-			return IBEX_INVALID;
-
-		if (p + more > end)
-			return IBEX_INCOMPLETE;
-
-		while (more--) {
-			if ((*++p & 0xc0) != 0x80)
-				return IBEX_INVALID;
-			uc <<= 6;
-			uc |= *p & 0x3f;
-		}
-
-		*np = p + 1;
-		if (unicode_isalpha (uc))
-			return IBEX_ALPHA;
-		else
-			return IBEX_NONALPHA;
-	}
-}
-
-/**
- * ibex_index_buffer: the lowest-level ibex indexing interface
- * @ib: an ibex
- * @name: the name of the file being indexed
- * @buffer: a buffer containing data from the file
- * @len: the length of @buffer
- * @unread: an output argument containing the number of unread bytes
- *
- * This routine indexes up to @len bytes from @buffer into @ib.
- * If @unread is NULL, the indexer assumes that the buffer ends on a
- * word boundary, and will index all the way to the end of the
- * buffer. If @unread is not NULL, and the buffer ends with an
- * alphabetic character, the indexer will assume that the buffer has
- * been cut off in the middle of a word, and return the number of
- * un-indexed bytes at the end of the buffer in *@unread. The caller
- * should then read in more data through whatever means it has
- * and pass in the unread bytes from the original buffer, followed
- * by the new data, on its next call.
- *
- * Return value: 0 on success, -1 on failure.
- **/
-int
-ibex_index_buffer (ibex *ib, char *name, char *buffer, size_t len, size_t *unread)
-{
-	char *p, *q, *nq, *end, *word;
-	int wordsiz, cat;
-	GHashTable *words = g_hash_table_new(g_str_hash, g_str_equal);
-	GPtrArray *wordlist = g_ptr_array_new();
-	int i, ret=-1;
-
-	if (unread)
-		*unread = 0;
-
-	end = buffer + len;
-	wordsiz = 20;
-	word = g_malloc (wordsiz);
-
-	p = buffer;
-	while (p < end) {
-		while (p < end) {
-			cat = utf8_category (p, &q, end);
-			if (cat != IBEX_NONALPHA)
-				break;
-			p = q;
-		}
-		if (p == end) {
-			goto done;
-		} else if (cat == IBEX_INVALID) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE)
-			q = end;
-
-		while (q < end) {
-			cat = utf8_category (q, &nq, end);
-			if (cat != IBEX_ALPHA)
-				break;
-			q = nq;
-		}
-		if (cat == IBEX_INVALID ||
-		    (cat == IBEX_INCOMPLETE && !unread)) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE || (q == end && unread)) {
-			*unread = end - p;
-			goto done;
-		}
-
-		if (wordsiz < q - p + 1) {
-			wordsiz = q - p + 1;
-			word = g_realloc (word, wordsiz);
-		}
-		ibex_normalise_word (p, q, word);
-		if (word[0]) {
-			if (g_hash_table_lookup(words, word) == 0) {
-				char *newword = g_strdup(word);
-				g_ptr_array_add(wordlist, newword);
-				g_hash_table_insert(words, newword, name);
-			}
-		}
-		p = q;
-	}
-done:
-	d(printf("name %s count %d size %d\n", name, wordlist->len, len));
-	if (!ib->predone) {
-		ib->words->klass->index_pre(ib->words);
-		ib->predone = TRUE;
-	}
-	ib->words->klass->add_list(ib->words, name, wordlist);
-	ret = 0;
-error:
-	for (i=0;i<wordlist->len;i++)
-		g_free(wordlist->pdata[i]);
-	g_ptr_array_free(wordlist, TRUE);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return ret;
-}
-
-
-ibex *ibex_open (char *file, int flags, int mode)
-{
-	ibex *ib;
-
-	ib = g_malloc0(sizeof(*ib));
-	ib->blocks = ibex_block_cache_open(file, flags, mode);
-	if (ib->blocks == 0) {
-		g_warning("create: Error occured?: %s\n", strerror(errno));
-		g_free(ib);
-		return NULL;
-	}
-	/* FIXME: the blockcache or the wordindex needs to manage the other one */
-	ib->words = ib->blocks->words;
-
-	return ib;
-}
-
-int ibex_save (ibex *ib)
-{
-	printf("syncing database\n");
-	if (ib->predone) {
-		ib->words->klass->index_post(ib->words);
-		ib->predone = FALSE;
-	}
-	ib->words->klass->sync(ib->words);
-	/* FIXME: some return */
-	ibex_block_cache_sync(ib->blocks);
-	return 0;
-}
-
-int ibex_close (ibex *ib)
-{
-	int ret = 0;
-
-	printf("closing database\n");
-
-	if (ib->predone) {
-		ib->words->klass->index_post(ib->words);
-		ib->predone = FALSE;
-	}
-
-	ib->words->klass->close(ib->words);
-	ibex_block_cache_close(ib->blocks);
-	g_free(ib);
-	return ret;
-}
-
-void ibex_unindex (ibex *ib, char *name)
-{
-	d(printf("trying to unindex '%s'\n", name));
-	ib->words->klass->unindex_name(ib->words, name);
-}
-
-GPtrArray *ibex_find (ibex *ib, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return ib->words->klass->find(ib->words, normal);
-}
-
-gboolean ibex_find_name (ibex *ib, char *name, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return ib->words->klass->find_name(ib->words, name, normal);
-}
-
-gboolean ibex_contains_name(ibex *ib, char *name)
-{
-	return ib->words->klass->contains_name(ib->words, name);
-}
diff --git a/libibex/ibex_db.c b/libibex/ibex_db.c
deleted file mode 100644
index 1ef0b3d1bc..0000000000
--- a/libibex/ibex_db.c
+++ /dev/null
@@ -1,512 +0,0 @@
-
-#include <glib.h>
-
-#include <db.h>
-#include <stdio.h>
-#include <unicode.h>
-#include <ctype.h>
-
-#include "ibex_internal.h"
-
-#define d(x)
-
-/*
-  Uses 2 databases: 
-
-  names - HASH  - lists which files are stored
-  words - BTREE - index words to files
-
-*/
-
-static int
-db_delete_name(DB *db, const char *name)
-{
-	DBC *cursor;
-	int err, namelen;
-	DBT key, data;
-
-	printf("called to delete name %s\n", name);
-	return 0;
-
-	err = db->cursor(db, NULL, &cursor, 0);
-	if (err != 0) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		return err;
-	}
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	namelen = strlen(name);
-
-	err = cursor->c_get(cursor, &key, &data, DB_FIRST);
-	while (err == 0) {
-		if (data.size == namelen && memcmp(data.data, name, namelen) == 0) {
-			d(printf("Found match, removing it\n"));
-			cursor->c_del(cursor, 0);
-		} else {
-			data.size = namelen;
-			data.data = (void *)name;
-			if (cursor->c_get(cursor, &key, &data, DB_GET_BOTH) == 0) {
-				d(printf("seek to match, removing it\n"));
-				cursor->c_del(cursor, 0);
-			} else {
-				d(printf("seek to match, not found\n"));
-			}
-		}
-		err = cursor->c_get(cursor, &key, &data, DB_NEXT_NODUP);
-	}
-
-	cursor->c_close(cursor);
-
-	return 0;
-}
-
-static int
-db_index_words(DB *db, char *name, char **words)
-{
-	DBT key, data;
-	int err = 0;
-	char *word;
-	
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	data.data = name;
-	data.size = strlen(name);
-	for (;(word=*words);words++) {
-		/* normalise word first ... */
-		key.data = word;
-		key.size = strlen(word);
-
-		err = db->put(db, NULL, &key, &data, 0);
-		if (err != 0)
-			printf("Error occured?: %s\n", db_strerror(err));
-	}
-
-	return err;
-}
-
-static int
-db_index_word(DB *db, char *name, char *word)
-{
-	DBT key, data;
-	int err = 0;
-	
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	data.data = name;
-	data.size = strlen(name);
-	key.data = word;
-	key.size = strlen(word);
-
-	err = db->put(db, NULL, &key, &data, 0);
-	if (err != 0)
-		printf("Error occured?: %s\n", db_strerror(err));
-
-	return err;
-}
-
-static GPtrArray *
-db_find(DB *db, char *word)
-{
-	DBT key, data;
-	int err;
-	DBC *cursor;
-	GPtrArray *matches = g_ptr_array_new();
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	err = db->cursor(db, NULL, &cursor, 0);
-	if (err != 0) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		return matches;
-	}
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	key.size = strlen(word);
-	key.data = word;
-
-	err = cursor->c_get(cursor, &key, &data, DB_SET);
-	while (err == 0) {
-		char *name;
-		name = g_malloc(data.size+1);
-		memcpy(name, data.data, data.size);
-		name[data.size] = '\0';
-		g_ptr_array_add(matches, name);
-		err = cursor->c_get(cursor, &key, &data, DB_NEXT_DUP);
-	}
-	if (err != DB_NOTFOUND) {
-		printf("Error occured?: %s\n", db_strerror(err));
-		/* what to do?  doesn't matter too much its just a search ... */
-	}
-
-	cursor->c_close(cursor);
-
-	return matches;
-}
-
-/* check that db contains key @word, optionally with contents @name */
-static gboolean
-db_contains_word(DB *db, char *name, char *word)
-{
-	DBT key, data;
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	if (name != NULL) {
-		data.size = strlen(name);
-		data.data = name;
-	}
-	key.size = strlen(word);
-	key.data = word;
-
-	return db->get(db, NULL, &key, &data, name?DB_GET_BOTH:DB_SET) == 0;
-}
-
-static int
-db_delete_word(DB *db, char *word)
-{
-	DBT key;
-
-	memset(&key, 0, sizeof(key));
-	key.size = strlen(word);
-	key.data = word;
-	return db->del(db, NULL, &key, 0);
-}
-
-
-static signed char utf8_trans[] = {
-	'A', 'A', 'A', 'A', 'A', 'A', -1, 'C', 'E', 'E', 'E', 'E', 'I', 'I',
-	'I', 'I', -2, 'N', 'O', 'O', 'O', 'O', 'O', '*', 'O', 'U', 'U', 'U',
-	'U', 'Y', -3, -4, 'a', 'a', 'a', 'a', 'a', 'a', -5, 'c', 'e', 'e',
-	'e', 'e', 'i', 'i', 'i', 'i', -6, 'n', 'o', 'o', 'o', 'o', 'o', '/',
-	'o', 'u', 'u', 'u', 'u', 'y', -7, 'y', 'A', 'a', 'A', 'a', 'A', 'a',
-	'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd', 'D', 'd', 'E', 'e',
-	'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g', 'G', 'g',
-	'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
-	'I', 'i', -8, -9, 'J', 'j', 'K', 'k', 'k', 'L', 'l', 'L', 'l', 'L',
-	'l', 'L', 'l', 'L', 'l', 'N', 'n', 'N', 'n', 'N', 'n', 'n', -10, -11,
-	'O', 'o', 'O', 'o', 'O', 'o', -12, -13, 'R', 'r', 'R', 'r', 'R', 'r',
-	'S', 'r', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't',
-	'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'W', 'w',
-	'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's'
-};
-
-static char *utf8_long_trans[] = {
-	"AE", "TH", "TH", "ss", "ae", "th", "th", "IJ", "ij",
-	"NG", "ng", "OE", "oe"
-};
-
-/* This is a bit weird. It takes pointers to the start and end (actually
- * just past the end) of a UTF-8-encoded word, and a buffer at least 1
- * byte longer than the length of the word. It copies the word into the
- * buffer in all lowercase without accents, and splits up ligatures.
- * (Since any ligature would be a multi-byte character in UTF-8, splitting
- * them into two US-ASCII characters won't overrun the buffer.)
- *
- * It is not safe to call this routine with bad UTF-8.
- */
-static void
-ibex_normalise_word(char *start, char *end, char *buf)
-{
-	unsigned char *s, *d;
-	unicode_char_t uc;
-
-	s = (unsigned char *)start;
-	d = (unsigned char *)buf;
-	while (s < (unsigned char *)end) {
-		if (*s < 0x80) {
-			/* US-ASCII character: copy unless it's
-			 * an apostrophe.
-			 */
-			if (*s != '\'')
-				*d++ = tolower (*s);
-			s++;
-		} else {
-			char *next = unicode_get_utf8 (s, &uc);
-			if (uc >= 0xc0 && uc < 0xc0 + sizeof (utf8_trans)) {
-				signed char ch = utf8_trans[uc - 0xc0];
-				if (ch > 0)
-					*d++ = tolower (ch);
-				else {
-					*d++ = tolower (utf8_long_trans[-ch - 1][0]);
-					*d++ = tolower (utf8_long_trans[-ch - 1][1]);
-				}
-				s = next;
-			} else {
-				while (s < (unsigned char *)next)
-					*d++ = *s++;
-			}
-		}
-	}
-	*d = '\0';
-}
-
-enum { IBEX_ALPHA, IBEX_NONALPHA, IBEX_INVALID, IBEX_INCOMPLETE };
-
-/* This incorporates parts of libunicode, because there's no way to
- * force libunicode to not read past a certain point.
- */
-static int
-utf8_category (char *sp, char **snp, char *send)
-{
-	unsigned char *p = (unsigned char *)sp, **np = (unsigned char **)snp;
-	unsigned char *end = (unsigned char *)send;
-
-	if (isascii (*p)) {
-		*np = p + 1;
-		if (isalpha (*p) || *p == '\'')
-			return IBEX_ALPHA;
-		return IBEX_NONALPHA;
-	} else {
-		unicode_char_t uc;
-		int more;
-
-		if ((*p & 0xe0) == 0xc0) {
-			more = 1;
-			uc = *p & 0x1f;
-		} else if ((*p & 0xf0) == 0xe0) {
-			more = 2;
-			uc = *p & 0x0f;
-		} else if ((*p & 0xf8) == 0xf0) {
-			more = 3;
-			uc = *p & 0x07;
-		} else if ((*p & 0xfc) == 0xf8) {
-			more = 4;
-			uc = *p & 0x03;
-		} else if ((*p & 0xfe) == 0xfc) {
-			more = 5;
-			uc = *p & 0x01;
-		} else
-			return IBEX_INVALID;
-
-		if (p + more > end)
-			return IBEX_INCOMPLETE;
-
-		while (more--) {
-			if ((*++p & 0xc0) != 0x80)
-				return IBEX_INVALID;
-			uc <<= 6;
-			uc |= *p & 0x3f;
-		}
-
-		*np = p + 1;
-		if (unicode_isalpha (uc))
-			return IBEX_ALPHA;
-		else
-			return IBEX_NONALPHA;
-	}
-}
-
-static void
-do_insert_words(char *key, char *name, ibex *ib)
-{
-	db_index_word(ib->words, name, key);
-	g_free(key);
-}
-
-static void
-do_free_words(char *key, char *name, void *data)
-{
-	g_free(key);
-}
-
-/**
- * ibex_index_buffer: the lowest-level ibex indexing interface
- * @ib: an ibex
- * @name: the name of the file being indexed
- * @buffer: a buffer containing data from the file
- * @len: the length of @buffer
- * @unread: an output argument containing the number of unread bytes
- *
- * This routine indexes up to @len bytes from @buffer into @ib.
- * If @unread is NULL, the indexer assumes that the buffer ends on a
- * word boundary, and will index all the way to the end of the
- * buffer. If @unread is not NULL, and the buffer ends with an
- * alphabetic character, the indexer will assume that the buffer has
- * been cut off in the middle of a word, and return the number of
- * un-indexed bytes at the end of the buffer in *@unread. The caller
- * should then read in more data through whatever means it has
- * and pass in the unread bytes from the original buffer, followed
- * by the new data, on its next call.
- *
- * Return value: 0 on success, -1 on failure.
- **/
-int
-ibex_index_buffer (ibex *ib, char *name, char *buffer, size_t len, size_t *unread)
-{
-	char *p, *q, *nq, *end, *word;
-	int wordsiz, cat;
-	GHashTable *words = g_hash_table_new(g_str_hash, g_str_equal);
-
-	if (unread)
-		*unread = 0;
-
-	end = buffer + len;
-	wordsiz = 20;
-	word = g_malloc (wordsiz);
-
-	p = buffer;
-	while (p < end) {
-		while (p < end) {
-			cat = utf8_category (p, &q, end);
-			if (cat != IBEX_NONALPHA)
-				break;
-			p = q;
-		}
-		if (p == end) {
-			goto done;
-		} else if (cat == IBEX_INVALID) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE)
-			q = end;
-
-		while (q < end) {
-			cat = utf8_category (q, &nq, end);
-			if (cat != IBEX_ALPHA)
-				break;
-			q = nq;
-		}
-		if (cat == IBEX_INVALID ||
-		    (cat == IBEX_INCOMPLETE && !unread)) {
-			goto error;
-		} else if (cat == IBEX_INCOMPLETE || (q == end && unread)) {
-			*unread = end - p;
-			goto done;
-		}
-
-		if (wordsiz < q - p + 1) {
-			wordsiz = q - p + 1;
-			word = g_realloc (word, wordsiz);
-		}
-		ibex_normalise_word (p, q, word);
-		if (word[0]) {
-			if (g_hash_table_lookup(words, word) == 0) {
-				g_hash_table_insert(words, g_strdup(word), name);
-			}
-		}
-		p = q;
-	}
-done:
-	/* FIXME: do this and inserts within a transaction */
-	if (!db_contains_word(ib->names, NULL, name)) {
-		printf("adding '%s' to database\n", name);
-		db_index_word(ib->names, "", name);
-	}
-	g_hash_table_foreach(words, (GHFunc)do_insert_words, ib);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return 0;
-error:
-	g_hash_table_foreach(words, (GHFunc)do_free_words, NULL);
-	g_hash_table_destroy(words);
-	g_free (word);
-	return -1;
-}
-
-
-ibex *ibex_open (char *file, int flags, int mode)
-{
-	ibex *ib;
-	u_int32_t dbflags = 0;
-	int err;
-
-	ib = g_malloc0(sizeof(*ib));
-	err = db_create(&ib->words, NULL, 0);
-	if (err != 0) {
-		g_warning("create: Error occured?: %s\n", db_strerror(err));
-		g_free(ib);
-		return NULL;
-	}
-
-	err = ib->words->set_flags(ib->words, DB_DUP);
-	if (err != 0) {
-		g_warning("set flags: Error occured?: %s\n", db_strerror(err));
-		ib->words->close(ib->words, 0);
-		g_free(ib);
-		return NULL;
-	}
-
-	if (flags & O_CREAT)
-		dbflags |= DB_CREATE;
-	if (flags & O_EXCL)
-		dbflags |= DB_EXCL;
-	if (flags & O_RDONLY)
-		dbflags |= DB_RDONLY;
-
-	/* 1MB cache size? */
-	ib->words->set_cachesize(ib->words, 0, 1000000, 0);
-
-	err = ib->words->open(ib->words, file, "words", DB_BTREE, dbflags, mode);
-	if (err != 0) {
-		printf("open: Error occured?: %s\n", db_strerror(err));
-		ib->words->close(ib->words, 0);
-		g_free(ib);		
-		return NULL;
-	}
-
-	/* FIXME: check returns */
-	err = db_create(&ib->names, NULL, 0);
-	err = ib->names->open(ib->names, file, "names", DB_HASH, dbflags, mode);
-
-	return ib;
-}
-
-int ibex_save (ibex *ib)
-{
-	printf("syncing database\n");
-	ib->names->sync(ib->names, 0);
-	return ib->words->sync(ib->words, 0);
-}
-
-int ibex_close (ibex *ib)
-{
-	int ret;
-
-	printf("closing database\n");
-
-	ret = ib->names->close(ib->names, 0);
-	ret = ib->words->close(ib->words, 0);
-	g_free(ib);
-	return ret;
-}
-
-void ibex_unindex (ibex *ib, char *name)
-{
-	printf("trying to unindex '%s'\n", name);
-	if (db_contains_word(ib->names, NULL, name)) {
-		/* FIXME: do within transaction? */
-		db_delete_name(ib->words, name);
-		db_delete_word(ib->names, name);
-	}
-}
-
-GPtrArray *ibex_find (ibex *ib, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return db_find(ib->words, normal);
-}
-
-gboolean ibex_find_name (ibex *ib, char *name, char *word)
-{
-	char *normal;
-	int len;
-
-	len = strlen(word);
-	normal = alloca(len+1);
-	ibex_normalise_word(word, word+len, normal);
-	return db_contains_word(ib->words, name, normal);
-}
-
-gboolean ibex_contains_name(ibex *ib, char *name)
-{
-	return db_contains_word(ib->names, NULL, name);
-}
diff --git a/libibex/ibex_internal.h b/libibex/ibex_internal.h
deleted file mode 100644
index 0eb4b625ce..0000000000
--- a/libibex/ibex_internal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-
-#include "ibex.h"
-#include "block.h"
-#include "wordindex.h"
-
-struct ibex {
-	char *path;
-	struct _memcache *blocks;
-	struct _IBEXWord *words;
-	int predone;
-};
diff --git a/libibex/index.h b/libibex/index.h
deleted file mode 100644
index 0cef7948b3..0000000000
--- a/libibex/index.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _INDEX_H
-#define _INDEX_H
-
-/* an indexing 'class' maps a key to 1 piece of info */
-
-#define INDEX_STAT
-
-struct _IBEXCursor {
-	struct _IBEXCursorClass *klass;
-	struct _IBEXIndex *index;
-};
-
-struct _IBEXCursorClass {
-	void (*close)(struct _IBEXCursor *);
-
-	guint32 (*next)(struct _IBEXCursor *);
-	char *(*next_key)(struct _IBEXCursor *, int *keylenptr);
-};
-
-struct _IBEXIndex {
-	struct _IBEXIndexClass *klass;
-	struct _memcache *blocks;
-	blockid_t root;		/* root block of ondisk index data */
-#ifdef INDEX_STAT
-	int lookups;		/* how many lookups */
-	int lookup_total;	/* how many blocks loaded for all lookups (hash chain depth) */
-#endif
-};
-
-struct _IBEXIndexClass {
-
-	struct _IBEXIndex *(*create)(struct _memcache *bc, int size);
-	struct _IBEXIndex *(*open)(struct _memcache *bc, blockid_t root);
-
-	int (*sync)(struct _IBEXIndex *);
-	int (*close)(struct _IBEXIndex *);
-
-	/* lookup a key in the index, returns the keyid of this item, or 0 if not found */
-	guint32 (*find)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* remove a key from the index */
-	void (*remove)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* insert a new key into the index, the keyid is returned */
-	guint32 (*insert)(struct _IBEXIndex *, const char *key, int keylen);
-
-	/* get the key contents/key length from the keyid */
-	char *(*get_key)(struct _IBEXIndex *, guint32 keyid, int *keylenptr);
-
-	/* set the key contents based on the keyid */
-	void (*set_data)(struct _IBEXIndex *, guint32 keyid, blockid_t datablock, blockid_t tail);
-
-	/* get the key contents based on the keyid */
-	blockid_t (*get_data)(struct _IBEXIndex *, guint32 keyid, blockid_t *tail);
-
-	/* get a cursor for iterating over all contents */
-	struct _IBEXCursor *(*get_cursor)(struct _IBEXIndex *);
-};
-
-/* a storage class, stores lists of lists of id's */
-
-struct _IBEXStore {
-	struct _IBEXStoreClass *klass;
-	struct _memcache *blocks;
-};
-
-struct _IBEXStoreClass {
-	struct _IBEXStore *(*create)(struct _memcache *bc);
-	int (*sync)(struct _IBEXStore *store);
-	int (*close)(struct _IBEXStore *store);
-
-	blockid_t (*add)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-	blockid_t (*add_list)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, GArray *data);
-	blockid_t (*remove)(struct _IBEXStore *store, blockid_t *head, blockid_t *tail, nameid_t data);
-	void (*free)(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-
-	gboolean (*find)(struct _IBEXStore *store, blockid_t head, blockid_t tail, nameid_t data);
-	GArray *(*get)(struct _IBEXStore *store, blockid_t head, blockid_t tail);
-};
-
-#endif
diff --git a/libibex/lookup.c b/libibex/lookup.c
deleted file mode 100644
index 2d01dbf850..0000000000
--- a/libibex/lookup.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* lookup.c: a simple client, part 2 */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ibex.h"
-
-extern int optind;
-extern char *optarg;
-
-static void
-usage (void)
-{
-	fprintf (stderr, "Usage: lookup [-f indexfile] word ...\n");
-	exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-	ibex *ib;
-	GPtrArray *ans, *words;
-	int opt, i;
-	char *file = "INDEX";
-
-	while ((opt = getopt (argc, argv, "f:")) != -1) {
-		switch (opt) {
-		case 'f':
-			file = optarg;
-			break;
-
-		default:
-			usage ();
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc == 0)
-		usage ();
-
-	ib = ibex_open (file, O_RDWR|O_CREAT, 0600);
-	if (!ib) {
-		printf ("Couldn't open %s: %s\n", file, strerror (errno));
-		exit (1);
-	}
-
-	words = g_ptr_array_new ();
-	while (argc--)
-		g_ptr_array_add (words, argv[argc]);
-
-	ans = ibex_find_all (ib, words);
-	if (ans) {
-		for (i = 0; i < ans->len; i++)
-			printf ("%s\n", (char *)g_ptr_array_index (ans, i));
-		exit (0);
-	} else {
-		printf ("Nope.\n");
-		exit (1);
-	}
-}
diff --git a/libibex/mkindex.c b/libibex/mkindex.c
deleted file mode 100644
index 151dcecb2d..0000000000
--- a/libibex/mkindex.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* mkindex.c: a simple client, part 1 */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ibex.h"
-
-extern int optind;
-extern char *optarg;
-
-static void
-usage (void)
-{
-	fprintf (stderr, "Usage: mkindex [-f indexfile] file ...\n");
-	exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-	ibex *ib;
-	int opt;
-	char *file = "INDEX";
-
-	while ((opt = getopt (argc, argv, "f:")) != -1) {
-		switch (opt) {
-		case 'f':
-			file = optarg;
-			break;
-
-		default:
-			usage ();
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc == 0)
-		usage ();
-
-	ib = ibex_open (file, O_CREAT|O_RDWR, 0600);
-	if (!ib) {
-		fprintf (stderr, "Couldn't open index file %s: %s\n",
-			 file, strerror (errno));
-		exit (1);
-	}
-
-	while (argc--) {
-		if (ibex_index_file (ib, argv[argc]) == -1) {
-			fprintf (stderr, "Couldn't index %s: %s\n",
-				 argv[argc], strerror (errno));
-			exit (1);
-		}
-	}
-
-	if (ibex_close (ib) != 0) {
-		fprintf (stderr, "Failed to write index file %s: %s\n",
-			 file, strerror (errno));
-		exit (1);
-	}
-	exit (0);
-}
diff --git a/libibex/wordindex.c b/libibex/wordindex.c
deleted file mode 100644
index 3cee391668..0000000000
--- a/libibex/wordindex.c
+++ /dev/null
@@ -1,646 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* code to manage a word index */
-/* includes a cache for word index writes,
-   but not for name index writes (currently), or any reads.
-
-Note the word cache is only needed during indexing of lots
-of words, and could then be discarded (:flush()).
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-#include "wordindex.h"
-
-#define d(x)
-
-/*#define WORDCACHE_SIZE (256)*/
-#define WORDCACHE_SIZE (4096)
-
-extern struct _IBEXStoreClass ibex_diskarray_class;
-extern struct _IBEXIndexClass ibex_hash_class;
-
-/* need 2 types of hash key?
-   one that just stores the wordid / wordblock
-   and one that stores the filecount/files?
-*/
-
-
-#define CACHE_FILE_COUNT (62)
-
-struct _wordcache {
-	struct _wordcache *next;
-	struct _wordcache *prev;
-	nameid_t wordid;	/* disk wordid */
-	blockid_t wordblock;	/* head of disk list */
-	blockid_t wordtail;	/* and the tail data */
-	short filecount;	/* how many valid items in files[] */
-	short filealloc;	/* how much allocated space in files[] */
-	union {
-		nameid_t *files;	/* memory cache of files */
-		nameid_t file0;	/* if filecount == 1 && filealloc == 0, store directly */
-	} file;
-	char word[1];		/* actual word follows */
-};
-
-static void unindex_name(struct _IBEXWord *, const char *name); 	/* unindex all entries for name */
-static gboolean contains_name(struct _IBEXWord *, const char *name);	/* index contains data for name */
-static GPtrArray *find(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-static gboolean find_name(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-static void add(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name (slow) */
-static void add_list(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-static int word_sync(struct _IBEXWord *idx);
-static int word_flush(struct _IBEXWord *idx);
-static int word_close(struct _IBEXWord *idx);
-static void word_index_pre(struct _IBEXWord *idx);
-static void word_index_post(struct _IBEXWord *idx);
-
-struct _IBEXWordClass ibex_word_index_class = {
-	word_sync, word_flush, word_close,
-	word_index_pre, word_index_post,
-	unindex_name, contains_name,
-	find, find_name,
-	add, add_list
-};
-
-/* this interface isn't the best, but it'll do for now */
-struct _IBEXWord *
-ibex_create_word_index(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot)
-{
-	struct _IBEXWord *idx;
-
-	idx = g_malloc0(sizeof(*idx));
-	idx->wordcache = g_hash_table_new(g_str_hash, g_str_equal);
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	idx->klass = &ibex_word_index_class;
-
-	/* we use the same block array storage for both indexes at the moment */
-	idx->wordstore = ibex_diskarray_class.create(bc);
-	idx->namestore = idx->wordstore;
-
-	/* but not the same indexes! */
-	if (*wordroot) {
-		printf("opening wordindex root = %d\n", *wordroot);
-		idx->wordindex = ibex_hash_class.open(bc, *wordroot);
-	} else {
-		idx->wordindex = ibex_hash_class.create(bc, 2048);
-		*wordroot = idx->wordindex->root;
-		printf("creating wordindex root = %d\n", *wordroot);
-	}
-	if (*nameroot) {
-		printf("opening nameindex root = %d\n", *nameroot);
-		idx->nameindex = ibex_hash_class.open(bc, *nameroot);
-	} else {
-		idx->nameindex = ibex_hash_class.create(bc, 2048);
-		*nameroot = idx->nameindex->root;
-		printf("creating nameindex root = %d\n", *nameroot);
-	}
-	return idx;
-}
-
-#if 1
-static void
-cache_sanity(struct _wordcache *head)
-{
-	while (head->next) {
-		g_assert(head->filecount <= head->filealloc);
-		g_assert(strlen(head->word) != 0);
-		head = head->next;
-	}
-}
-#endif
-
-static void word_index_pre(struct _IBEXWord *idx)
-{
-}
-
-static void word_index_post(struct _IBEXWord *idx)
-{
-}
-
-/* unindex all entries for name */
-static void unindex_name(struct _IBEXWord *idx, const char *name)
-{
-	GArray *words;
-	int i;
-	nameid_t nameid, wordid;
-	blockid_t nameblock, wordblock, newblock, nametail, wordtail, newtail;
-	char *word;
-	struct _wordcache *cache;
-
-	d(printf("unindexing %s\n", name));
-
-	/* lookup the hash key */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this key */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-	/* and the data for this block */
-	words = idx->namestore->klass->get(idx->namestore, nameblock, nametail);
-	/* walk it ... */
-	for (i=0;i<words->len;i++) {
-		/* get the word */
-		wordid = g_array_index(words, nameid_t, i);
-		d(printf(" word %d\n", wordid));
-		/* get the data block */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-		/* clear this name from it */
-		newblock = wordblock;
-		newtail = wordtail;
-		idx->wordstore->klass->remove(idx->wordstore, &newblock, &newtail, nameid);
-		if (newblock != wordblock || newtail != wordtail)
-			idx->wordindex->klass->set_data(idx->wordindex, wordid, newblock, newtail);
-
-		/* now check the cache as well */
-		word = idx->nameindex->klass->get_key(idx->wordindex, wordid, NULL);
-		if (word) {
-			cache = g_hash_table_lookup(idx->wordcache, word);
-			if (cache) {
-				/* its there, update our head/tail pointers */
-				cache->wordblock = newblock;
-				cache->wordtail = newtail;
-
-				/* now check that we have a data entry in it */
-				if (cache->filealloc == 0 && cache->filecount == 1) {
-					if (cache->file.file0 == nameid) {
-						cache->filecount = 0;
-					}
-				} else {
-					int j;
-
-					for (j=0;j<cache->filecount;j++) {
-						if (cache->file.files[j] == nameid) {
-							cache->file.files[j] = cache->file.files[cache->filecount-1];
-							cache->filecount--;
-							break;
-						}
-					}
-				}
-			}
-			g_free(word);
-		}
-	}
-	g_array_free(words, TRUE);
-
-	/* and remove name data and itself */
-	idx->namestore->klass->free(idx->namestore, nameblock, nametail);
-	idx->nameindex->klass->remove(idx->nameindex, name, strlen(name));
-}
-
-/* index contains (any) data for name */
-static gboolean contains_name(struct _IBEXWord *idx, const char *name)
-{
-	return idx->nameindex->klass->find(idx->nameindex, name, strlen(name)) != 0;
-}
-
-/* returns all matches for word */
-static GPtrArray *find(struct _IBEXWord *idx, const char *word)
-{
-	nameid_t wordid, nameid;
-	GPtrArray *res;
-	GArray *names;
-	int i;
-	char *new;
-	struct _wordcache *cache;
-	blockid_t wordblock, wordtail;
-
-	res = g_ptr_array_new();
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-		wordid = cache->wordid;
-		wordblock = cache->wordblock;
-		wordtail = cache->wordtail;
-	} else {
-		/* lookup the hash key */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-		/* get the block for this key */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-	}
-	/* and the data for this block */
-	names = idx->wordstore->klass->get(idx->wordstore, wordblock, wordtail);
-	/* .. including any memory-only data */
-	if (cache) {
-		if (cache->filealloc == 0 && cache->filecount == 1)
-			g_array_append_val(names, cache->file.file0);
-		else
-			g_array_append_vals(names, cache->file.files, cache->filecount);
-	}
-
-	/* walk it ... converting id's back to strings */
-	g_ptr_array_set_size(res, names->len);
-	for (i=0;i<names->len;i++) {
-		nameid = g_array_index(names, nameid_t, i);
-		new = idx->nameindex->klass->get_key(idx->nameindex, nameid, NULL);
-		res->pdata[i] = new;
-	}
-	g_array_free(names, TRUE);
-	return res;
-}
-
-/* find if name contains word */
-static gboolean find_name(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t wordid, nameid;
-	blockid_t nameblock, nametail;
-	struct _wordcache *cache;
-	int i;
-
-	/* lookup the hash key for the name */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this name */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-
-	/* check if there is an in-memory cache for this word, check its file there first */
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-		if (cache->filecount == 1 && cache->filealloc == 0) {
-			if (cache->file.file0 == nameid)
-				return TRUE;
-		} else {
-			for (i=0;i<cache->filecount;i++) {
-				if (cache->file.files[i] == nameid)
-					return TRUE;
-			}
-		}
-		/* not there?  well we can use the wordid anyway */
-		wordid = cache->wordid;
-	} else {
-		/* lookup the hash key for word */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-	}
-
-	/* see if wordid is in nameblock */
-	return idx->namestore->klass->find(idx->namestore, nameblock, nametail, wordid);
-}
-
-/* cache helper functions */
-/* flush a cache entry to disk, and empty it out */
-static void
-sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache)
-{
-	GArray array; /* just use this as a header */
-	blockid_t oldblock, oldtail;
-	
-	d(printf("syncing cache entry '%s' used %d\n", cache->word, cache->filecount));
-	if (cache->filecount == 1 && cache->filealloc == 0)
-		array.data = (char *)&cache->file.file0;
-	else
-		array.data = (char *)cache->file.files;
-	array.len = cache->filecount;
-	oldblock = cache->wordblock;
-	oldtail = cache->wordtail;
-	idx->wordstore->klass->add_list(idx->wordstore, &cache->wordblock, &cache->wordtail, &array);
-	if (oldblock != cache->wordblock || oldtail != cache->wordtail) {
-		idx->wordindex->klass->set_data(idx->wordindex, cache->wordid, cache->wordblock, cache->wordtail);
-	}
-	cache->filecount = 0;
-}
-
-/* create a new key in an index, returning its id and head block */
-static void
-add_index_key(struct _IBEXIndex *wordindex, const char *word, nameid_t *wordid, blockid_t *wordblock, blockid_t *wordtail)
-{
-	/* initialise cache entry - id of word entry and head block */
-	*wordid = wordindex->klass->find(wordindex, word, strlen(word));
-	if (*wordid == 0) {
-		*wordid = wordindex->klass->insert(wordindex, word, strlen(word));
-		*wordblock = 0;
-		*wordtail = 0;
-	} else {
-		*wordblock = wordindex->klass->get_data(wordindex, *wordid, wordtail);
-	}
-}
-
-/* create a new key in a cached index (only word cache so far), flushing old keys
-   if too much space is being used */
-static struct _wordcache *
-add_index_cache(struct _IBEXWord *idx, const char *word)
-{
-	struct _wordcache *cache;
-
-	d(printf("adding %s to cache\n", word));
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache == 0) {
-		/* see if we have to flush off the last entry */
-		if (idx->wordcount >= WORDCACHE_SIZE) {
-			struct _wordcache *mincache;
-			int min, count=0;
-			/* remove last entry, and flush it */
-			cache = (struct _wordcache *)idx->wordnodes.tailpred;
-			mincache = cache;
-			min = mincache->filecount;
-
-			d(printf("flushing word from cache %s\n", cache->word));
-			/* instead of just using the last entry, we try and find an entry with
-			   with only 1 item (failing that, the smallest in the range we look at) */
-			/* this could probably benefit greatly from a more sophisticated aging algorithm */
-			while (cache->next && count < 100) {
-				if (cache->filecount == 1) {
-					mincache = cache;
-					break;
-				}
-				if (cache->filecount > 0 && cache->filecount < min) {
-					mincache = cache;
-					min = cache->filecount;
-				}
-				cache = cache->next;
-				count++;
-			}
-			ibex_list_remove((struct _listnode *)mincache);
-			g_hash_table_remove(idx->wordcache, mincache->word);
-			sync_cache_entry(idx, mincache);
-			if (mincache->filealloc)
-				g_free(mincache->file.files);
-			g_free(mincache);
-			idx->wordcount--;
-		}
-		cache = g_malloc0(sizeof(*cache)+strlen(word));
-		/* initialise cache entry - id of word entry and head block */
-		add_index_key(idx->wordindex, word, &cache->wordid, &cache->wordblock, &cache->wordtail);
-		/* other fields */
-		strcpy(cache->word, word);
-		cache->filecount = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-		idx->wordcount++;
-	} else {
-		/* move cache bucket ot the head of the cache list */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-	}
-	return cache;
-}
-
-/* adds a single word to name (slow) */
-static void add(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t nameid;
-	blockid_t nameblock, newblock, nametail, newtail;
-	struct _wordcache *cache;
-
-	g_error("Dont use wordindex::add()");
-	abort();
-
-	cache = add_index_cache(idx, word);
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	/* check for repeats of the last name - dont add anything */
-	if (cache->filecount == 1 && cache->filealloc == 0) {
-		if (cache->file.file0 == nameid)
-			return;
-	} else {
-		if (cache->file.files[cache->filecount] == nameid)
-			return;
-	}
-
-	/* see if we are setting the first, drop it in the union */
-	if (cache->filecount == 0 && cache->filealloc == 0) {
-		cache->file.file0 = nameid;
-	} else if (cache->filecount == 1 && cache->filealloc == 0) {
-		nameid_t saveid;
-		/* we need to allocate space for words */
-		saveid = cache->file.file0;
-		cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-		/* this could possibly grow as needed, but i wont for now */
-		cache->filealloc = CACHE_FILE_COUNT;
-		cache->file.files[0] = saveid;
-		cache->file.files[1] = nameid;
-	} else {
-		cache->file.files[cache->filecount] = nameid;
-	}
-
-	cache->filecount++;
-
-	/* if we are full, force a flush now */
-	if (cache->filealloc && cache->filecount >= cache->filealloc) {
-		sync_cache_entry(idx, cache);
-	}
-
-	newtail = nametail;
-	newblock = nameblock;
-	idx->namestore->klass->add(idx->namestore, &newblock, &newtail, cache->wordid);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-}
-
-/* adds a bunch of words to a given name */
-static void add_list(struct _IBEXWord *idx, const char *name, GPtrArray *words)
-{
-	int i;
-	GArray *data = g_array_new(0, 0, sizeof(nameid_t));
-	blockid_t nameblock, newblock, nametail, newtail;
-	nameid_t nameid;
-	struct _wordcache *cache;
-
-	d(printf("Adding words to name %s\n", name));
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	for (i=0;i<words->len;i++) {
-		char *word = words->pdata[i];
-
-		cache = add_index_cache(idx, word);
-
-		/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-
-		/* check for duplicates; doesn't catch duplicates over an overflow boundary.  Watch me care. */
-		if (cache->filecount == 0
-		    /* the 1 item case */
-		    || (cache->filecount == 1 && cache->filealloc == 0 && cache->file.file0 != nameid)
-		    /* the normal case */
-		    || (cache->filealloc > 0 && cache->file.files[cache->filecount-1] != nameid)) {
-
-			/* see if we are setting the first, drop it in the union */
-			if (cache->filecount == 0 && cache->filealloc == 0) {
-				cache->file.file0 = nameid;
-			} else if (cache->filecount == 1 && cache->filealloc == 0) {
-				nameid_t saveid;
-				/* we need to allocate space for words */
-				saveid = cache->file.file0;
-				cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-				/* this could possibly grow as needed, but i wont for now */
-				cache->filealloc = CACHE_FILE_COUNT;
-				cache->file.files[0] = saveid;
-				cache->file.files[1] = nameid;
-			} else {
-				cache->file.files[cache->filecount] = nameid;
-			}
-
-			cache->filecount++;
-
-			/* if we are full, force a flush now */
-			if (cache->filealloc && cache->filecount >= cache->filealloc) {
-				sync_cache_entry(idx, cache);
-			}
-
-			/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-
-			/* and append this wordid for this name in memory */
-			g_array_append_val(data, cache->wordid);
-		}
-
-		/*d(cache_sanity((struct _wordcache *)idx->wordnodes.head));*/
-	}
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	/* and append these word id's in one go */
-	newblock = nameblock;
-	newtail = nametail;
-	idx->namestore->klass->add_list(idx->namestore, &newblock, &newtail, data);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-
-	d(cache_sanity((struct _wordcache *)idx->wordnodes.head));
-
-	g_array_free(data, TRUE);
-}
-
-/* sync any in-memory data to disk */
-static int
-word_sync(struct _IBEXWord *idx)
-{
-	/* we just flush also, save memory */
-	word_flush(idx);
-
-#if 0
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head;
-
-	while (cache->next) {
-		sync_cache_entry(idx, cache);
-		cache = cache->next;
-	}
-
-	/*ibex_hash_dump(idx->wordindex);*/
-	/*ibex_hash_dump(idx->nameindex);*/
-#endif
-	return 0;
-}
-
-/* sync and flush any in-memory data to disk and free it */
-static int
-word_flush(struct _IBEXWord *idx)
-{
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head, *next;
-	extern int block_log;
-	int count= 0;
-	int used=0, wasted=0;
-
-	block_log = 0;
-
-	next = cache->next;
-	while (next) {
-		count++;
-		used += sizeof(struct _wordcache) + (cache->filealloc * sizeof(nameid_t));
-		if (cache->filealloc)
-			wasted += (cache->filealloc-cache->filecount)*sizeof(nameid_t);
-		else
-			wasted += (1-cache->filecount) * sizeof(nameid_t);
-
-		/*printf("syncing word %s\n", cache->word);*/
-		sync_cache_entry(idx, cache);
-		g_hash_table_remove(idx->wordcache, cache->word);
-		if (cache->filealloc)
-			g_free(cache->file.files);
-		g_free(cache);
-		cache = next;
-		next = cache->next;
-	}
-
-	printf("sync cache entries = %d\n used memory = %d\n wasted memory = %d\n", count, used, wasted);
-
-	block_log = 0;
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	return 0;
-}
-
-static int word_close(struct _IBEXWord *idx)
-{
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head, *next;
-	extern int block_log;
-	int count= 0;
-	int used=0, wasted=0;
-
-	block_log = 0;
-
-	next = cache->next;
-	while (next) {
-		count++;
-		used += sizeof(struct _wordcache) + (cache->filealloc * sizeof(nameid_t));
-		if (cache->filealloc)
-			wasted += (cache->filealloc-cache->filecount)*sizeof(nameid_t);
-		else
-			wasted += (1-cache->filecount) * sizeof(nameid_t);
-
-		/*printf("closing word %s\n", cache->word);*/
-		sync_cache_entry(idx, cache);
-		if (cache->filealloc)
-			g_free(cache->file.files);
-		g_free(cache);
-		cache = next;
-		next = cache->next;
-	}
-	block_log = 0;
-
-	printf("cache entries = %d\n used memory = %d\n wasted memory = %d\n", count, used, wasted);
-
-	idx->namestore->klass->close(idx->namestore);
-	idx->nameindex->klass->close(idx->nameindex);
-	/*same as namestore:
-	  idx->wordstore->klass->close(idx->wordstore);*/
-	idx->wordindex->klass->close(idx->wordindex);
-	g_hash_table_destroy(idx->wordcache);
-	g_free(idx);
-
-	return 0;
-}
diff --git a/libibex/wordindex.h b/libibex/wordindex.h
deleted file mode 100644
index 353f4dddc6..0000000000
--- a/libibex/wordindex.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _WORDINDEX_H
-#define _WORDINDEX_H
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-
-struct _IBEXWord;
-
-/* not used yet */
-typedef void (*IBEXNormaliseFunc)(char *source, int len, char *dest);
-
-struct _IBEXWordClass {
-	int (*sync)(struct _IBEXWord *);
-	int (*flush)(struct _IBEXWord *);
-	int (*close)(struct _IBEXWord *);
-
-	void (*index_pre)(struct _IBEXWord *); /* get ready for doing a lot of indexing.  may be a nop */
-	void (*index_post)(struct _IBEXWord *);
-
-	void (*unindex_name)(struct _IBEXWord *, const char *name);		/* unindex all entries for name */
-	gboolean (*contains_name)(struct _IBEXWord *, const char *name);	/* index contains data for name */
-	GPtrArray *(*find)(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-	gboolean (*find_name)(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-	void (*add)(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name */
-	void (*add_list)(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-};
-
-struct _IBEXWord {
-	struct _IBEXWordClass *klass;
-	struct _IBEXStore *wordstore;
-	struct _IBEXIndex *wordindex;
-	struct _IBEXStore *namestore;
-	struct _IBEXIndex *nameindex;
-
-	/* word caching info (should probably be modularised) */
-	GHashTable *wordcache;	/* word->struct _wordcache mapping */
-	struct _list wordnodes;	/* LRU list of wordcache structures */
-	int wordcount;		/* how much space used in cache */
-	int precount;
-};
-
-
-struct _IBEXWord *ibex_create_word_index(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-/* alternate implemenation */
-struct _IBEXWord *ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot);
-
-#endif /* !_WORDINDEX_H */
diff --git a/libibex/wordindexmem.c b/libibex/wordindexmem.c
deleted file mode 100644
index f0cc7336f8..0000000000
--- a/libibex/wordindexmem.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* this is the same as wordindex.c, but it doesn't have an LRU cache
-   for word names.  it has a lookup tab le that is only loaded if
-   index-pre is called, otherwise it always hits disk */
-
-/* code to manage a word index */
-/* includes a cache for word index writes,
-   but not for name index writes (currently), or any reads.
-
-Note the word cache is only needed during indexing of lots
-of words, and could then be discarded (:flush()).
-
-*/
-
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "block.h"
-#include "index.h"
-#include "wordindex.h"
-
-/*#define MALLOC_CHECK*/
-
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#endif
-
-#define d(x)
-
-/*#define WORDCACHE_SIZE (256)*/
-#define WORDCACHE_SIZE (4096)
-
-extern struct _IBEXStoreClass ibex_diskarray_class;
-extern struct _IBEXIndexClass ibex_hash_class;
-
-/* need 2 types of hash key?
-   one that just stores the wordid / wordblock
-   and one that stores the filecount/files?
-*/
-
-
-#define CACHE_FILE_COUNT (62)
-
-struct _wordcache {
-	nameid_t wordid;	/* disk wordid */
-	blockid_t wordblock;	/* head of disk list */
-	blockid_t wordtail;	/* and the tail data */
-	short filecount;	/* how many valid items in files[] */
-	short filealloc;	/* how much allocated space in files[] */
-	union {
-		nameid_t *files;	/* memory cache of files */
-		nameid_t file0;	/* if filecount == 1 && filealloc == 0, store directly */
-	} file;
-	char word[1];		/* actual word follows */
-};
-
-static void unindex_name(struct _IBEXWord *, const char *name); 	/* unindex all entries for name */
-static gboolean contains_name(struct _IBEXWord *, const char *name);	/* index contains data for name */
-static GPtrArray *find(struct _IBEXWord *, const char *word);		/* returns all matches for word */
-static gboolean find_name(struct _IBEXWord *, const char *name, const char *word);	/* find if name contains word */
-static void add(struct _IBEXWord *, const char *name, const char *word);	/* adds a single word to name (slow) */
-static void add_list(struct _IBEXWord *, const char *name, GPtrArray *words);/* adds a bunch of words to a given name */
-static int word_sync(struct _IBEXWord *idx);
-static int word_flush(struct _IBEXWord *idx);
-static int word_close(struct _IBEXWord *idx);
-static void word_index_pre(struct _IBEXWord *idx);
-static void word_index_post(struct _IBEXWord *idx);
-
-static void sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache);
-
-struct _IBEXWordClass ibex_word_index_mem_class = {
-	word_sync, word_flush, word_close,
-	word_index_pre, word_index_post,
-	unindex_name, contains_name,
-	find, find_name,
-	add, add_list
-};
-
-#ifdef MALLOC_CHECK
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-/* this interface isn't the best, but it'll do for now */
-struct _IBEXWord *
-ibex_create_word_index_mem(struct _memcache *bc, blockid_t *wordroot, blockid_t *nameroot)
-{
-	struct _IBEXWord *idx;
-
-	idx = g_malloc0(sizeof(*idx));
-	idx->wordcache = g_hash_table_new(g_str_hash, g_str_equal);
-	ibex_list_new(&idx->wordnodes);
-	idx->wordcount = 0;
-	idx->precount = 0;
-	idx->klass = &ibex_word_index_mem_class;
-
-	/* we use the same block array storage for both indexes at the moment */
-	idx->wordstore = ibex_diskarray_class.create(bc);
-	idx->namestore = idx->wordstore;
-
-	/* but not the same indexes! */
-	if (*wordroot) {
-		printf("opening wordindex root = %d\n", *wordroot);
-		idx->wordindex = ibex_hash_class.open(bc, *wordroot);
-	} else {
-		idx->wordindex = ibex_hash_class.create(bc, 2048);
-		*wordroot = idx->wordindex->root;
-		printf("creating wordindex root = %d\n", *wordroot);
-	}
-	if (*nameroot) {
-		printf("opening nameindex root = %d\n", *nameroot);
-		idx->nameindex = ibex_hash_class.open(bc, *nameroot);
-	} else {
-		idx->nameindex = ibex_hash_class.create(bc, 2048);
-		*nameroot = idx->nameindex->root;
-		printf("creating nameindex root = %d\n", *nameroot);
-	}
-	return idx;
-}
-
-static void
-node_sanity(char *key, struct _wordcache *node, void *data)
-{
-	g_assert(node->filecount <= node->filealloc || (node->filecount == 1 && node->filealloc == 0));
-	g_assert(strlen(node->word) != 0);
-#ifdef MALLOC_CHECK
-	checkmem(node);
-	if (node->filealloc)
-		checkmem(node->file.files);
-#endif
-}
-
-static void
-cache_sanity(struct _IBEXWord *idx)
-{
-#ifdef MALLOC_CHECK
-	checkmem(idx);
-#endif
-	g_hash_table_foreach(idx->wordcache, (GHFunc)node_sanity, idx);
-}
-
-static void word_index_pre(struct _IBEXWord *idx)
-{
-	struct _IBEXCursor *idc;
-	struct _wordcache *cache;
-	nameid_t wordid;
-	char *key;
-	int len;
-
-	idx->precount ++;
-	if (idx->precount > 1)
-		return;
-
-	/* want to load all words into the cache lookup table */
-	printf("pre-loading all word info into memory\n");
-	idc = idx->wordindex->klass->get_cursor(idx->wordindex);
-	while ( (wordid = idc->klass->next(idc)) ) {
-		key = idc->index->klass->get_key(idc->index, wordid, &len);
-		/*d(printf("Adding word %s\n", key));*/
-		cache = g_malloc0(sizeof(*cache) + strlen(key));
-		strcpy(cache->word, key);
-		g_free(key);
-		cache->wordid = wordid;
-		cache->wordblock = idc->index->klass->get_data(idc->index, wordid, &cache->wordtail);
-		cache->filecount = 0;
-		cache->filealloc = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-		idx->wordcount++;
-	}
-
-#ifdef MALLOC_CHECK
-	cache_sanity(idx);
-#endif
-
-	idc->klass->close(idc);
-
-	printf("done\n");
-}
-
-static gboolean
-sync_free_value(void *key, void *value, void *data)
-{
-	struct _wordcache *cache = (struct _wordcache *)value;
-	struct _IBEXWord *idx = (struct _IBEXWord *)data;
-
-	sync_cache_entry(idx, cache);
-	if (cache->filealloc)
-		g_free(cache->file.files);
-	g_free(cache);
-
-	return TRUE;
-}
-
-static void
-sync_value(void *key, void *value, void *data)
-{
-	struct _wordcache *cache = (struct _wordcache *)value;
-	struct _IBEXWord *idx = (struct _IBEXWord *)data;
-
-	sync_cache_entry(idx, cache);
-}
-
-static void word_index_post(struct _IBEXWord *idx)
-{
-	idx->precount--;
-	if (idx->precount > 0)
-		return;
-	idx->precount = 0;
-
-#ifdef MALLOC_CHECK
-	cache_sanity(idx);
-#endif
-
-	g_hash_table_foreach_remove(idx->wordcache, sync_free_value, idx);
-	idx->wordcount = 0;
-}
-
-/* unindex all entries for name */
-static void unindex_name(struct _IBEXWord *idx, const char *name)
-{
-	GArray *words;
-	int i;
-	nameid_t nameid, wordid;
-	blockid_t nameblock, wordblock, newblock, nametail, wordtail, newtail;
-	char *word;
-	struct _wordcache *cache;
-
-	d(printf("unindexing %s\n", name));
-
-	/* lookup the hash key */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this key */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-	/* and the data for this block */
-	words = idx->namestore->klass->get(idx->namestore, nameblock, nametail);
-	/* walk it ... */
-	for (i=0;i<words->len;i++) {
-		/* get the word */
-		wordid = g_array_index(words, nameid_t, i);
-		d(printf(" word %d\n", wordid));
-		/* get the data block */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-		/* clear this name from it */
-		newblock = wordblock;
-		newtail = wordtail;
-		idx->wordstore->klass->remove(idx->wordstore, &newblock, &newtail, nameid);
-		if (newblock != wordblock || newtail != wordtail)
-			idx->wordindex->klass->set_data(idx->wordindex, wordid, newblock, newtail);
-
-		/* now check the cache as well */
-		word = idx->nameindex->klass->get_key(idx->wordindex, wordid, NULL);
-		if (word) {
-			cache = g_hash_table_lookup(idx->wordcache, word);
-			if (cache) {
-				/* its there, update our head/tail pointers */
-				cache->wordblock = newblock;
-				cache->wordtail = newtail;
-
-				/* now check that we have a data entry in it */
-				if (cache->filealloc == 0 && cache->filecount == 1) {
-					if (cache->file.file0 == nameid) {
-						cache->filecount = 0;
-					}
-				} else {
-					int j;
-
-					for (j=0;j<cache->filecount;j++) {
-						if (cache->file.files[j] == nameid) {
-							cache->file.files[j] = cache->file.files[cache->filecount-1];
-							cache->filecount--;
-							break;
-						}
-					}
-				}
-			}
-			g_free(word);
-		}
-	}
-	g_array_free(words, TRUE);
-
-	/* and remove name data and itself */
-	idx->namestore->klass->free(idx->namestore, nameblock, nametail);
-	idx->nameindex->klass->remove(idx->nameindex, name, strlen(name));
-}
-
-/* index contains (any) data for name */
-static gboolean contains_name(struct _IBEXWord *idx, const char *name)
-{
-	return idx->nameindex->klass->find(idx->nameindex, name, strlen(name)) != 0;
-}
-
-/* returns all matches for word */
-static GPtrArray *find(struct _IBEXWord *idx, const char *word)
-{
-	nameid_t wordid, nameid;
-	GPtrArray *res;
-	GArray *names;
-	int i;
-	char *new;
-	struct _wordcache *cache;
-	blockid_t wordblock, wordtail;
-
-	res = g_ptr_array_new();
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-#if 0
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		wordid = cache->wordid;
-		wordblock = cache->wordblock;
-		wordtail = cache->wordtail;
-	} else {
-		/* lookup the hash key */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-		/* get the block for this key */
-		wordblock = idx->wordindex->klass->get_data(idx->wordindex, wordid, &wordtail);
-	}
-	/* and the data for this block */
-	names = idx->wordstore->klass->get(idx->wordstore, wordblock, wordtail);
-	/* .. including any memory-only data */
-	if (cache) {
-		if (cache->filealloc == 0 && cache->filecount == 1)
-			g_array_append_val(names, cache->file.file0);
-		else
-			g_array_append_vals(names, cache->file.files, cache->filecount);
-	}
-
-	/* walk it ... converting id's back to strings */
-	g_ptr_array_set_size(res, names->len);
-	for (i=0;i<names->len;i++) {
-		nameid = g_array_index(names, nameid_t, i);
-		new = idx->nameindex->klass->get_key(idx->nameindex, nameid, NULL);
-		res->pdata[i] = new;
-	}
-	g_array_free(names, TRUE);
-	return res;
-}
-
-/* find if name contains word */
-static gboolean find_name(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t wordid, nameid;
-	blockid_t nameblock, nametail;
-	struct _wordcache *cache;
-	int i;
-
-	/* lookup the hash key for the name */
-	nameid = idx->nameindex->klass->find(idx->nameindex, name, strlen(name));
-	/* get the block for this name */
-	nameblock = idx->nameindex->klass->get_data(idx->nameindex, nameid, &nametail);
-
-	/* check if there is an in-memory cache for this word, check its file there first */
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache) {
-#if 0
-		/* freshen cache entry if we touch it */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addtail(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		if (cache->filecount == 1 && cache->filealloc == 0) {
-			if (cache->file.file0 == nameid)
-				return TRUE;
-		} else {
-			for (i=0;i<cache->filecount;i++) {
-				if (cache->file.files[i] == nameid)
-					return TRUE;
-			}
-		}
-		/* not there?  well we can use the wordid anyway */
-		wordid = cache->wordid;
-	} else {
-		/* lookup the hash key for word */
-		wordid = idx->wordindex->klass->find(idx->wordindex, word, strlen(word));
-	}
-
-	/* see if wordid is in nameblock */
-	return idx->namestore->klass->find(idx->namestore, nameblock, nametail, wordid);
-}
-
-/* cache helper functions */
-/* flush a cache entry to disk, and empty it out */
-static void
-sync_cache_entry(struct _IBEXWord *idx, struct _wordcache *cache)
-{
-	GArray array; /* just use this as a header */
-	blockid_t oldblock, oldtail;
-	
-	if (cache->filecount == 0)
-		return;
-
-	d(printf("syncing cache entry '%s' used %d\n", cache->word, cache->filecount));
-	if (cache->filecount == 1 && cache->filealloc == 0)
-		array.data = (char *)&cache->file.file0;
-	else
-		array.data = (char *)cache->file.files;
-	array.len = cache->filecount;
-	oldblock = cache->wordblock;
-	oldtail = cache->wordtail;
-	idx->wordstore->klass->add_list(idx->wordstore, &cache->wordblock, &cache->wordtail, &array);
-	if (oldblock != cache->wordblock || oldtail != cache->wordtail) {
-		idx->wordindex->klass->set_data(idx->wordindex, cache->wordid, cache->wordblock, cache->wordtail);
-	}
-	cache->filecount = 0;
-}
-
-/* create a new key in an index, returning its id and head block */
-static void
-add_index_key(struct _IBEXIndex *wordindex, const char *word, nameid_t *wordid, blockid_t *wordblock, blockid_t *wordtail)
-{
-	/* initialise cache entry - id of word entry and head block */
-	*wordid = wordindex->klass->find(wordindex, word, strlen(word));
-
-	if (*wordid == 0) {
-		*wordid = wordindex->klass->insert(wordindex, word, strlen(word));
-		*wordblock = 0;
-		*wordtail = 0;
-	} else {
-		*wordblock = wordindex->klass->get_data(wordindex, *wordid, wordtail);
-	}
-}
-
-/* create a new key in a cached index (only word cache so far), flushing old keys
-   if too much space is being used */
-static struct _wordcache *
-add_index_cache(struct _IBEXWord *idx, const char *word)
-{
-	struct _wordcache *cache;
-
-	cache = g_hash_table_lookup(idx->wordcache, word);
-	if (cache == 0) {
-		/*d(printf("adding %s to cache\n", word));*/
-
-#if 0
-		/* see if we have to flush off the last entry */
-		if (idx->wordcount >= WORDCACHE_SIZE) {
-			struct _wordcache *mincache;
-			int min, count=0;
-			/* remove last entry, and flush it */
-			cache = (struct _wordcache *)idx->wordnodes.tailpred;
-			mincache = cache;
-			min = mincache->filecount;
-
-			d(printf("flushing word from cache %s\n", cache->word));
-			/* instead of just using the last entry, we try and find an entry with
-			   with only 1 item (failing that, the smallest in the range we look at) */
-			/* this could probably benefit greatly from a more sophisticated aging algorithm */
-			while (cache->next && count < 100) {
-				if (cache->filecount == 1) {
-					mincache = cache;
-					break;
-				}
-				if (cache->filecount > 0 && cache->filecount < min) {
-					mincache = cache;
-					min = cache->filecount;
-				}
-				cache = cache->next;
-				count++;
-			}
-			ibex_list_remove((struct _listnode *)mincache);
-			g_hash_table_remove(idx->wordcache, mincache->word);
-			sync_cache_entry(idx, mincache);
-			if (mincache->filealloc)
-				g_free(mincache->file.files);
-			g_free(mincache);
-			idx->wordcount--;
-		}
-#endif
-		cache = g_malloc0(sizeof(*cache)+strlen(word));
-		/* if we're in an index state, we can assume we dont have it if we dont have it in memory */
-		if (idx->precount == 0) {
-			/* initialise cache entry - id of word entry and head block */
-			add_index_key(idx->wordindex, word, &cache->wordid, &cache->wordblock, &cache->wordtail);
-		} else {
-			cache->wordid = idx->wordindex->klass->insert(idx->wordindex, word, strlen(word));
-		}
-		/* other fields */
-		strcpy(cache->word, word);
-		cache->filecount = 0;
-		g_hash_table_insert(idx->wordcache, cache->word, cache);
-#if 0
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-		idx->wordcount++;
-	} else {
-		/*d(printf("already have %s in cache\n", word));*/
-#if 0
-		/* move cache bucket ot the head of the cache list */
-		ibex_list_remove((struct _listnode *)cache);
-		ibex_list_addhead(&idx->wordnodes, (struct _listnode *)cache);
-#endif
-	}
-	return cache;
-}
-
-/* adds a single word to name (slow) */
-static void add(struct _IBEXWord *idx, const char *name, const char *word)
-{
-	nameid_t nameid;
-	blockid_t nameblock, newblock, nametail, newtail;
-	struct _wordcache *cache;
-
-	g_error("Dont use wordindex::add()");
-	abort();
-
-	cache = add_index_cache(idx, word);
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	/* check for repeats of the last name - dont add anything */
-	if (cache->filecount == 1 && cache->filealloc == 0) {
-		if (cache->file.file0 == nameid)
-			return;
-	} else {
-		if (cache->file.files[cache->filecount] == nameid)
-			return;
-	}
-
-	/* see if we are setting the first, drop it in the union */
-	if (cache->filecount == 0 && cache->filealloc == 0) {
-		cache->file.file0 = nameid;
-	} else if (cache->filecount == 1 && cache->filealloc == 0) {
-		nameid_t saveid;
-		/* we need to allocate space for words */
-		saveid = cache->file.file0;
-		cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-		/* this could possibly grow as needed, but i wont for now */
-		cache->filealloc = CACHE_FILE_COUNT;
-		cache->file.files[0] = saveid;
-		cache->file.files[1] = nameid;
-	} else {
-		cache->file.files[cache->filecount] = nameid;
-	}
-
-	cache->filecount++;
-
-	/* if we are full, force a flush now */
-	if (cache->filealloc && cache->filecount >= cache->filealloc) {
-		sync_cache_entry(idx, cache);
-	}
-
-	newtail = nametail;
-	newblock = nameblock;
-	idx->namestore->klass->add(idx->namestore, &newblock, &newtail, cache->wordid);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-}
-
-/* adds a bunch of words to a given name */
-static void add_list(struct _IBEXWord *idx, const char *name, GPtrArray *words)
-{
-	int i;
-	GArray *data = g_array_new(0, 0, sizeof(nameid_t));
-	blockid_t nameblock, newblock, nametail, newtail;
-	nameid_t nameid;
-	struct _wordcache *cache;
-
-	d(printf("Adding words to name %s\n", name));
-
-	d(cache_sanity(idx));
-
-	/* get the nameid and block start for this name */
-	add_index_key(idx->nameindex, name, &nameid, &nameblock, &nametail);
-
-	d(cache_sanity(idx));
-
-	for (i=0;i<words->len;i++) {
-		char *word = words->pdata[i];
-
-		cache = add_index_cache(idx, word);
-
-		/*d(cache_sanity(idx));*/
-
-		/* check for duplicates; doesn't catch duplicates over an overflow boundary.  Watch me care. */
-		if (cache->filecount == 0
-		    /* the 1 item case */
-		    || (cache->filecount == 1 && cache->filealloc == 0 && cache->file.file0 != nameid)
-		    /* the normal case */
-		    || (cache->filealloc > 0 && cache->file.files[cache->filecount-1] != nameid)) {
-
-			/* see if we are setting the first, drop it in the union */
-			if (cache->filecount == 0 && cache->filealloc == 0) {
-				cache->file.file0 = nameid;
-			} else if (cache->filecount == 1 && cache->filealloc == 0) {
-				nameid_t saveid;
-				/* we need to allocate space for words */
-				saveid = cache->file.file0;
-				cache->file.files = g_malloc(sizeof(cache->file.files[0]) * CACHE_FILE_COUNT);
-				/* this could possibly grow as needed, but i wont for now */
-				cache->filealloc = CACHE_FILE_COUNT;
-				cache->file.files[0] = saveid;
-				cache->file.files[1] = nameid;
-			} else {
-				cache->file.files[cache->filecount] = nameid;
-			}
-
-			cache->filecount++;
-
-			/* if we are full, force a flush now */
-			if (cache->filealloc && cache->filecount >= cache->filealloc) {
-				sync_cache_entry(idx, cache);
-			}
-
-			/*d(cache_sanity(idx));*/
-
-			/* and append this wordid for this name in memory */
-			g_array_append_val(data, cache->wordid);
-		}
-
-		/*d(cache_sanity(idx));*/
-	}
-
-	d(cache_sanity(idx));
-
-	/* and append these word id's in one go */
-	newblock = nameblock;
-	newtail = nametail;
-	idx->namestore->klass->add_list(idx->namestore, &newblock, &newtail, data);
-	if (newblock != nameblock || newtail != nametail) {
-		idx->nameindex->klass->set_data(idx->nameindex, nameid, newblock, newtail);
-	}
-
-	d(cache_sanity(idx));
-
-	g_array_free(data, TRUE);
-}
-
-/* sync any in-memory data to disk */
-static int
-word_sync(struct _IBEXWord *idx)
-{
-	/* we just flush also, save memory */
-	word_flush(idx);
-
-#if 0
-	struct _wordcache *cache = (struct _wordcache *)idx->wordnodes.head;
-
-	while (cache->next) {
-		sync_cache_entry(idx, cache);
-		cache = cache->next;
-	}
-
-	/*ibex_hash_dump(idx->wordindex);*/
-	/*ibex_hash_dump(idx->nameindex);*/
-#endif
-	return 0;
-}
-
-/* sync and flush any in-memory data to disk and free it */
-static int
-word_flush(struct _IBEXWord *idx)
-{
-	d(cache_sanity(idx));
-
-	g_hash_table_foreach_remove(idx->wordcache, sync_free_value, idx);
-	idx->wordcount = 0;
-	return 0;
-}
-
-static int word_close(struct _IBEXWord *idx)
-{
-	idx->klass->flush(idx);
-
-	idx->namestore->klass->close(idx->namestore);
-	idx->nameindex->klass->close(idx->nameindex);
-	/*same as namestore:
-	  idx->wordstore->klass->close(idx->wordstore);*/
-	idx->wordindex->klass->close(idx->wordindex);
-	g_hash_table_destroy(idx->wordcache);
-	g_free(idx);
-
-	return 0;
-}
diff --git a/libical/.cvsignore b/libical/.cvsignore
deleted file mode 100644
index 41f3513f40..0000000000
--- a/libical/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.la
-*.lo
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-libtool
-ltconfig
-ltmain.sh
-stamp-h
-stamp-h.in
diff --git a/libical/AUTHORS b/libical/AUTHORS
deleted file mode 100644
index e69de29bb2..0000000000
--- a/libical/AUTHORS
+++ /dev/null